From 58f8944c92d17509d1005e80f1b6de693d8c2f21 Mon Sep 17 00:00:00 2001 From: Default email Date: Thu, 24 Sep 2020 23:45:31 -0500 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 5aba0fe9766a7201a336249fd6cb76e0d7ba2faf --- third_party/nixpkgs/.editorconfig | 15 +- third_party/nixpkgs/.github/CODEOWNERS | 15 +- third_party/nixpkgs/.github/CONTRIBUTING.md | 2 +- .../.github/workflows/editorconfig.yml | 27 + .../.github/workflows/pending-clear.yml | 21 + .../nixpkgs/.github/workflows/pending-set.yml | 20 + third_party/nixpkgs/.version | 2 +- .../doc/builders/images/dockertools.xml | 12 +- .../nixpkgs/doc/builders/images/ocitools.xml | 3 +- .../nixpkgs/doc/builders/packages/citrix.xml | 8 +- .../nixpkgs/doc/builders/packages/urxvt.xml | 50 +- .../doc/contributing/submitting-changes.xml | 12 +- .../nixpkgs/doc/languages-frameworks/beam.xml | 6 +- .../nixpkgs/doc/languages-frameworks/go.xml | 107 +- .../doc/languages-frameworks/node.section.md | 9 +- .../nixpkgs/doc/languages-frameworks/perl.xml | 186 +- .../languages-frameworks/python.section.md | 2 +- .../nixpkgs/doc/languages-frameworks/qt.xml | 2 +- .../nixpkgs/doc/languages-frameworks/ruby.xml | 25 +- .../doc/languages-frameworks/rust.section.md | 14 +- .../doc/languages-frameworks/texlive.xml | 10 +- .../doc/languages-frameworks/vim.section.md | 2 + third_party/nixpkgs/doc/manual.xml | 2 +- .../nixpkgs/doc/stdenv/multiple-output.xml | 78 +- .../nixpkgs/doc/using/configuration.xml | 8 +- third_party/nixpkgs/doc/using/overlays.xml | 36 +- third_party/nixpkgs/flake.nix | 26 +- third_party/nixpkgs/lib/generators.nix | 59 +- third_party/nixpkgs/lib/licenses.nix | 17 +- third_party/nixpkgs/lib/modules.nix | 21 +- third_party/nixpkgs/lib/options.nix | 34 +- third_party/nixpkgs/lib/strings.nix | 17 +- .../nixpkgs/lib/systems/architectures.nix | 77 + third_party/nixpkgs/lib/systems/default.nix | 3 + third_party/nixpkgs/lib/systems/doubles.nix | 49 +- third_party/nixpkgs/lib/systems/examples.nix | 8 +- third_party/nixpkgs/lib/tests/misc.nix | 98 +- third_party/nixpkgs/lib/tests/modules.sh | 53 +- .../types-anything/attrs-coercible.nix | 12 + .../modules/types-anything/equal-atoms.nix | 26 + .../modules/types-anything/functions.nix | 17 + .../tests/modules/types-anything/lists.nix | 16 + .../tests/modules/types-anything/mk-mods.nix | 44 + .../modules/types-anything/nested-attrs.nix | 22 + third_party/nixpkgs/lib/tests/release.nix | 1 - third_party/nixpkgs/lib/trivial.nix | 2 +- third_party/nixpkgs/lib/types.nix | 189 +- .../nixpkgs/maintainers/maintainer-list.nix | 312 +- .../nixpkgs/maintainers/scripts/build.nix | 10 +- .../maintainers/scripts/luarocks-packages.csv | 4 + third_party/nixpkgs/maintainers/team-list.nix | 7 + .../manual/administration/boot-problems.xml | 4 +- .../administration/imperative-containers.xml | 34 +- .../administration/maintenance-mode.xml | 2 +- .../administration/network-problems.xml | 4 +- .../doc/manual/administration/rebooting.xml | 6 +- .../doc/manual/administration/rollback.xml | 6 +- .../manual/administration/service-mgmt.xml | 6 +- .../manual/administration/user-sessions.xml | 2 +- .../configuration/adding-custom-packages.xml | 2 +- .../doc/manual/configuration/file-systems.xml | 8 +- .../doc/manual/configuration/gpu-accel.xml | 32 +- .../doc/manual/configuration/ipv4-config.xml | 2 +- .../doc/manual/configuration/ipv6-config.xml | 2 +- .../doc/manual/configuration/linux-kernel.xml | 16 +- .../configuration/luks-file-systems.xml | 20 +- .../manual/configuration/network-manager.xml | 2 +- .../nixos/doc/manual/configuration/ssh.xml | 2 +- .../doc/manual/configuration/user-mgmt.xml | 20 +- .../doc/manual/configuration/x-windows.xml | 2 +- .../manual/development/meta-attributes.xml | 2 +- .../doc/manual/development/option-types.xml | 79 +- .../nixos/doc/manual/development/releases.xml | 319 +- .../development/writing-documentation.xml | 4 +- .../development/writing-nixos-tests.xml | 2 +- .../manual/installation/changing-config.xml | 2 +- .../installing-behind-a-proxy.xml | 14 +- .../installing-from-other-distro.xml | 18 +- .../doc/manual/installation/installing.xml | 12 +- .../doc/manual/installation/upgrading.xml | 12 +- .../nixos/doc/manual/man-nixos-enter.xml | 4 +- .../nixos/doc/manual/man-nixos-install.xml | 16 + .../nixos/doc/manual/man-nixos-rebuild.xml | 2 +- .../nixos/doc/manual/man-nixos-version.xml | 4 +- .../manual/release-notes/release-notes.xml | 1 + .../doc/manual/release-notes/rl-2003.xml | 2 +- .../doc/manual/release-notes/rl-2009.xml | 261 +- .../doc/manual/release-notes/rl-2103.xml | 80 + third_party/nixpkgs/nixos/lib/build-vms.nix | 8 +- third_party/nixpkgs/nixos/lib/eval-config.nix | 4 +- .../make-options-doc/options-to-docbook.xsl | 2 +- third_party/nixpkgs/nixos/lib/qemu-flags.nix | 4 +- .../nixpkgs/nixos/lib/test-driver/Logger.pm | 75 - .../nixpkgs/nixos/lib/test-driver/Machine.pm | 734 - .../nixos/lib/test-driver/test-driver.pl | 191 - .../nixos/lib/test-driver/test-driver.py | 31 +- .../nixpkgs/nixos/lib/testing-python.nix | 13 +- third_party/nixpkgs/nixos/lib/testing.nix | 258 - third_party/nixpkgs/nixos/lib/utils.nix | 5 + .../maintainers/scripts/ec2/create-amis.sh | 2 +- .../nixos/modules/config/fonts/fontconfig.nix | 32 +- .../nixos/modules/config/krb5/default.nix | 34 +- .../nixos/modules/config/system-path.nix | 23 +- .../nixos/modules/config/users-groups.nix | 4 +- .../nixos/modules/hardware/device-tree.nix | 164 +- .../nixos/modules/hardware/onlykey.nix | 2 +- .../nixos/modules/hardware/system-76.nix | 56 + .../nixos/modules/hardware/video/nvidia.nix | 2 + .../cd-dvd/sd-image-raspberrypi4.nix | 2 +- .../modules/installer/cd-dvd/sd-image.nix | 12 + .../modules/installer/tools/nixos-install.sh | 73 +- .../tools/nixos-option/nixos-option.cc | 2 +- .../modules/installer/tools/nixos-rebuild.sh | 25 +- .../nixos/modules/installer/tools/tools.nix | 8 +- .../nixpkgs/nixos/modules/misc/ids.nix | 8 +- .../nixpkgs/nixos/modules/misc/locate.nix | 2 +- .../nixpkgs/nixos/modules/misc/nixpkgs.nix | 2 - .../nixpkgs/nixos/modules/module-list.nix | 12 +- .../nixos/modules/profiles/hardened.nix | 5 +- .../modules/profiles/installation-device.nix | 15 +- .../nixos/modules/programs/environment.nix | 1 - .../nixpkgs/nixos/modules/programs/gpaste.nix | 2 + .../nixos/modules/programs/nm-applet.nix | 15 +- .../nixpkgs/nixos/modules/programs/qt5ct.nix | 2 +- .../nixpkgs/nixos/modules/programs/ssh.nix | 2 +- .../nixos/modules/programs/tsm-client.nix | 4 +- .../nixos/modules/programs/xss-lock.nix | 2 +- .../nixos/modules/programs/zsh/oh-my-zsh.xml | 2 +- third_party/nixpkgs/nixos/modules/rename.nix | 4 + .../nixpkgs/nixos/modules/security/acme.nix | 652 +- .../nixpkgs/nixos/modules/security/acme.xml | 20 +- .../nixos/modules/security/apparmor.nix | 6 + .../nixpkgs/nixos/modules/security/duosec.nix | 2 +- .../nixpkgs/nixos/modules/security/misc.nix | 14 + .../nixpkgs/nixos/modules/security/pam.nix | 6 +- .../nixpkgs/nixos/modules/security/rngd.nix | 13 +- .../modules/security/systemd-confinement.nix | 2 +- .../nixos/modules/services/audio/icecast.nix | 2 +- .../nixos/modules/services/audio/mpd.nix | 31 +- .../modules/services/backup/borgbackup.xml | 30 +- .../modules/services/backup/znapzend.nix | 4 +- .../services/cluster/kubernetes/pki.nix | 5 +- .../hercules-ci-agent/common.nix | 213 + .../hercules-ci-agent/default.nix | 86 + .../modules/services/databases/couchdb.nix | 25 +- .../modules/services/databases/postgresql.nix | 128 +- .../services/databases/victoriametrics.nix | 4 +- .../services/desktops/deepin/deepin.nix | 123 - .../modules/services/desktops/espanso.nix | 25 + .../modules/services/desktops/geoclue2.nix | 2 +- .../development/jupyterhub/default.nix | 2 +- .../modules/services/development/lorri.nix | 13 +- .../nixos/modules/services/editors/emacs.xml | 14 +- .../nixos/modules/services/games/terraria.nix | 18 +- .../modules/services/hardware/fancontrol.nix | 2 +- .../hardware/sane_extra_backends/brscan4.nix | 2 +- .../modules/services/hardware/thermald.nix | 10 + .../modules/services/hardware/undervolt.nix | 18 +- .../modules/services/logging/logrotate.nix | 146 +- .../modules/services/logging/logstash.nix | 6 +- .../nixos/modules/services/mail/dovecot.nix | 33 +- .../nixos/modules/services/mail/mailhog.nix | 68 +- .../nixos/modules/services/mail/opendkim.nix | 30 + .../modules/services/misc/beanstalkd.nix | 10 + .../modules/services/misc/calibre-server.nix | 49 +- .../modules/services/misc/gammu-smsd.nix | 2 +- .../nixos/modules/services/misc/gitlab.nix | 25 +- .../nixos/modules/services/misc/gitlab.xml | 6 + .../nixos/modules/services/misc/gollum.nix | 7 + .../modules/services/misc/nix-daemon.nix | 31 +- .../nixos/modules/services/misc/nix-gc.nix | 2 +- .../modules/services/misc/nix-optimise.nix | 2 +- .../nixos/modules/services/misc/octoprint.nix | 4 +- .../nixos/modules/services/misc/redmine.nix | 102 +- .../nixos/modules/services/misc/ssm-agent.nix | 6 +- .../nixos/modules/services/misc/sssd.nix | 4 +- .../services/monitoring/datadog-agent.nix | 14 +- .../modules/services/monitoring/monit.nix | 2 + .../monitoring/prometheus/default.nix | 29 +- .../monitoring/prometheus/exporters.nix | 4 +- .../prometheus/exporters/unifi-poller.nix | 34 + .../modules/services/monitoring/smartd.nix | 6 +- .../services/monitoring/unifi-poller.nix | 242 + .../services/monitoring/zabbix-proxy.nix | 17 +- .../services/monitoring/zabbix-server.nix | 17 +- .../network-filesystems/cachefilesd.nix | 18 +- .../network-filesystems/orangefs/server.nix | 4 +- .../services/network-filesystems/samba.nix | 2 +- .../modules/services/networking/biboumi.nix | 269 + .../modules/services/networking/heyefi.nix | 82 - .../services/networking/hylafax/options.nix | 4 +- .../modules/services/networking/monero.nix | 2 +- .../modules/services/networking/namecoind.nix | 2 +- .../services/networking/networkmanager.nix | 2 +- .../services/networking/ntp/chrony.nix | 1 - .../modules/services/networking/nylon.nix | 2 +- .../modules/services/networking/onedrive.nix | 2 +- .../modules/services/networking/openvpn.nix | 2 +- .../modules/services/networking/prosody.nix | 2 +- .../modules/services/networking/prosody.xml | 13 +- .../services/networking/robustirc-bridge.nix | 47 + .../modules/services/networking/seeks.nix | 75 - .../services/networking/shadowsocks.nix | 54 +- .../modules/services/networking/ssh/sshd.nix | 12 +- .../modules/services/networking/syncthing.nix | 13 +- .../services/networking/wpa_supplicant.nix | 3 + .../security/bitwarden_rs/default.nix | 19 +- .../modules/services/security/physlock.nix | 10 +- .../nixos/modules/services/security/tor.nix | 22 +- .../services/video/epgstation/default.nix | 295 + .../services/video/epgstation/generate | 31 + .../services/video/epgstation/streaming.json | 119 + .../modules/services/video/mirakurun.nix | 24 +- .../nixos/modules/services/wayland/cage.nix | 1 + .../modules/services/web-apps/codimd.nix | 39 +- .../modules/services/web-apps/jitsi-meet.nix | 1 + .../modules/services/web-apps/jitsi-meet.xml | 55 + .../nixos/modules/services/web-apps/sogo.nix | 1 - .../web-servers/apache-httpd/default.nix | 96 +- .../modules/services/web-servers/caddy.nix | 66 +- .../modules/services/web-servers/meguca.nix | 174 - .../services/web-servers/nginx/default.nix | 97 +- .../services/web-servers/phpfpm/default.nix | 1 + .../x11/desktop-managers/cinnamon.nix | 205 + .../services/x11/desktop-managers/default.nix | 1 + .../x11/desktop-managers/pantheon.nix | 2 + .../services/x11/desktop-managers/plasma5.nix | 18 +- .../services/x11/display-managers/default.nix | 31 +- .../services/x11/display-managers/gdm.nix | 8 +- .../nixos/modules/services/x11/imwheel.nix | 3 +- .../services/x11/window-managers/xmonad.nix | 30 +- .../nixos/modules/services/x11/xserver.nix | 20 +- .../modules/system/activation/top-level.nix | 6 +- .../raspberrypi/raspberrypi-builder.nix | 4 +- .../systemd-boot/systemd-boot-builder.py | 25 +- .../boot/loader/systemd-boot/systemd-boot.nix | 2 + .../nixos/modules/system/boot/luksroot.nix | 4 +- .../nixos/modules/system/boot/stage-1-init.sh | 7 +- .../nixos/modules/system/boot/stage-1.nix | 11 +- .../system/boot/systemd-unit-options.nix | 1 - .../nixos/modules/system/boot/systemd.nix | 14 +- .../nixpkgs/nixos/modules/system/etc/etc.nix | 2 +- .../nixos/modules/tasks/encrypted-devices.nix | 2 +- .../nixos/modules/tasks/filesystems.nix | 4 +- .../modules/tasks/network-interfaces.nix | 5 +- .../modules/testing/test-instrumentation.nix | 9 - .../modules/virtualisation/containers.nix | 20 +- .../nixos/modules/virtualisation/cri-o.nix | 25 +- .../virtualisation/docker-preloader.nix | 134 - .../virtualisation/nixos-containers.nix | 2 +- .../virtualisation/parallels-guest.nix | 2 +- .../nixos/modules/virtualisation/podman.nix | 9 +- .../nixos/modules/virtualisation/qemu-vm.nix | 1 - .../nixos/modules/virtualisation/railcar.nix | 4 +- .../virtualisation/spice-usb-redirection.nix | 24 + .../nixpkgs/nixos/release-combined.nix | 18 + third_party/nixpkgs/nixos/tests/3proxy.nix | 4 + third_party/nixpkgs/nixos/tests/acme.nix | 372 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 13 +- third_party/nixpkgs/nixos/tests/bitwarden.nix | 188 + third_party/nixpkgs/nixos/tests/caddy.nix | 18 +- .../nixpkgs/nixos/tests/charliecloud.nix | 43 + third_party/nixpkgs/nixos/tests/codimd.nix | 10 +- .../tests/common/acme/client/default.nix | 11 +- .../tests/common/acme/server/default.nix | 72 +- .../tests/common/acme/server/mkcerts.nix | 68 - .../nixos/tests/common/acme/server/mkcerts.sh | 6 - .../common/acme/server/snakeoil-certs.nix | 206 +- .../nixpkgs/nixos/tests/common/ec2.nix | 58 +- .../nixos/tests/containers-reloadable.nix | 4 +- third_party/nixpkgs/nixos/tests/couchdb.nix | 80 +- third_party/nixpkgs/nixos/tests/cri-o.nix | 19 + .../nixpkgs/nixos/tests/docker-preloader.nix | 27 - .../nixpkgs/nixos/tests/docker-tools.nix | 9 +- third_party/nixpkgs/nixos/tests/ec2.nix | 134 +- third_party/nixpkgs/nixos/tests/gnome3.nix | 10 +- .../nixpkgs/nixos/tests/gotify-server.nix | 5 + third_party/nixpkgs/nixos/tests/hardened.nix | 112 +- .../tests/hocker-fetchdocker/default.nix | 9 +- third_party/nixpkgs/nixos/tests/installer.nix | 14 +- third_party/nixpkgs/nixos/tests/kafka.nix | 1 + .../nixos/tests/krb5/example-config.nix | 8 +- .../nixpkgs/nixos/tests/lxd-nftables.nix | 1 + third_party/nixpkgs/nixos/tests/lxd.nix | 14 +- third_party/nixpkgs/nixos/tests/magnetico.nix | 7 +- third_party/nixpkgs/nixos/tests/make-test.nix | 9 - .../nixpkgs/nixos/tests/nginx-sandbox.nix | 1 - .../nixpkgs/nixos/tests/openstack-image.nix | 70 +- third_party/nixpkgs/nixos/tests/os-prober.nix | 33 +- ...postfix-raise-smtpd-tls-security-level.nix | 3 - third_party/nixpkgs/nixos/tests/postfix.nix | 13 +- .../nixos/tests/postgresql-wal-receiver.nix | 198 +- .../nixos/tests/prometheus-exporters.nix | 33 +- .../nixpkgs/nixos/tests/prometheus.nix | 7 +- .../nixpkgs/nixos/tests/robustirc-bridge.nix | 29 + .../nixos/tests/shadowsocks/common.nix | 84 + .../nixos/tests/shadowsocks/default.nix | 16 + .../nixpkgs/nixos/tests/signal-desktop.nix | 9 +- third_party/nixpkgs/nixos/tests/sssd-ldap.nix | 78 + third_party/nixpkgs/nixos/tests/sssd.nix | 17 + ...ystemd-networkd-ipv6-prefix-delegation.nix | 8 +- .../nixpkgs/nixos/tests/systemd-networkd.nix | 11 +- third_party/nixpkgs/nixos/tests/systemd.nix | 32 +- .../nixpkgs/nixos/tests/transmission.nix | 2 + third_party/nixpkgs/nixos/tests/v2ray.nix | 83 + .../nixpkgs/nixos/tests/virtualbox.nix | 392 +- .../nixpkgs/nixos/tests/xmpp/ejabberd.nix | 16 +- .../nixos/tests/xmpp/xmpp-sendmessage.nix | 6 +- .../applications/audio/ashuffle/default.nix | 26 + .../applications/audio/audacity/default.nix | 2 +- .../applications/audio/axoloti/libusb1.nix | 4 +- .../audio/bambootracker/default.nix | 29 +- .../applications/audio/bchoppr/default.nix | 4 +- .../audio/bitwig-studio/bitwig-studio3.nix | 4 +- .../applications/audio/bjumblr/default.nix | 4 +- .../applications/audio/bs1770gain/default.nix | 4 +- .../applications/audio/bschaffl/default.nix | 4 +- .../applications/audio/cantata/default.nix | 17 +- .../cantata/dont-check-for-perl-in-PATH.diff | 17 + .../applications/audio/csound/default.nix | 4 +- .../audio/dragonfly-reverb/default.nix | 4 +- .../applications/audio/drumkv1/default.nix | 4 +- .../pkgs/applications/audio/faust/faust2.nix | 11 +- .../applications/audio/faust/faust2jack.nix | 2 + .../applications/audio/faust/faust2jaqt.nix | 2 + .../applications/audio/fdkaac/default.nix | 6 +- .../pkgs/applications/audio/fmit/default.nix | 4 +- .../applications/audio/friture/default.nix | 16 +- .../audio/friture/unlock_constraints.patch | 34 + .../applications/audio/ft2-clone/default.nix | 4 +- .../applications/audio/geonkick/default.nix | 7 +- .../applications/audio/gspeech/default.nix | 8 +- .../pkgs/applications/audio/helm/default.nix | 25 +- .../pkgs/applications/audio/hydrogen/0.nix | 26 + .../applications/audio/hydrogen/default.nix | 26 +- .../applications/audio/hydrogen/unstable.nix | 34 - .../applications/audio/jackmix/default.nix | 3 +- .../applications/audio/jamulus/default.nix | 4 +- .../applications/audio/lingot/default.nix | 8 +- .../0001-Remove-coherency-checks.patch | 52 + ...l-directory-to-the-current-directory.patch | 27 + .../audio/littlegptracker/default.nix | 72 + .../audio/lv2-cpp-tools/default.nix | 28 + .../pkgs/applications/audio/mamba/default.nix | 13 +- .../applications/audio/mamba/fix-build.patch | 10 - .../audio/midi-visualizer/default.nix | 42 + .../applications/audio/mooSpace/default.nix | 35 + .../pkgs/applications/audio/mopidy/iris.nix | 2 +- .../pkgs/applications/audio/mopidy/mopidy.nix | 2 +- .../applications/audio/mpg123/default.nix | 30 +- .../pkgs/applications/audio/musly/default.nix | 4 +- .../pkgs/applications/audio/ncmpc/default.nix | 4 +- .../applications/audio/ncspot/default.nix | 6 +- .../audio/netease-cloud-music/default.nix | 81 - .../applications/audio/openmpt123/default.nix | 4 +- .../applications/audio/parlatype/default.nix | 4 +- .../applications/audio/picard/default.nix | 4 +- .../applications/audio/picoloop/default.nix | 50 + .../applications/audio/plexamp/default.nix | 4 +- .../applications/audio/puddletag/default.nix | 31 +- .../audio/pulseaudio-dlna/default.nix | 6 +- .../audio/pulseeffects/default.nix | 4 +- .../applications/audio/qjackctl/default.nix | 4 +- .../applications/audio/qsynth/default.nix | 4 +- .../applications/audio/qtractor/default.nix | 4 +- .../applications/audio/reaper/default.nix | 4 +- .../applications/audio/renoise/default.nix | 4 +- .../pkgs/applications/audio/seq66/default.nix | 35 + .../pkgs/applications/audio/snd/default.nix | 4 +- .../applications/audio/sonata/default.nix | 36 +- .../audio/sonic-lineup/default.nix | 6 +- .../audio/sonic-visualiser/default.nix | 18 +- .../audio/soundkonverter/default.nix | 11 +- .../applications/audio/spotify/default.nix | 2 +- .../applications/audio/spotify/wrapper.nix | 31 + .../audio/sublime-music/default.nix | 4 +- .../applications/audio/sunvox/default.nix | 2 +- .../pkgs/applications/audio/surge/default.nix | 48 + .../applications/audio/synthv1/default.nix | 4 +- .../audio/talentedhack/default.nix | 36 + .../applications/audio/transcribe/default.nix | 73 - .../applications/audio/tunefish/default.nix | 43 + .../applications/audio/vcv-rack/default.nix | 2 +- .../audio/virtual-ans/default.nix | 89 + .../applications/audio/vocproc/default.nix | 27 + .../applications/backup/deja-dup/default.nix | 55 +- .../backup/deja-dup/hardcode-gsettings.patch | 16 - .../applications/backup/vorta/default.nix | 4 +- .../applications/blockchains/bitcoin-abc.nix | 4 +- .../blockchains/bitcoin-unlimited.nix | 6 +- .../pkgs/applications/blockchains/bitcoin.nix | 2 +- .../blockchains/btcpayserver/default.nix | 66 + .../blockchains/btcpayserver/deps.nix | 1937 ++ .../blockchains/btcpayserver/update.sh | 6 + .../applications/blockchains/clightning.nix | 4 +- .../pkgs/applications/blockchains/dashpay.nix | 2 +- .../pkgs/applications/blockchains/dcrd.nix | 4 +- .../applications/blockchains/dogecoin.nix | 2 +- .../applications/blockchains/ergo/default.nix | 4 +- .../blockchains/exodus/default.nix | 6 +- .../applications/blockchains/go-ethereum.nix | 9 +- .../applications/blockchains/litecoin.nix | 2 +- .../pkgs/applications/blockchains/lnd.nix | 6 +- .../blockchains/monero/default.nix | 4 +- .../applications/blockchains/namecoin.nix | 2 +- .../blockchains/nbxplorer/default.nix | 54 + .../blockchains/nbxplorer/deps.nix | 1072 + .../blockchains/nbxplorer/update.sh | 6 + .../blockchains/nbxplorer/util/create-deps.sh | 45 + .../nbxplorer/util/update-common.sh | 51 + .../blockchains/wasabibackend/default.nix | 4 +- .../blockchains/wasabibackend/deps.nix | 1279 +- .../blockchains/wasabiwallet/default.nix | 6 +- .../editors/android-studio/common.nix | 2 +- .../editors/android-studio/default.nix | 12 +- .../applications/editors/bluej/default.nix | 36 + .../applications/editors/brackets/default.nix | 4 +- .../editors/code-browser/default.nix | 48 + .../applications/editors/cudatext/default.nix | 113 + .../applications/editors/cudatext/deps.json | 42 + .../editors/cudatext/dont-check-update.patch | 12 + .../editors/emacs-modes/elpa-generated.nix | 318 +- .../editors/emacs-modes/melpa-packages.nix | 26 + .../editors/emacs-modes/org-generated.nix | 12 +- .../emacs-modes/recipes-archive-melpa.json | 12188 ++++++---- .../editors/emacs-modes/updater-emacs.nix | 2 +- .../pkgs/applications/editors/emacs/25.nix | 146 - .../pkgs/applications/editors/emacs/26.nix | 8 + .../pkgs/applications/editors/emacs/27.nix | 8 + .../editors/emacs/clean-env-26.patch | 15 + .../emacs/{default.nix => generic.nix} | 50 +- .../applications/editors/emacs/macport.nix | 4 +- .../emacs/tramp-detect-wrapped-gvfsd-26.patch | 14 + .../editors/featherpad/default.nix | 12 +- .../editors/gophernotes/default.nix | 26 + .../applications/editors/jedit/default.nix | 8 +- .../editors/jetbrains/default.nix | 53 +- .../applications/editors/kakoune/default.nix | 4 +- .../editors/kakoune/plugins/case.kak.nix | 27 + .../editors/kakoune/plugins/default.nix | 1 + .../applications/editors/kibi/default.nix | 25 + .../editors/lighttable/default.nix | 6 +- .../applications/editors/micro/default.nix | 4 +- .../pkgs/applications/editors/micro/deps.nix | 17 +- .../applications/editors/nano/default.nix | 4 +- .../pkgs/applications/editors/neovim/qt.nix | 1 + .../applications/editors/netbeans/default.nix | 4 +- .../applications/editors/setzer/default.nix | 4 +- .../editors/texstudio/default.nix | 4 +- .../applications/editors/typora/default.nix | 8 +- .../pkgs/applications/editors/vim/common.nix | 4 +- .../pkgs/applications/editors/vim/qvim.nix | 113 - .../pkgs/applications/editors/viw/default.nix | 30 + .../applications/editors/vscode/generic.nix | 2 +- .../applications/editors/vscode/update.sh | 4 +- .../applications/editors/vscode/vscode.nix | 6 +- .../applications/editors/vscode/vscodium.nix | 6 +- .../applications/editors/xxe-pe/default.nix | 77 + .../nixpkgs/pkgs/applications/gis/gmt/dcw.nix | 32 + .../pkgs/applications/gis/gmt/default.nix | 73 + .../pkgs/applications/gis/gmt/gshhg.nix | 31 + .../gis/openorienteering-mapper/default.nix | 2 - .../pkgs/applications/gis/qgis/unwrapped.nix | 4 +- .../pkgs/applications/gis/saga/default.nix | 4 +- .../applications/graphics/akira/default.nix | 8 +- .../applications/graphics/digikam/default.nix | 4 +- .../applications/graphics/drawio/default.nix | 2 +- .../graphics/drawpile/default.nix | 69 +- .../applications/graphics/feh/default.nix | 4 +- .../graphics/fontmatrix/default.nix | 24 +- .../applications/graphics/gcolor3/default.nix | 43 +- .../applications/graphics/inkscape/0.x.nix | 133 - .../graphics/inkscape/default.nix | 4 +- .../graphics/inkscape/extensions.nix | 37 + .../graphics/inkscape/with-extensions.nix | 21 + .../applications/graphics/ktikz/default.nix | 9 +- .../graphics/lightburn/default.nix | 49 + .../applications/graphics/meshlab/default.nix | 32 +- .../graphics/meshlab/fix-version.patch | 5 - .../graphics/meshlab/meshlab.desktop | 3 +- .../graphics/meshlab/no-build-date.patch | 10 - .../applications/graphics/mypaint/default.nix | 6 + .../applications/graphics/nomacs/default.nix | 4 +- .../graphics/odafileconverter/default.nix | 53 + .../graphics/opentoonz/default.nix | 51 + .../graphics/opentoonz/libtiff.nix | 21 + .../graphics/opentoonz/source.nix | 16 + .../applications/graphics/pdfcpu/default.nix | 7 +- .../applications/graphics/pencil/default.nix | 2 +- .../applications/graphics/qosmic/default.nix | 70 + .../graphics/runwayml/default.nix | 9 +- .../sane/backends/airscan/default.nix | 8 +- .../graphics/shotwell/default.nix | 4 +- .../applications/graphics/ufraw/default.nix | 2 + .../graphics/viewnior/default.nix | 44 +- .../graphics/write_stylus/default.nix | 28 +- .../graphics/xfractint/default.nix | 4 +- .../applications/graphics/yed/default.nix | 4 +- .../pkgs/applications/kde/akonadi/default.nix | 2 +- .../pkgs/applications/kde/calendarsupport.nix | 4 +- .../nixpkgs/pkgs/applications/kde/default.nix | 25 +- .../nixpkgs/pkgs/applications/kde/fetch.sh | 2 +- .../kde/grantleetheme/default.nix | 3 +- .../grantlee-merge-theme-dirs.patch | 155 - .../applications/kde/grantleetheme/series | 1 - .../pkgs/applications/kde/incidenceeditor.nix | 4 +- .../nixpkgs/pkgs/applications/kde/kalzium.nix | 26 + .../nixpkgs/pkgs/applications/kde/kapman.nix | 21 + .../nixpkgs/pkgs/applications/kde/katomic.nix | 22 + .../pkgs/applications/kde/kblackbox.nix | 21 + .../nixpkgs/pkgs/applications/kde/kblocks.nix | 21 + .../nixpkgs/pkgs/applications/kde/kbounce.nix | 22 + .../kde/kdepim-apps-libs/default.nix | 3 +- ...-apps-libs-grantlee-merge-theme-dirs.patch | 62 - .../applications/kde/kdepim-apps-libs/series | 1 - .../kde/kdepim-runtime/default.nix | 10 +- .../pkgs/applications/kde/kdiamond.nix | 23 + .../nixpkgs/pkgs/applications/kde/kigo.nix | 22 + .../pkgs/applications/kde/killbots.nix | 21 + .../pkgs/applications/kde/klettres.nix | 22 + .../nixpkgs/pkgs/applications/kde/klines.nix | 21 + .../nixpkgs/pkgs/applications/kde/kmag.nix | 20 + .../nixpkgs/pkgs/applications/kde/kmail.nix | 1 - .../nixpkgs/pkgs/applications/kde/kmail.patch | 24 - .../nixpkgs/pkgs/applications/kde/kmines.nix | 23 + .../pkgs/applications/kde/knavalbattle.nix | 22 + .../pkgs/applications/kde/knetwalk.nix | 21 + .../nixpkgs/pkgs/applications/kde/knights.nix | 23 + .../pkgs/applications/kde/kollision.nix | 21 + .../nixpkgs/pkgs/applications/kde/kontact.nix | 4 +- .../pkgs/applications/kde/kreversi.nix | 19 + .../nixpkgs/pkgs/applications/kde/kshisen.nix | 22 + .../pkgs/applications/kde/ksquares.nix | 22 + .../pkgs/applications/kde/kteatime.nix | 23 + .../nixpkgs/pkgs/applications/kde/ktimer.nix | 20 + .../nixpkgs/pkgs/applications/kde/kturtle.nix | 21 + .../nixpkgs/pkgs/applications/kde/kwave.nix | 37 + .../pkgs/applications/kde/mailimporter.nix | 4 +- .../pkgs/applications/kde/pimcommon.nix | 10 +- .../nixpkgs/pkgs/applications/kde/srcs.nix | 1744 +- .../applications/misc/1password/default.nix | 8 +- .../misc/ArchiSteamFarm/default.nix | 4 +- .../misc/adobe-reader/default.nix | 8 +- .../applications/misc/almanah/default.nix | 20 +- .../applications/misc/ausweisapp2/default.nix | 4 +- .../misc/autospotting/default.nix | 2 - .../applications/misc/autospotting/deps.nix | 75 - .../pkgs/applications/misc/bemenu/default.nix | 4 +- .../applications/misc/blender/default.nix | 15 +- .../applications/misc/calibre/default.nix | 63 +- .../pkgs/applications/misc/cheat/default.nix | 4 +- .../misc/cli-visualizer/default.nix | 8 +- .../applications/misc/cointop/default.nix | 8 +- .../applications/misc/coolreader/default.nix | 26 + .../pkgs/applications/misc/copyq/default.nix | 4 +- .../pkgs/applications/misc/cura/default.nix | 6 +- .../pkgs/applications/misc/cura/plugins.nix | 6 +- .../applications/misc/curaengine/default.nix | 4 +- .../applications/misc/dbeaver/default.nix | 4 +- .../misc/electron-cash/default.nix | 20 +- .../applications/misc/electrum/default.nix | 23 +- .../pkgs/applications/misc/electrum/ltc.nix | 8 +- .../applications/misc/etesync-dav/default.nix | 4 + .../applications/misc/exercism/default.nix | 2 +- .../applications/misc/fetchmail/default.nix | 4 +- .../pkgs/applications/misc/foot/default.nix | 38 + .../pkgs/applications/misc/fuzzel/default.nix | 5 +- .../applications/misc/gallery-dl/default.nix | 4 +- .../applications/misc/go-jira/default.nix | 4 +- .../applications/misc/googleearth/default.nix | 5 +- .../applications/misc/gpsprune/default.nix | 6 +- .../pkgs/applications/misc/gramps/default.nix | 4 +- .../pkgs/applications/misc/grip/default.nix | 4 +- .../pkgs/applications/misc/havoc/default.nix | 6 +- .../pkgs/applications/misc/heimer/default.nix | 4 +- .../applications/misc/hovercraft/default.nix | 4 +- .../misc/html5validator/default.nix | 25 + .../pkgs/applications/misc/imag/default.nix | 63 + .../misc/joplin-desktop/default.nix | 4 +- .../pkgs/applications/misc/josm/default.nix | 6 +- .../misc/k2pdfopt/0001-Fix-CMakeLists.patch | 49 + .../applications/misc/k2pdfopt/default.nix | 150 +- .../misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch | 151 - .../applications/misc/k2pdfopt/k2pdfopt.patch | 99 - .../misc/k2pdfopt/leptonica.patch | 254 - .../applications/misc/k2pdfopt/mupdf.patch | 1060 - .../misc/k2pdfopt/tesseract.patch | 675 - .../applications/misc/keepass/default.nix | 4 +- .../applications/misc/keepassx/community.nix | 4 +- .../applications/misc/krename/default.nix | 2 + .../pkgs/applications/misc/lutris/default.nix | 9 +- .../pkgs/applications/misc/lutris/fhsenv.nix | 2 +- .../misc/mediainfo-gui/default.nix | 4 +- .../pkgs/applications/misc/minder/default.nix | 4 +- .../pkgs/applications/misc/mlterm/default.nix | 5 +- .../applications/misc/moolticute/default.nix | 4 +- .../pkgs/applications/misc/navi/default.nix | 12 +- .../pkgs/applications/misc/nimmm/default.nix | 2 - .../misc/nwg-launchers/default.nix | 4 +- .../applications/misc/obinskit/default.nix | 3 +- .../applications/misc/obsidian/default.nix | 82 +- .../applications/misc/octoprint/default.nix | 238 +- .../applications/misc/octoprint/plugins.nix | 38 + .../applications/misc/openambit/default.nix | 48 + .../applications/misc/openrgb/default.nix | 14 +- .../pkgs/applications/misc/orca/default.nix | 4 +- .../misc/prusa-slicer/super-slicer.nix | 50 + .../misc/qcad/application-dir.patch | 13 + .../pkgs/applications/misc/qcad/default.nix | 42 +- .../applications/misc/qdirstat/default.nix | 12 +- .../applications/misc/redshift/default.nix | 9 +- .../applications/misc/rescuetime/default.nix | 12 +- .../pkgs/applications/misc/rofi/default.nix | 4 +- .../pkgs/applications/misc/sdcv/default.nix | 4 +- .../applications/misc/sidequest/default.nix | 4 +- .../applications/misc/simplenote/default.nix | 7 +- .../applications/misc/snowsql/default.nix | 46 + .../misc/super_user_spark/default.nix | 32 - .../misc/systembus-notify/default.nix | 4 +- .../applications/misc/taskell/default.nix | 66 - .../applications/misc/timewarrior/default.nix | 4 +- .../pkgs/applications/misc/tipp10/default.nix | 8 +- .../applications/misc/tippecanoe/default.nix | 5 +- .../pkgs/applications/misc/topydo/default.nix | 9 +- .../misc/tty-solitaire/default.nix | 27 + .../applications/misc/weather/default.nix | 71 +- .../pkgs/applications/misc/wofi/default.nix | 5 + .../misc/wofi/do_not_follow_symlinks.patch | 39 + .../pkgs/applications/misc/worker/default.nix | 4 +- .../applications/misc/xbattbar/default.nix | 46 + .../misc/xbattbar/sys-by-default.patch | 26 + .../applications/misc/xdragon/default.nix | 28 + .../pkgs/applications/misc/xmenu/default.nix | 25 + .../applications/misc/zathura/wrapper.nix | 13 +- .../pkgs/applications/misc/zettlr/default.nix | 38 + .../pkgs/applications/misc/zola/default.nix | 12 +- .../applications/networking/Sylk/default.nix | 4 +- .../networking/browsers/amfora/default.nix | 6 +- .../networking/browsers/arora/default.nix | 26 - .../networking/browsers/castor/default.nix | 3 +- .../networking/browsers/chromium/browser.nix | 1 - .../networking/browsers/chromium/common.nix | 39 +- .../networking/browsers/chromium/default.nix | 63 +- .../networking/browsers/chromium/plugins.nix | 4 +- .../networking/browsers/chromium/update.nix | 271 - .../networking/browsers/chromium/update.py | 77 + .../networking/browsers/chromium/update.sh | 4 - .../browsers/chromium/upstream-info.json | 17 + .../browsers/chromium/upstream-info.nix | 18 - .../networking/browsers/eolie/default.nix | 18 +- .../browsers/firefox-bin/beta_sources.nix | 770 +- .../browsers/firefox-bin/default.nix | 4 +- .../browsers/firefox-bin/release_sources.nix | 770 +- .../networking/browsers/firefox/common.nix | 67 +- .../firefox/no-buildconfig-ffx65.patch | 24 - .../networking/browsers/firefox/packages.nix | 37 +- .../browsers/google-chrome/default.nix | 12 +- .../networking/browsers/luakit/default.nix | 18 +- .../mozilla-plugins/flashplayer/default.nix | 10 +- .../flashplayer/standalone.nix | 6 +- .../browsers/next/next-gtk-webkit.nix | 6 +- .../networking/browsers/opera/default.nix | 6 +- .../networking/browsers/palemoon/default.nix | 10 +- .../browsers/qutebrowser/default.nix | 3 +- .../tor-browser-bundle-bin/default.nix | 6 +- .../browsers/ungoogled-chromium/common.nix | 42 +- .../browsers/ungoogled-chromium/default.nix | 72 +- .../browsers/ungoogled-chromium/plugins.nix | 4 +- .../ungoogled-chromium/ungoogled-src.nix | 6 +- .../browsers/ungoogled-chromium/update.nix | 271 - .../browsers/ungoogled-chromium/update.py | 77 + .../browsers/ungoogled-chromium/update.sh | 4 - .../ungoogled-chromium/upstream-info.json | 17 + .../ungoogled-chromium/upstream-info.nix | 18 - .../networking/browsers/vivaldi/default.nix | 6 +- .../applications/networking/c14/default.nix | 2 - .../pkgs/applications/networking/c14/deps.nix | 1 - .../networking/cawbird/default.nix | 6 +- .../networking/charles/default.nix | 4 +- .../networking/cloudflared/default.nix | 4 +- .../networking/cluster/argo/default.nix | 6 +- .../networking/cluster/atlantis/default.nix | 4 +- .../networking/cluster/cni/default.nix | 2 +- .../networking/cluster/cni/plugins.nix | 8 +- .../networking/cluster/flink/default.nix | 6 +- .../networking/cluster/fluxctl/default.nix | 6 +- .../networking/cluster/helm/default.nix | 8 +- .../networking/cluster/helmfile/default.nix | 6 +- .../networking/cluster/heptio-ark/default.nix | 25 - .../networking/cluster/istioctl/default.nix | 6 +- .../networking/cluster/jx/default.nix | 6 +- .../networking/cluster/k3s/default.nix | 13 +- .../networking/cluster/k9s/default.nix | 6 +- .../networking/cluster/kops/default.nix | 29 +- .../networking/cluster/kpt/default.nix | 12 +- .../networking/cluster/kube3d/default.nix | 4 +- .../networking/cluster/kubernetes/default.nix | 4 +- .../networking/cluster/luigi/default.nix | 15 +- .../networking/cluster/minikube/default.nix | 6 +- .../cluster/node-problem-detector/default.nix | 4 +- .../networking/cluster/nomad/0.11.nix | 3 +- .../networking/cluster/nomad/0.12.nix | 7 +- .../networking/cluster/popeye/default.nix | 34 + .../networking/cluster/ssm-agent/default.nix | 47 +- .../networking/cluster/stern/default.nix | 1 + .../networking/cluster/tanka/default.nix | 9 +- .../cluster/terraform-compliance/default.nix | 5 + .../networking/cluster/terraform/default.nix | 4 +- .../networking/cluster/terragrunt/default.nix | 6 +- .../networking/cluster/tilt/default.nix | 4 +- .../networking/cluster/velero/default.nix | 45 + .../networking/datovka/default.nix | 4 +- .../networking/dnscontrol/default.nix | 16 +- .../feedreaders/rss2email/default.nix | 4 +- .../feedreaders/rssguard/default.nix | 4 +- .../networking/flexget/default.nix | 4 +- .../networking/ftp/filezilla/default.nix | 7 +- .../gnome-network-displays/default.nix | 82 + .../applications/networking/gns3/default.nix | 6 +- .../networking/ids/snort/default.nix | 2 +- .../networking/ids/zeek/default.nix | 7 +- .../networking/ids/zeek/script.nix | 7 + .../instant-messengers/bluejeans/default.nix | 3 +- .../chatterino2/default.nix | 11 +- .../instant-messengers/cordless/default.nix | 25 + .../instant-messengers/dino/default.nix | 28 +- .../instant-messengers/discord/default.nix | 12 +- .../element/element-desktop-package.json | 2 +- .../element/element-desktop-yarndeps.nix | 40 +- .../element/element-desktop.nix | 4 +- .../element/element-web.nix | 4 +- .../instant-messengers/fractal/default.nix | 3 + .../instant-messengers/franz/generic.nix | 3 +- .../instant-messengers/gajim/default.nix | 30 +- .../instant-messengers/gomuks/default.nix | 6 +- .../instant-messengers/jackline/default.nix | 52 +- .../jitsi-meet-electron/default.nix | 4 +- .../instant-messengers/jitsi/default.nix | 3 +- .../pantalaimon/default.nix | 4 +- .../instant-messengers/psi-plus/default.nix | 4 +- .../instant-messengers/psi/default.nix | 4 +- .../instant-messengers/rambox/default.nix | 10 +- .../signal-desktop/default.nix | 12 +- .../instant-messengers/sky/default.nix | 86 - .../instant-messengers/slack/default.nix | 8 +- .../instant-messengers/teams/default.nix | 2 +- .../telegram/kotatogram-desktop/default.nix | 4 +- .../telegram/tdesktop/default.nix | 4 +- .../vk-messenger/default.nix | 4 +- .../instant-messengers/wavebox/default.nix | 2 +- .../wire-desktop/default.nix | 5 +- .../instant-messengers/ytalk/default.nix | 21 + .../instant-messengers/zoom-us/default.nix | 4 +- .../instant-messengers/zoom-us/update.sh | 15 +- .../instant-messengers/zulip-term/default.nix | 46 + .../zulip-term/pytest-executable-name.patch | 13 + .../applications/networking/ipfs/default.nix | 15 +- .../networking/irc/convos/default.nix | 8 +- .../networking/irc/weechat/default.nix | 2 +- .../irc/weechat/scripts/default.nix | 2 + .../scripts/weechat-notify-send/default.nix | 31 + .../networking/maestral-qt/default.nix | 4 +- .../mailreaders/claws-mail/default.nix | 14 +- .../mailreaders/mailspring/default.nix | 3 +- .../networking/mailreaders/mutt/default.nix | 4 +- .../mailreaders/neomutt/default.nix | 4 +- .../mailreaders/notmuch-bower/default.nix | 4 +- .../thunderbird-bin/68_sources.nix | 490 +- .../thunderbird-bin/release_sources.nix | 530 +- .../networking/mailreaders/thunderbird/68.nix | 7 +- .../mailreaders/thunderbird/default.nix | 15 +- .../mailreaders/trojita/default.nix | 28 +- .../trojita/fix-qttranslations-path.patch | 13 + .../networking/modem-manager-gui/default.nix | 29 +- .../applications/networking/msmtp/default.nix | 4 +- .../networking/mullvad-vpn/default.nix | 4 +- .../networking/mumble/default.nix | 9 +- .../networking/ncgopher/default.nix | 37 + .../newsreaders/liferea/default.nix | 8 +- .../networking/nextdns/default.nix | 4 +- .../networking/owncloud-client/default.nix | 4 +- .../networking/p2p/tixati/default.nix | 4 +- .../networking/p2p/tremc/default.nix | 49 + .../networking/remote/anydesk/default.nix | 4 +- .../remote/citrix-workspace/generic.nix | 6 +- .../remote/citrix-workspace/sources.nix | 26 +- .../networking/remote/teamviewer/default.nix | 4 +- .../networking/scaleft/default.nix | 4 +- .../networking/seafile-client/default.nix | 4 +- .../networking/sniffers/kismet/default.nix | 4 +- .../networking/ssb-patchwork/default.nix | 26 +- .../networking/sync/rclone/default.nix | 26 +- .../networking/syncthing/default.nix | 6 +- .../networking/termius/default.nix | 3 +- .../networking/utahfs/default.nix | 1 - .../applications/networking/utahfs/deps.nix | 327 - .../applications/office/calligra/default.nix | 27 +- .../applications/office/espanso/default.nix | 6 +- .../applications/office/flexibee/default.nix | 4 +- .../applications/office/gnumeric/default.nix | 8 +- .../pkgs/applications/office/gtg/default.nix | 13 +- .../applications/office/homebank/default.nix | 4 +- .../applications/office/ledger/default.nix | 4 - .../office/libreoffice/default.nix | 9 +- .../office/libreoffice/src-fresh/download.nix | 178 +- .../office/libreoffice/src-fresh/primary.nix | 14 +- .../office/libreoffice/src-still/override.nix | 9 +- .../office/p3x-onenote/default.nix | 55 + .../applications/office/paperless/default.nix | 26 +- .../paperless/python-modules/default.nix | 30 + .../applications/office/portfolio/default.nix | 4 +- .../applications/office/skrooge/default.nix | 4 +- .../office/softmaker/freeoffice.nix | 20 +- .../applications/office/softmaker/generic.nix | 28 +- .../office/softmaker/softmaker_office.nix | 21 +- .../applications/office/timeular/default.nix | 45 + .../office/todo.txt-cli/default.nix | 4 +- .../office/wordgrinder/default.nix | 1 + .../applications/office/wpsoffice/default.nix | 4 +- .../applications/office/zotero/default.nix | 11 +- .../pkgs/applications/radio/chirp/default.nix | 4 +- .../applications/radio/fldigi/default.nix | 4 +- .../applications/radio/inspectrum/default.nix | 11 +- .../applications/radio/noaa-apt/default.nix | 64 + .../applications/radio/welle-io/default.nix | 4 +- .../science/astronomy/gildas/default.nix | 6 +- .../science/biology/bwa/default.nix | 9 +- .../science/biology/igv/default.nix | 22 +- .../science/biology/mosdepth/default.nix | 5 +- .../science/biology/obitools/obitools3.nix | 38 + .../science/biology/octopus/default.nix | 4 +- .../science/biology/picard-tools/default.nix | 4 +- .../science/biology/star/default.nix | 4 +- .../science/biology/truvari/default.nix | 19 +- .../science/biology/whisper/default.nix | 34 + .../science/chemistry/jmol/default.nix | 4 +- .../science/chemistry/marvin/default.nix | 4 +- .../science/electronics/adms/default.nix | 4 +- .../science/electronics/flatcam/default.nix | 56 + .../science/electronics/flatcam/release.patch | 13 + .../science/electronics/hyp2mat/default.nix | 6 +- .../science/electronics/kicad/base.nix | 2 +- .../science/electronics/kicad/default.nix | 2 +- .../science/electronics/kicad/libraries.nix | 9 +- .../science/electronics/kicad/versions.nix | 24 +- .../electronics/openhantek6022/default.nix | 4 +- .../science/electronics/verilator/default.nix | 23 +- .../science/electronics/verilog/default.nix | 8 +- .../science/electronics/vhd2vl/default.nix | 39 + .../science/logic/alt-ergo/default.nix | 12 +- .../logic/avy/0001-no-static-boost-libs.patch | 12 - .../science/logic/avy/default.nix | 12 +- .../science/logic/coq/default.nix | 2 - .../science/logic/cvc3/default.nix | 9 +- .../science/logic/isabelle/default.nix | 22 +- .../science/logic/lean/default.nix | 4 +- .../science/logic/leo3/binary.nix | 2 +- .../science/logic/ltl2ba/default.nix | 4 +- .../science/logic/mcy/default.nix | 6 +- .../science/logic/ott/default.nix | 17 +- .../science/logic/proverif/default.nix | 4 +- .../science/logic/symbiyosys/default.nix | 25 +- .../science/logic/tlaplus/tlaps.nix | 2 +- .../science/logic/tlaplus/toolbox.nix | 2 +- .../science/logic/why3/default.nix | 6 +- .../applications/science/logic/z3/default.nix | 6 +- .../machine-learning/labelimg/default.nix | 33 +- .../machine-learning/streamlit/default.nix | 4 +- .../applications/science/math/R/default.nix | 4 +- .../science/math/calculix/calculix.patch | 27 +- .../science/math/calculix/default.nix | 4 +- .../science/math/geogebra/geogebra6.nix | 6 +- .../science/math/lp_solve/default.nix | 4 +- .../science/math/mathematica/l10ns.nix | 6 + .../science/math/nasc/default.nix | 61 +- .../science/math/nauty/default.nix | 10 +- .../science/math/qalculate-gtk/default.nix | 14 +- .../science/math/rofi-calc/default.nix | 4 +- .../science/math/sage/sage-env.nix | 4 +- .../science/math/wxmaxima/default.nix | 4 +- .../science/misc/rink/default.nix | 6 +- .../applications/search/recoll/default.nix | 14 +- .../version-management/commitizen/default.nix | 17 + .../commitizen/generate-dependencies.sh | 9 + .../commitizen/node-composition.nix | 17 + .../commitizen/node-env.nix | 542 + .../commitizen/node-packages.nix | 9071 ++++++++ .../commitizen/package.json | 3 + .../version-management/fossil/default.nix | 43 +- .../version-management/gerrit/default.nix | 4 +- .../git-and-tools/default.nix | 12 +- .../git-and-tools/delta/default.nix | 6 +- .../git-and-tools/diff-so-fancy/default.nix | 15 +- .../git-and-tools/fast-export/default.nix | 36 +- .../git-and-tools/gh/default.nix | 7 +- .../git-and-tools/git-imerge/default.nix | 27 +- .../git-interactive-rebase-tool/default.nix | 2 +- .../git-and-tools/git-machete/default.nix | 4 +- .../git-and-tools/git-subtrac/default.nix | 6 +- .../git-and-tools/gita/default.nix | 5 +- .../git-and-tools/gitstatus/default.nix | 58 +- .../git-and-tools/lefthook/default.nix | 6 + .../rs-git-fsmonitor/default.nix | 33 + .../version-management/git-lfs/default.nix | 5 +- .../version-management/git-repo/default.nix | 4 +- .../version-management/gitea/default.nix | 4 +- .../gitea/static-root-path.patch | 14 +- .../version-management/gitkraken/default.nix | 8 +- .../version-management/gitlab/data.json | 10 +- .../gitlab/gitaly/default.nix | 4 +- .../version-management/gitolite/default.nix | 2 +- .../version-management/gitoxide/default.nix | 17 +- .../version-management/gomp/default.nix | 23 + .../version-management/p4/default.nix | 30 + .../version-management/sourcehut/builds.nix | 13 +- .../version-management/sourcehut/core.nix | 10 +- .../version-management/sourcehut/default.nix | 6 +- .../version-management/sourcehut/dispatch.nix | 9 +- .../version-management/sourcehut/git.nix | 34 +- .../version-management/sourcehut/hg.nix | 9 +- .../version-management/sourcehut/hub.nix | 31 + .../version-management/sourcehut/lists.nix | 9 +- .../version-management/sourcehut/man.nix | 9 +- .../version-management/sourcehut/meta.nix | 26 +- .../version-management/sourcehut/paste.nix | 9 +- .../version-management/sourcehut/scm.nix | 4 +- .../version-management/sourcehut/todo.nix | 9 +- .../version-management/sourcehut/update.sh | 4 +- .../sourcehut/use-srht-path.patch | 43 - .../sparkleshare/default.nix | 89 + .../sublime-merge/default.nix | 8 +- .../version-management/yadm/default.nix | 4 +- .../applications/video/aegisub/default.nix | 6 + .../pkgs/applications/video/catt/default.nix | 23 +- .../applications/video/celluloid/default.nix | 4 +- .../applications/video/clipgrab/default.nix | 4 +- .../video/electronplayer/electronplayer.nix | 33 + .../applications/video/epgstation/default.nix | 85 + .../video/epgstation/epgstation.1 | 52 + .../applications/video/epgstation/generate.sh | 34 + .../video/epgstation/package.json | 101 + .../use-mysql-over-domain-socket.patch | 17 + .../applications/video/filebot/default.nix | 54 + .../pkgs/applications/video/gpac/default.nix | 8 +- .../applications/video/lightworks/default.nix | 2 +- .../applications/video/mkvtoolnix/default.nix | 8 +- .../pkgs/applications/video/mpv/default.nix | 1 + .../video/mpv/scripts/autoload.nix | 20 + .../video/mpv/scripts/sponsorblock.nix | 51 + .../applications/video/obs-studio/obs-ndi.nix | 4 +- .../video/obs-studio/v4l2sink.nix | 4 +- .../applications/video/pitivi/default.nix | 152 +- .../applications/video/smplayer/default.nix | 4 +- .../applications/video/smtube/default.nix | 4 +- .../video/streamlink-twitch-gui/bin.nix | 100 + .../pkgs/applications/video/vcs/default.nix | 39 + .../pkgs/applications/video/vcs/fonts.patch | 23 + .../pkgs/applications/video/vdr/default.nix | 18 +- .../video/vdr/glibc2.31-compat.patch | 15 - .../pkgs/applications/video/vdr/plugins.nix | 18 +- .../pkgs/applications/video/vlc/default.nix | 1 + .../video/vokoscreen-ng/default.nix | 71 + .../applications/video/vokoscreen/default.nix | 4 +- .../applications/video/webcamoid/default.nix | 4 +- .../virtualization/charliecloud/default.nix | 30 +- .../virtualization/conmon/default.nix | 6 +- .../virtualization/containerd/default.nix | 4 +- .../virtualization/cri-o/default.nix | 11 +- .../virtualization/cri-o/wrapper.nix | 4 +- .../virtualization/crun/default.nix | 7 +- .../virtualization/docker-slim/default.nix | 4 +- .../virtualization/docker/default.nix | 47 +- .../virtualization/firecracker/default.nix | 10 +- .../virtualization/podman/default.nix | 6 +- .../virtualization/qemu/default.nix | 2 + .../virtualization/runc/default.nix | 2 +- .../virtualization/singularity/default.nix | 9 +- .../virtualization/singularity/deps.nix | 1 - .../virtualization/tini/default.nix | 3 +- .../window-managers/dwm/default.nix | 8 +- .../window-managers/i3/lock-fancy-rapid.nix | 32 + .../window-managers/sxhkd/default.nix | 4 +- .../window-managers/weston/default.nix | 26 +- .../window-managers/windowchef/default.nix | 27 + .../window-managers/windowmaker/default.nix | 9 +- .../alternatives/blas/default.nix | 2 +- .../pkgs/build-support/appimage/default.nix | 1 - .../build-bazel-package/default.nix | 34 +- .../pkgs/build-support/cc-wrapper/default.nix | 29 +- .../build-support/cc-wrapper/fortran-hook.sh | 11 + .../build-support/cc-wrapper/gnat-wrapper.sh | 2 + .../pkgs/build-support/docker/default.nix | 60 +- .../pkgs/build-support/docker/examples.nix | 13 +- .../docker/stream_layered_image.py | 76 +- .../dotnetenv/build-solution.nix | 30 +- .../pkgs/build-support/dotnetenv/default.nix | 2 +- .../pkgs/build-support/dotnetenv/wrapper.nix | 10 +- .../build-support/fetchgitlab/default.nix | 2 +- .../build-support/kernel/modules-closure.sh | 12 +- .../pkgs/build-support/release/default.nix | 4 - .../build-support/release/gcov-report.nix | 49 - .../pkgs/build-support/rust/default.nix | 15 +- .../pkgs/build-support/rust/fetchcrate.nix | 7 +- .../singularity-tools/default.nix | 4 +- .../pkgs/build-support/writers/default.nix | 5 +- .../pkgs/data/fonts/3270font/default.nix | 8 +- .../data/fonts/caladea/cambria-alias.conf | 2 +- .../data/fonts/carlito/calibri-alias.conf | 2 +- .../pkgs/data/fonts/cascadia-code/default.nix | 4 +- .../pkgs/data/fonts/clearlyU/default.nix | 11 +- .../pkgs/data/fonts/comic-neue/default.nix | 54 +- .../comic-relief/comic-sans-ms-alias.conf | 2 +- .../pkgs/data/fonts/corefonts/default.nix | 2 +- .../pkgs/data/fonts/corefonts/no-op.conf | 2 +- .../nixpkgs/pkgs/data/fonts/creep/default.nix | 6 +- .../nixpkgs/pkgs/data/fonts/dina/default.nix | 6 +- .../pkgs/data/fonts/emojione/default.nix | 20 +- .../pkgs/data/fonts/envypn-font/default.nix | 6 +- .../pkgs/data/fonts/gohufont/default.nix | 11 +- .../pkgs/data/fonts/ibm-plex/default.nix | 4 +- .../nixpkgs/pkgs/data/fonts/iosevka/bin.nix | 4 +- .../data/fonts/jetbrains-mono/default.nix | 8 +- .../fonts/kanji-stroke-order-font/default.nix | 20 +- .../data/fonts/liberation-fonts/default.nix | 5 +- .../pkgs/data/fonts/noto-fonts/default.nix | 38 +- .../pkgs/data/fonts/noto-fonts/tools.nix | 62 +- .../pkgs/data/fonts/profont/default.nix | 7 +- .../pkgs/data/fonts/recursive/default.nix | 10 +- .../nixpkgs/pkgs/data/fonts/siji/default.nix | 6 +- .../pkgs/data/fonts/tamsyn/default.nix | 6 +- .../pkgs/data/fonts/tamzen/default.nix | 6 +- .../pkgs/data/fonts/terminus-font/default.nix | 6 +- .../nixpkgs/pkgs/data/fonts/tewi/default.nix | 8 +- .../data/fonts/twemoji-color-font/default.nix | 17 +- .../fonts/twitter-color-emoji/default.nix | 25 +- .../pkgs/data/fonts/ucs-fonts/default.nix | 8 +- .../default.nix | 6 +- .../pkgs/data/fonts/uni-vga/default.nix | 9 +- .../pkgs/data/fonts/unifont/default.nix | 6 +- .../pkgs/data/fonts/uw-ttyp0/default.nix | 4 +- .../data/fonts/vista-fonts-chs/no-op.conf | 2 +- .../pkgs/data/fonts/vista-fonts/no-op.conf | 2 +- .../data/icons/bibata-cursors/default.nix | 4 +- .../pkgs/data/icons/bibata-cursors/extra.nix | 4 +- .../data/icons/bibata-cursors/translucent.nix | 6 +- .../data/icons/capitaine-cursors/default.nix | 4 +- .../data/icons/iconpack-obsidian/default.nix | 10 +- .../pkgs/data/icons/iso-flags/default.nix | 47 + .../data/icons/numix-cursor-theme/default.nix | 4 +- .../pkgs/data/icons/vanilla-dmz/default.nix | 26 +- .../misc/cldr-emoji-annotation/default.nix | 4 +- .../pkgs/data/themes/adapta/default.nix | 4 +- .../nixpkgs/pkgs/data/themes/arc/default.nix | 11 +- .../data/themes/marwaita-manjaro/default.nix | 46 + .../themes/marwaita-peppermint/default.nix | 46 + .../pkgs/data/themes/marwaita/default.nix | 7 +- .../pkgs/data/themes/mojave/default.nix | 6 +- .../data/themes/numix-solarized/default.nix | 6 +- .../pkgs/data/themes/obsidian2/default.nix | 18 +- .../pkgs/data/themes/plata/default.nix | 4 +- .../pkgs/data/themes/pop-gtk/default.nix | 6 +- .../data/themes/ubuntu-themes/default.nix | 8 +- .../pkgs/data/themes/venta/default.nix | 47 + .../nixpkgs/pkgs/data/themes/yaru/default.nix | 4 +- .../cinnamon/cinnamon-common/default.nix | 166 + .../cinnamon/cinnamon-common/libcroco.nix | 33 + .../cinnamon-control-center/default.nix | 15 +- .../cinnamon/cinnamon-desktop/default.nix | 6 +- .../cinnamon-gsettings-overrides/default.nix | 57 + .../cinnamon/cinnamon-menus/default.nix | 6 +- .../cinnamon/cinnamon-screensaver/default.nix | 116 + .../0001-Add-dbus_glib-dependency.patch | 38 - ...001-Use-dbus_glib-instead-of-elogind.patch | 38 + .../cinnamon/cinnamon-session/default.nix | 8 +- .../cinnamon-settings-daemon/default.nix | 8 +- .../cinnamon-translations/default.nix | 2 +- .../pkgs/desktops/cinnamon/cjs/default.nix | 6 +- .../pkgs/desktops/cinnamon/default.nix | 18 + .../cinnamon/mint-artwork/default.nix | 39 + .../desktops/cinnamon/mint-themes/default.nix | 9 +- .../cinnamon}/mint-x-icons/default.nix | 37 +- .../cinnamon/mint-y-icons/default.nix | 9 +- .../pkgs/desktops/cinnamon/muffin/default.nix | 21 +- .../pkgs/desktops/cinnamon/nemo/default.nix | 13 +- .../desktops/cinnamon/warpinator/default.nix | 79 + .../pkgs/desktops/cinnamon/xapps/default.nix | 31 +- .../pkgs/desktops/deepin/dde-api/default.nix | 127 - .../pkgs/desktops/deepin/dde-api/deps.nix | 102 - .../desktops/deepin/dde-calendar/default.nix | 57 - .../deepin/dde-control-center/default.nix | 150 - .../deepin/dde-control-center/fix-paths.patch | 65 - .../desktops/deepin/dde-daemon/default.nix | 159 - .../pkgs/desktops/deepin/dde-daemon/deps.nix | 111 - .../dde-dock/dde-dock.plugins-dir.patch | 39 - .../pkgs/desktops/deepin/dde-dock/default.nix | 116 - .../pkgs/desktops/deepin/dde-dock/wrapper.nix | 25 - ...de-file-manager.fix-mime-cache-paths.patch | 323 - .../dde-file-manager.fix-paths.patch | 89 - .../dde-file-manager.pixmaps-paths.patch | 38 - .../deepin/dde-file-manager/default.nix | 298 - ...0001-dde-kwin.pc-make-paths-relative.patch | 56 - .../pkgs/desktops/deepin/dde-kwin/default.nix | 142 - .../desktops/deepin/dde-kwin/fix-paths.patch | 16 - .../desktops/deepin/dde-launcher/default.nix | 101 - .../deepin/dde-network-utils/default.nix | 63 - .../deepin/dde-network-utils/fix-paths.patch | 23 - .../dde-polkit-agent.plugins-dir.patch | 42 - .../deepin/dde-polkit-agent/default.nix | 60 - .../deepin/dde-qt-dbus-factory/default.nix | 43 - .../deepin/dde-session-ui/default.nix | 157 - .../deepin/deepin-anything/default.nix | 82 - .../deepin/deepin-calculator/default.nix | 57 - .../deepin/deepin-desktop-base/default.nix | 68 - .../deepin/deepin-desktop-schemas/default.nix | 79 - .../desktops/deepin/deepin-editor/default.nix | 72 - .../deepin/deepin-gettext-tools/default.nix | 55 - .../deepin/deepin-gtk-theme/default.nix | 35 - .../deepin/deepin-icon-theme/default.nix | 67 - .../deepin/deepin-image-viewer/default.nix | 66 - .../desktops/deepin/deepin-menu/default.nix | 54 - .../deepin/deepin-movie-reborn/default.nix | 85 - .../deepin/deepin-shortcut-viewer/default.nix | 45 - .../deepin/deepin-sound-theme/default.nix | 30 - .../deepin/deepin-terminal/default.nix | 117 - .../desktops/deepin/deepin-turbo/default.nix | 50 - .../deepin/deepin-wallpapers/default.nix | 52 - .../nixpkgs/pkgs/desktops/deepin/default.nix | 62 - .../desktops/deepin/disomaster/default.nix | 50 - .../deepin/dpa-ext-gnomekeyring/default.nix | 49 - .../pkgs/desktops/deepin/dtkcore/default.nix | 63 - .../desktops/deepin/dtkwidget/default.nix | 65 - .../pkgs/desktops/deepin/dtkwm/default.nix | 58 - .../deepin/go-dbus-factory/default.nix | 34 - .../deepin/go-gir-generator/default.nix | 59 - .../pkgs/desktops/deepin/go-lib/default.nix | 46 - .../pkgs/desktops/deepin/qcef/default.nix | 127 - .../deepin/qt5integration/default.nix | 65 - .../deepin/qt5platform-plugins/default.nix | 63 - .../pkgs/desktops/deepin/setup-hook.sh | 64 - .../pkgs/desktops/deepin/startdde/default.nix | 161 - .../pkgs/desktops/deepin/startdde/deps.nix | 30 - .../desktops/deepin/udisks2-qt5/default.nix | 50 - .../pkgs/desktops/enlightenment/default.nix | 1 + .../desktops/enlightenment/efl/default.nix | 4 +- .../desktops/enlightenment/evisum/default.nix | 29 + .../enlightenment/terminology/default.nix | 13 +- .../desktop/mail-notification/default.nix | 4 +- .../gnome-2/platform/libgnomeui/default.nix | 2 +- .../gnome-3/apps/gnome-documents/default.nix | 4 +- .../gnome-3/apps/gnome-notes/default.nix | 4 +- .../desktops/gnome-3/core/eog/default.nix | 62 +- .../gnome-3/core/gnome-desktop/default.nix | 4 +- .../gnome-3/core/gnome-shell/default.nix | 6 +- .../extensions/appindicator/default.nix | 4 +- .../extensions/dash-to-panel/default.nix | 4 +- .../gnome-3/extensions/gsconnect/default.nix | 4 +- .../extensions/gsconnect/fix-paths.patch | 34 +- .../night-theme-switcher/default.nix | 12 +- .../gnome-3/extensions/timepp/default.nix | 7 +- .../desktops/lxde/core/lxpanel/default.nix | 19 +- .../nixpkgs/pkgs/desktops/lxqt/default.nix | 8 +- .../pkgs/desktops/mate/mate-utils/default.nix | 4 +- .../pantheon/apps/appcenter/default.nix | 4 +- .../apps/elementary-calculator/default.nix | 2 +- .../apps/elementary-calendar/default.nix | 4 +- .../apps/elementary-camera/default.nix | 2 +- .../pantheon/apps/elementary-code/default.nix | 2 +- .../pantheon/apps/elementary-dock/default.nix | 9 + .../apps/elementary-feedback/default.nix | 2 +- ...-module-hardcode-gsettings-for-nixos.patch | 35 + .../apps/elementary-files/default.nix | 10 +- .../elementary-files/hardcode-gsettings.patch | 22 - .../apps/elementary-music/default.nix | 2 +- .../apps/elementary-photos/default.nix | 2 +- .../elementary-screenshot-tool/default.nix | 2 +- .../apps/elementary-terminal/default.nix | 2 +- .../apps/elementary-videos/default.nix | 2 +- .../pantheon/apps/sideload/default.nix | 2 +- .../apps/switchboard-plugs/a11y/default.nix | 2 +- .../apps/switchboard-plugs/about/default.nix | 2 +- .../applications/default.nix | 2 +- .../switchboard-plugs/bluetooth/default.nix | 2 +- .../switchboard-plugs/datetime/default.nix | 2 +- .../switchboard-plugs/display/default.nix | 2 +- ...ve-Install-Unlisted-Engines-function.patch | 700 + .../switchboard-plugs/keyboard/default.nix | 10 +- .../mouse-touchpad/default.nix | 2 +- .../switchboard-plugs/network/default.nix | 4 +- .../notifications/default.nix | 2 +- .../onlineaccounts/default.nix | 2 +- .../pantheon-shell/default.nix | 10 +- .../apps/switchboard-plugs/power/default.nix | 2 +- .../switchboard-plugs/printers/default.nix | 2 +- .../security-privacy/default.nix | 2 +- .../switchboard-plugs/sharing/default.nix | 2 +- .../apps/switchboard-plugs/sound/default.nix | 4 +- .../pantheon/apps/switchboard/default.nix | 2 +- .../artwork/elementary-gtk-theme/default.nix | 2 +- .../artwork/elementary-icon-theme/default.nix | 2 +- .../elementary-sound-theme/default.nix | 2 +- .../artwork/elementary-wallpapers/default.nix | 2 +- .../elementary-default-settings/default.nix | 2 +- .../desktop/elementary-greeter/default.nix | 2 +- .../elementary-gsettings-schemas/default.nix | 6 +- .../desktop/elementary-onboarding/default.nix | 2 +- .../desktop/elementary-print-shim/default.nix | 2 +- .../elementary-shortcut-overlay/default.nix | 2 +- .../pantheon/desktop/gala/default.nix | 8 +- .../applications-menu/default.nix | 6 +- .../bluetooth/default.nix | 2 +- .../wingpanel-indicators/datetime/default.nix | 2 +- .../wingpanel-indicators/keyboard/default.nix | 2 +- .../wingpanel-indicators/network/default.nix | 2 +- .../nightlight/default.nix | 4 +- .../notifications/default.nix | 2 +- .../wingpanel-indicators/power/default.nix | 4 +- .../wingpanel-indicators/session/default.nix | 2 +- .../wingpanel-indicators/sound/default.nix | 4 +- .../pantheon/desktop/wingpanel/default.nix | 2 +- .../desktops/pantheon/granite/default.nix | 2 +- .../pantheon/services/contractor/default.nix | 2 +- .../elementary-capnet-assist/default.nix | 2 +- .../elementary-dpms-helper/default.nix | 2 +- .../pantheon-agent-geoclue2/default.nix | 2 +- .../pantheon-agent-polkit/default.nix | 2 +- .../3rdparty/addons/caffeine-plus.nix | 32 + .../kwin/scripts/dynamic-workspaces.nix | 39 + .../{ => 3rdparty}/kwin/scripts/krohnkite.nix | 2 +- .../{ => 3rdparty}/kwin/scripts/tiling.nix | 2 +- .../plasma-5/breeze-plymouth/default.nix | 11 +- .../desktops/plasma-5/breeze-plymouth/series | 1 - .../pkgs/desktops/plasma-5/default.nix | 10 + .../nixpkgs/pkgs/desktops/plasma-5/fetch.sh | 2 +- .../pkgs/desktops/plasma-5/kde-cli-tools.nix | 16 +- .../0001-gsettings-schemas-path.patch | 21 + .../plasma-5/kde-gtk-config/default.nix | 8 +- .../patches/follow-symlinks.patch | 49 - .../kde-gtk-config/patches/gsettings.patch | 21 - .../plasma-5/kde-gtk-config/patches/series | 2 - .../desktops/plasma-5/kdeplasma-addons.nix | 13 +- .../pkgs/desktops/plasma-5/khotkeys.nix | 5 +- .../pkgs/desktops/plasma-5/kinfocenter.nix | 9 +- .../desktops/plasma-5/kscreen-417316.patch | 76 - .../pkgs/desktops/plasma-5/kscreen.nix | 5 +- .../pkgs/desktops/plasma-5/ksysguard.nix | 4 +- .../pkgs/desktops/plasma-5/kwin/default.nix | 10 +- .../desktops/plasma-5/libkscreen/default.nix | 6 +- .../pkgs/desktops/plasma-5/libkscreen/series | 1 - ...1-Add-a-logging-category-config-file.patch | 210 + .../plasma-5/plasma-desktop/default.nix | 11 +- .../plasma-desktop/hwclock-path.patch | 2 +- .../desktops/plasma-5/plasma-desktop/series | 2 - .../pkgs/desktops/plasma-5/plasma-pa.nix | 13 +- .../plasma-workspace/0001-startkde.patch | 39 +- .../0002-absolute-wallpaper-install-dir.patch | 13 +- .../plasma-5/plasma-workspace/default.nix | 9 +- .../pkgs/desktops/plasma-5/powerdevil.nix | 7 +- .../nixpkgs/pkgs/desktops/plasma-5/srcs.nix | 386 +- .../plasma-5/xdg-desktop-portal-kde.nix | 9 +- .../applications/xfce4-volumed/default.nix | 52 - .../nixpkgs/pkgs/desktops/xfce/default.nix | 4 - .../androidndk-pkgs/androidndk-pkgs.nix | 4 +- .../development/androidndk-pkgs/default.nix | 30 + .../arduino/arduino-cli/default.nix | 6 +- .../arduino/platformio/chrootenv.nix | 4 +- .../development/arduino/platformio/core.nix | 56 +- .../platformio/missing-udev-rules-nixos.patch | 10 +- .../use-local-spdx-license-list.patch | 13 +- .../pkgs/development/beam-modules/default.nix | 13 +- .../chez-modules/chez-mit/default.nix | 1 - .../chez-modules/chez-scmutils/default.nix | 1 - .../development/compilers/aspectj/default.nix | 11 +- .../development/compilers/bigloo/default.nix | 20 +- .../0001-Get-rid-of-git-dependency.patch | 38 - .../compilers/binaryen/default.nix | 41 +- .../bs-platform/build-bs-platform.nix | 7 +- .../compilers/bs-platform/default.nix | 6 +- .../bs-platform/jscomp-release-ninja.patch | 16 + .../development/compilers/chez/default.nix | 2 + .../development/compilers/chez/setup-hook.sh | 5 + .../development/compilers/closure/default.nix | 4 +- .../development/compilers/copper/default.nix | 32 + .../compilers/cudatoolkit/common.nix | 30 +- .../compilers/cudatoolkit/default.nix | 11 + .../development/compilers/dmd/default.nix | 14 +- .../development/compilers/dotnet/default.nix | 59 +- .../development/compilers/elm/default.nix | 14 +- .../compilers/elm/packages/elm-format.nix | 16 +- .../compilers/elm/packages/node-packages.json | 3 +- .../compilers/elm/packages/node-packages.nix | 1026 +- .../compilers/emscripten/default.nix | 133 +- .../compilers/emscripten/fastcomp/default.nix | 28 - .../fastcomp/emscripten-fastcomp.nix | 53 - .../compilers/emscripten/package.json | 15 + .../compilers/emscripten/yarn.lock | 346 + .../development/compilers/emscripten/yarn.nix | 437 + .../pkgs/development/compilers/fasm/bin.nix | 4 +- .../development/compilers/flutter/default.nix | 1 + .../pkgs/development/compilers/fpc/binary.nix | 20 +- .../development/compilers/fpc/default.nix | 19 +- .../development/compilers/fpc/libqt5pas.nix | 24 + .../compilers/fpc/mark-paths.patch | 109 + .../development/compilers/gcc/10/default.nix | 19 +- .../development/compilers/gcc/4.8/default.nix | 15 +- .../development/compilers/gcc/4.9/default.nix | 15 +- .../development/compilers/gcc/6/default.nix | 15 +- .../development/compilers/gcc/7/default.nix | 15 +- .../development/compilers/gcc/8/default.nix | 15 +- .../development/compilers/gcc/9/default.nix | 17 +- .../pkgs/development/compilers/gcc/builder.sh | 14 +- .../compilers/gcc/common/pre-configure.nix | 9 + .../pkgs/development/compilers/ghc/8.10.1.nix | 22 +- .../pkgs/development/compilers/ghc/8.6.5.nix | 11 +- .../pkgs/development/compilers/ghc/8.8.2.nix | 22 +- .../pkgs/development/compilers/ghc/8.8.3.nix | 22 +- .../pkgs/development/compilers/ghc/8.8.4.nix | 22 +- .../pkgs/development/compilers/ghc/head.nix | 19 +- .../compilers/ghcjs-ng/8.6/dep-overrides.nix | 7 +- .../compilers/ghcjs-ng/default.nix | 3 +- .../development/compilers/gleam/default.nix | 6 +- .../pkgs/development/compilers/go/1.14.nix | 4 +- .../pkgs/development/compilers/go/1.15.nix | 4 +- .../compilers/go/ssl-cert-file-1.15.patch | 16 +- .../development/compilers/hop/default.nix | 20 +- .../development/compilers/idris2/default.nix | 41 +- .../development/compilers/jasmin/default.nix | 4 +- .../development/compilers/kotlin/default.nix | 4 +- .../compilers/llvm/11/bintools.nix | 29 + .../compilers/llvm/11/clang/default.nix | 117 + .../compilers/llvm/11/clang/purity.patch | 28 + .../llvm/11/compiler-rt-armv7l.patch | 32 + .../llvm/11/compiler-rt-codesign.patch | 33 + .../compilers/llvm/11/compiler-rt.nix | 85 + .../development/compilers/llvm/11/default.nix | 195 + .../compilers/llvm/11/libc++/default.nix | 52 + .../compilers/llvm/11/libc++abi.nix | 67 + .../llvm/11/libcxxabi-no-threads.patch | 12 + .../compilers/llvm/11/libcxxabi-wasm.patch | 16 + .../compilers/llvm/11/libunwind.nix | 14 + .../development/compilers/llvm/11/lld.nix | 33 + .../compilers/llvm/11/lldb-procfs.patch | 31 + .../development/compilers/llvm/11/lldb.nix | 101 + .../compilers/llvm/11/llvm-outputs.patch | 26 + .../development/compilers/llvm/11/llvm.nix | 190 + .../development/compilers/llvm/11/openmp.nix | 26 + .../compilers/llvm/11/sanitizers-nongnu.patch | 412 + .../development/compilers/llvm/5/lldb.nix | 10 + .../development/compilers/llvm/6/lldb.nix | 10 + .../development/compilers/llvm/rocm/clang.nix | 3 +- .../compilers/llvm/rocm/default.nix | 4 +- .../development/compilers/lobster/default.nix | 66 + .../lobster/test-can-run-hello-world.nix | 13 + .../development/compilers/mcpp/default.nix | 10 +- .../compilers/mit-scheme/default.nix | 15 +- .../development/compilers/mlton/default.nix | 17 +- .../compilers/mlton/from-git-source.nix | 4 + .../development/compilers/mozart/default.nix | 5 +- .../compilers/mruby/bison-36-compat.patch | 59 - .../development/compilers/mruby/default.nix | 8 +- .../development/compilers/nextpnr/default.nix | 6 +- .../compilers/nim/NIM_CONFIG_DIR.patch | 23 + .../development/compilers/nim/default.nix | 284 +- .../development/compilers/nim/nixbuild.patch | 51 + .../pkgs/development/compilers/ocaml/4.11.nix | 4 +- .../development/compilers/ocaml/generic.nix | 8 +- .../compilers/openjdk/openjfx/14.nix | 2 +- .../development/compilers/pforth/default.nix | 10 +- .../development/compilers/reason/default.nix | 6 +- .../pkgs/development/compilers/rust/1_45.nix | 4 +- .../compilers/sagittarius-scheme/default.nix | 4 +- .../development/compilers/souffle/default.nix | 4 +- .../development/compilers/yosys/default.nix | 6 +- .../coq-modules/Cheerios/default.nix | 2 +- .../coq-modules/InfSeqExt/default.nix | 2 +- .../development/coq-modules/Verdi/default.nix | 2 +- .../coq-modules/coq-elpi/default.nix | 8 +- .../coq-modules/coqprime/default.nix | 14 +- .../coq-modules/dpdgraph/default.nix | 4 + .../coq-modules/gappalib/default.nix | 8 +- .../coq-modules/metalib/default.nix | 47 +- .../development/coq-modules/paco/default.nix | 1 + .../coq-modules/paramcoq/default.nix | 3 + .../python-language-server/deps.nix | 42 +- .../go-modules/generic/default.nix | 2 +- .../go-packages/generic/default.nix | 17 +- .../guile-modules/guile-sdl2/default.nix | 4 +- .../haskell-modules/configuration-common.nix | 245 +- .../configuration-ghc-8.10.x.nix | 16 +- .../configuration-ghc-8.8.x.nix | 19 + .../configuration-ghc-head.nix | 1 + .../configuration-hackage2nix.yaml | 296 +- .../haskell-modules/configuration-nix.nix | 23 +- .../haskell-modules/generic-builder.nix | 73 +- .../haskell-modules/hackage-packages.nix | 5776 +++-- .../haskell-modules/non-hackage-packages.nix | 10 + .../patches/hasura-884-compat.patch | 26 + .../haskell-modules/with-packages-wrapper.nix | 11 - .../interpreters/chibi/default.nix | 4 +- .../interpreters/clojure/default.nix | 9 +- .../development/interpreters/elixir/1.6.nix | 7 - .../interpreters/elixir/generic-builder.nix | 8 +- .../interpreters/erlang/generic-builder.nix | 11 +- .../interpreters/groovy/default.nix | 4 +- .../development/interpreters/guile/2.0.nix | 2 +- .../development/interpreters/j/default.nix | 9 +- .../interpreters/janet/default.nix | 4 +- .../development/interpreters/luajit/2.0.nix | 6 +- .../development/interpreters/luajit/2.1.nix | 6 +- .../development/interpreters/perl/default.nix | 42 +- .../interpreters/perl/setup-hook-cross.sh | 2 +- .../development/interpreters/php/default.nix | 6 +- .../python/cpython/2.7/CVE-2019-20907.patch | 24 + .../python/cpython/2.7/default.nix | 3 + .../interpreters/python/cpython/default.nix | 11 + .../interpreters/python/default.nix | 14 +- .../python/mk-python-derivation.nix | 134 +- .../development/interpreters/python/tests.nix | 145 +- .../{ => test_environments}/test_python.py | 0 .../interpreters/rakudo/default.nix | 4 +- .../interpreters/rakudo/moarvm.nix | 4 +- .../development/interpreters/rakudo/nqp.nix | 6 +- .../development/interpreters/red/default.nix | 8 +- .../interpreters/shen-sbcl/default.nix | 32 + .../interpreters/shen-sources/default.nix | 28 + .../development/java-modules/jogl/default.nix | 5 +- .../development/libraries/alembic/default.nix | 4 +- .../development/libraries/allegro/default.nix | 5 +- .../libraries/allegro/encoding.patch | 10 + .../development/libraries/amdvlk/default.nix | 29 +- .../libraries/appindicator-sharp/default.nix | 43 + .../libraries/appstream/default.nix | 12 +- .../development/libraries/appstream/qt.nix | 11 +- .../libraries/armadillo/default.nix | 4 +- .../libraries/arrow-cpp/default.nix | 62 +- .../arrow-cpp/jemalloc-disable-shared.patch | 11 - .../libraries/aspell/dictionaries.nix | 8 +- .../development/libraries/assimp/default.nix | 2 +- .../libraries/audiality2/default.nix | 39 + .../libraries/ayatana-ido/default.nix | 4 +- .../development/libraries/catch2/default.nix | 4 +- .../development/libraries/check/default.nix | 4 +- .../libraries/chromaprint/default.nix | 7 +- .../development/libraries/cimg/default.nix | 4 +- .../development/libraries/crc32c/default.nix | 5 +- .../development/libraries/crcpp/default.nix | 30 + .../libraries/cutelyst/default.nix | 4 +- .../development/libraries/dlib/default.nix | 4 +- .../development/libraries/draco/default.nix | 34 + .../development/libraries/duckdb/default.nix | 4 +- .../development/libraries/dxflib/default.nix | 5 +- .../development/libraries/embree/default.nix | 37 + .../development/libraries/enchant/2.x.nix | 8 +- .../development/libraries/ethash/default.nix | 4 +- .../development/libraries/exiv2/default.nix | 64 +- .../development/libraries/fcft/default.nix | 7 +- .../libraries/fflas-ffpack/default.nix | 24 +- .../libraries/ffmpeg-full/default.nix | 4 +- .../development/libraries/ffmpeg/generic.nix | 1 + .../development/libraries/flatpak/default.nix | 4 +- .../libraries/fontconfig/config-compat.patch | 36 - .../libraries/fontconfig/default.nix | 50 +- .../libraries/fontconfig/make-fonts-cache.nix | 2 +- .../libraries/fontconfig/make-fonts-conf.nix | 2 - .../libraries/fontconfig/make-fonts-conf.xsl | 11 +- .../development/libraries/g2o/default.nix | 17 +- .../development/libraries/gdal/default.nix | 9 +- .../development/libraries/gensio/default.nix | 4 +- .../development/libraries/givaro/default.nix | 20 +- .../development/libraries/glib/default.nix | 7 +- .../development/libraries/glibmm/default.nix | 7 +- .../development/libraries/goffice/default.nix | 4 +- .../libraries/grantlee/5/default.nix | 7 +- .../development/libraries/grantlee/5/series | 2 - .../development/libraries/grpc/default.nix | 4 +- .../libraries/gstreamer/default.nix | 2 +- .../gstreamer/legacy/gnonlin/default.nix | 23 - .../legacy/gst-plugins-bad/default.nix | 36 - .../legacy/gst-plugins-base/default.nix | 62 - .../legacy/gst-plugins-base/gcc-4.9.patch | 38 - .../legacy/gst-plugins-good/default.nix | 52 - .../gst-plugins-good/linux-headers-3.9.patch | 27 - .../legacy/gst-plugins-good/v4l.patch | 11 - .../legacy/gst-plugins-ugly/default.nix | 30 - .../gstreamer/legacy/gst-python/default.nix | 37 - .../legacy/gst-python/disable-testFake.patch | 56 - .../gstreamer/legacy/gstreamer/darwin.patch | 14 - .../gstreamer/legacy/gstreamer/default.nix | 89 - .../gstreamer/legacy/gstreamer/setup-hook.sh | 8 - .../gstreamer/legacy/gstreamermm/default.nix | 31 - .../gstreamer/rtsp-server/default.nix | 9 + .../fix_pkgconfig_includedir.patch | 15 + .../libraries/gtk-layer-shell/default.nix | 26 +- .../libraries/harfbuzz/default.nix | 51 +- .../development/libraries/herqq/default.nix | 6 +- .../development/libraries/hiredis/default.nix | 4 +- .../development/libraries/hpx/default.nix | 4 +- .../development/libraries/ilmbase/cross.patch | 35 - .../development/libraries/ilmbase/default.nix | 18 +- .../development/libraries/imlib2/default.nix | 4 +- .../libraries/intel-gmmlib/default.nix | 6 +- .../development/libraries/itk/default.nix | 4 +- .../development/libraries/jasper/default.nix | 51 - .../libraries/java/dbus-java/default.nix | 3 +- .../libraries/java/hsqldb/default.nix | 4 +- .../libraries/java/lombok/default.nix | 4 +- .../libraries/jbig2dec/default.nix | 2 +- .../development/libraries/jxrlib/default.nix | 8 +- .../libraries/kde-frameworks/default.nix | 4 +- .../extra-cmake-modules/default.nix | 6 +- .../kde-frameworks/extra-cmake-modules/series | 1 - .../libraries/kde-frameworks/fetch.sh | 2 +- .../kde-frameworks/kauth/default.nix | 6 +- .../libraries/kde-frameworks/kauth/series | 1 - .../kde-frameworks/kcmutils/default.nix | 2 +- .../libraries/kde-frameworks}/kdav.nix | 3 +- .../kdelibs4support/default.nix | 6 +- .../kde-frameworks/kdelibs4support/series | 1 - .../{kdesu.nix => kdesu/default.nix} | 1 + ...desu-search-for-wrapped-daemon-first.patch | 38 + .../kde-frameworks/kfilemetadata/default.nix | 6 +- .../kde-frameworks/kfilemetadata/series | 1 - .../kde-frameworks/kiconthemes/default.nix | 6 +- .../kde-frameworks/kiconthemes/series | 1 - .../kde-frameworks/kinit/default.nix | 2 +- .../libraries/kde-frameworks/kinit/series | 3 - .../libraries/kde-frameworks/kio/default.nix | 7 +- .../libraries/kde-frameworks/kio/series | 2 - .../kde-frameworks/kpackage/default.nix | 7 +- .../libraries/kde-frameworks/kpackage/series | 2 - .../libraries/kde-frameworks/kquickcharts.nix | 15 + .../libraries/kde-frameworks/krunner.nix | 7 - .../kde-frameworks/kservice/default.nix | 7 +- .../libraries/kde-frameworks/kservice/series | 2 - .../libraries/kde-frameworks/kwayland.nix | 4 +- .../kde-frameworks/kwindowsystem/default.nix | 6 +- .../kde-frameworks/kwindowsystem/series | 1 - .../libraries/kde-frameworks/srcs.nix | 664 +- .../development/libraries/kpmcore/default.nix | 13 +- .../development/libraries/libaacs/default.nix | 4 +- .../libraries/libappindicator/default.nix | 28 +- .../libraries/libbacktrace/default.nix | 23 + .../libraries/libbytesize/default.nix | 4 +- .../development/libraries/libcint/default.nix | 4 +- .../libraries/libde265/default.nix | 4 +- .../libraries/libevdev/default.nix | 13 +- .../libraries/libfilezilla/default.nix | 8 +- .../libraries/libgdiplus/default.nix | 2 + .../libraries/libgpiod/default.nix | 4 +- .../libraries/libguestfs/default.nix | 4 +- .../libraries/libgumath/default.nix | 8 +- .../development/libraries/libheif/default.nix | 4 +- .../development/libraries/libiio/default.nix | 3 +- .../libraries/libinput/default.nix | 4 +- .../development/libraries/libipt/default.nix | 4 +- .../libraries/liblouis/default.nix | 4 +- .../libraries/libmatroska/default.nix | 4 +- .../development/libraries/libmbim/default.nix | 4 +- .../development/libraries/libmpc/default.nix | 4 +- .../libraries/libndtypes/default.nix | 8 +- .../libraries/liboping/default.nix | 5 +- .../development/libraries/libpfm/default.nix | 4 +- .../libraries/libpipeline/default.nix | 4 +- .../development/libraries/libpqxx/default.nix | 2 +- .../libraries/libpwquality/default.nix | 19 +- .../libraries/libqalculate/default.nix | 4 +- .../development/libraries/libqmi/default.nix | 4 +- .../development/libraries/libraw/default.nix | 11 +- .../development/libraries/librseq/default.nix | 15 +- .../libraries/libseccomp/default.nix | 20 +- .../libraries/libthreadar/default.nix | 35 + .../libraries/libunibreak/default.nix | 20 +- .../fix-headers.patch | 0 .../development/libraries/libusb1/default.nix | 4 +- .../development/libraries/libuv/default.nix | 2 +- .../libraries/libversion/default.nix | 6 +- .../development/libraries/libvmaf/default.nix | 8 +- .../libraries/libwacom/default.nix | 4 +- .../development/libraries/libxmlb/default.nix | 4 +- .../development/libraries/libxnd/default.nix | 16 +- .../development/libraries/libxsmm/default.nix | 33 +- .../development/libraries/linbox/default.nix | 21 +- .../development/libraries/lyra/default.nix | 4 +- .../libraries/malcontent/default.nix | 4 +- .../development/libraries/malcontent/ui.nix | 2 + .../development/libraries/mesa/default.nix | 25 +- .../link-radv-with-ld_args_build_id.patch | 17 +- .../libraries/mimalloc/default.nix | 4 +- .../pkgs/development/libraries/mlt/qt-5.nix | 1 + .../libraries/muparserx/default.nix | 42 + .../development/libraries/neatvnc/default.nix | 9 +- .../development/libraries/nghttp2/default.nix | 4 +- .../libraries/notify-sharp/default.nix | 7 +- .../development/libraries/nspr/default.nix | 4 +- .../development/libraries/nss/default.nix | 4 +- .../development/libraries/oneDNN/default.nix | 4 +- .../libraries/opencascade/default.nix | 25 +- .../libraries/opencl-clhpp/default.nix | 4 +- .../pkgs/development/libraries/opencv/3.x.nix | 3 - .../pkgs/development/libraries/opencv/4.x.nix | 8 +- .../development/libraries/opencv/default.nix | 3 - .../development/libraries/openexr/default.nix | 46 +- .../libraries/openldap/default.nix | 4 +- .../development/libraries/openmpi/default.nix | 4 +- .../libraries/openscenegraph/default.nix | 2 - .../libraries/openxr-loader/default.nix | 4 +- .../libraries/orocos-kdl/default.nix | 26 + .../development/libraries/p11-kit/default.nix | 11 +- .../development/libraries/pcl/default.nix | 5 +- .../development/libraries/pcre2/default.nix | 3 +- .../plasma-wayland-protocols/default.nix | 25 + .../development/libraries/poppler/default.nix | 4 +- .../development/libraries/protobuf/3.13.nix | 6 + .../development/libraries/qca-qt5/default.nix | 4 +- .../development/libraries/qoauth/default.nix | 10 +- .../development/libraries/qpdf/default.nix | 18 +- .../libraries/qt-4.x/4.8/default.nix | 10 +- .../libraries/qt-5/5.12/default.nix | 22 +- ...e-darwin-fix-failed-static-assertion.patch | 31 + ...qtwebengine-darwin-no-platform-check.patch | 44 +- .../libraries/qt-5/5.14/default.nix | 16 +- .../libraries/qt-5/5.15/default.nix | 176 + .../development/libraries/qt-5/5.15/fetch.sh | 1 + .../0001-qtbase-mkspecs-mac.patch | 411 + .../5.15/qtbase.patch.d/0002-qtbase-mac.patch | 118 + .../qtbase.patch.d/0003-qtbase-mkspecs.patch | 464 + .../0004-qtbase-replace-libdir.patch | 68 + .../qtbase.patch.d/0005-qtbase-cmake.patch | 194 + .../qtbase.patch.d/0006-qtbase-gtk3.patch | 48 + .../qtbase.patch.d/0007-qtbase-xcursor.patch | 29 + .../qtbase.patch.d/0008-qtbase-tzdir.patch | 64 + .../0009-qtbase-qtpluginpath.patch | 33 + .../qtbase.patch.d/0010-qtbase-assert.patch | 32 + .../0011-fix-header_module.patch | 25 + .../libraries/qt-5/5.15/qtdeclarative.patch | 114 + .../libraries/qt-5/5.15/qtscript.patch | 13 + .../libraries/qt-5/5.15/qtserialport.patch | 22 + .../libraries/qt-5/5.15/qttools.patch | 15 + ...qtwebengine-darwin-no-platform-check.patch | 33 + .../5.15/qtwebkit-darwin-no-qos-classes.patch | 11 + .../5.15/qtwebkit-darwin-no-readline.patch | 45 + .../libraries/qt-5/5.15/qtwebkit.patch | 12 + .../development/libraries/qt-5/5.15/srcs.nix | 342 + .../libraries/qt-5/modules/qtbase.nix | 39 +- .../libraries/qt-5/modules/qtimageformats.nix | 3 +- .../libraries/qt-5/modules/qtwebengine.nix | 67 +- .../libraries/qt-5/modules/qtwebkit.nix | 5 +- .../libraries/qtstyleplugins/default.nix | 2 + .../fix-build-against-Qt-5.15.patch | 44 + .../pkgs/development/libraries/qwt/6_qt4.nix | 4 +- .../development/libraries/rdkafka/default.nix | 4 +- .../development/libraries/readosm/default.nix | 4 +- .../development/libraries/redkite/default.nix | 4 +- .../development/libraries/relibc/default.nix | 79 +- .../development/libraries/rocclr/default.nix | 14 +- .../libraries/rocm-comgr/default.nix | 4 +- .../libraries/rocm-device-libs/default.nix | 7 +- .../libraries/rocm-opencl-icd/default.nix | 2 +- .../libraries/rocm-opencl-runtime/default.nix | 29 +- .../libraries/rocm-runtime-ext/default.nix | 42 - .../libraries/rocm-runtime-ext/setup-hook.sh | 7 - .../libraries/rocm-runtime/default.nix | 31 +- .../libraries/rocm-runtime/rocr-ext-dir.diff | 23 - .../libraries/rocm-thunk/default.nix | 4 +- .../science/biology/nifticlib/default.nix | 26 +- .../libraries/science/math/arpack/default.nix | 2 +- .../libraries/science/math/blis/default.nix | 64 + .../libraries/science/math/cudnn/default.nix | 11 +- .../libraries/science/math/cudnn/generic.nix | 10 +- .../libraries/science/math/libtorch/bin.nix | 111 + .../science/math/libtorch/binary-hashes.nix | 14 + .../science/math/libtorch/test/CMakeLists.txt | 4 + .../science/math/libtorch/test/default.nix | 26 + .../science/math/libtorch/test/test.cpp | 7 + .../libraries/science/math/magma/default.nix | 14 +- .../libraries/science/math/mkl/default.nix | 14 +- .../libraries/science/math/nccl/default.nix | 4 +- .../science/math/openlibm/default.nix | 4 +- .../libraries/science/math/petsc/default.nix | 4 +- .../math/suitesparse-graphblas/default.nix | 4 +- .../science/math/suitesparse/default.nix | 23 - .../development/libraries/sope/default.nix | 4 +- .../development/libraries/soqt/default.nix | 4 +- .../libraries/sparsehash/default.nix | 4 +- .../development/libraries/spdlog/default.nix | 4 +- .../development/libraries/speechd/default.nix | 4 +- .../development/libraries/sqlite/analyzer.nix | 4 +- .../development/libraries/sqlite/default.nix | 6 +- .../development/libraries/sqlite/tools.nix | 43 + .../development/libraries/strigi/default.nix | 43 - .../strigi/export_bufferedstream.patch | 12 - .../development/libraries/strigi/gcc6.patch | 45 - .../development/libraries/sundials/2.x.nix | 2 +- .../libraries/sundials/default.nix | 25 +- .../development/libraries/tbb/default.nix | 4 +- .../development/libraries/tiledb/default.nix | 19 +- .../pkgs/development/libraries/tk/generic.nix | 2 +- .../libraries/utf8proc/default.nix | 14 +- .../libraries/vid-stab/default.nix | 27 +- .../development/libraries/vmmlib/default.nix | 13 +- .../libraries/vulkan-loader/default.nix | 4 +- .../development/libraries/wcslib/default.nix | 4 +- .../libraries/webkit2-sharp/default.nix | 49 + .../libraries/webkitgtk/default.nix | 3 +- .../development/libraries/wolfssl/default.nix | 4 +- .../libraries/wxsqlite3/default.nix | 4 +- .../libraries/wxwidgets/2.8/default.nix | 4 +- .../libraries/wxwidgets/2.9/default.nix | 7 +- .../libraries/wxwidgets/3.0/default.nix | 4 +- .../libraries/wxwidgets/3.1/default.nix | 4 +- .../development/libraries/x265/default.nix | 68 +- .../development/libraries/xapian/default.nix | 2 +- .../development/libraries/yder/default.nix | 4 +- .../development/libraries/zimg/default.nix | 4 +- .../lua-modules/generated-packages.nix | 68 + .../misc/haskell/hasura/ci-info/default.nix} | 0 .../hasura/graphql-engine/default.nix} | 10 +- .../hasura/graphql-parser/default.nix} | 7 +- .../haskell/hasura/pg-client/default.nix} | 0 .../androidenv/compose-android-packages.nix | 6 +- .../development/mobile/androidenv/default.nix | 4 +- .../androidenv/deploy-androidpackage.nix | 3 +- .../mobile/androidenv/generated/addons.nix | 128 - .../mobile/androidenv/ndk-bundle/default.nix | 14 +- .../development/node-packages/default.nix | 46 +- .../node-packages/node-packages.json | 9 +- .../node-packages/node-packages.nix | 18628 +++++++++++----- .../ocaml-modules/apron/default.nix | 4 +- .../ocaml-modules/batteries/default.nix | 18 +- .../ocaml-modules/camlpdf/default.nix | 12 +- .../ocaml-modules/cohttp/async.nix | 22 + .../ocaml-modules/conduit/async.nix | 19 + .../ocaml-modules/conduit/default.nix | 2 +- .../ocaml-modules/containers/data.nix | 18 + .../ocaml-modules/containers/default.nix | 14 +- .../ocaml-modules/cpdf/default.nix | 8 +- .../ocaml-modules/csexp/default.nix | 24 + .../dune-action-plugin/default.nix | 19 + .../ocaml-modules/dune-build-info/default.nix | 2 +- .../dune-configurator/default.nix | 6 +- .../ocaml-modules/dune-glob/default.nix | 19 + .../dune-private-libs/default.nix | 4 +- .../ocaml-modules/eliom/default.nix | 4 +- .../ocaml-modules/elpi/default.nix | 12 +- .../ocaml-modules/fdkaac/default.nix | 27 + .../ocaml-modules/genspio/default.nix | 32 + .../ocaml-modules/graphql_ppx/default.nix | 12 +- .../ocaml-modules/hidapi/default.nix | 27 + .../development/ocaml-modules/irmin/1.4.nix | 26 - .../ocaml-modules/janestreet/0.13.nix | 10 + .../ocaml-modules/jwto/default.nix | 30 + .../ocaml-modules/lablgtk3/default.nix | 3 +- .../ocaml-modules/labltk/default.nix | 4 + .../ocaml-modules/mirage-crypto/default.nix | 4 +- .../ocaml-modules/mirage-stack/default.nix | 4 +- .../ocaml-modules/nonstd/default.nix | 24 + .../ocaml-modules/ocamlgraph/default.nix | 28 +- .../ocaml-modules/ocamlgraph/destdir.patch | 13 - .../ocaml-modules/ocamlnet/default.nix | 4 +- .../ocaml-modules/piqi-ocaml/default.nix | 20 +- .../development/ocaml-modules/posix/base.nix | 26 + .../ocaml-modules/posix/socket.nix | 16 + .../development/ocaml-modules/posix/types.nix | 15 + .../ocaml-modules/ptmap/default.nix | 46 +- .../ocaml-modules/ptset/default.nix | 26 + .../ocaml-modules/qcheck/alcotest.nix | 13 + .../development/ocaml-modules/qcheck/core.nix | 23 + .../ocaml-modules/qcheck/default.nix | 31 +- .../ocaml-modules/qcheck/ounit.nix | 14 + .../ocaml-modules/qtest/default.nix | 34 +- .../development/ocaml-modules/re/default.nix | 10 +- .../ocaml-modules/sosa/default.nix | 30 + .../development/ocaml-modules/srt/default.nix | 30 + .../ocaml-modules/uunf/default.nix | 38 +- .../ocaml-modules/webbrowser/default.nix | 26 + .../ocaml-modules/zarith/default.nix | 6 +- .../development/ocaml-modules/zed/default.nix | 4 +- .../perl-modules/generic/default.nix | 2 +- .../python-modules/Fabric/default.nix | 4 + .../python-modules/JPype1/default.nix | 4 +- .../python-modules/Nikola/default.nix | 4 +- .../python-modules/WSME/default.nix | 67 +- .../python-modules/acebinf/default.nix | 28 + .../python-modules/afdko/default.nix | 56 + .../python-modules/agate-sql/default.nix | 4 +- .../python-modules/aioesphomeapi/default.nix | 18 +- .../python-modules/aioftp/default.nix | 4 +- .../python-modules/aiohttp/default.nix | 2 + .../python-modules/aiohue/default.nix | 4 +- .../python-modules/aiounifi/default.nix | 4 +- .../python-modules/alerta-server/default.nix | 4 +- .../python-modules/alerta/default.nix | 4 +- .../python-modules/amply/default.nix | 37 + .../python-modules/amqp/default.nix | 4 +- .../python-modules/ansiconv/default.nix | 3 +- .../python-modules/apprise/default.nix | 4 +- .../python-modules/apsw/default.nix | 4 +- .../python-modules/aresponses/default.nix | 3 + .../python-modules/aria2p/default.nix | 2 +- .../python-modules/asdf/default.nix | 4 +- .../python-modules/asgi-csrf/default.nix | 31 + .../python-modules/asn1crypto/default.nix | 4 +- .../python-modules/astor/default.nix | 20 +- .../python-modules/asyncpg/default.nix | 2 +- .../python-modules/asyncssh/default.nix | 4 +- .../atlassian-python-api/default.nix | 13 +- .../python-modules/atpublic/default.nix | 18 +- .../python-modules/audiotools/default.nix | 2 +- .../python-modules/auth0-python/default.nix | 4 +- .../python-modules/autobahn/default.nix | 4 +- .../python-modules/avro-python3/default.nix | 4 +- .../python-modules/avro/default.nix | 18 +- .../python-modules/awkward/default.nix | 4 +- .../python-modules/awkward1/default.nix | 4 +- .../aws-sam-translator/default.nix | 4 +- .../python-modules/aws-xray-sdk/default.nix | 4 +- .../azure-mgmt-appconfiguration/default.nix | 4 +- .../azure-mgmt-containerservice/default.nix | 4 +- .../azure-mgmt-cosmosdb/default.nix | 4 +- .../azure-mgmt-hdinsight/default.nix | 4 +- .../azure-mgmt-keyvault/default.nix | 2 + .../azure-mgmt-reservations/default.nix | 4 +- .../azure-mgmt-storage/default.nix | 4 +- .../azure-mgmt-synapse/default.nix | 32 + .../azure-multiapi-storage/default.nix | 4 +- .../azure-synapse-accesscontrol/default.nix | 31 + .../azure-synapse-spark/default.nix | 31 + .../python-modules/b2sdk/default.nix | 28 + .../python-modules/backcall/default.nix | 4 +- .../batchgenerators/default.nix | 2 +- .../bayesian-optimization/default.nix | 2 +- .../development/python-modules/bcrypt/3_1.nix | 23 + .../python-modules/bcrypt/default.nix | 7 +- .../python-modules/behave/default.nix | 42 +- .../python-modules/bellows/default.nix | 4 +- .../python-modules/bespon/default.nix | 6 +- .../python-modules/bidict/default.nix | 4 +- .../python-modules/bip_utils/default.nix | 5 +- .../python-modules/bitarray/default.nix | 4 +- .../black-macchiato/default.nix | 35 + .../python-modules/bleak/default.nix | 4 +- .../python-modules/blis/default.nix | 6 +- .../python-modules/block-io/default.nix | 4 +- .../python-modules/bokeh/default.nix | 4 +- .../python-modules/boltztrap2/default.nix | 4 +- .../booleanoperations/default.nix | 34 + .../python-modules/boto3/default.nix | 4 +- .../python-modules/botocore/default.nix | 4 +- .../python-modules/breathe/default.nix | 4 +- .../python-modules/brother/default.nix | 6 +- .../python-modules/brotlipy/default.nix | 2 +- .../python-modules/bugsnag/default.nix | 4 +- .../python-modules/build/default.nix | 2 +- .../python-modules/buildbot/default.nix | 11 +- .../python-modules/buildbot/pkg.nix | 2 +- .../python-modules/buildbot/plugins.nix | 10 +- .../python-modules/buildbot/worker.nix | 2 +- .../python-modules/bwapy/default.nix | 42 + .../python-modules/caldav/default.nix | 2 + .../python-modules/canonicaljson/default.nix | 2 +- .../python-modules/cartopy/default.nix | 4 +- .../cassandra-driver/default.nix | 4 +- .../python-modules/catalogue/default.nix | 10 +- .../python-modules/celery/default.nix | 4 +- .../python-modules/certbot/default.nix | 4 +- .../python-modules/certifi/default.nix | 4 +- .../python-modules/certipy/default.nix | 2 +- .../python-modules/cffi/default.nix | 4 +- .../python-modules/cfn-lint/default.nix | 61 +- .../python-modules/cftime/default.nix | 6 +- .../python-modules/chalice/default.nix | 18 +- .../python-modules/chameleon/default.nix | 4 +- .../python-modules/channels-redis/default.nix | 2 +- .../python-modules/cheroot/default.nix | 4 +- .../python-modules/cherrypy/default.nix | 3 + .../python-modules/cirq/default.nix | 22 +- .../python-modules/cliff/default.nix | 4 +- .../python-modules/clifford/default.nix | 2 + .../python-modules/clldutils/default.nix | 53 + .../python-modules/cloudflare/default.nix | 6 +- .../python-modules/cloudpickle/default.nix | 4 +- .../python-modules/cmd2/default.nix | 4 +- .../python-modules/codecov/default.nix | 4 +- .../python-modules/colander/default.nix | 4 +- .../python-modules/configparser/4.nix | 2 +- .../confluent-kafka/default.nix | 4 +- .../python-modules/cookiecutter/default.nix | 2 +- .../python-modules/cornice/default.nix | 4 +- .../python-modules/coverage/default.nix | 4 +- .../python-modules/coveralls/default.nix | 4 +- .../python-modules/cozy/default.nix | 5 +- .../python-modules/cppy/default.nix | 2 +- .../python-modules/crate/default.nix | 37 + .../python-modules/credstash/default.nix | 10 +- .../python-modules/cryptography/default.nix | 4 +- .../python-modules/cryptography/vectors.nix | 2 +- .../python-modules/csvw/default.nix | 51 + .../cucumber-tag-expressions/default.nix | 21 + .../python-modules/cupy/default.nix | 6 +- .../python-modules/cvxpy/default.nix | 17 +- .../python-modules/cx_freeze/default.nix | 8 +- .../python-modules/cx_oracle/default.nix | 4 +- .../python-modules/dask-ml/default.nix | 4 +- .../python-modules/dask-mpi/default.nix | 4 +- .../python-modules/dask-xgboost/default.nix | 4 +- .../databricks-connect/default.nix | 32 + .../python-modules/datadog/default.nix | 11 +- .../python-modules/datasets/default.nix | 52 + .../python-modules/datasette/default.nix | 24 +- .../python-modules/datashader/default.nix | 4 +- .../python-modules/dbf/default.nix | 4 +- .../python-modules/dbus-next/default.nix | 41 + .../python-modules/deepdiff/default.nix | 12 +- .../python-modules/defcon/default.nix | 35 + .../dependency-injector/default.nix | 8 +- .../diff-match-patch/default.nix | 4 +- .../python-modules/dipy/default.nix | 4 +- .../python-modules/distributed/default.nix | 9 +- .../django-auth-ldap/default.nix | 6 +- .../python-modules/django-cleanup/default.nix | 4 +- .../django-cors-headers/default.nix | 4 +- .../django-dynamic-preferences/default.nix | 6 +- .../django-extensions/default.nix | 4 +- .../python-modules/django-ipware/default.nix | 4 +- .../django-maintenance-mode/default.nix | 24 + .../django-multiselectfield/default.nix | 2 +- .../django-picklefield/default.nix | 19 +- .../python-modules/django-q/default.nix | 4 +- .../django-widget-tweaks/default.nix | 25 + .../python-modules/django/1_11.nix | 34 - .../development/python-modules/django/2_2.nix | 4 +- .../django_evolution/default.nix | 4 +- .../django_guardian/default.nix | 4 +- .../python-modules/django_nose/default.nix | 4 +- .../python-modules/djangoql/default.nix | 4 +- .../djangorestframework-simplejwt/default.nix | 8 +- .../python-modules/dkimpy/default.nix | 2 +- .../python-modules/dlib/default.nix | 4 +- .../python-modules/dnspython/1.nix | 22 + .../python-modules/dnspython/default.nix | 7 +- .../python-modules/docker/default.nix | 4 +- .../dockerfile-parse/default.nix | 4 +- .../python-modules/docplex/default.nix | 4 +- .../python-modules/dogpile.cache/default.nix | 19 +- .../python-modules/dominate/default.nix | 4 +- .../python-modules/dropbox/default.nix | 4 +- .../python-modules/duckdb/default.nix | 7 + .../python-modules/elasticsearch/default.nix | 4 +- .../python-modules/emoji/default.nix | 4 +- .../python-modules/eventlet/default.nix | 16 +- .../python-modules/executor/default.nix | 23 +- .../python-modules/factory_boy/default.nix | 4 +- .../python-modules/faker/default.nix | 4 +- .../python-modules/fastparquet/default.nix | 4 +- .../python-modules/fixtures/default.nix | 2 +- .../python-modules/flake8/default.nix | 3 +- .../python-modules/flaky/default.nix | 4 +- .../python-modules/flask-api/default.nix | 4 +- .../flask-marshmallow/default.nix | 6 +- .../python-modules/flit/default.nix | 4 +- .../python-modules/fluent-logger/default.nix | 13 +- .../python-modules/flufl/bounce.nix | 4 +- .../python-modules/fontmath/default.nix | 25 + .../python-modules/fontparts/default.nix | 40 + .../python-modules/fontpens/default.nix | 38 + .../python-modules/fonttools/default.nix | 62 +- .../python-modules/ftputil/default.nix | 9 +- .../python-modules/fuse-python/default.nix | 3 +- .../python-modules/gast/default.nix | 4 +- .../python-modules/gdown/default.nix | 4 +- .../python-modules/geoip2/default.nix | 2 +- .../python-modules/geopandas/default.nix | 14 +- .../python-modules/globus-sdk/default.nix | 10 +- .../python-modules/glom/default.nix | 9 +- .../python-modules/goobook/default.nix | 26 +- .../python-modules/goobook/fix-build.patch | 32 - .../google-api-python-client/default.nix | 4 +- .../python-modules/google-crc32c/default.nix | 31 + .../google_api_core/default.nix | 4 +- .../python-modules/google_auth/default.nix | 4 +- .../google_cloud_asset/default.nix | 4 +- .../google_cloud_automl/default.nix | 4 +- .../google_cloud_bigquery/default.nix | 4 +- .../default.nix | 4 +- .../google_cloud_bigtable/default.nix | 4 +- .../google_cloud_container/default.nix | 4 +- .../google_cloud_core/default.nix | 4 +- .../google_cloud_dataproc/default.nix | 4 +- .../google_cloud_datastore/default.nix | 4 +- .../google_cloud_dlp/default.nix | 4 +- .../google_cloud_firestore/default.nix | 4 +- .../google_cloud_kms/default.nix | 4 +- .../google_cloud_logging/default.nix | 4 +- .../google_cloud_pubsub/default.nix | 4 +- .../google_cloud_runtimeconfig/default.nix | 4 +- .../google_cloud_securitycenter/default.nix | 4 +- .../google_cloud_storage/default.nix | 4 +- .../google_cloud_texttospeech/default.nix | 4 +- .../google_cloud_trace/default.nix | 4 +- .../google_cloud_translate/default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 4 +- .../google_resumable_media/default.nix | 15 +- .../python-modules/graph-tool/2.x.x.nix | 4 +- .../graphite_beacon/default.nix | 12 +- .../python-modules/graphviz/default.nix | 10 +- .../graphviz/hardcode-graphviz-path.patch | 73 +- .../python-modules/graspy/default.nix | 19 +- .../python-modules/green/default.nix | 10 +- .../python-modules/grpcio-tools/default.nix | 8 +- .../python-modules/grpcio/default.nix | 1 + .../development/python-modules/gsd/1.7.nix | 4 +- .../python-modules/gspread/default.nix | 5 +- .../python-modules/gssapi/default.nix | 23 +- .../python-modules/gumath/default.nix | 20 +- .../python-modules/h5netcdf/default.nix | 2 +- .../python-modules/hcloud/default.nix | 4 +- .../python-modules/helpdev/default.nix | 2 +- .../python-modules/hickle/default.nix | 10 +- .../python-modules/hieroglyph/default.nix | 7 +- .../python-modules/hiredis/default.nix | 6 +- .../python-modules/holidays/default.nix | 17 +- .../python-modules/howdoi/default.nix | 18 +- .../python-modules/html5lib/default.nix | 4 +- .../python-modules/http-parser/default.nix | 31 + .../python-modules/httpcore/default.nix | 34 + .../python-modules/httpx/default.nix | 33 +- .../python-modules/humanize/default.nix | 4 +- .../python-modules/hyperlink/default.nix | 11 +- .../hypothesis-auto/default.nix | 36 + .../python-modules/hypothesis/default.nix | 4 +- .../python-modules/hyppo/default.nix | 40 + .../python-modules/i3ipc/default.nix | 4 +- .../python-modules/iapws/default.nix | 4 +- .../python-modules/identify/default.nix | 4 +- .../python-modules/idna/default.nix | 6 +- .../python-modules/ihatemoney/default.nix | 12 +- .../python-modules/ijson/default.nix | 4 +- .../imagecorruptions/default.nix | 2 +- .../python-modules/imageio/default.nix | 4 +- .../imbalanced-learn/default.nix | 4 +- .../python-modules/img2pdf/default.nix | 7 +- .../python-modules/imgsize/default.nix | 23 + .../importlib-metadata/default.nix | 4 +- .../importlib-resources/default.nix | 4 +- .../python-modules/inflection/default.nix | 4 +- .../python-modules/iniconfig/default.nix | 21 + .../python-modules/inquirer/default.nix | 4 +- .../python-modules/intervaltree/default.nix | 4 +- .../python-modules/ipykernel/default.nix | 4 +- .../python-modules/ipython/7.16.nix | 70 + .../python-modules/ipython/default.nix | 6 +- .../python-modules/ipyvue/default.nix | 4 +- .../python-modules/ipyvuetify/default.nix | 4 +- .../python-modules/irc/default.nix | 9 +- .../python-modules/islpy/default.nix | 4 +- .../python-modules/iterm2/default.nix | 4 +- .../python-modules/jdcal/default.nix | 2 +- .../python-modules/jedi/default.nix | 15 +- .../jenkins-job-builder/default.nix | 4 +- .../python-modules/jenkinsapi/default.nix | 20 +- .../python-modules/jinja2/default.nix | 6 +- .../python-modules/joblib/default.nix | 6 +- .../python-modules/josepy/default.nix | 4 +- .../development/python-modules/jq/default.nix | 12 +- .../python-modules/jq/jq-py-setup.patch | 111 +- .../python-modules/jsbeautifier/default.nix | 4 +- .../python-modules/jsonpatch/default.nix | 4 +- .../python-modules/jug/default.nix | 6 +- .../python-modules/junos-eznc/default.nix | 10 +- .../python-modules/jupyter-sphinx/default.nix | 4 +- .../python-modules/jupyter_client/5.nix | 4 +- .../python-modules/jupyter_client/default.nix | 4 +- .../jupyterhub-ldapauthenticator/default.nix | 6 +- .../jupyterhub-tmpauthenticator/default.nix | 31 + .../python-modules/jupyterlab-git/default.nix | 37 + .../python-modules/jupyterlab/default.nix | 4 +- .../jupyterlab_server/default.nix | 2 +- .../python-modules/jupytext/default.nix | 4 +- .../python-modules/jwcrypto/default.nix | 4 +- .../python-modules/keep/default.nix | 36 + .../python-modules/keras/default.nix | 4 +- .../python-modules/keyring/default.nix | 4 +- .../python-modules/kiwisolver/default.nix | 4 +- .../korean-lunar-calendar/default.nix | 25 + .../python-modules/kubernetes/default.nix | 2 +- .../python-modules/labelbox/default.nix | 6 +- .../python-modules/lazy/default.nix | 2 +- .../python-modules/ldap3/default.nix | 4 +- .../python-modules/libarcus/default.nix | 4 +- .../development/python-modules/libcloud/2.nix | 4 +- .../python-modules/librosa/default.nix | 13 +- .../python-modules/libsavitar/default.nix | 4 +- .../python-modules/libtmux/default.nix | 4 +- .../python-modules/lightparam/default.nix | 23 +- .../python-modules/llvmlite/default.nix | 4 +- .../python-modules/lmdb/default.nix | 4 +- .../python-modules/lml/default.nix | 30 + .../python-modules/lmtpd/default.nix | 4 +- .../python-modules/logfury/default.nix | 2 +- .../python-modules/loguru/default.nix | 2 +- .../python-modules/ludios_wpull/default.nix | 8 +- .../python-modules/maestral/default.nix | 8 +- .../maildir-deduplicate/default.nix | 27 - .../marionette-harness/default.nix | 4 +- .../marionette-harness/marionette_driver.nix | 2 +- .../marionette-harness/mozhttpd.nix | 6 +- .../marionette-harness/moznetwork.nix | 2 +- .../python-modules/markdown/3_1.nix | 4 +- .../python-modules/markdown/default.nix | 4 +- .../marshmallow-polyfield/default.nix | 2 +- .../python-modules/marshmallow/default.nix | 4 +- .../python-modules/mask-rcnn/default.nix | 3 +- .../python-modules/mathlibtools/default.nix | 26 + .../python-modules/matplotlib/default.nix | 10 +- .../matplotlib/setup-darwin.cfg | 7 + .../python-modules/matrix-nio/default.nix | 4 +- .../python-modules/maxminddb/default.nix | 2 +- .../python-modules/mergedeep/default.nix | 26 + .../python-modules/minio/default.nix | 6 +- .../python-modules/mistletoe/default.nix | 22 + .../python-modules/mitmproxy/default.nix | 121 + .../python-modules/mlflow/default.nix | 4 +- .../python-modules/mmh3/default.nix | 23 + .../python-modules/mock-open/default.nix | 13 +- .../development/python-modules/mock/2.nix | 2 +- .../python-modules/mocket/default.nix | 6 +- .../python-modules/mohawk/default.nix | 27 + .../python-modules/more-itertools/default.nix | 4 +- .../python-modules/morphys/default.nix | 2 +- .../python-modules/msal/default.nix | 4 +- .../python-modules/mt-940/default.nix | 4 +- .../python-modules/multitasking/default.nix | 25 + .../python-modules/mutagen/1.43.nix | 4 +- .../python-modules/mutagen/default.nix | 7 +- .../python-modules/mutatormath/default.nix | 25 + .../python-modules/mwoauth/default.nix | 2 +- .../python-modules/myfitnesspal/default.nix | 4 +- .../python-modules/mypy-protobuf/default.nix | 4 +- .../python-modules/mysqlclient/default.nix | 4 +- .../python-modules/nassl/default.nix | 4 +- .../python-modules/nbclient/default.nix | 4 +- .../python-modules/nbconflux/default.nix | 10 +- .../python-modules/nbxmpp/default.nix | 16 +- .../python-modules/ncclient/default.nix | 4 +- .../python-modules/ndtypes/default.nix | 13 +- .../python-modules/netaddr/default.nix | 29 +- .../python-modules/netdisco/default.nix | 4 +- .../python-modules/nipype/default.nix | 4 +- .../nix-prefetch-github/default.nix | 11 +- .../python-modules/nmigen/default.nix | 13 +- .../python-modules/nodeenv/default.nix | 4 +- .../development/python-modules/notebook/2.nix | 4 +- .../python-modules/notebook/default.nix | 35 +- .../python-modules/notify2/default.nix | 2 +- .../python-modules/ntc-templates/default.nix | 36 + .../python-modules/numba/default.nix | 4 +- .../development/python-modules/numpy/1.16.nix | 7 +- .../python-modules/numpy/default.nix | 6 + .../python-modules/numpydoc/default.nix | 7 +- .../python-modules/nunavut/default.nix | 4 +- .../python-modules/oauthenticator/default.nix | 4 +- .../python-modules/openpyxl/default.nix | 4 +- .../python-modules/opentracing/default.nix | 2 +- .../python-modules/pa-ringbuffer/default.nix | 20 + .../python-modules/packet-python/default.nix | 4 +- .../python-modules/palettable/default.nix | 5 +- .../python-modules/pam/default.nix | 32 - .../python-modules/pandas/default.nix | 8 +- .../python-modules/papermill/default.nix | 4 +- .../python-modules/paramiko/default.nix | 9 + .../python-modules/parfive/default.nix | 4 +- .../python-modules/parse/default.nix | 4 +- .../python-modules/parsedatetime/default.nix | 2 + .../python-modules/parso/default.nix | 18 +- .../python-modules/patator/default.nix | 4 +- .../python-modules/pathspec/default.nix | 2 +- .../python-modules/pcpp/default.nix | 2 +- .../python-modules/pdfminer_six/default.nix | 4 +- .../python-modules/pdftotext/default.nix | 4 +- .../python-modules/pecan/default.nix | 45 +- .../python-modules/pelican/default.nix | 27 +- .../python-modules/pep517/default.nix | 2 +- .../python-modules/pg8000/default.nix | 4 +- .../python-modules/pglast/default.nix | 4 +- .../python-modules/phonenumbers/default.nix | 4 +- .../python-modules/phonopy/default.nix | 22 +- .../python-modules/picos/default.nix | 4 +- .../python-modules/pikepdf/default.nix | 4 +- .../python-modules/pillow/default.nix | 4 +- .../python-modules/pims/default.nix | 4 +- .../python-modules/pint/default.nix | 11 +- .../python-modules/pip-tools/default.nix | 4 +- .../python-modules/pip2nix/default.nix | 40 - .../python-modules/pipdate/default.nix | 10 +- .../python-modules/pipx/default.nix | 52 + .../python-modules/pivy/default.nix | 14 +- .../python-modules/plotly/default.nix | 4 +- .../python-modules/plumbum/default.nix | 2 +- .../python-modules/poetry/default.nix | 6 +- .../python-modules/pooch/default.nix | 46 + .../development/python-modules/pq/default.nix | 20 +- .../python-modules/pre-commit/default.nix | 4 +- .../python-modules/preshed/default.nix | 2 +- .../python-modules/prompt_toolkit/default.nix | 4 +- .../python-modules/psautohint/default.nix | 40 + .../python-modules/psutil/default.nix | 4 +- .../python-modules/ptpython/default.nix | 4 +- .../python-modules/pulp/default.nix | 7 +- .../python-modules/pure-eval/default.nix | 27 + .../python-modules/pwntools/default.nix | 9 +- .../python-modules/py-multibase/default.nix | 2 +- .../python-modules/py-multihash/default.nix | 2 +- .../development/python-modules/py/default.nix | 4 +- .../pyTelegramBotAPI/default.nix | 4 +- .../py_stringmatching/default.nix | 2 +- .../python-modules/pyatmo/default.nix | 4 +- .../python-modules/pyatv/default.nix | 4 +- .../python-modules/pybullet/default.nix | 4 +- .../python-modules/pychromecast/default.nix | 4 +- .../python-modules/pycoin/default.nix | 4 +- .../python-modules/pydocstyle/default.nix | 4 +- .../python-modules/pydub/default.nix | 4 +- .../python-modules/pyexcel-io/default.nix | 31 + .../python-modules/pyexcel-ods/default.nix | 41 + .../python-modules/pyexcel-xls/default.nix | 41 + .../python-modules/pyexcel/default.nix | 45 + .../python-modules/pyfakefs/default.nix | 10 +- .../python-modules/pyfxa/default.nix | 7 +- .../python-modules/pygraphviz/default.nix | 4 +- .../python-modules/pyhaversion/default.nix | 6 + .../python-modules/pyhomematic/default.nix | 4 +- .../python-modules/pyipp/default.nix | 4 +- .../python-modules/pyjet/default.nix | 17 +- .../python-modules/pykdl/default.nix | 20 + .../python-modules/pylatexenc/default.nix | 6 +- .../python-modules/pylibftdi/default.nix | 4 +- .../python-modules/pymatgen/default.nix | 4 +- .../python-modules/pymc3/default.nix | 4 +- .../python-modules/pymongo/default.nix | 4 +- .../python-modules/pymupdf/default.nix | 4 +- .../python-modules/pynamodb/default.nix | 4 +- .../python-modules/pyopencl/default.nix | 4 +- .../pyopengl-accelerate/default.nix | 23 + .../python-modules/pyotp/default.nix | 4 +- .../python-modules/pyphotonfile/default.nix | 2 +- .../python-modules/pyro-ppl/default.nix | 4 +- .../python-modules/pyro5/default.nix | 4 +- .../python-modules/pysdl2/PySDL2-dll.patch | 113 +- .../python-modules/pysdl2/default.nix | 27 +- .../python-modules/pyside2/default.nix | 4 +- .../python-modules/pyslurm/default.nix | 1 + .../python-modules/pysnow/default.nix | 42 +- .../python-modules/pyspark/default.nix | 4 +- .../python-modules/pyspice/default.nix | 51 + .../python-modules/pysqueezebox/default.nix | 27 + .../python-modules/pytabix/default.nix | 32 + .../python-modules/pytest-asyncio/default.nix | 4 +- .../python-modules/pytest-bdd/default.nix | 2 +- .../python-modules/pytest-cov/default.nix | 4 +- .../pytest-doctestplus/default.nix | 4 +- .../python-modules/pytest-forked/default.nix | 4 +- .../python-modules/pytest-mock/default.nix | 7 +- .../pytest-randomly/default.nix | 31 + .../pytest-services/default.nix | 4 +- .../python-modules/pytest-trio/default.nix | 10 +- .../python-modules/pytest-xdist/2.nix | 31 + .../python-modules/pytest-xdist/default.nix | 8 +- .../development/python-modules/pytest/4.nix | 4 +- .../development/python-modules/pytest/5.nix | 80 + .../python-modules/pytest/default.nix | 39 +- .../python-modules/python-docx/default.nix | 1 + .../python-engineio/default.nix | 13 +- .../python-modules/python-gitlab/default.nix | 8 +- .../python-language-server/default.nix | 14 +- .../python-libarchive/default.nix | 27 - .../python-markdown-math/default.nix | 4 +- .../python-modules/python-packer/default.nix | 5 +- .../python-modules/python-pam/default.nix | 27 +- .../python-modules/python-ptrace/default.nix | 4 +- .../python-redis-lock/default.nix | 4 +- .../python-modules/python-rtmidi/default.nix | 4 +- .../python-modules/python-snap7/default.nix | 37 + .../python-modules/python-stdnum/default.nix | 4 +- .../python-modules/pytools/default.nix | 6 +- .../pytorch-lightning/default.nix | 46 + .../python-modules/pytorch/bin.nix | 68 + .../python-modules/pytorch/binary-hashes.nix | 10 + .../python-modules/pytorch/default.nix | 24 +- .../python-modules/pyuavcan/default.nix | 2 +- .../python-modules/pyudev/default.nix | 2 +- .../python-modules/pyvcf/default.nix | 6 +- .../python-modules/pywbem/default.nix | 6 +- .../python-modules/pyxdg/default.nix | 4 +- .../python-modules/pyxnat/default.nix | 34 + .../python-modules/pyzmq/default.nix | 4 +- .../python-modules/qiskit-aer/default.nix | 34 +- .../qiskit-aer/remove-conan-install.patch | 63 + .../python-modules/qiskit-aqua/default.nix | 24 +- .../qiskit-ibmq-provider/default.nix | 5 +- .../python-modules/qiskit-ignis/default.nix | 18 +- .../python-modules/qiskit-terra/default.nix | 24 +- .../python-modules/qiskit/default.nix | 21 +- .../python-modules/qtconsole/default.nix | 4 +- .../python-modules/qutip/default.nix | 45 - .../python-modules/rabbitpy/default.nix | 6 +- .../readthedocs-sphinx-ext/default.nix | 4 +- .../python-modules/regex/default.nix | 4 +- .../python-modules/relatorio/default.nix | 4 +- .../python-modules/reportlab/default.nix | 4 +- .../requests-aws4auth/default.nix | 17 +- .../python-modules/requests/default.nix | 4 +- .../python-modules/responses/default.nix | 4 +- .../python-modules/rethinkdb/default.nix | 5 +- .../python-modules/retworkx/default.nix | 81 +- .../python-modules/rhpl/builder.sh | 2 +- .../python-modules/ripser/default.nix | 6 +- .../python-modules/rising/default.nix | 38 + .../python-modules/roboschool/default.nix | 6 +- .../robotframework-requests/default.nix | 4 +- .../development/python-modules/rq/default.nix | 12 +- .../python-modules/rsa/default.nix | 4 +- .../python-modules/rtmixer/default.nix | 40 + .../python-modules/rubymarshal/default.nix | 4 +- .../python-modules/runway-python/default.nix | 18 +- .../python-modules/sabyenc3/default.nix | 22 + .../python-modules/samsungctl/default.nix | 29 + .../python-modules/samsungtvws/default.nix | 36 + .../python-modules/sanic-auth/default.nix | 10 +- .../sapi-python-client/default.nix | 23 +- .../python-modules/sarge/default.nix | 4 +- .../python-modules/scapy/default.nix | 50 +- .../python-modules/scapy/fix-version.patch | 13 - .../python-modules/schema/default.nix | 4 +- .../scikit-optimize/default.nix | 17 +- .../python-modules/scikitlearn/default.nix | 4 +- .../python-modules/scikits-odes/default.nix | 5 +- .../python-modules/scour/default.nix | 4 +- .../scrapy-fake-useragent/default.nix | 4 +- .../python-modules/seekpath/default.nix | 3 +- .../python-modules/segments/default.nix | 47 + .../python-modules/sentry-sdk/default.nix | 10 +- .../python-modules/shouldbe/default.nix | 3 + .../python-modules/sievelib/default.nix | 6 + .../python-modules/smart_open/default.nix | 6 +- .../snowflake-connector-python/default.nix | 4 +- .../python-modules/solo-python/default.nix | 4 +- .../python-modules/sopel/default.nix | 2 +- .../sortedcontainers/default.nix | 4 +- .../python-modules/sounddevice/default.nix | 2 + .../python-modules/spglib/default.nix | 4 +- .../sphinxcontrib-openapi/default.nix | 4 +- .../sphinxcontrib-spelling/default.nix | 4 +- .../sphinxcontrib-websupport/default.nix | 7 +- .../python-modules/splinter/default.nix | 4 +- .../python-modules/spotipy/default.nix | 16 +- .../python-modules/spyder-kernels/0.x.nix | 4 +- .../python-modules/spyder-kernels/default.nix | 8 +- .../development/python-modules/spyder/3.nix | 2 +- .../python-modules/spyder/default.nix | 13 +- .../sqlalchemy-citext/default.nix | 11 +- .../python-modules/sqlalchemy/default.nix | 4 +- .../python-modules/sqlitedict/default.nix | 8 +- .../python-modules/sqlmap/default.nix | 4 +- .../python-modules/sslyze/default.nix | 3 +- .../python-modules/starlette/default.nix | 10 +- .../python-modules/stevedore/default.nix | 22 +- .../python-modules/streamz/default.nix | 5 +- .../python-modules/strictyaml/default.nix | 2 +- .../python-modules/stripe/default.nix | 4 +- .../python-modules/supervisor/default.nix | 11 +- .../supervisor/glibc-2.31.patch | 13 - .../python-modules/suseapi/default.nix | 2 +- .../python-modules/svglib/default.nix | 4 +- .../python-modules/sybil/default.nix | 4 +- .../python-modules/sympy/default.nix | 4 +- .../python-modules/tasklib/default.nix | 4 +- .../python-modules/tblib/default.nix | 2 +- ...-pytest-remove-flake8-black-coverage.patch | 28 - .../python-modules/tempora/default.nix | 13 +- .../python-modules/tensorflow/1/default.nix | 13 +- .../python-modules/tensorflow/2/default.nix | 6 +- .../python-modules/test-tube/default.nix | 46 + .../python-modules/textfsm/default.nix | 39 + .../python-modules/tifffile/default.nix | 4 +- .../python-modules/tiledb/default.nix | 16 +- .../python-modules/timelib/default.nix | 4 +- .../python-modules/timezonefinder/default.nix | 8 +- .../python-modules/tinycss2/default.nix | 5 + .../python-modules/tinydb/default.nix | 2 +- .../python-modules/titlecase/default.nix | 4 +- .../python-modules/tldextract/default.nix | 7 +- .../python-modules/todoist/default.nix | 22 +- .../python-modules/tomlkit/default.nix | 4 +- .../python-modules/tox/default.nix | 4 +- .../python-modules/tqdm/default.nix | 4 +- .../python-modules/transformers/default.nix | 23 +- .../python-modules/transip/default.nix | 2 + .../translationstring/default.nix | 4 +- .../python-modules/trezor/default.nix | 48 +- .../python-modules/trimesh/default.nix | 4 +- .../python-modules/trio/default.nix | 22 +- .../python-modules/trytond/default.nix | 7 +- .../python-modules/tvnamer/default.nix | 2 +- .../python-modules/tweepy/default.nix | 4 +- .../typing-extensions/default.nix | 4 +- .../u-msgpack-python/default.nix | 4 +- .../python-modules/uamqp/default.nix | 4 +- .../python-modules/ufonormalizer/default.nix | 19 + .../python-modules/ufoprocessor/default.nix | 35 + .../development/python-modules/ujson/2.nix | 28 + .../python-modules/ujson/default.nix | 4 +- .../python-modules/unicodedata2/default.nix | 23 + .../unittest-xml-reporting/default.nix | 4 +- .../python-modules/untangle/default.nix | 6 +- .../python-modules/update_checker/default.nix | 4 +- .../python-modules/uproot/default.nix | 4 +- .../python-modules/uranium/default.nix | 4 +- .../python-modules/urwid-readline/default.nix | 33 + .../python-modules/urwid/default.nix | 8 +- .../python-modules/userpath/default.nix | 30 + .../python-modules/validators/default.nix | 5 +- .../python-modules/varint/default.nix | 2 +- .../python-modules/vcrpy/default.nix | 4 +- .../python-modules/vertica-python/default.nix | 14 +- .../python-modules/virtualenv/default.nix | 4 +- .../python-modules/vulture/default.nix | 7 +- .../python-modules/wasabi/default.nix | 17 +- .../python-modules/web/default.nix | 4 +- .../python-modules/websockets/default.nix | 7 + .../python-modules/west/default.nix | 4 +- .../python-modules/whitenoise/default.nix | 4 +- .../python-modules/word2vec/default.nix | 27 +- .../python-modules/xarray/default.nix | 4 +- .../python-modules/xcffib/default.nix | 9 +- .../python-modules/xdis/default.nix | 4 +- .../python-modules/xlib/default.nix | 4 +- .../python-modules/xml2rfc/default.nix | 8 +- .../python-modules/xnd/default.nix | 13 +- .../python-modules/xpybutil/default.nix | 4 +- .../python-modules/xxhash/default.nix | 4 +- .../yamlordereddictloader/default.nix | 31 + .../python-modules/yarl/default.nix | 12 +- .../python-modules/yattag/default.nix | 4 +- .../python-modules/ydiff/default.nix | 4 +- .../python-modules/yeelight/default.nix | 20 + .../python-modules/yfinance/default.nix | 36 + .../{tools => python-modules}/yq/default.nix | 30 +- .../python-modules/zarr/default.nix | 2 + .../python-modules/zeroconf/default.nix | 4 +- .../python-modules/zha-quirks/default.nix | 4 +- .../python-modules/zict/default.nix | 4 +- .../python-modules/zigpy-cc/default.nix | 4 +- .../development/python-modules/zipp/1.nix | 2 +- .../python-modules/zodb/default.nix | 17 +- .../zope_exceptions/default.nix | 4 +- .../python-modules/zope_i18n/default.nix | 27 - .../zope_testrunner/default.nix | 4 +- .../python-modules/zopfli/default.nix | 21 + .../python-modules/zstandard/default.nix | 8 +- .../python-modules/zulip/default.nix | 41 + .../ruby-modules/solargraph/Gemfile.lock | 26 +- .../ruby-modules/solargraph/gemset.nix | 56 +- .../pkgs/development/tools/alloy/default.nix | 2 +- .../pkgs/development/tools/ameba/default.nix | 4 +- .../analysis/cargo-tarpaulin/default.nix | 6 +- .../tools/analysis/checkstyle/default.nix | 4 +- .../tools/analysis/codeql/default.nix | 4 +- .../tools/analysis/flow/default.nix | 5 +- .../tools/analysis/hotspot/default.nix | 4 +- .../tools/analysis/pmd/default.nix | 4 +- .../tools/analysis/radare2/cutter.nix | 4 +- .../tools/analysis/radare2/default.nix | 24 +- .../tools/analysis/radare2/update.py | 20 +- .../tools/analysis/svlint/default.nix | 25 + .../tools/analysis/tflint/default.nix | 6 +- .../tools/analysis/tfsec/default.nix | 4 +- .../development/tools/avro-tools/default.nix | 6 +- .../development/tools/aws-sam-cli/default.nix | 4 +- .../pkgs/development/tools/azcopy/default.nix | 6 +- .../development/tools/bazel-kazel/default.nix | 4 +- .../development/tools/bazelisk/default.nix | 4 +- .../bazel/bazel_0_26/default.nix | 4 + .../bazel/bazel_0_29/default.nix | 4 + .../build-managers/bazel/bazel_1/default.nix | 4 + .../build-managers/bazel/bazel_3/default.nix | 4 + .../tools/build-managers/bloop/default.nix | 8 +- .../tools/build-managers/cmake/default.nix | 17 +- .../tools/build-managers/cmake/setup-hook.sh | 4 +- .../tools/build-managers/fac/cargo-lock.patch | 802 + .../tools/build-managers/fac/default.nix | 50 + .../meson/allow-dirs-outside-of-prefix.patch | 4 +- .../meson/clear-old-rpath.patch | 4 +- .../tools/build-managers/meson/default.nix | 8 +- .../build-managers/meson/fix-rpath.patch | 8 +- .../meson/gir-fallback-path.patch | 6 +- .../build-managers/meson/more-env-vars.patch | 4 +- .../tools/build-managers/ninja/default.nix | 4 +- .../tools/build-managers/redo-sh/default.nix | 10 +- .../build-managers/rocm-cmake/default.nix | 2 +- .../development/tools/buildah/default.nix | 13 +- .../tools/cloudfoundry-cli/default.nix | 15 +- .../tools/cmake-format/default.nix | 11 +- .../continuous-integration/fly/default.nix | 6 +- .../gitlab-runner/default.nix | 8 +- .../jenkins/default.nix | 4 +- .../laminar/default.nix | 80 + .../laminar/patches/no-network.patch | 26 + .../development/tools/coursier/default.nix | 4 +- .../pkgs/development/tools/dapper/default.nix | 4 +- .../tools/database/dbmate/default.nix | 6 +- .../tools/database/liquibase/default.nix | 4 +- .../timescaledb-parallel-copy/default.nix | 28 +- .../timescaledb-parallel-copy/deps.nix | 21 - .../database/timescaledb-tune/default.nix | 20 +- .../tools/database/timescaledb-tune/deps.nix | 21 - .../pkgs/development/tools/dep2nix/deps.nix | 272 +- .../pkgs/development/tools/devd/default.nix | 1 - .../pkgs/development/tools/devd/deps.nix | 201 - .../tools/documentation/doxygen/default.nix | 4 +- .../development/tools/dot-http/default.nix | 28 + .../pkgs/development/tools/drip/default.nix | 4 +- .../development/tools/dt-schema/default.nix | 37 + .../development/tools/easyjson/default.nix | 1 - .../pkgs/development/tools/easyjson/deps.nix | 3 - .../pkgs/development/tools/ejson/default.nix | 2 - .../pkgs/development/tools/ejson/deps.nix | 48 - .../development/tools/electron/default.nix | 49 +- .../development/tools/electron/generic.nix | 4 +- .../pkgs/development/tools/flyway/default.nix | 4 +- .../pkgs/development/tools/gauge/default.nix | 4 +- .../pkgs/development/tools/ginkgo/default.nix | 22 + .../tools/global-platform-pro/default.nix | 3 +- .../development/tools/go-migrate/default.nix | 24 + .../development/tools/go-swag/default.nix | 24 + .../pkgs/development/tools/godot/default.nix | 4 +- .../godot/dont_clobber_environment.patch | 20 +- .../pkgs/development/tools/godot/headless.nix | 18 + .../tools/godot/pkg_config_additions.patch | 31 +- .../pkgs/development/tools/godot/server.nix | 18 + .../tools/golangci-lint/default.nix | 6 +- .../pkgs/development/tools/gopls/default.nix | 8 +- .../development/tools/gotestsum/default.nix | 6 +- .../development/tools/gotools/default.nix | 16 +- .../tools/haskell/dconf2nix/dconf2nix.nix | 13 +- .../haskell-language-server/default.nix | 35 +- .../haskell-language-server/hls-brittany.nix | 36 + .../haskell-language-server/hls-ghcide.nix | 45 +- .../haskell/haskell-language-server/update.sh | 22 +- .../pkgs/development/tools/hcloud/default.nix | 6 +- .../development/tools/icestorm/default.nix | 8 +- .../tools/java/visualvm/default.nix | 4 +- .../development/tools/kexpand/default.nix | 2 - .../pkgs/development/tools/kexpand/deps.nix | 63 - .../tools/knightos/kcc/default.nix | 25 + .../tools/knightos/kimg/default.nix | 26 + .../tools/knightos/kpack/default.nix | 27 + .../tools/knightos/mkrom/default.nix | 27 + .../knightos}/scas/default.nix | 10 +- .../tools/lattice-diamond/default.nix | 3 +- .../development/tools/lazygit/default.nix | 17 +- .../pkgs/development/tools/leaps/deps.nix | 350 +- .../pkgs/development/tools/manul/default.nix | 1 + .../pkgs/development/tools/metals/default.nix | 4 +- .../development/tools/misc/act/default.nix | 6 +- .../tools/misc/argbash/default.nix | 4 +- .../development/tools/misc/asls/default.nix | 4 +- .../tools/misc/circleci-cli/default.nix | 4 +- .../tools/misc/clojure-lsp/default.nix | 4 +- .../tools/misc/fujprog/default.nix | 37 + .../development/tools/misc/gdb/default.nix | 13 +- .../development/tools/misc/global/default.nix | 4 +- .../development/tools/misc/hound/default.nix | 2 - .../development/tools/misc/hound/deps.nix | 1 - .../development/tools/misc/hydra/default.nix | 6 +- .../tools/misc/intltool/default.nix | 8 +- .../tools/misc/itm-tools/cargo-lock.patch | 321 + .../tools/misc/itm-tools/default.nix | 28 + .../tools/misc/nix-build-uncached/default.nix | 7 +- .../tools/misc/objconv/default.nix | 4 +- .../tools/misc/openocd/default.nix | 34 +- .../tools/misc/patchelf/default.nix | 7 +- .../tools/misc/replacement/default.nix | 46 + .../development/tools/misc/scc/default.nix | 12 +- .../development/tools/misc/svls/default.nix | 25 + .../pkgs/development/tools/misc/swig/4.nix | 4 +- .../tools/misc/terraform-ls/default.nix | 4 +- .../tools/misc/terraformer/default.nix | 24 + .../development/tools/misc/texinfo/6.7.nix | 4 + .../development/tools/misc/texinfo/common.nix | 5 +- .../development/tools/misc/texinfo/perl.patch | 43 - .../pkgs/development/tools/modd/default.nix | 1 - .../pkgs/development/tools/modd/deps.nix | 138 - .../development/tools/node-webkit/nw12.nix | 4 +- .../pkgs/development/tools/nsis/default.nix | 13 +- .../pkgs/development/tools/nwjs/default.nix | 4 +- .../tools/ocaml/camlp4/default.nix | 5 + .../pkgs/development/tools/ocaml/dune/2.nix | 16 +- .../tools/ocaml/merlin/default.nix | 4 +- .../tools/ocaml/ocamlformat/default.nix | 113 +- .../tools/ocaml/ocp-index/default.nix | 12 +- .../tools/omnisharp-roslyn/default.nix | 4 +- .../tools/open-policy-agent/default.nix | 5 +- .../tools/open-policy-agent/deps.nix | 399 - .../tools/osslsigncode/default.nix | 9 +- .../pkgs/development/tools/packer/default.nix | 4 +- .../tools/parsing/bison/default.nix | 4 +- .../tools/parsing/tree-sitter/default.nix | 5 +- .../development/tools/pgformatter/default.nix | 4 +- .../pkgs/development/tools/pipenv/default.nix | 10 +- .../tools/poetry2nix/poetry2nix/default.nix | 21 +- .../poetry2nix/poetry2nix/hooks/default.nix | 12 + .../poetry2nix/hooks/wheel-unpack-hook.sh | 18 + .../poetry2nix/poetry2nix/mk-poetry-dep.nix | 14 +- .../tools/poetry2nix/poetry2nix/overrides.nix | 125 +- .../tools/poetry2nix/poetry2nix/pep425.nix | 2 +- .../poetry2nix/poetry2nix/shell-scripts.nix | 41 + .../tools/profiling/heaptrack/default.nix | 4 +- .../tools/profiling/sysprof/default.nix | 3 +- .../tools/purescript/spago/spago.nix | 6 +- .../tools/react-native-debugger/default.nix | 25 +- .../development/tools/rebazel/default.nix | 21 + .../pkgs/development/tools/rgp/default.nix | 11 +- .../tools/rust/cargo-c/default.nix | 8 +- .../tools/rust/cargo-cache/default.nix | 26 + .../tools/rust/cargo-embed/default.nix | 27 + .../tools/rust/cargo-flash/default.nix | 27 + .../tools/rust/cargo-fuzz/default.nix | 4 +- .../tools/rust/cargo-make/Cargo.lock | 1323 -- .../tools/rust/cargo-make/default.nix | 24 +- .../tools/rust/cargo-sync-readme/default.nix | 22 + .../tools/rust/cargo-udeps/default.nix | 6 +- .../tools/rust/cbindgen/default.nix | 6 +- .../tools/rust/maturin/default.nix | 6 +- .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/rust-analyzer/generic.nix | 26 +- .../rust-analyzer/no-loop-in-const-fn.patch | 223 + .../rust/rust-analyzer/no-option-zip.patch | 72 + .../development/tools/rust/rustup/default.nix | 30 +- .../tools/selenium/chromedriver/default.nix | 10 +- .../development/tools/skaffold/default.nix | 4 +- .../pkgs/development/tools/so/default.nix | 27 + .../tools/spring-boot-cli/default.nix | 4 +- .../pkgs/development/tools/statik/default.nix | 1 - .../pkgs/development/tools/statik/deps.nix | 3 - .../pkgs/development/tools/summon/default.nix | 35 + .../tools/summon/resolve-paths.patch | 39 + .../development/tools/the-way/default.nix | 23 +- .../pkgs/development/tools/tracy/default.nix | 14 +- .../development/tools/trellis/default.nix | 8 +- .../development/tools/unityhub/default.nix | 6 +- ...004-Support-system-installed-plugins.patch | 10 +- .../development/tools/vagrant/default.nix | 11 +- .../pkgs/development/tools/vagrant/gemset.nix | 44 +- .../vagrant/use-system-bundler-version.patch | 10 +- .../development/tools/vcstool/default.nix | 4 +- .../development/tools/vultr-cli/default.nix | 4 +- .../pkgs/development/tools/vultr/default.nix | 4 +- .../pkgs/development/tools/ws/default.nix | 2 - .../pkgs/development/tools/ws/deps.nix | 12 - .../tools/wxformbuilder/default.nix | 35 + .../pkgs/development/tools/yarn/default.nix | 4 +- .../pkgs/development/tools/ydiff/default.nix | 4 +- .../pkgs/development/web/cypress/default.nix | 4 +- .../pkgs/development/web/deno/default.nix | 6 +- .../pkgs/development/web/deno/deps.nix | 8 +- .../development/web/deno/update/common.ts | 15 +- .../pkgs/development/web/flyctl/default.nix | 6 +- .../pkgs/development/web/grails/default.nix | 4 +- .../development/web/lucky-cli/default.nix | 4 +- .../pkgs/development/web/newman/default.nix | 19 + .../web/newman/generate-dependencies.sh | 9 + .../web/newman/node-composition.nix | 17 + .../pkgs/development/web/newman/node-env.nix | 542 + .../development/web/newman/node-packages.nix | 5957 +++++ .../pkgs/development/web/newman/package.json | 3 + .../pkgs/development/web/nodejs/v10.nix | 4 +- .../pkgs/development/web/nodejs/v12.nix | 4 +- .../pkgs/development/web/nodejs/v14.nix | 4 +- .../pkgs/development/web/postman/default.nix | 4 +- .../pkgs/games/arx-libertatis/default.nix | 4 +- .../nixpkgs/pkgs/games/cockatrice/default.nix | 4 +- .../pkgs/games/crawl/crawl_purify.patch | 43 +- .../nixpkgs/pkgs/games/crawl/default.nix | 4 +- .../pkgs/games/dwarf-fortress/default.nix | 6 +- .../games/dwarf-fortress/dfhack/default.nix | 29 +- .../games/dwarf-fortress/themes/themes.json | 54 +- .../games/dwarf-fortress/twbt/default.nix | 13 +- .../wrapper/dwarf-fortress-init.in | 2 +- .../nixpkgs/pkgs/games/exult/arch.patch | 123 - .../nixpkgs/pkgs/games/exult/default.nix | 15 +- .../nixpkgs/pkgs/games/gambatte/default.nix | 10 +- .../nixpkgs/pkgs/games/gemrb/default.nix | 19 +- .../nixpkgs/pkgs/games/hedgewars/default.nix | 9 +- .../nixpkgs/pkgs/games/hyperrogue/default.nix | 4 +- .../nixpkgs/pkgs/games/instead/default.nix | 9 +- .../nixpkgs/pkgs/games/katago/default.nix | 55 +- .../nixpkgs/pkgs/games/klavaro/default.nix | 5 +- .../nixpkgs/pkgs/games/koboredux/default.nix | 87 + .../nixpkgs/pkgs/games/left4gore/default.nix | 48 + .../pkgs/games/legendary-gl/default.nix | 30 + .../pkgs/games/minecraft-server/default.nix | 6 +- .../nixpkgs/pkgs/games/minecraft/default.nix | 5 +- .../nixpkgs/pkgs/games/multimc/default.nix | 3 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 6 +- .../nixpkgs/pkgs/games/osu-lazer/deps.nix | 48 +- .../nixpkgs/pkgs/games/papermc/default.nix | 29 +- .../games/shattered-pixel-dungeon/default.nix | 4 +- .../nixpkgs/pkgs/games/sm64ex/default.nix | 69 + .../nixpkgs/pkgs/games/steam/fhsenv.nix | 7 +- .../nixpkgs/pkgs/games/stockfish/default.nix | 19 +- .../nixpkgs/pkgs/games/tdm/default.nix | 8 +- .../nixpkgs/pkgs/games/tome2/default.nix | 2 +- .../pkgs/games/ultrastardx/default.nix | 41 +- .../nixpkgs/pkgs/games/unnethack/default.nix | 24 +- .../nixpkgs/pkgs/games/uqm/default.nix | 4 +- .../nixpkgs/pkgs/games/vassal/default.nix | 4 +- .../pkgs/games/wyvern/cargo-lock.patch | 2514 +++ .../nixpkgs/pkgs/games/wyvern/default.nix | 36 + .../nixpkgs/pkgs/games/xcowsay/default.nix | 40 + .../nixpkgs/pkgs/games/zandronum/default.nix | 2 +- .../misc/cups/drivers/hl1210w/default.nix | 62 + .../misc/drivers/epson-escpr2/default.nix | 8 +- .../misc/drivers/sc-controller/default.nix | 3 - .../pkgs/misc/emulators/mame/default.nix | 16 +- .../{custom-nixos.mk => custom-nix.mk} | 0 .../pkgs/misc/emulators/openmsx/default.nix | 18 +- .../pkgs/misc/emulators/ryujinx/default.nix | 8 +- .../pkgs/misc/emulators/ryujinx/deps.nix | 331 +- .../pkgs/misc/emulators/sameboy/default.nix | 53 + .../pkgs/misc/emulators/wine/sources.nix | 8 +- .../nixpkgs/pkgs/misc/ghostscript/default.nix | 5 + third_party/nixpkgs/pkgs/misc/hdt/default.nix | 27 + .../nixpkgs/pkgs/misc/logging/beats/6.x.nix | 4 +- .../nixpkgs/pkgs/misc/logging/beats/7.x.nix | 4 +- .../pkgs/misc/screensavers/pipes/default.nix | 7 +- .../misc/screensavers/xlockmore/default.nix | 4 +- .../pkgs/misc/seafile-shared/default.nix | 4 +- .../nixpkgs/pkgs/misc/sndio/default.nix | 16 +- .../nixpkgs/pkgs/misc/solfege/default.nix | 1 + .../nixpkgs/pkgs/misc/solfege/texinfo.patch | 20 + .../pkgs/misc/tmux-plugins/default.nix | 17 +- .../nixpkgs/pkgs/misc/uboot/default.nix | 9 +- .../pkgs/misc/vim-plugins/deprecated.json | 4 + .../pkgs/misc/vim-plugins/generated.nix | 1313 +- .../pkgs/misc/vim-plugins/overrides.nix | 241 +- .../pkgs/misc/vim-plugins/vim-plugin-names | 55 +- .../pkgs/misc/vscode-extensions/default.nix | 18 +- .../misc/vscode-extensions/python/default.nix | 4 +- .../rust-analyzer/build-deps/package.json | 28 +- .../misc/vscode-extensions/updateSettings.nix | 6 +- .../vscode-lldb/build-deps/package.json | 24 + .../cmake-build-extension-only.patch | 45 + .../vscode-extensions/vscode-lldb/default.nix | 106 + .../vscode-lldb/reset-cargo-config.patch | 11 + .../pkgs/misc/vscode-extensions/vscodeEnv.nix | 14 +- .../misc/vscode-extensions/vscodeEnvTest.nix | 3 +- .../misc/vscode-extensions/vscodeExts2nix.nix | 12 +- .../vscodeWithConfiguration.nix | 26 +- .../darwin/discrete-scroll/default.nix | 35 + .../pkgs/os-specific/darwin/yabai/default.nix | 4 +- .../os-specific/linux/alsa-utils/default.nix | 13 +- .../os-specific/linux/apparmor/default.nix | 6 +- .../os-specific/linux/batman-adv/version.nix | 8 +- .../pkgs/os-specific/linux/bcc/default.nix | 13 +- .../os-specific/linux/bpftrace/default.nix | 10 +- .../os-specific/linux/busybox/default.nix | 18 +- .../os-specific/linux/can-isotp/default.nix | 6 +- .../os-specific/linux/checksec/default.nix | 4 +- .../pkgs/os-specific/linux/conspy/default.nix | 8 +- .../pkgs/os-specific/linux/cpuid/default.nix | 50 + .../os-specific/linux/cryptodev/default.nix | 15 +- .../linux/deepin-anything/default.nix | 22 - .../os-specific/linux/device-tree/default.nix | 27 +- .../os-specific/linux/dmidecode/default.nix | 46 +- .../pkgs/os-specific/linux/ell/default.nix | 4 +- .../os-specific/linux/eventstat/default.nix | 4 +- .../pkgs/os-specific/linux/exfat/default.nix | 13 +- .../firmware/firmware-manager/default.nix | 38 + .../linux/firmware/fwupd/default.nix | 141 +- .../firmware/system76-firmware/default.nix | 39 + .../os-specific/linux/fscrypt/default.nix | 4 - .../os-specific/linux/fswebcam/default.nix | 4 +- .../pkgs/os-specific/linux/fwts/default.nix | 4 +- .../linux/intel-compute-runtime/default.nix | 9 +- .../linux/intel-compute-runtime/etc-dir.patch | 15 - .../os-specific/linux/iproute/default.nix | 7 +- .../pkgs/os-specific/linux/iproute/mptcp.nix | 6 + .../os-specific/linux/iputils/default.nix | 27 +- .../pkgs/os-specific/linux/iw/default.nix | 4 +- .../pkgs/os-specific/linux/iwd/default.nix | 4 +- .../linux/kernel/common-config.nix | 2 + .../linux/kernel/hardened/patches.json | 29 +- .../os-specific/linux/kernel/linux-4.14.nix | 4 +- .../os-specific/linux/kernel/linux-4.19.nix | 4 +- .../os-specific/linux/kernel/linux-4.4.nix | 4 +- .../os-specific/linux/kernel/linux-4.9.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-5.7.nix | 4 +- .../os-specific/linux/kernel/linux-5.8.nix | 18 + .../os-specific/linux/kernel/linux-rt-5.4.nix | 41 + .../os-specific/linux/kernel/linux-rt-5.6.nix | 41 + .../linux/kernel/linux-testing-bcachefs.nix | 15 +- .../linux/kernel/linux-testing.nix | 4 +- .../os-specific/linux/kernel/linux-zen.nix | 4 +- .../linux/kernel/manual-config.nix | 4 +- .../os-specific/linux/kernel/update-rt.sh | 77 + .../pkgs/os-specific/linux/kernel/update.sh | 3 + .../pkgs/os-specific/linux/klibc/default.nix | 4 +- .../pkgs/os-specific/linux/kmod/default.nix | 2 +- .../linux/kmod/no-name-field.patch | 24 + .../pkgs/os-specific/linux/libbpf/default.nix | 33 +- .../os-specific/linux/libfabric/default.nix | 4 +- .../os-specific/linux/lockdep/default.nix | 43 +- .../pkgs/os-specific/linux/lvm2/default.nix | 4 +- .../pkgs/os-specific/linux/microcode/amd.nix | 2 +- .../os-specific/linux/mmc-utils/default.nix | 6 +- .../os-specific/linux/netatop/default.nix | 5 +- .../50-numworks-calculator.rules | 2 + .../linux/numworks-udev-rules/default.nix | 21 + .../linux/numworks-udev-rules/update.sh | 3 + .../os-specific/linux/nvidia-x11/default.nix | 11 + .../os-specific/linux/nvidia-x11/generic.nix | 15 +- .../linux/nvidia-x11/persistenced.nix | 6 +- .../os-specific/linux/nvidia-x11/settings.nix | 6 +- .../linux/oci-seccomp-bpf-hook/default.nix | 58 + .../os-specific/linux/openvswitch/default.nix | 4 +- .../os-specific/linux/pam_gnupg/default.nix | 32 + .../pkgs/os-specific/linux/pcm/default.nix | 4 +- .../os-specific/linux/rdma-core/default.nix | 4 +- .../pkgs/os-specific/linux/rfkill/default.nix | 20 - .../os-specific/linux/rtl8821cu/default.nix | 37 + .../pkgs/os-specific/linux/sysdig/default.nix | 4 +- .../linux/system76-acpi/default.nix | 43 + .../os-specific/linux/system76-io/default.nix | 38 + .../os-specific/linux/system76/default.nix | 44 + ...ts-for-uninitialised-encrypted-devic.patch | 6 +- ...on-t-try-to-unmount-nix-or-nix-store.patch | 6 +- .../systemd/0003-Fix-NixOS-containers.patch | 10 +- ...004-Look-for-fsck-in-the-right-place.patch | 4 +- ...some-NixOS-specific-unit-directories.patch | 107 +- ...f-a-useless-message-in-user-sessions.patch | 8 +- ...d-timedated-disable-methods-that-cha.patch | 38 +- .../linux/systemd/0008-Fix-hwdb-paths.patch | 4 +- ...e-usr-share-zoneinfo-to-etc-zoneinfo.patch | 28 +- ...calectl-use-etc-X11-xkb-for-list-x11.patch | 8 +- ...te-statedir-and-don-t-touch-prefixdi.patch | 10 +- ...configuration-into-out-share-factory.patch | 71 +- ...-environment-when-calling-generators.patch | 8 +- ...4-add-rootprefix-to-lookup-dir-paths.patch | 4 +- ...-execute-scripts-in-etc-systemd-syst.patch | 8 +- ...ecute-scripts-in-etc-systemd-system-.patch | 8 +- ...s.service-Update-ConditionFileNotEmp.patch | 4 +- ...-placeholder-for-DEFAULT_PATH_NORMAL.patch | 4 +- .../linux/systemd/cryptsetup-generator.nix | 34 - .../os-specific/linux/systemd/default.nix | 87 +- .../os-specific/linux/sysvinit/default.nix | 4 +- .../os-specific/linux/tiscamera/default.nix | 42 +- .../os-specific/linux/util-linux/default.nix | 4 +- .../os-specific/linux/wireguard/default.nix | 4 +- .../os-specific/linux/xpadneo/default.nix | 4 +- .../os-specific/linux/zenmonitor/default.nix | 4 +- .../pkgs/os-specific/linux/zfs/default.nix | 24 +- .../servers/amqp/rabbitmq-server/default.nix | 6 +- .../pkgs/servers/apache-kafka/default.nix | 13 +- .../pkgs/servers/atlassian/confluence.nix | 4 +- .../nixpkgs/pkgs/servers/atlassian/jira.nix | 4 +- .../nixpkgs/pkgs/servers/bazarr/default.nix | 6 +- .../nixpkgs/pkgs/servers/caddy/default.nix | 22 +- third_party/nixpkgs/pkgs/servers/caddy/v1.nix | 38 + third_party/nixpkgs/pkgs/servers/caddy/v2.nix | 26 - .../pkgs/servers/computing/slurm/default.nix | 4 +- .../nixpkgs/pkgs/servers/consul/default.nix | 6 +- .../nixpkgs/pkgs/servers/dex/default.nix | 4 +- .../nixpkgs/pkgs/servers/dgraph/default.nix | 6 +- .../nixpkgs/pkgs/servers/dico/default.nix | 4 +- .../nixpkgs/pkgs/servers/dns/bind/default.nix | 23 +- .../dns/bind/dont-keep-configure-flags.patch | 47 +- .../pkgs/servers/dns/knot-dns/default.nix | 15 +- .../servers/dns/knot-dns/runtime-deps.patch | 14 + .../servers/dns/knot-resolver/default.nix | 4 +- third_party/nixpkgs/pkgs/servers/etcd/3.4.nix | 13 +- .../nixpkgs/pkgs/servers/etcd/default.nix | 9 +- .../pkgs/servers/freeradius/default.nix | 4 +- .../nixpkgs/pkgs/servers/gonic/default.nix | 59 + .../nixpkgs/pkgs/servers/gonic/deps.nix | 795 + .../nixpkgs/pkgs/servers/gotify/default.nix | 12 +- .../nixpkgs/pkgs/servers/gotify/package.json | 63 +- .../pkgs/servers/gotify/source-sha.nix | 2 +- .../nixpkgs/pkgs/servers/gotify/update.sh | 6 +- .../pkgs/servers/gotify/vendor-sha.nix | 2 +- .../nixpkgs/pkgs/servers/gotify/version.nix | 2 +- .../nixpkgs/pkgs/servers/gotify/yarndeps.nix | 2928 +-- .../nixpkgs/pkgs/servers/hasura/cli.nix | 2 +- .../nixpkgs/pkgs/servers/hasura/default.nix | 63 - .../pkgs/servers/hasura/dependent-map.nix | 13 - .../pkgs/servers/hasura/dependent-sum.nix | 10 - .../pkgs/servers/hasura/ghc-heap-view.nix | 18 - .../nixpkgs/pkgs/servers/hasura/immortal.nix | 17 - .../pkgs/servers/hasura/network-uri.nix | 18 - .../nixpkgs/pkgs/servers/hasura/these.nix | 25 - .../home-assistant/component-packages.nix | 548 +- .../pkgs/servers/home-assistant/default.nix | 24 +- .../home-assistant/parse-requirements.py | 11 +- .../nixpkgs/pkgs/servers/http/couchdb/3.nix | 38 + .../pkgs/servers/http/nginx/mainline.nix | 4 +- .../pkgs/servers/http/nginx/modules.nix | 139 +- .../pkgs/servers/http/openresty/default.nix | 6 +- .../servers/http/tomcat/tomcat-native.nix | 4 +- .../pkgs/servers/http/unit/default.nix | 8 +- .../pkgs/servers/icingaweb2/default.nix | 4 +- .../nixpkgs/pkgs/servers/imgproxy/default.nix | 6 +- .../servers/irc/robustirc-bridge/default.nix | 29 + .../nixpkgs/pkgs/servers/isso/default.nix | 26 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 44 +- .../nixpkgs/pkgs/servers/jellyfin/default.nix | 8 +- .../nixpkgs/pkgs/servers/keycloak/default.nix | 4 +- .../pkgs/servers/limesurvey/default.nix | 10 +- .../nixpkgs/pkgs/servers/livepeer/default.nix | 24 +- .../nixpkgs/pkgs/servers/livepeer/deps.nix | 20 - .../pkgs/servers/mail/dovecot/default.nix | 2 +- .../dovecot/plugins/pigeonhole/default.nix | 2 +- .../pkgs/servers/mail/opensmtpd/default.nix | 2 +- .../pkgs/servers/mail/postfix/default.nix | 2 +- .../pkgs/servers/matrix-synapse/default.nix | 4 +- .../pkgs/servers/mautrix-whatsapp/default.nix | 6 +- .../pkgs/servers/mbtileserver/default.nix | 23 + .../nixpkgs/pkgs/servers/meguca/default.nix | 50 - .../pkgs/servers/meguca/server_deps.nix | 390 - .../nixpkgs/pkgs/servers/metabase/default.nix | 4 +- .../pkgs/servers/microserver/default.nix | 22 + .../nixpkgs/pkgs/servers/miniflux/default.nix | 18 +- .../nixpkgs/pkgs/servers/minio/default.nix | 9 + .../pkgs/servers/mirrorbits/default.nix | 1 + .../servers/monitoring/grafana/default.nix | 8 +- .../pkgs/servers/monitoring/loki/default.nix | 8 +- .../servers/monitoring/nagios/default.nix | 3 +- .../monitoring/prometheus/aws-s3-exporter.nix | 2 - .../prometheus/aws-s3-exporter_deps.nix | 336 - .../servers/monitoring/prometheus/default.nix | 8 +- .../prometheus/postfix-exporter.nix | 4 +- .../prometheus/process-exporter.nix | 2 - .../prometheus/process-exporter_deps.nix | 156 - .../monitoring/prometheus/webui-yarndeps.nix | 16 +- .../servers/monitoring/sensu-go/default.nix | 4 +- .../timescale-prometheus/default.nix | 4 +- .../monitoring/unifi-poller/default.nix | 31 + .../pkgs/servers/monitoring/zabbix/server.nix | 11 +- .../servers/monitoring/zabbix/versions.nix | 10 +- .../pkgs/servers/monitoring/zabbix/web.nix | 2 +- .../pkgs/servers/nosql/arangodb/default.nix | 12 +- .../pkgs/servers/nosql/influxdb/default.nix | 4 +- .../pkgs/servers/nosql/rethinkdb/default.nix | 18 +- .../servers/nosql/victoriametrics/default.nix | 4 +- .../pkgs/servers/oauth2_proxy/default.nix | 6 +- .../nixpkgs/pkgs/servers/openbgpd/default.nix | 45 + .../nixpkgs/pkgs/servers/pinnwand/default.nix | 4 +- third_party/nixpkgs/pkgs/servers/plex/raw.nix | 4 +- .../nixpkgs/pkgs/servers/pounce/default.nix | 4 +- .../nixpkgs/pkgs/servers/radarr/default.nix | 2 +- .../nixpkgs/pkgs/servers/radicale/3.x.nix | 4 +- .../nixpkgs/pkgs/servers/rippled/default.nix | 19 +- .../nixpkgs/pkgs/servers/sabnzbd/default.nix | 24 +- .../pkgs/servers/search/groonga/default.nix | 4 +- .../pkgs/servers/search/solr/default.nix | 4 +- .../nixpkgs/pkgs/servers/ser2net/default.nix | 4 +- .../pkgs/servers/sickbeard/sickgear.nix | 4 +- .../nixpkgs/pkgs/servers/sonarr/default.nix | 2 +- .../pkgs/servers/sql/cockroachdb/default.nix | 4 +- .../nixpkgs/pkgs/servers/sql/dolt/default.nix | 6 +- .../pkgs/servers/sql/percona/5.6.x.nix | 4 +- .../pkgs/servers/sql/postgresql/default.nix | 20 +- .../pkgs/servers/sql/postgresql/ext/age.nix | 65 + .../sql/postgresql/ext/pg_auto_failover.nix | 4 +- .../servers/sql/postgresql/ext/pgrouting.nix | 4 +- .../sql/postgresql/ext/timescaledb.nix | 4 +- .../pkgs/servers/sql/postgresql/packages.nix | 4 + .../nixpkgs/pkgs/servers/squid/default.nix | 4 +- .../nixpkgs/pkgs/servers/sslh/default.nix | 4 +- .../pkgs/servers/tailscale/default.nix | 4 +- .../nixpkgs/pkgs/servers/tegola/default.nix | 6 +- .../nixpkgs/pkgs/servers/traefik/default.nix | 12 +- .../servers/tt-rss/theme-feedly/default.nix | 4 +- .../nixpkgs/pkgs/servers/unifi/default.nix | 4 +- .../pkgs/servers/web-apps/codimd/default.nix | 4 +- .../pkgs/servers/web-apps/matomo/default.nix | 8 +- .../pkgs/servers/web-apps/sogo/default.nix | 13 +- .../pkgs/servers/xmpp/biboumi/default.nix | 7 +- .../pkgs/servers/xmpp/prosody/default.nix | 10 +- .../pkgs/servers/zigbee2mqtt/default.nix | 4 +- .../servers/zigbee2mqtt/node-packages.nix | 2096 +- .../nixpkgs/pkgs/shells/dash/default.nix | 11 +- .../nixpkgs/pkgs/shells/elvish/default.nix | 4 +- .../nixpkgs/pkgs/shells/nushell/default.nix | 8 +- .../nixpkgs/pkgs/shells/rssh/default.nix | 97 - .../pkgs/shells/rssh/fix-config-path.patch | 12 - .../nixpkgs/pkgs/shells/xonsh/default.nix | 5 +- .../pkgs/shells/zsh/antibody/default.nix | 4 +- .../pkgs/shells/zsh/oh-my-zsh/default.nix | 90 +- .../pkgs/shells/zsh/oh-my-zsh/update.sh | 1 - .../pkgs/stdenv/generic/make-derivation.nix | 34 +- .../pkgs/tools/X11/ckbcomp/default.nix | 4 +- .../pkgs/tools/X11/wmutils-libwm/default.nix | 25 + .../nixpkgs/pkgs/tools/X11/xpra/default.nix | 5 +- .../pkgs/tools/X11/xpra/libfakeXinerama.nix | 3 +- .../pkgs/tools/X11/xwallpaper/default.nix | 15 +- .../pkgs/tools/admin/acme.sh/default.nix | 4 +- .../pkgs/tools/admin/ansible/default.nix | 29 +- .../pkgs/tools/admin/aws-vault/default.nix | 6 +- .../pkgs/tools/admin/awscli/default.nix | 4 +- .../pkgs/tools/admin/awscli2/default.nix | 10 +- .../pkgs/tools/admin/azure-cli/default.nix | 7 +- .../tools/admin/azure-cli/python-packages.nix | 46 +- .../pkgs/tools/admin/cli53/default.nix | 2 - .../nixpkgs/pkgs/tools/admin/cli53/deps.nix | 93 - .../pkgs/tools/admin/eksctl/default.nix | 8 +- .../pkgs/tools/admin/exoscale-cli/default.nix | 4 +- .../tools/admin/google-cloud-sdk/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/lego/default.nix | 10 +- .../nixpkgs/pkgs/tools/admin/lxd/default.nix | 4 +- .../nixpkgs/pkgs/tools/admin/pulumi/data.nix | 170 +- .../pkgs/tools/admin/pulumi/default.nix | 1 + .../nixpkgs/pkgs/tools/admin/pulumi/update.sh | 41 +- .../nixpkgs/pkgs/tools/admin/salt/default.nix | 2 +- .../pkgs/tools/admin/salt/pepper/default.nix | 13 +- .../pkgs/tools/archivers/bomutils/default.nix | 25 + .../tools/archivers/innoextract/default.nix | 4 +- .../pkgs/tools/archivers/maxcso/default.nix | 26 + .../pkgs/tools/archivers/wimlib/default.nix | 4 +- .../pkgs/tools/audio/abcmidi/default.nix | 4 +- .../pkgs/tools/audio/beets/default.nix | 7 +- .../tools/audio/beets/extrafiles-plugin.nix | 30 + .../pkgs/tools/audio/beets/mutagen-1.43.patch | 17 +- .../pkgs/tools/audio/liquidsoap/full.nix | 24 +- .../pkgs/tools/audio/qastools/default.nix | 4 +- .../nixpkgs/pkgs/tools/backup/bup/default.nix | 4 +- .../nixpkgs/pkgs/tools/backup/dar/default.nix | 24 +- .../pkgs/tools/backup/dump/default.nix | 24 + .../pkgs/tools/backup/duplicity/default.nix | 7 +- .../pkgs/tools/backup/grab-site/default.nix | 14 +- .../pkgs/tools/backup/kopia/default.nix | 6 +- .../tools/bluetooth/blueberry/default.nix | 96 + .../pkgs/tools/compression/bzip2/1_1.nix | 45 + .../pkgs/tools/compression/zstd/default.nix | 11 +- .../pkgs/tools/filesystems/avfs/default.nix | 4 +- .../tools/filesystems/bashmount/default.nix | 4 +- .../filesystems/bcachefs-tools/default.nix | 19 +- .../pkgs/tools/filesystems/ceph/default.nix | 4 +- .../tools/filesystems/f2fs-tools/default.nix | 4 +- .../pkgs/tools/filesystems/f3/default.nix | 53 +- .../filesystems/fuse-overlayfs/default.nix | 2 +- .../tools/filesystems/gocryptfs/default.nix | 41 +- .../pkgs/tools/filesystems/gocryptfs/deps.nix | 75 - .../pkgs/tools/filesystems/idsk/default.nix | 4 +- .../tools/filesystems/lizardfs/default.nix | 6 + .../tools/filesystems/nixpart/0.4/blivet.nix | 2 +- .../nixpart/0.4/multipath-tools.nix | 4 +- .../tools/filesystems/orangefs/default.nix | 4 +- .../pkgs/tools/filesystems/rar2fs/default.nix | 4 +- .../filesystems/reiser4progs/default.nix | 4 +- .../tools/filesystems/securefs/default.nix | 5 +- .../tools/filesystems/ubidump/default.nix | 40 + .../filesystems/wiimms-iso-tools/default.nix | 37 + .../wiimms-iso-tools/fix-paths.diff | 12 + .../pkgs/tools/graphics/dcraw/default.nix | 9 +- .../pkgs/tools/graphics/fim/default.nix | 4 +- .../pkgs/tools/graphics/gmic/default.nix | 4 +- .../pkgs/tools/graphics/gnuplot/default.nix | 4 +- .../pkgs/tools/graphics/netpbm/default.nix | 20 +- .../pkgs/tools/graphics/scrot/default.nix | 8 +- .../pkgs/tools/graphics/svgbob/default.nix | 5 +- .../pkgs/tools/graphics/swfdec/default.nix | 37 - .../pkgs/tools/graphics/viu/default.nix | 6 +- .../pkgs/tools/graphics/wdisplays/default.nix | 15 +- .../tools/graphics/yafaray-core/default.nix | 6 +- .../fcitx-engines/fcitx-mozc/default.nix | 8 +- .../ibus-engines/ibus-bamboo/default.nix | 55 + .../ibus-engines/ibus-mozc/default.nix | 7 +- .../inputmethods/skk/skk-dicts/default.nix | 6 +- .../inputmethods/skk/skktools/default.nix | 8 +- .../pkgs/tools/misc/antimicroX/default.nix | 4 +- .../tools/misc/asciinema-scenario/default.nix | 23 + .../pkgs/tools/misc/barman/default.nix | 29 + .../pkgs/tools/misc/bashcards/default.nix | 4 +- .../pkgs/tools/misc/birdfont/default.nix | 7 +- .../pkgs/tools/misc/birdfont/xmlbird.nix | 6 +- .../pkgs/tools/misc/bmap-tools/default.nix | 3 + .../nixpkgs/pkgs/tools/misc/broot/default.nix | 28 +- .../pkgs/tools/misc/catimg/default.nix | 4 +- .../pkgs/tools/misc/chezmoi/default.nix | 6 +- .../pkgs/tools/misc/cht.sh/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/cloc/default.nix | 4 +- .../pkgs/tools/misc/clpeak/clpeak-clhpp2.diff | 72 + .../pkgs/tools/misc/clpeak/default.nix | 33 + .../nixpkgs/pkgs/tools/misc/cod/default.nix | 28 + .../pkgs/tools/misc/colorpicker/default.nix | 27 + .../tools/misc/cpuminer-multi/default.nix | 4 +- .../pkgs/tools/misc/debianutils/default.nix | 4 +- .../pkgs/tools/misc/diffoscope/default.nix | 4 +- .../pkgs/tools/misc/direnv/default.nix | 4 +- .../pkgs/tools/misc/discocss/default.nix | 27 + .../nixpkgs/pkgs/tools/misc/duf/default.nix | 23 + .../nixpkgs/pkgs/tools/misc/dust/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/eva/default.nix | 6 + .../nixpkgs/pkgs/tools/misc/exa/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/fd/default.nix | 2 +- .../pkgs/tools/misc/fet-sh/default.nix | 4 +- .../pkgs/tools/misc/flashrom/default.nix | 3 +- .../pkgs/tools/misc/fluent-bit/default.nix | 4 +- .../pkgs/tools/misc/fx_cast/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/fzf/default.nix | 9 +- .../pkgs/tools/misc/git-town/default.nix | 13 +- .../nixpkgs/pkgs/tools/misc/godu/default.nix | 24 + .../nixpkgs/pkgs/tools/misc/godu/go-mod.patch | 33 + .../pkgs/tools/misc/gotify-cli/default.nix | 4 + .../nixpkgs/pkgs/tools/misc/grub/2.0x.nix | 4 +- .../pkgs/tools/misc/hacksaw/default.nix | 25 + .../pkgs/tools/misc/hakuneko/default.nix | 3 +- .../pkgs/tools/misc/html-proofer/Gemfile.lock | 12 +- .../pkgs/tools/misc/html-proofer/gemset.nix | 24 +- .../nixpkgs/pkgs/tools/misc/ili2c/default.nix | 3 +- .../tools/misc/kdecoration-viewer/default.nix | 28 - .../pkgs/tools/misc/lesspipe/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/lorri/default.nix | 5 +- .../nixpkgs/pkgs/tools/misc/lsd/default.nix | 6 +- .../pkgs/tools/misc/mbuffer/default.nix | 8 + .../nixpkgs/pkgs/tools/misc/mcfly/default.nix | 12 +- .../pkgs/tools/misc/miniserve/default.nix | 10 +- .../tools/misc/mongodb-compass/default.nix | 31 +- .../pkgs/tools/misc/mpdscribble/default.nix | 16 +- .../pkgs/tools/misc/mstflint/default.nix | 4 +- .../pkgs/tools/misc/mutagen/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/noti/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/ntfy/default.nix | 10 +- .../pkgs/tools/misc/opentsdb/default.nix | 4 +- .../pkgs/tools/misc/oppai-ng/default.nix | 4 +- .../pkgs/tools/misc/ostree/default.nix | 4 +- .../misc/pandoc-plantuml-filter/default.nix | 26 + .../pkgs/tools/misc/parallel/default.nix | 4 +- .../pkgs/tools/misc/plantuml/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/pspg/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/pubs/default.nix | 27 +- .../nixpkgs/pkgs/tools/misc/rargs/default.nix | 24 + .../tools/misc/rockbox-utility/default.nix | 14 +- .../pkgs/tools/misc/rpm-ostree/default.nix | 4 +- .../pkgs/tools/misc/sd-mux-ctrl/default.nix | 28 + .../pkgs/tools/misc/somafm-cli/default.nix | 33 + .../pkgs/tools/misc/staruml/default.nix | 4 +- .../pkgs/tools/misc/systrayhelper/default.nix | 2 - .../pkgs/tools/misc/systrayhelper/deps.nix | 102 - .../pkgs/tools/misc/tealdeer/default.nix | 6 +- .../pkgs/tools/misc/teleconsole/default.nix | 11 +- .../pkgs/tools/misc/teleconsole/deps.nix | 13 - .../misc/thin-provisioning-tools/default.nix | 22 +- .../pkgs/tools/misc/topgrade/default.nix | 6 +- .../pkgs/tools/misc/wootility/default.nix | 4 +- .../pkgs/tools/misc/youtube-dl/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/ytree/default.nix | 10 - .../tools/misc/yubikey-manager-qt/default.nix | 4 +- .../tools/misc/yubikey-manager/default.nix | 4 +- .../pkgs/tools/networking/amass/default.nix | 10 +- .../tools/networking/bandwhich/default.nix | 20 +- .../pkgs/tools/networking/bgpq4/default.nix | 25 + .../pkgs/tools/networking/chrony/default.nix | 4 +- .../pkgs/tools/networking/circus/default.nix | 13 +- .../pkgs/tools/networking/clash/default.nix | 6 +- .../pkgs/tools/networking/croc/default.nix | 6 +- .../pkgs/tools/networking/curl/default.nix | 4 +- .../pkgs/tools/networking/curlie/default.nix | 6 +- .../networking/dd-agent/datadog-agent.nix | 2 +- .../pkgs/tools/networking/dnsperf/default.nix | 4 +- .../tools/networking/dnsproxy/default.nix | 4 +- .../tools/networking/findomain/default.nix | 6 +- .../tools/networking/goreplay/default.nix | 26 + .../networking/guardian-agent/default.nix | 1 + .../pkgs/tools/networking/hping/default.nix | 55 +- .../pkgs/tools/networking/i2p/default.nix | 10 +- .../pkgs/tools/networking/i2p/i2p.patch | 2 +- .../pkgs/tools/networking/i2pd/default.nix | 8 +- .../pkgs/tools/networking/ipgrep/default.nix | 14 +- .../pkgs/tools/networking/kail/default.nix | 1 + .../tools/networking/keepalived/default.nix | 4 +- .../pkgs/tools/networking/lftp/default.nix | 4 +- .../tools/networking/linkchecker/default.nix | 26 +- .../tools/networking/mailutils/default.nix | 2 +- .../tools/networking/mitmproxy/default.nix | 55 - .../pkgs/tools/networking/mozwire/default.nix | 7 +- .../pkgs/tools/networking/ncftp/default.nix | 2 + .../pkgs/tools/networking/oneshot/default.nix | 6 +- .../tools/networking/openfortivpn/default.nix | 2 +- .../pkgs/tools/networking/openssh/default.nix | 2 +- .../tools/networking/p2p/seeks/default.nix | 69 - .../pkgs/tools/networking/phodav/default.nix | 4 +- .../tools/networking/radsecproxy/default.nix | 4 +- .../tools/networking/shadowfox/default.nix | 4 +- .../networking/shadowsocks-libev/default.nix | 4 +- .../networking/shadowsocks-rust/default.nix | 6 +- .../shadowsocks-v2ray-plugin/default.nix | 23 + .../pkgs/tools/networking/siege/default.nix | 4 +- .../tools/networking/slirp4netns/default.nix | 2 +- .../pkgs/tools/networking/toss/default.nix | 20 + .../networking/tridactyl-native/default.nix | 4 +- .../pkgs/tools/networking/unbound/default.nix | 9 +- .../pkgs/tools/networking/v2ray/default.nix | 73 +- .../pkgs/tools/networking/v2ray/generic.nix | 52 - .../tools/networking/vpn-slice/default.nix | 25 + .../networking/wireguard-tools/default.nix | 4 +- .../tools/networking/wstunnel/default.nix | 18 +- .../pkgs/tools/networking/zap/default.nix | 3 +- .../pkgs/tools/networking/zssh/default.nix | 4 +- .../nixpkgs/pkgs/tools/nix/manix/default.nix | 25 + .../package-management/cargo-kcov/default.nix | 27 + .../cargo-update/default.nix | 18 +- .../home-manager/default.nix | 8 +- .../package-management/librepo/default.nix | 4 +- .../tools/package-management/nfpm/default.nix | 6 +- .../package-management/nix-du/default.nix | 6 +- .../nix-prefetch/default.nix | 12 +- .../nix-template/default.nix | 23 + .../tools/package-management/nix/default.nix | 8 +- .../nixpkgs-review/default.nix | 4 +- .../protontricks/default.nix | 18 +- .../tools/package-management/rpm/default.nix | 5 +- .../tools/security/1password-gui/default.nix | 13 +- .../tools/security/1password-gui/update.sh | 5 + .../pkgs/tools/security/age/default.nix | 11 +- .../pkgs/tools/security/bettercap/default.nix | 7 +- .../pkgs/tools/security/bitwarden/default.nix | 7 +- .../tools/security/bitwarden_rs/default.nix | 4 +- .../tools/security/bitwarden_rs/vault.nix | 8 +- .../pkgs/tools/security/clevis/default.nix | 4 +- .../pkgs/tools/security/creddump/default.nix | 36 + .../pkgs/tools/security/doppler/default.nix | 4 +- .../pkgs/tools/security/encryptr/default.nix | 4 +- .../pkgs/tools/security/fail2ban/default.nix | 2 +- .../pkgs/tools/security/fierce/default.nix | 8 + .../nixpkgs/pkgs/tools/security/gnupg/22.nix | 10 +- .../pkgs/tools/security/gopass/default.nix | 41 +- .../pkgs/tools/security/hologram/default.nix | 2 - .../pkgs/tools/security/hologram/deps.nix | 110 - .../pkgs/tools/security/honggfuzz/default.nix | 10 +- .../tools/security/ibm-sw-tpm2/default.nix | 4 +- .../pkgs/tools/security/jwt-cli/default.nix | 11 +- .../pkgs/tools/security/kbs2/default.nix | 8 +- .../pkgs/tools/security/keybase/gui.nix | 4 +- .../tools/security/lesspass-cli/default.nix | 4 +- .../pkgs/tools/security/minica/default.nix | 34 + .../pkgs/tools/security/rbw/default.nix | 76 + .../pkgs/tools/security/rhash/default.nix | 4 +- .../pkgs/tools/security/rustscan/default.nix | 37 + .../pkgs/tools/security/saml2aws/default.nix | 6 +- .../pkgs/tools/security/sequoia/default.nix | 53 +- .../pkgs/tools/security/sops/default.nix | 6 +- .../pkgs/tools/security/sshguard/default.nix | 4 +- .../pkgs/tools/security/vault/default.nix | 4 +- .../pkgs/tools/security/vault/vault-bin.nix | 12 +- .../pkgs/tools/system/bpytop/default.nix | 5 +- .../pkgs/tools/system/collectd/default.nix | 4 +- .../tools/system/ddrescueview/default.nix | 23 +- .../pkgs/tools/system/facter/default.nix | 4 +- .../nixpkgs/pkgs/tools/system/fio/default.nix | 4 +- .../pkgs/tools/system/freeipmi/default.nix | 4 +- .../pkgs/tools/system/htop/default.nix | 25 +- .../pkgs/tools/system/netdata/default.nix | 16 +- .../pkgs/tools/system/nvtop/default.nix | 16 +- .../pkgs/tools/system/pciutils/default.nix | 6 +- .../pkgs/tools/system/rocm-smi/default.nix | 4 +- .../tools/system/smartmontools/default.nix | 5 + .../pkgs/tools/system/storebrowse/default.nix | 44 - .../pkgs/tools/system/stress-ng/default.nix | 4 +- .../pkgs/tools/system/thermald/default.nix | 57 +- .../pkgs/tools/system/zenith/default.nix | 7 +- .../pkgs/tools/text/choose/default.nix | 25 + .../pkgs/tools/text/chroma/default.nix | 24 + .../pkgs/tools/text/cmigemo/default.nix | 35 + .../text/cmigemo/no-http-tool-check.patch | 23 + .../pkgs/tools/text/codesearch/default.nix | 2 - .../pkgs/tools/text/codesearch/deps.nix | 3 - .../pkgs/tools/text/csvkit/default.nix | 29 +- .../pkgs/tools/text/discount/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/gist/default.nix | 4 +- .../pkgs/tools/text/kdiff3/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/mdcat/default.nix | 6 +- .../pkgs/tools/text/miller/default.nix | 4 +- .../pkgs/tools/text/ocrmypdf/default.nix | 6 +- .../pkgs/tools/text/podiff/default.nix | 6 +- .../pkgs/tools/text/poedit/default.nix | 4 +- .../pkgs/tools/text/ripgrep/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/shfmt/default.nix | 10 +- .../pkgs/tools/text/snippetpixie/default.nix | 8 +- .../nixpkgs/pkgs/tools/text/tab/default.nix | 12 +- .../nixpkgs/pkgs/tools/text/ugrep/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/vale/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/vgrep/default.nix | 24 + .../pkgs/tools/text/wgetpaste/default.nix | 4 +- .../tools/typesetting/asciidoctor/default.nix | 1 - .../typesetting/asciidoctorj/default.nix | 4 +- .../tools/typesetting/lowdown/default.nix | 4 +- .../tools/typesetting/satysfi/default.nix | 32 +- .../tools/typesetting/tectonic/default.nix | 8 +- .../tools/typesetting/tex/dblatex/default.nix | 6 +- .../tools/typesetting/tex/texlive/default.nix | 17 +- .../typesetting/tex/texlive/fixedHashes.nix | 2 +- .../pkgs/tools/typesetting/tikzit/default.nix | 6 +- .../pkgs/tools/video/rav1e/default.nix | 6 +- .../pkgs/tools/video/untrunc/default.nix | 6 +- .../nixpkgs/pkgs/tools/video/vcsi/default.nix | 28 + .../virtualization/cri-tools/default.nix | 4 +- .../virtualization/rootlesskit/default.nix | 4 +- .../tools/virtualization/xva-img/default.nix | 24 + .../nixpkgs/pkgs/top-level/aliases.nix | 37 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 1759 +- .../nixpkgs/pkgs/top-level/beam-packages.nix | 2 +- .../nixpkgs/pkgs/top-level/coq-packages.nix | 2 +- .../pkgs/top-level/darwin-packages.nix | 4 + third_party/nixpkgs/pkgs/top-level/impure.nix | 2 +- .../nixpkgs/pkgs/top-level/make-tarball.nix | 1 - .../nixpkgs/pkgs/top-level/metrics.nix | 1 - .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 52 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 154 +- .../pkgs/top-level/python-packages.nix | 11071 +++++---- .../nixpkgs/pkgs/top-level/release-cross.nix | 4 +- .../nixpkgs/pkgs/top-level/release-python.nix | 4 +- .../nixpkgs/pkgs/top-level/release-small.nix | 6 +- third_party/nixpkgs/pkgs/top-level/stage.nix | 1 + third_party/nixpkgs/pkgs/top-level/static.nix | 3 + 3325 files changed, 104557 insertions(+), 56443 deletions(-) create mode 100644 third_party/nixpkgs/.github/workflows/editorconfig.yml create mode 100644 third_party/nixpkgs/.github/workflows/pending-clear.yml create mode 100644 third_party/nixpkgs/.github/workflows/pending-set.yml create mode 100644 third_party/nixpkgs/lib/systems/architectures.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/types-anything/attrs-coercible.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/types-anything/equal-atoms.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/types-anything/functions.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/types-anything/lists.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/types-anything/mk-mods.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/types-anything/nested-attrs.nix create mode 100644 third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml delete mode 100644 third_party/nixpkgs/nixos/lib/test-driver/Logger.pm delete mode 100644 third_party/nixpkgs/nixos/lib/test-driver/Machine.pm delete mode 100644 third_party/nixpkgs/nixos/lib/test-driver/test-driver.pl delete mode 100644 third_party/nixpkgs/nixos/lib/testing.nix create mode 100644 third_party/nixpkgs/nixos/modules/hardware/system-76.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/desktops/espanso.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/networking/heyefi.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/robustirc-bridge.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/networking/seeks.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix create mode 100755 third_party/nixpkgs/nixos/modules/services/video/epgstation/generate create mode 100644 third_party/nixpkgs/nixos/modules/services/video/epgstation/streaming.json create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.xml delete mode 100644 third_party/nixpkgs/nixos/modules/services/web-servers/meguca.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix delete mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/docker-preloader.nix create mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix create mode 100644 third_party/nixpkgs/nixos/tests/bitwarden.nix create mode 100644 third_party/nixpkgs/nixos/tests/charliecloud.nix delete mode 100644 third_party/nixpkgs/nixos/tests/common/acme/server/mkcerts.nix delete mode 100755 third_party/nixpkgs/nixos/tests/common/acme/server/mkcerts.sh create mode 100644 third_party/nixpkgs/nixos/tests/cri-o.nix delete mode 100644 third_party/nixpkgs/nixos/tests/docker-preloader.nix delete mode 100644 third_party/nixpkgs/nixos/tests/make-test.nix create mode 100644 third_party/nixpkgs/nixos/tests/robustirc-bridge.nix create mode 100644 third_party/nixpkgs/nixos/tests/shadowsocks/common.nix create mode 100644 third_party/nixpkgs/nixos/tests/shadowsocks/default.nix create mode 100644 third_party/nixpkgs/nixos/tests/sssd-ldap.nix create mode 100644 third_party/nixpkgs/nixos/tests/sssd.nix create mode 100644 third_party/nixpkgs/nixos/tests/v2ray.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff create mode 100644 third_party/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch create mode 100644 third_party/nixpkgs/pkgs/applications/audio/hydrogen/0.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/hydrogen/unstable.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch create mode 100644 third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch create mode 100644 third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/lv2-cpp-tools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/mamba/fix-build.patch create mode 100644 third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/mooSpace/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/seq66/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/spotify/wrapper.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/surge/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/talentedhack/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/tunefish/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/vocproc/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix create mode 100755 third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix create mode 100755 third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/update.sh create mode 100755 third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh create mode 100755 third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh create mode 100644 third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/code-browser/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json create mode 100644 third_party/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/25.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/26.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/27.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch rename third_party/nixpkgs/pkgs/applications/editors/emacs/{default.nix => generic.nix} (85%) create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch create mode 100644 third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/vim/qvim.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/viw/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/xxe-pe/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix create mode 100644 third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/gis/gmt/gshhg.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/inkscape/0.x.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/meshlab/fix-version.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/meshlab/no-build-date.patch create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/odafileconverter/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/qosmic/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/kde/grantleetheme/series create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kalzium.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kapman.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/katomic.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kblackbox.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kblocks.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kbounce.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/series create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kdiamond.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kigo.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/killbots.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/klettres.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/klines.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kmag.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/kde/kmail.patch create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kmines.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/knavalbattle.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/knetwalk.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/knights.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kollision.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kreversi.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kshisen.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/ksquares.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kteatime.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/ktimer.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kturtle.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kwave.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/autospotting/deps.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/foot/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/imag/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/leptonica.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/mupdf.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/openambit/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/super_user_spark/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/taskell/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/xbattbar/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/xbattbar/sys-by-default.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/xdragon/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix create mode 100755 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py delete mode 100755 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix create mode 100755 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.py delete mode 100755 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/c14/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ytalk/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/utahfs/deps.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/timeular/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/release.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix create mode 100755 third_party/nixpkgs/pkgs/applications/version-management/commitizen/generate-dependencies.sh create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-composition.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-env.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-packages.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/commitizen/package.json create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/gomp/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/version-management/sourcehut/use-srht-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/epgstation/epgstation.1 create mode 100755 third_party/nixpkgs/pkgs/applications/video/epgstation/generate.sh create mode 100644 third_party/nixpkgs/pkgs/applications/video/epgstation/package.json create mode 100644 third_party/nixpkgs/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/filebot/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/autoload.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/vcs/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/vcs/fonts.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/video/vdr/glibc2.31-compat.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/cc-wrapper/fortran-hook.sh delete mode 100644 third_party/nixpkgs/pkgs/build-support/release/gcov-report.nix create mode 100644 third_party/nixpkgs/pkgs/data/icons/iso-flags/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/themes/venta/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix rename third_party/nixpkgs/pkgs/{data/icons => desktops/cinnamon}/mint-x-icons/default.nix (60%) create mode 100644 third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-api/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-control-center/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-control-center/fix-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-daemon/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-dock/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-dock/wrapper.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-kwin/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-kwin/fix-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-launcher/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-anything/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-calculator/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-editor/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/disomaster/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/dtkwm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/qcef/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/qt5platform-plugins/default.nix delete mode 100755 third_party/nixpkgs/pkgs/desktops/deepin/setup-hook.sh delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/startdde/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/startdde/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/0001-filechooser-module-hardcode-gsettings-for-nixos.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix rename third_party/nixpkgs/pkgs/desktops/plasma-5/{ => 3rdparty}/kwin/scripts/krohnkite.nix (97%) rename third_party/nixpkgs/pkgs/desktops/plasma-5/{ => 3rdparty}/kwin/scripts/tiling.nix (97%) delete mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/series create mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/patches/series delete mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/kscreen-417316.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/series create mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/patches/0001-Add-a-logging-category-config-file.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/series delete mode 100644 third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/chez/setup-hook.sh create mode 100644 third_party/nixpkgs/pkgs/development/compilers/copper/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json create mode 100644 third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.lock create mode 100644 third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/fpc/libqt5pas.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/fpc/mark-paths.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/bintools.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/purity.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt-armv7l.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt-codesign.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi-no-threads.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi-wasm.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb-procfs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm-outputs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/sanitizers-nongnu.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/lobster/test-can-run-hello-world.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/mruby/bison-36-compat.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/nim/nixbuild.patch create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/patches/hasura-884-compat.patch delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/CVE-2019-20907.patch rename third_party/nixpkgs/pkgs/development/interpreters/python/tests/{ => test_environments}/test_python.py (100%) create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/allegro/encoding.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/appindicator-sharp/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/audiality2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/draco/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/embree/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/fontconfig/config-compat.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/grantlee/5/series delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/ilmbase/cross.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/series rename third_party/nixpkgs/pkgs/{applications/kde => development/libraries/kde-frameworks}/kdav.nix (83%) delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/series rename third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/{kdesu.nix => kdesu/default.nix} (85%) create mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/series delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/series delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/series delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/series delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/series create mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kquickcharts.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/series delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/series create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix rename third_party/nixpkgs/pkgs/development/libraries/{libusb => libusb-compat}/fix-headers.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtscript.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtserialport.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qttools.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp create mode 100644 third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/strigi/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/strigi/export_bufferedstream.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/strigi/gcc6.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/webkit2-sharp/default.nix rename third_party/nixpkgs/pkgs/{servers/hasura/ci-info.nix => development/misc/haskell/hasura/ci-info/default.nix} (100%) rename third_party/nixpkgs/pkgs/{servers/hasura/graphql-engine.nix => development/misc/haskell/hasura/graphql-engine/default.nix} (91%) rename third_party/nixpkgs/pkgs/{servers/hasura/graphql-parser.nix => development/misc/haskell/hasura/graphql-parser/default.nix} (88%) rename third_party/nixpkgs/pkgs/{servers/hasura/pg-client.nix => development/misc/haskell/hasura/pg-client/default.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/dune-action-plugin/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/genspio/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/1.4.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/posix/base.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/posix/socket.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/posix/types.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ptset/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/srt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/acebinf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3_1.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bwapy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django/1_11.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fontpens/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/goobook/fix-build.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/imgsize/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ipython/7.16.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/maildir-deduplicate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup-darwin.cfg create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mohawk/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/multitasking/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pa-ringbuffer/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pam/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pip2nix/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyspice/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytabix/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest/5.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-libarchive/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/samsungctl/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/scapy/fix-version.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/supervisor/glibc-2.31.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ufoprocessor/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ujson/2.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/yamlordereddictloader/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix rename third_party/nixpkgs/pkgs/development/{tools => python-modules}/yq/default.nix (56%) delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/zope_i18n/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/fac/cargo-lock.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/devd/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/dot-http/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/easyjson/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/ejson/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/godot/headless.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/godot/server.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/kexpand/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix rename third_party/nixpkgs/pkgs/development/{compilers => tools/knightos}/scas/default.nix (97%) create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/hound/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/cargo-lock.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/modd/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/open-policy-agent/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh create mode 100644 third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/so/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/statik/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/summon/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/summon/resolve-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/ws/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/web/newman/default.nix create mode 100755 third_party/nixpkgs/pkgs/development/web/newman/generate-dependencies.sh create mode 100644 third_party/nixpkgs/pkgs/development/web/newman/node-composition.nix create mode 100644 third_party/nixpkgs/pkgs/development/web/newman/node-env.nix create mode 100644 third_party/nixpkgs/pkgs/development/web/newman/node-packages.nix create mode 100644 third_party/nixpkgs/pkgs/development/web/newman/package.json delete mode 100644 third_party/nixpkgs/pkgs/games/exult/arch.patch create mode 100644 third_party/nixpkgs/pkgs/games/koboredux/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/left4gore/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/legendary-gl/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/sm64ex/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/wyvern/cargo-lock.patch create mode 100644 third_party/nixpkgs/pkgs/games/wyvern/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/xcowsay/default.nix create mode 100644 third_party/nixpkgs/pkgs/misc/cups/drivers/hl1210w/default.nix rename third_party/nixpkgs/pkgs/misc/emulators/openmsx/{custom-nixos.mk => custom-nix.mk} (100%) create mode 100644 third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix create mode 100644 third_party/nixpkgs/pkgs/misc/hdt/default.nix create mode 100644 third_party/nixpkgs/pkgs/misc/solfege/texinfo.patch create mode 100644 third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json create mode 100644 third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch create mode 100644 third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix create mode 100644 third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/darwin/discrete-scroll/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/deepin-anything/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix create mode 100755 third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kmod/no-name-field.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/default.nix create mode 100755 third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/update.sh create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/rfkill/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/system76-acpi/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/system76-io/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/system76/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix create mode 100644 third_party/nixpkgs/pkgs/servers/caddy/v1.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/caddy/v2.nix create mode 100644 third_party/nixpkgs/pkgs/servers/dns/knot-dns/runtime-deps.patch create mode 100644 third_party/nixpkgs/pkgs/servers/gonic/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/gonic/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/hasura/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/hasura/dependent-map.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/hasura/dependent-sum.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/hasura/ghc-heap-view.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/hasura/immortal.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/hasura/network-uri.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/hasura/these.nix create mode 100644 third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix create mode 100644 third_party/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/livepeer/deps.nix create mode 100644 third_party/nixpkgs/pkgs/servers/mbtileserver/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/meguca/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/meguca/server_deps.nix create mode 100644 third_party/nixpkgs/pkgs/servers/microserver/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/openbgpd/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix delete mode 100644 third_party/nixpkgs/pkgs/shells/rssh/default.nix delete mode 100644 third_party/nixpkgs/pkgs/shells/rssh/fix-config-path.patch create mode 100644 third_party/nixpkgs/pkgs/tools/X11/wmutils-libwm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/admin/cli53/deps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/audio/beets/extrafiles-plugin.nix create mode 100644 third_party/nixpkgs/pkgs/tools/backup/dump/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/deps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/swfdec/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/barman/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff create mode 100644 third_party/nixpkgs/pkgs/tools/misc/clpeak/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/cod/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/colorpicker/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/duf/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/godu/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/godu/go-mod.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/pandoc-plantuml-filter/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/sd-mux-ctrl/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/systrayhelper/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/teleconsole/deps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/toss/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/nix/manix/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix create mode 100755 third_party/nixpkgs/pkgs/tools/security/1password-gui/update.sh create mode 100644 third_party/nixpkgs/pkgs/tools/security/creddump/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/hologram/deps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/minica/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/rbw/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/system/storebrowse/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/choose/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/chroma/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/cmigemo/no-http-tool-check.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/text/codesearch/deps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/video/vcsi/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix diff --git a/third_party/nixpkgs/.editorconfig b/third_party/nixpkgs/.editorconfig index 75c3437413..129ef84df8 100644 --- a/third_party/nixpkgs/.editorconfig +++ b/third_party/nixpkgs/.editorconfig @@ -57,10 +57,13 @@ indent_size = unset [deps.nix] insert_final_newline = unset +[eggs.nix] +trim_trailing_whitespace = unset + [gemset.nix] insert_final_newline = unset -[node-packages.nix] +[node-{composition,packages}.nix] insert_final_newline = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] @@ -102,5 +105,15 @@ insert_final_newline = unset indent_size = unset trim_trailing_whitespace = unset +[pkgs/tools/misc/timidity/timidity.cfg] +trim_trailing_whitespace = unset + +[pkgs/tools/security/enpass/data.json] +insert_final_newline = unset +trim_trailing_whitespace = unset + +[pkgs/top-level/emscripten-packages.nix] +trim_trailing_whitespace = unset + [pkgs/top-level/perl-packages.nix] indent_size = unset diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index d362d85783..556dcd770c 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -83,9 +83,9 @@ /pkgs/development/haskell-modules/hoogle.nix @cdepillabout # Perl -/pkgs/development/interpreters/perl @volth -/pkgs/top-level/perl-packages.nix @volth -/pkgs/development/perl-modules @volth +/pkgs/development/interpreters/perl @volth @stigtsp +/pkgs/top-level/perl-packages.nix @volth @stigtsp +/pkgs/development/perl-modules @volth @stigtsp # R /pkgs/applications/science/math/R @peti @@ -195,10 +195,11 @@ /pkgs/top-level/php-packages.nix @NixOS/php # Podman, CRI-O modules and related -/nixos/modules/virtualisation/containers.nix @NixOS/podman -/nixos/modules/virtualisation/cri-o.nix @NixOS/podman -/nixos/modules/virtualisation/podman.nix @NixOS/podman -/nixos/tests/podman.nix @NixOS/podman +/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq +/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq +/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq +/nixos/tests/cri-o.nix @NixOS/podman @zowoq +/nixos/tests/podman.nix @NixOS/podman @zowoq # Blockchains /pkgs/applications/blockchains @mmahut diff --git a/third_party/nixpkgs/.github/CONTRIBUTING.md b/third_party/nixpkgs/.github/CONTRIBUTING.md index cb0264b016..fd2a6073df 100644 --- a/third_party/nixpkgs/.github/CONTRIBUTING.md +++ b/third_party/nixpkgs/.github/CONTRIBUTING.md @@ -55,7 +55,7 @@ Follow these steps to backport a change into a release branch in compliance with 1. Take note of the commits in which the change was introduced into `master` branch. 2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`. 3. Create a branch for your change, e.g. `git checkout -b backport`. -4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. +4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.03]`. ## Reviewing contributions diff --git a/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig.yml new file mode 100644 index 0000000000..98c7afbab7 --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/editorconfig.yml @@ -0,0 +1,27 @@ +name: "Checking EditorConfig" + +on: + pull_request: + +jobs: + tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: technote-space/get-diff-action@v3.1.0 + - name: Fetch editorconfig-checker + if: env.GIT_DIFF + env: + ECC_VERSION: "2.1.0" + ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download" + run: | + curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \ + tar xzf ec-linux-amd64.tar.gz && \ + mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker + - name: Checking EditorConfig + if: env.GIT_DIFF + run: | + ./bin/editorconfig-checker -disable-indentation \ + ${{ env.GIT_DIFF }} diff --git a/third_party/nixpkgs/.github/workflows/pending-clear.yml b/third_party/nixpkgs/.github/workflows/pending-clear.yml new file mode 100644 index 0000000000..d06b1e2143 --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/pending-clear.yml @@ -0,0 +1,21 @@ +name: "clear pending status" + +on: + check_suite: + types: [ completed ] + +jobs: + action: + runs-on: ubuntu-latest + steps: + - name: clear pending status + if: github.repository_owner == 'NixOS' && github.event.check_suite.app.name == 'OfBorg' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + curl \ + -X POST \ + -H "Accept: application/vnd.github.v3+json" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -d '{"state": "success", "target_url": " ", "description": " ", "context": "Wait for ofborg"}' \ + "https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.check_suite.head_sha }}" diff --git a/third_party/nixpkgs/.github/workflows/pending-set.yml b/third_party/nixpkgs/.github/workflows/pending-set.yml new file mode 100644 index 0000000000..f59ac9439e --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/pending-set.yml @@ -0,0 +1,20 @@ +name: "set pending status" + +on: + pull_request_target: + +jobs: + action: + runs-on: ubuntu-latest + steps: + - name: set pending status + if: github.repository_owner == 'NixOS' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + curl \ + -X POST \ + -H "Accept: application/vnd.github.v3+json" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -d '{"state": "failure", "target_url": " ", "description": "This failed status will be cleared when ofborg finishes eval.", "context": "Wait for ofborg"}' \ + "https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.pull_request.head.sha }}" diff --git a/third_party/nixpkgs/.version b/third_party/nixpkgs/.version index 3eea3c4c0e..62c36bbb17 100644 --- a/third_party/nixpkgs/.version +++ b/third_party/nixpkgs/.version @@ -1 +1 @@ -20.09 +21.03 diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.xml b/third_party/nixpkgs/doc/builders/images/dockertools.xml index 126698d0a9..d881e712a0 100644 --- a/third_party/nixpkgs/doc/builders/images/dockertools.xml +++ b/third_party/nixpkgs/doc/builders/images/dockertools.xml @@ -132,11 +132,11 @@ buildImage { By default buildImage will use a static date of one second past the UNIX Epoch. This allows buildImage to produce binary reproducible images. When listing images with docker images, the newly created images will be listed like this: - +$ docker images REPOSITORY TAG IMAGE ID CREATED SIZE hello latest 08c791c7846e 48 years ago 25.2MB -]]> + You can break binary reproducibility but have a sorted, meaningful CREATED column by setting created to now. @@ -152,11 +152,11 @@ pkgs.dockerTools.buildImage { ]]> and now the Docker CLI will display a reasonable date and sort the images as expected: - +$ docker images REPOSITORY TAG IMAGE ID CREATED SIZE hello latest de2bf4786de6 About a minute ago 25.2MB -]]> + however, the produced images will not be binary reproducible. diff --git a/third_party/nixpkgs/doc/builders/images/ocitools.xml b/third_party/nixpkgs/doc/builders/images/ocitools.xml index e8cd3472f5..f26ed86442 100644 --- a/third_party/nixpkgs/doc/builders/images/ocitools.xml +++ b/third_party/nixpkgs/doc/builders/images/ocitools.xml @@ -38,8 +38,7 @@ buildContainer { readonly = false; } - - + diff --git a/third_party/nixpkgs/doc/builders/packages/citrix.xml b/third_party/nixpkgs/doc/builders/packages/citrix.xml index 16f1bc6f8f..803eb2e4fc 100644 --- a/third_party/nixpkgs/doc/builders/packages/citrix.xml +++ b/third_party/nixpkgs/doc/builders/packages/citrix.xml @@ -22,10 +22,10 @@ In order to set this up, you first have to download the .cr file from the Netscaler Gateway. After that you can configure the selfservice like this: - - $ storebrowse -C ~/Downloads/receiverconfig.cr - $ selfservice - + +$ storebrowse -C ~/Downloads/receiverconfig.cr +$ selfservice + diff --git a/third_party/nixpkgs/doc/builders/packages/urxvt.xml b/third_party/nixpkgs/doc/builders/packages/urxvt.xml index 135cc82a0b..330e056b65 100644 --- a/third_party/nixpkgs/doc/builders/packages/urxvt.xml +++ b/third_party/nixpkgs/doc/builders/packages/urxvt.xml @@ -18,10 +18,13 @@ includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as - rxvt-unicode.override { configure = { availablePlugins, ... }: { + +rxvt-unicode.override { + configure = { availablePlugins, ... }: { plugins = with availablePlugins; [ perls resize-font vtwheel ]; - } -} + }; +} + If the configure function returns an attrset without the plugins attribute, availablePlugins will be used automatically. @@ -30,18 +33,22 @@ In order to add plugins but also keep all default plugins installed, it is possible to use the following method: - rxvt-unicode.override { configure = { availablePlugins, ... }: { - plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; - }; -} + +rxvt-unicode.override { + configure = { availablePlugins, ... }: { + plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; + }; +} + To get a list of all the plugins available, open the Nix REPL and run - $ nix repl + +$ nix repl :l <nixpkgs> map (p: p.name) pkgs.rxvt-unicode.plugins - + Alternatively, if your shell is bash or zsh and have completion enabled, simply type nixpkgs.rxvt-unicode.plugins.<tab>. @@ -53,18 +60,24 @@ map (p: p.name) pkgs.rxvt-unicode.plugins extraDeps can be used, for example, to provide xsel (a clipboard manager) to the clipboard plugin, without installing it globally: - rxvt-unicode.override { configure = { availablePlugins, ... }: { - pluginsDeps = [ xsel ]; - } -} + +rxvt-unicode.override { + configure = { availablePlugins, ... }: { + pluginsDeps = [ xsel ]; + }; +} + perlDeps is a handy way to provide Perl packages to your custom plugins (in $HOME/.urxvt/ext). For example, if you need AnyEvent you can do: - rxvt-unicode.override { configure = { availablePlugins, ... }: { - perlDeps = with perlPackages; [ AnyEvent ]; - } -} + +rxvt-unicode.override { + configure = { availablePlugins, ... }: { + perlDeps = with perlPackages; [ AnyEvent ]; + }; +} + @@ -90,7 +103,8 @@ map (p: p.name) pkgs.rxvt-unicode.plugins If the plugin is itself a perl package that needs to be imported from other plugins or scripts, add the following passthrough: - passthru.perlPackages = [ "self" ]; + +passthru.perlPackages = [ "self" ]; This will make the urxvt wrapper pick up the dependency and set up the perl path accordingly. diff --git a/third_party/nixpkgs/doc/contributing/submitting-changes.xml b/third_party/nixpkgs/doc/contributing/submitting-changes.xml index a88965f5cc..22389c24ea 100644 --- a/third_party/nixpkgs/doc/contributing/submitting-changes.xml +++ b/third_party/nixpkgs/doc/contributing/submitting-changes.xml @@ -209,12 +209,12 @@ Additional information. - (fetchpatch { - name = "CVE-2019-11068.patch"; - url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; - sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; - }) - +(fetchpatch { + name = "CVE-2019-11068.patch"; + url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; + sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; +}) + If a security fix applies to both master and a stable release then, similar to regular changes, they are preferably delivered via master first and cherry-picked to the release branch. diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.xml b/third_party/nixpkgs/doc/languages-frameworks/beam.xml index 1d307e1d6d..addab24f7f 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/beam.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/beam.xml @@ -72,9 +72,9 @@ To install any of those builders into your profile, refer to them by their attribute path beamPackages.rebar3: - - $ nix-env -f "<nixpkgs>" -iA beamPackages.rebar3 - + +$ nix-env -f "<nixpkgs>" -iA beamPackages.rebar3 +
diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.xml b/third_party/nixpkgs/doc/languages-frameworks/go.xml index 26414f23c7..ebdcf61605 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/go.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/go.xml @@ -38,11 +38,7 @@ pet = buildGoModule rec { vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; - subPackages = [ "." ]; - - deleteVendor = true; - - runVend = true; + runVend = true; meta = with lib; { description = "Simple command-line snippet manager, written in Go"; @@ -64,16 +60,6 @@ pet = buildGoModule rec { - - subPackages limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. - - - - - deleteVendor removes the pre-existing vendor directory and fetches the dependencies. This should only be used if the dependencies included in the vendor folder are broken or incomplete. - - - runVend runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. @@ -82,12 +68,7 @@ pet = buildGoModule rec { - vendorSha256 can also take null as an input. - - When `null` is used as a value, rather than fetching the dependencies - and vendoring them, we use the vendoring included within the source repo. - If you'd like to not have to update this field on dependency changes, - run `go mod vendor` in your source repo and set 'vendorSha256 = null;' + vendorSha256 can also take null as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set 'vendorSha256 = null;'
@@ -106,7 +87,6 @@ deis = buildGoPackage rec { version = "1.13.0"; goPackagePath = "github.com/deis/deis"; - subPackages = [ "client" ]; src = fetchFromGitHub { owner = "deis"; @@ -115,9 +95,7 @@ deis = buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.nix; - - buildFlags = [ "--tags" "release" ]; + goDeps = ./deps.nix; } @@ -131,23 +109,10 @@ deis = buildGoPackage rec { - - subPackages limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. - - - In this example only github.com/deis/deis/client will be built. - - - goDeps is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate deps.nix file for readability. The dependency data structure is described below. - - - buildFlags is a list of flags passed to the go build command. - - @@ -214,4 +179,70 @@ done + +
+ Attributes used by the builders + + + Both buildGoModule and buildGoPackage can be tweaked to behave slightly differently, if the following attributes are used: + + + + + + buildFlagsArray and buildFlags + + + + These attributes set build flags supported by go build. We recommend using buildFlagsArray. The most common use case of these attributes is to make the resulting executable aware of its own version. For example: + + + buildFlagsArray + + buildFlagsArray = [ + "-ldflags=-X main.Version=${version} -X main.Commit=${version}" + ]; + + + + + + Note: single quotes are not needed. + + + + + buildFlagsArray + + buildFlagsArray = '' + -ldflags= + -X main.Version=${version} + -X main.Commit=${version} + ''; + + + + + + + deleteVendor + + + + Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. + + + + + + subPackages + + + + Limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. + + + + +
diff --git a/third_party/nixpkgs/doc/languages-frameworks/node.section.md b/third_party/nixpkgs/doc/languages-frameworks/node.section.md index c1f4294711..2120adfc0b 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/node.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/node.section.md @@ -25,12 +25,13 @@ build system it uses. Here are some examples: After you have identified the correct system, you need to override your package expression while adding in build system as a build input. For example, `dat` -requires `node-gyp-build`, so we override its expression in `default.nix`: +requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blob/32f5e5da4a1b3f0595527f5195ac3a91451e9b56/pkgs/development/node-packages/default.nix#L37-L40) its expression in [`default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/default.nix): ```nix -dat = nodePackages.dat.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; -}); + dat = super.dat.override { + buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; + meta.broken = since "12"; + }; ``` To add a package from NPM to nixpkgs: diff --git a/third_party/nixpkgs/doc/languages-frameworks/perl.xml b/third_party/nixpkgs/doc/languages-frameworks/perl.xml index ff0f350e99..b017c028f6 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/perl.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/perl.xml @@ -8,28 +8,28 @@ When executing a Perl script, it is possible you get an error such as ./myscript.pl: bad interpreter: /usr/bin/perl: no such file or directory. This happens when the script expects Perl to be installed at /usr/bin/perl, which is not the case when using Perl from nixpkgs. You can fix the script by changing the first line to: - - #!/usr/bin/env perl - + +#!/usr/bin/env perl + to take the Perl installation from the PATH environment variable, or invoke Perl directly with: - - $ perl ./myscript.pl - + +$ perl ./myscript.pl + When the script is using a Perl library that is not installed globally, you might get an error such as Can't locate DB_File.pm in @INC (you may need to install the DB_File module). In that case, you can use nix-shell to start an ad-hoc shell with that library installed, for instance: - - $ nix-shell -p perl perlPackages.DBFile --run ./myscript.pl - + +$ nix-shell -p perl perlPackages.DBFile --run ./myscript.pl + If you are always using the script in places where nix-shell is available, you can embed the nix-shell invocation in the shebang like this: - - #!/usr/bin/env nix-shell - #! nix-shell -i perl -p perl perlPackages.DBFile - + +#!/usr/bin/env nix-shell +#! nix-shell -i perl -p perl perlPackages.DBFile + @@ -44,30 +44,30 @@ Perl packages from CPAN are defined in pkgs/top-level/perl-packages.nix, rather than pkgs/all-packages.nix. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package called from perl-packages.nix. However, more complicated packages should be put in a separate file, typically in pkgs/development/perl-modules. Here is an example of the former: - - ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.21"; - src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; - }; - }; - + +ClassC3 = buildPerlPackage rec { + name = "Class-C3-0.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; + }; +}; + Note the use of mirror://cpan/, and the ${name} in the URL definition to ensure that the name attribute is consistent with the source that we’re actually downloading. Perl packages are made available in all-packages.nix through the variable perlPackages. For instance, if you have a package that needs ClassC3, you would typically write - - foo = import ../path/to/foo.nix { - inherit stdenv fetchurl ...; - inherit (perlPackages) ClassC3; - }; - + +foo = import ../path/to/foo.nix { + inherit stdenv fetchurl ...; + inherit (perlPackages) ClassC3; +}; + in all-packages.nix. You can test building a Perl package as follows: - - $ nix-build -A perlPackages.ClassC3 - + +$ nix-build -A perlPackages.ClassC3 + buildPerlPackage adds perl- to the start of the name attribute, so the package above is actually called perl-Class-C3-0.21. So to install it, you can say: - - $ nix-env -i perl-Class-C3 - + +$ nix-env -i perl-Class-C3 + (Of course you can also install using the attribute name: nix-env -i -A perlPackages.ClassC3.) @@ -94,61 +94,61 @@ buildPerlPackage is built on top of stdenv, so everything can be customised in the usual way. For instance, the BerkeleyDB module has a preConfigure hook to generate a configuration file used by Makefile.PL: - - { buildPerlPackage, fetchurl, db }: + +{ buildPerlPackage, fetchurl, db }: - buildPerlPackage rec { - name = "BerkeleyDB-0.36"; +buildPerlPackage rec { + name = "BerkeleyDB-0.36"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; - }; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; + }; - preConfigure = '' - echo "LIB = ${db.out}/lib" > config.in - echo "INCLUDE = ${db.dev}/include" >> config.in - ''; - } - + preConfigure = '' + echo "LIB = ${db.out}/lib" > config.in + echo "INCLUDE = ${db.dev}/include" >> config.in + ''; +} + Dependencies on other Perl packages can be specified in the buildInputs and propagatedBuildInputs attributes. If something is exclusively a build-time dependency, use buildInputs; if it’s (also) a runtime dependency, use propagatedBuildInputs. For instance, this builds a Perl module that has runtime dependencies on a bunch of other modules: - - ClassC3Componentised = buildPerlPackage rec { - name = "Class-C3-Componentised-1.0004"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; - sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; - }; - propagatedBuildInputs = [ - ClassC3 ClassInspector TestException MROCompat - ]; - }; - + +ClassC3Componentised = buildPerlPackage rec { + name = "Class-C3-Componentised-1.0004"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; + sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; + }; + propagatedBuildInputs = [ + ClassC3 ClassInspector TestException MROCompat + ]; +}; + On Darwin, if a script has too many -Idir flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the shortenPerlShebang function from the postInstall phase: - - { stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: + +{ stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: - ImageExifTool = buildPerlPackage { - pname = "Image-ExifTool"; - version = "11.50"; +ImageExifTool = buildPerlPackage { + pname = "Image-ExifTool"; + version = "11.50"; - src = fetchurl { - url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; - sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; - }; + src = fetchurl { + url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; + sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; + }; - buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optional stdenv.isDarwin '' - shortenPerlShebang $out/bin/exiftool - ''; - }; - + buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optional stdenv.isDarwin '' + shortenPerlShebang $out/bin/exiftool + ''; +}; + This will remove the -I flags from the shebang line, rewrite them in the use lib form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place. @@ -159,27 +159,27 @@ Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program nix-generate-from-cpan, which can be installed as follows: - - $ nix-env -i nix-generate-from-cpan - + +$ nix-env -i nix-generate-from-cpan + This program takes a Perl module name, looks it up on CPAN, fetches and unpacks the corresponding package, and prints a Nix expression on standard output. For example: - - $ nix-generate-from-cpan XML::Simple - XMLSimple = buildPerlPackage rec { - name = "XML-Simple-2.22"; - src = fetchurl { - url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz"; - sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; - }; - propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; - meta = { - description = "An API for simple XML files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - + +$ nix-generate-from-cpan XML::Simple + XMLSimple = buildPerlPackage rec { + name = "XML-Simple-2.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz"; + sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; + }; + propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; + meta = { + description = "An API for simple XML files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + The output can be pasted into pkgs/top-level/perl-packages.nix or wherever else you need it. diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index f189ce3144..e2d9172919 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -567,7 +567,7 @@ test run would be: checkPhase = "pytest"; ``` -However, many repositories' test suites do not translate well to nix's build +However, many repositories' test suites do not translate well to nix's build sandbox, and will generally need many tests to be disabled. To filter tests using pytest, one can do the following: diff --git a/third_party/nixpkgs/doc/languages-frameworks/qt.xml b/third_party/nixpkgs/doc/languages-frameworks/qt.xml index 8d97de504a..ec95621d8f 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/qt.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/qt.xml @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ qtbase ]; } - + diff --git a/third_party/nixpkgs/doc/languages-frameworks/ruby.xml b/third_party/nixpkgs/doc/languages-frameworks/ruby.xml index 9b36801fb9..9b579d6804 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ruby.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/ruby.xml @@ -12,14 +12,14 @@ - Gemfile +$ cd pkgs/servers/monitoring +$ mkdir sensu +$ cd sensu +$ cat > Gemfile source 'https://rubygems.org' gem 'sensu' -$ $(nix-build '' -A bundix --no-out-link)/bin/bundix --magic -$ cat > default.nix +$ $(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic +$ cat > default.nix { lib, bundlerEnv, ruby }: bundlerEnv rec { @@ -37,7 +37,7 @@ bundlerEnv rec { maintainers = with maintainers; [ theuni ]; platforms = platforms.unix; }; -}]]> +} @@ -49,17 +49,16 @@ bundlerEnv rec { - +$ cd pkgs/servers/monitoring/sensu +$ nix-shell -p bundler --run 'bundle lock --update' +$ nix-shell -p bundix --run 'bundix' For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. rake at the command line, there is an alternative builder called bundlerApp. Set up the gemset.nix the same way, and then, for example: - + - + The chief advantage of bundlerApp over bundlerEnv is the executables introduced in the environment are precisely those selected in the exes list, as opposed to bundlerEnv which adds all the executables made available by gems in the gemset, which can mean e.g. rspec or rake in unpredictable versions available from various packages. diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index 6c51da87ca..0e1d59e1a9 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { `buildRustPackage` requires a `cargoSha256` attribute which is computed over all crate sources of this package. Currently it is obtained by inserting a fake checksum into the expression and building the package once. The correct -checksum can be then take from the failed build. +checksum can then be taken from the failed build. Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html) best practices guide, Rust applications should always commit the `Cargo.lock` @@ -119,6 +119,18 @@ The above are just guidelines, and exceptions may be granted on a case-by-case b However, please check if it's possible to disable a problematic subset of the test suite and leave a comment explaining your reasoning. +#### Setting `test-threads` + +`buildRustPackage` will use parallel test threads by default, +sometimes it may be necessary to disable this so the tests run consecutively. + +```nix +rustPlatform.buildRustPackage { + /* ... */ + cargoParallelTestThreads = false; +} +``` + ### Building a package in `debug` mode By default, `buildRustPackage` will use `release` mode for builds. If a package diff --git a/third_party/nixpkgs/doc/languages-frameworks/texlive.xml b/third_party/nixpkgs/doc/languages-frameworks/texlive.xml index a581ec5911..141c46e5a6 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/texlive.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/texlive.xml @@ -44,11 +44,11 @@ texlive.combine { You can list packages e.g. by nix repl. - :l -nix-repl> texlive.collection- -]]> + +$ nix repl +nix-repl> :l <nixpkgs> +nix-repl> texlive.collection- + diff --git a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md index 4911509212..8e4826232e 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md @@ -263,6 +263,8 @@ Sometimes plugins require an override that must be changed when the plugin is up To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running. +Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of Language Server Protocol integration with vim/neovim. + ## Important repositories - [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository diff --git a/third_party/nixpkgs/doc/manual.xml b/third_party/nixpkgs/doc/manual.xml index 1f69872d2a..4ca497e234 100644 --- a/third_party/nixpkgs/doc/manual.xml +++ b/third_party/nixpkgs/doc/manual.xml @@ -1,7 +1,7 @@ - Nixpkgs Users and Contributors Guide + Nixpkgs Manual Version diff --git a/third_party/nixpkgs/doc/stdenv/multiple-output.xml b/third_party/nixpkgs/doc/stdenv/multiple-output.xml index 51e1cc2e02..20658918db 100644 --- a/third_party/nixpkgs/doc/stdenv/multiple-output.xml +++ b/third_party/nixpkgs/doc/stdenv/multiple-output.xml @@ -22,39 +22,69 @@ The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb. + + + A number of attributes can be used to work with a derivation with multiple outputs. The attribute outputs is a list of strings, which are the names of the outputs. For each of these names, an identically named attribute is created, corresponding to that output. The attribute meta.outputsToInstall is used to determine the default set of outputs to install when using the derivation name unqualified. + +
Installing a split package - When installing a package via systemPackages or nix-env you have several options: + When installing a package with multiple outputs, the package's meta.outputsToInstall attribute determines which outputs are actually installed. meta.outputsToInstall is a list whose default installs binaries and the associated man pages. The following sections describe ways to install different outputs. - - - - You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The outputs attribute contains a list of output names. - - - - - You can let it use the default outputs. These are handled by meta.outputsToInstall attribute that contains a list of output names. - - - TODO: more about tweaking the attribute, etc. - - - - - NixOS provides configuration option environment.extraOutputsToInstall that allows adding extra outputs of environment.systemPackages atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options. - - +
+ Selecting outputs to install via NixOS + + + NixOS provides two ways to select the outputs to install for packages listed in environment.systemPackages: + + + + - At this moment there is no similar configurability for packages installed by nix-env. You can still use approach from to override meta.outputsToInstall attributes, but that's a rather inconvenient way. + The configuration option environment.extraOutputsToInstall is appended to each package's meta.outputsToInstall attribute to determine the outputs to install. It can for example be used to install info documentation or debug symbols for all packages. - - - + + + + The outputs can be listed as packages in environment.systemPackages. For example, the "out" and "info" outputs for the coreutils package can be installed by including coreutils and coreutils.info in environment.systemPackages. + + + +
+ +
+ Selecting outputs to install via <command>nix-env</command> + + + nix-env lacks an easy way to select the outputs to install. When installing a package, nix-env always installs the outputs listed in meta.outputsToInstall, even when the user explicitly selects an output. + + + + + nix-env silenty disregards the outputs selected by the user, and instead installs the outputs from meta.outputsToInstall. For example, + +$ nix-env -iA nixpkgs.coreutils.info + + installs the "out" output (coreutils.meta.outputsToInstall is [ "out" ]) instead of the requested "info". + + + + + The only recourse to select an output with nix-env is to override the package's meta.outputsToInstall, using the functions described in . For example, the following overlay adds the "info" output for the coreutils package: + + +self: super: +{ + coreutils = super.coreutils.overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { outputsToInstall = oldAttrs.meta.outputsToInstall or [ "out" ] ++ [ "info" ]; }; + }); +} + +
Using a split package diff --git a/third_party/nixpkgs/doc/using/configuration.xml b/third_party/nixpkgs/doc/using/configuration.xml index b670f78f28..3e21b0e228 100644 --- a/third_party/nixpkgs/doc/using/configuration.xml +++ b/third_party/nixpkgs/doc/using/configuration.xml @@ -66,7 +66,7 @@ For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_BROKEN=1 +$ export NIXPKGS_ALLOW_BROKEN=1 @@ -92,7 +92,7 @@ For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 +$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 @@ -122,7 +122,7 @@ To temporarily allow all unfree packages, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_UNFREE=1 +$ export NIXPKGS_ALLOW_UNFREE=1 @@ -187,7 +187,7 @@ To temporarily allow all insecure packages, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_INSECURE=1 +$ export NIXPKGS_ALLOW_INSECURE=1 diff --git a/third_party/nixpkgs/doc/using/overlays.xml b/third_party/nixpkgs/doc/using/overlays.xml index 7f6ee040c7..4937e95088 100644 --- a/third_party/nixpkgs/doc/using/overlays.xml +++ b/third_party/nixpkgs/doc/using/overlays.xml @@ -187,14 +187,28 @@ self: super: AMD - BLIS/LIBFLAME (optimized for modern AMD x86_64 CPUs) + xlink:href="https://github.com/flame/blis">BLIS - The AMD BLIS library, with attribute amd-blis, - provides a BLAS implementation. The complementary AMD LIBFLAME - library, with attribute amd-libflame, provides - a LAPACK implementation. + BLIS, available through the attribute + blis, is a framework for linear algebra kernels. In + addition, it implements the BLAS interface. + + + + + AMD + BLIS/LIBFLAME (optimized for modern AMD x86_64 CPUs) + + + The AMD fork of the BLIS library, with attribute + amd-blis, extends BLIS with optimizations for + modern AMD CPUs. The changes are usually submitted to + the upstream BLIS project after some time. However, AMD BLIS + typically provides some performance improvements on AMD Zen CPUs. + The complementary AMD LIBFLAME library, with attribute + amd-libflame, provides a LAPACK implementation. @@ -226,7 +240,7 @@ self: super: lapackProvider = self.mkl; } } - + This overlay uses Intel’s MKL library for both BLAS and LAPACK interfaces. Note that the same can be accomplished at runtime @@ -234,9 +248,9 @@ self: super: libblas.so.3 and liblapack.so.3. For instance: - -$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave - + +$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave + Intel MKL requires an openmp implementation when running with multiple processors. By default, @@ -274,7 +288,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation { ... } - +
diff --git a/third_party/nixpkgs/flake.nix b/third_party/nixpkgs/flake.nix index e7c04417ac..8440c460b1 100644 --- a/third_party/nixpkgs/flake.nix +++ b/third_party/nixpkgs/flake.nix @@ -5,7 +5,6 @@ outputs = { self }: let - jobs = import ./pkgs/top-level/release.nix { nixpkgs = self; }; @@ -28,10 +27,31 @@ lib = lib.extend (final: prev: { nixosSystem = { modules, ... } @ args: import ./nixos/lib/eval-config.nix (args // { - modules = modules ++ - [ { system.nixos.versionSuffix = + modules = + let + vmConfig = (import ./nixos/lib/eval-config.nix + (args // { + modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ]; + })).config; + + vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix + (args // { + modules = modules ++ [ + ./nixos/modules/virtualisation/qemu-vm.nix + { virtualisation.useBootLoader = true; } + ]; + })).config; + in + modules ++ [ + { + system.nixos.versionSuffix = ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; system.nixos.revision = final.mkIf (self ? rev) self.rev; + + system.build = { + vm = vmConfig.system.build.vm; + vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; + }; } ]; }); diff --git a/third_party/nixpkgs/lib/generators.nix b/third_party/nixpkgs/lib/generators.nix index abd237eb7d..501a23599f 100644 --- a/third_party/nixpkgs/lib/generators.nix +++ b/third_party/nixpkgs/lib/generators.nix @@ -203,40 +203,59 @@ rec { /* If this option is true, attrsets like { __pretty = fn; val = …; } will use fn to convert val to a pretty printed representation. (This means fn is type Val -> String.) */ - allowPrettyValues ? false - }@args: v: with builtins; + allowPrettyValues ? false, + /* If this option is true, the output is indented with newlines for attribute sets and lists */ + multiline ? true + }@args: let + go = indent: v: with builtins; let isPath = v: typeOf v == "path"; + introSpace = if multiline then "\n${indent} " else " "; + outroSpace = if multiline then "\n${indent}" else " "; in if isInt v then toString v else if isFloat v then "~${toString v}" - else if isString v then ''"${libStr.escape [''"''] v}"'' + else if isString v then + let + # Separate a string into its lines + newlineSplits = filter (v: ! isList v) (builtins.split "\n" v); + # For a '' string terminated by a \n, which happens when the closing '' is on a new line + multilineResult = "''" + introSpace + concatStringsSep introSpace (lib.init newlineSplits) + outroSpace + "''"; + # For a '' string not terminated by a \n, which happens when the closing '' is not on a new line + multilineResult' = "''" + introSpace + concatStringsSep introSpace newlineSplits + "''"; + # For single lines, replace all newlines with their escaped representation + singlelineResult = "\"" + libStr.escape [ "\"" ] (concatStringsSep "\\n" newlineSplits) + "\""; + in if multiline && length newlineSplits > 1 then + if lib.last newlineSplits == "" then multilineResult else multilineResult' + else singlelineResult else if true == v then "true" else if false == v then "false" else if null == v then "null" else if isPath v then toString v - else if isList v then "[ " - + libStr.concatMapStringsSep " " (toPretty args) v - + " ]" + else if isList v then + if v == [] then "[ ]" + else "[" + introSpace + + libStr.concatMapStringsSep introSpace (go (indent + " ")) v + + outroSpace + "]" + else if isFunction v then + let fna = lib.functionArgs v; + showFnas = concatStringsSep ", " (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then name + "?" else name) + fna); + in if fna == {} then "" + else "" else if isAttrs v then # apply pretty values if allowed if attrNames v == [ "__pretty" "val" ] && allowPrettyValues then v.__pretty v.val - # TODO: there is probably a better representation? + else if v == {} then "{ }" else if v ? type && v.type == "derivation" then - "<δ:${v.name}>" - # "<δ:${concatStringsSep "," (builtins.attrNames v)}>" - else "{ " - + libStr.concatStringsSep " " (libAttr.mapAttrsToList + "" + else "{" + introSpace + + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList (name: value: - "${toPretty args name} = ${toPretty args value};") v) - + " }" - else if isFunction v then - let fna = lib.functionArgs v; - showFnas = concatStringsSep "," (libAttr.mapAttrsToList - (name: hasDefVal: if hasDefVal then "(${name})" else name) - fna); - in if fna == {} then "<λ>" - else "<λ:{${showFnas}}>" + "${libStr.escapeNixIdentifier name} = ${go (indent + " ") value};") v) + + outroSpace + "}" else abort "generators.toPretty: should never happen (v = ${v})"; + in go ""; # PLIST handling toPlist = {}: v: let diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index 5cdb43ded6..a704a6884c 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -436,17 +436,18 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { }; # Proprietary binaries; free to redistribute without modification. + databricks = { + fullName = "Databricks Proprietary License"; + url = "https://pypi.org/project/databricks-connect"; + free = false; + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; free = false; }; - jasper = spdx { - spdxId = "JasPer-2.0"; - fullName = "JasPer License"; - }; - lgpl2Only = spdx { spdxId = "LGPL-2.0-only"; fullName = "GNU Library General Public License v2 only"; @@ -643,6 +644,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd"; }; + prosperity30 = { + fullName = "Prosperity-3.0.0"; + free = false; + url = "https://prosperitylicense.com/versions/3.0.0.html"; + }; + qhull = spdx { spdxId = "Qhull"; fullName = "Qhull License"; diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index 2ec3469980..02a669df65 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -117,7 +117,7 @@ rec { if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then let firstDef = head merged.unmatchedDefns; - baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist."; + baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}"; in if attrNames options == [ "_module" ] then throw '' @@ -449,7 +449,13 @@ rec { # Handle properties, check types, and merge everything together. res = if opt.readOnly or false && length defs' > 1 then - throw "The option `${showOption loc}' is read-only, but it's set multiple times." + let + # For a better error message, evaluate all readOnly definitions as + # if they were the only definition. + separateDefs = map (def: def // { + value = (mergeDefinitions loc opt.type [ def ]).mergedValue; + }) defs'; + in throw "The option `${showOption loc}' is read-only, but it's set multiple times. Definition values:${showDefs separateDefs}" else mergeDefinitions loc opt.type defs'; @@ -457,7 +463,11 @@ rec { # yield a value computed from the definitions value = if opt ? apply then opt.apply res.mergedValue else res.mergedValue; - in opt // + warnDeprecation = + if opt.type.deprecationMessage == null then id + else warn "The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}"; + + in warnDeprecation opt // { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; inherit (res.defsFinal') highestPrio; definitions = map (def: def.value) res.defsFinal; @@ -493,8 +503,8 @@ rec { mergedValue = if isDefined then if all (def: type.check def.value) defsFinal then type.merge loc defsFinal - else let firstInvalid = findFirst (def: ! type.check def.value) null defsFinal; - in throw "The option value `${showOption loc}' in `${firstInvalid.file}' is not of type `${type.description}'." + else let allInvalid = filter (def: ! type.check def.value) defsFinal; + in throw "A definition for option `${showOption loc}' is not of type `${type.description}'. Definition values:${showDefs allInvalid}" else # (nixos-option detects this specific error message and gives it special # handling. If changed here, please change it there too.) @@ -613,7 +623,6 @@ rec { if tp.name == "option set" || tp.name == "submodule" then throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) - else if optionSetIn "loaOf" then types.loaOf (types.submodule options) else if optionSetIn "listOf" then types.listOf (types.submodule options) else if optionSetIn "nullOr" then types.nullOr (types.submodule options) else tp; diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index 38f4f1329f..5b7482c809 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -96,22 +96,26 @@ rec { else if all isBool list then foldl' lib.or false list else if all isString list then lib.concatStrings list else if all isInt list && all (x: x == head list) list then head list - else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}."; + else throw "Cannot merge definitions of `${showOption loc}'. Definition values:${showDefs defs}"; mergeOneOption = loc: defs: if defs == [] then abort "This case should never happen." else if length defs != 1 then - throw "The unique option `${showOption loc}' is defined multiple times, in:\n - ${concatStringsSep "\n - " (getFiles defs)}." + throw "The unique option `${showOption loc}' is defined multiple times. Definition values:${showDefs defs}" else (head defs).value; /* "Merge" option definitions by checking that they all have the same value. */ mergeEqualOption = loc: defs: if defs == [] then abort "This case should never happen." - else foldl' (val: def: - if def.value != val then - throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." + # Return early if we only have one element + # This also makes it work for functions, because the foldl' below would try + # to compare the first element with itself, which is false for functions + else if length defs == 1 then (elemAt defs 0).value + else (foldl' (first: def: + if def.value != first.value then + throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}" else - val) (head defs).value defs; + first) (head defs) defs).value; /* Extracts values of all "value" keys of the given list. @@ -209,6 +213,24 @@ rec { else escaped; in (concatStringsSep ".") (map escapeOptionPart parts); showFiles = files: concatStringsSep " and " (map (f: "`${f}'") files); + + showDefs = defs: concatMapStrings (def: + let + # Pretty print the value for display, if successful + prettyEval = builtins.tryEval (lib.generators.toPretty {} def.value); + # Split it into its lines + lines = filter (v: ! isList v) (builtins.split "\n" prettyEval.value); + # Only display the first 5 lines, and indent them for better visibility + value = concatStringsSep "\n " (take 5 lines ++ optional (length lines > 5) "..."); + result = + # Don't print any value if evaluating the value strictly fails + if ! prettyEval.success then "" + # Put it on a new line if it consists of multiple + else if length lines > 1 then ":\n " + value + else ": " + value; + in "\n- In `${def.file}'${result}" + ) defs; + unknownModule = ""; } diff --git a/third_party/nixpkgs/lib/strings.nix b/third_party/nixpkgs/lib/strings.nix index 0baa942355..9fa9f02356 100644 --- a/third_party/nixpkgs/lib/strings.nix +++ b/third_party/nixpkgs/lib/strings.nix @@ -689,14 +689,15 @@ rec { "/prefix/nix-profiles-library-paths.patch" "/prefix/compose-search-path.patch" ] */ - readPathsFromFile = rootPath: file: - let - lines = lib.splitString "\n" (builtins.readFile file); - removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); - relativePaths = removeComments lines; - absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; - in - absolutePaths; + readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead" + (rootPath: file: + let + lines = lib.splitString "\n" (builtins.readFile file); + removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); + relativePaths = removeComments lines; + absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; + in + absolutePaths); /* Read the contents of a file removing the trailing \n diff --git a/third_party/nixpkgs/lib/systems/architectures.nix b/third_party/nixpkgs/lib/systems/architectures.nix new file mode 100644 index 0000000000..bfecaec1ae --- /dev/null +++ b/third_party/nixpkgs/lib/systems/architectures.nix @@ -0,0 +1,77 @@ +{ lib }: + +rec { + # platform.gcc.arch to its features (as in /proc/cpuinfo) + features = { + default = [ ]; + # x86_64 Intel + westmere = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" ]; + sandybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; + ivybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; + haswell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; + broadwell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; + skylake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; + skylake-avx512 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; + # x86_64 AMD + btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ]; + btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; + bdver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ]; + bdver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ]; + bdver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ]; + bdver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" "fma4" ]; + znver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; + znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; + # other + armv5te = [ ]; + armv6 = [ ]; + armv7-a = [ ]; + armv8-a = [ ]; + mips32 = [ ]; + loongson2f = [ ]; + }; + + # a superior CPU has all the features of an inferior and is able to build and test code for it + inferiors = { + # x86_64 Intel + default = [ ]; + westmere = [ ]; + sandybridge = [ "westmere" ] ++ inferiors.westmere; + ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge; + haswell = [ "ivybridge" ] ++ inferiors.ivybridge; + broadwell = [ "haswell" ] ++ inferiors.haswell; + skylake = [ "broadwell" ] ++ inferiors.broadwell; + skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; + # x86_64 AMD + btver1 = [ ]; + btver2 = [ ]; # TODO: fill this (need testing) + bdver1 = [ ]; # TODO: fill this (need testing) + bdver2 = [ ]; # TODO: fill this (need testing) + bdver3 = [ ]; # TODO: fill this (need testing) + bdver4 = [ ]; # TODO: fill this (need testing) + znver1 = [ ]; # TODO: fill this (need testing) + znver2 = [ ]; # TODO: fill this (need testing) + # other + armv5te = [ ]; + armv6 = [ ]; + armv7-a = [ ]; + armv8-a = [ ]; + mips32 = [ ]; + loongson2f = [ ]; + }; + + predicates = let + featureSupport = feature: x: builtins.elem feature features.${x} or []; + in { + sse3Support = featureSupport "sse3"; + ssse3Support = featureSupport "ssse3"; + sse4_1Support = featureSupport "sse4_1"; + sse4_2Support = featureSupport "sse4_2"; + sse4_aSupport = featureSupport "sse4a"; + avxSupport = featureSupport "avx"; + avx2Support = featureSupport "avx2"; + avx512Support = featureSupport "avx512"; + aesSupport = featureSupport "aes"; + fmaSupport = featureSupport "fma"; + fma4Support = featureSupport "fma4"; + }; +} diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix index c929781dd8..9939743157 100644 --- a/third_party/nixpkgs/lib/systems/default.nix +++ b/third_party/nixpkgs/lib/systems/default.nix @@ -7,6 +7,7 @@ rec { inspect = import ./inspect.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; }; examples = import ./examples.nix { inherit lib; }; + architectures = import ./architectures.nix { inherit lib; }; # Elaborate a `localSystem` or `crossSystem` so that it contains everything # necessary. @@ -76,6 +77,7 @@ rec { # uname -r release = null; }; + isStatic = final.isWasm || final.isRedox; kernelArch = if final.isAarch32 then "arm" @@ -125,6 +127,7 @@ rec { else throw "Don't know how to run ${final.config} executables."; } // mapAttrs (n: v: v final.parsed) inspect.predicates + // mapAttrs (n: v: v final.platform.gcc.arch or "default") architectures.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; assert lib.foldl diff --git a/third_party/nixpkgs/lib/systems/doubles.nix b/third_party/nixpkgs/lib/systems/doubles.nix index fb7d722e73..517a7296af 100644 --- a/third_party/nixpkgs/lib/systems/doubles.nix +++ b/third_party/nixpkgs/lib/systems/doubles.nix @@ -50,32 +50,35 @@ in { none = []; - arm = filterDoubles predicates.isAarch32; - aarch64 = filterDoubles predicates.isAarch64; - x86 = filterDoubles predicates.isx86; - i686 = filterDoubles predicates.isi686; - x86_64 = filterDoubles predicates.isx86_64; - mips = filterDoubles predicates.isMips; - riscv = filterDoubles predicates.isRiscV; - vc4 = filterDoubles predicates.isVc4; - js = filterDoubles predicates.isJavaScript; + arm = filterDoubles predicates.isAarch32; + aarch64 = filterDoubles predicates.isAarch64; + x86 = filterDoubles predicates.isx86; + i686 = filterDoubles predicates.isi686; + x86_64 = filterDoubles predicates.isx86_64; + mips = filterDoubles predicates.isMips; + riscv = filterDoubles predicates.isRiscV; + vc4 = filterDoubles predicates.isVc4; + js = filterDoubles predicates.isJavaScript; - cygwin = filterDoubles predicates.isCygwin; - darwin = filterDoubles predicates.isDarwin; - freebsd = filterDoubles predicates.isFreeBSD; + bigEndian = filterDoubles predicates.isBigEndian; + littleEndian = filterDoubles predicates.isLittleEndian; + + cygwin = filterDoubles predicates.isCygwin; + darwin = filterDoubles predicates.isDarwin; + freebsd = filterDoubles predicates.isFreeBSD; # Should be better, but MinGW is unclear. - gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); - illumos = filterDoubles predicates.isSunOS; - linux = filterDoubles predicates.isLinux; - netbsd = filterDoubles predicates.isNetBSD; - openbsd = filterDoubles predicates.isOpenBSD; - unix = filterDoubles predicates.isUnix; - wasi = filterDoubles predicates.isWasi; - redox = filterDoubles predicates.isRedox; - windows = filterDoubles predicates.isWindows; - genode = filterDoubles predicates.isGenode; + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); + illumos = filterDoubles predicates.isSunOS; + linux = filterDoubles predicates.isLinux; + netbsd = filterDoubles predicates.isNetBSD; + openbsd = filterDoubles predicates.isOpenBSD; + unix = filterDoubles predicates.isUnix; + wasi = filterDoubles predicates.isWasi; + redox = filterDoubles predicates.isRedox; + windows = filterDoubles predicates.isWindows; + genode = filterDoubles predicates.isGenode; - embedded = filterDoubles predicates.isNone; + embedded = filterDoubles predicates.isNone; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; } diff --git a/third_party/nixpkgs/lib/systems/examples.nix b/third_party/nixpkgs/lib/systems/examples.nix index ca562d2e45..5403f73405 100644 --- a/third_party/nixpkgs/lib/systems/examples.nix +++ b/third_party/nixpkgs/lib/systems/examples.nix @@ -46,16 +46,16 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; - sdkVer = "24"; - ndkVer = "18b"; + sdkVer = "29"; + ndkVer = "21"; platform = platforms.armv7a-android; useAndroidPrebuilt = true; }; aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; - sdkVer = "24"; - ndkVer = "18b"; + sdkVer = "29"; + ndkVer = "21"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix index b066f577f3..3a6db53c27 100644 --- a/third_party/nixpkgs/lib/tests/misc.nix +++ b/third_party/nixpkgs/lib/tests/misc.nix @@ -445,32 +445,90 @@ runTests { expected = builtins.toJSON val; }; - testToPretty = { - expr = mapAttrs (const (generators.toPretty {})) rec { + testToPretty = + let + deriv = derivation { name = "test"; builder = "/bin/sh"; system = builtins.currentSystem; }; + in { + expr = mapAttrs (const (generators.toPretty { multiline = false; })) rec { int = 42; float = 0.1337; bool = true; + emptystring = ""; string = ''fno"rd''; + newlinestring = "\n"; path = /. + "/foo"; null_ = null; function = x: x; functionArgs = { arg ? 4, foo }: arg; list = [ 3 4 function [ false ] ]; + emptylist = []; attrs = { foo = null; "foo bar" = "baz"; }; - drv = derivation { name = "test"; system = builtins.currentSystem; }; + emptyattrs = {}; + drv = deriv; }; expected = rec { int = "42"; float = "~0.133700"; bool = "true"; + emptystring = ''""''; string = ''"fno\"rd"''; + newlinestring = "\"\\n\""; path = "/foo"; null_ = "null"; - function = "<λ>"; - functionArgs = "<λ:{(arg),foo}>"; + function = ""; + functionArgs = ""; list = "[ 3 4 ${function} [ false ] ]"; - attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }"; - drv = "<δ:test>"; + emptylist = "[ ]"; + attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; + emptyattrs = "{ }"; + drv = ""; + }; + }; + + testToPrettyMultiline = { + expr = mapAttrs (const (generators.toPretty { })) rec { + list = [ 3 4 [ false ] ]; + attrs = { foo = null; bar.foo = "baz"; }; + newlinestring = "\n"; + multilinestring = '' + hello + there + test + ''; + multilinestring' = '' + hello + there + test''; + }; + expected = rec { + list = '' + [ + 3 + 4 + [ + false + ] + ]''; + attrs = '' + { + bar = { + foo = "baz"; + }; + foo = null; + }''; + newlinestring = "''\n \n''"; + multilinestring = '' + ''' + hello + there + test + '''''; + multilinestring' = '' + ''' + hello + there + test'''''; + }; }; @@ -542,4 +600,30 @@ runTests { name = ""; expected = "unknown"; }; + + testFreeformOptions = { + expr = + let + submodule = { lib, ... }: { + freeformType = lib.types.attrsOf (lib.types.submodule { + options.bar = lib.mkOption {}; + }); + options.bar = lib.mkOption {}; + }; + + module = { lib, ... }: { + options.foo = lib.mkOption { + type = lib.types.submodule submodule; + }; + }; + + options = (evalModules { + modules = [ module ]; + }).options; + + locs = filter (o: ! o.internal) (optionAttrSetToDocList options); + in map (o: o.loc) locs; + expected = [ [ "foo" ] [ "foo" "" "bar" ] [ "foo" "bar" ] ]; + }; + } diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh index 943deebe3c..309c531136 100755 --- a/third_party/nixpkgs/lib/tests/modules.sh +++ b/third_party/nixpkgs/lib/tests/modules.sh @@ -49,7 +49,7 @@ checkConfigError() { reportFailure "$@" return 1 else - if echo "$err" | grep --silent "$errorContains" ; then + if echo "$err" | grep -zP --silent "$errorContains" ; then pass=$((pass + 1)) return 0; else @@ -62,17 +62,17 @@ checkConfigError() { # Check boolean option. checkConfigOutput "false" config.enable ./declare-enable.nix -checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix +checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./define-enable.nix # Check integer types. # unsigned checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix -checkConfigError 'The option value .* in .* is not of type.*unsigned integer.*' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix +checkConfigError 'A definition for option .* is not of type.*unsigned integer.*. Definition values:\n- In .*: -23' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix # positive -checkConfigError 'The option value .* in .* is not of type.*positive integer.*' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix +checkConfigError 'A definition for option .* is not of type.*positive integer.*. Definition values:\n- In .*: 0' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix # between checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix -checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix +checkConfigError 'A definition for option .* is not of type.*between.*-21 and 43.*inclusive.*. Definition values:\n- In .*: -23' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix # Check either types # types.either @@ -125,7 +125,7 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-foo-enable set -- config.enable ./define-enable.nix ./declare-enable.nix checkConfigOutput "true" "$@" checkConfigOutput "false" "$@" ./disable-define-enable.nix -checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix +checkConfigError "The option .*enable.* does not exist. Definition values:\n- In .*: true" "$@" ./disable-declare-enable.nix checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix @@ -142,17 +142,17 @@ checkConfigError 'infinite recursion encountered' "$@" # Check _module.check. set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-attrsOfSub-foo.nix -checkConfigError 'The option .* defined in .* does not exist.' "$@" +checkConfigError 'The option .* does not exist. Definition values:\n- In .*' "$@" checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix # Check coerced value with unsound coercion checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix -checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix +checkConfigError 'A definition for option .* is not of type .*. Definition values:\n- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix # Check mkAliasOptionModule. @@ -183,7 +183,7 @@ checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.ni checkConfigOutput "true" config.enable ./disable-recursive/main.nix checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-foo.nix} checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-bar.nix} -checkConfigError 'The option .* defined in .* does not exist' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix} +checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix} # Check that imports can depend on derivations checkConfigOutput "true" config.enable ./import-from-store.nix @@ -207,7 +207,7 @@ checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-c # Even with multiple assignments, a type error should be thrown if any of them aren't valid -checkConfigError 'The option value .* in .* is not of type .*' \ +checkConfigError 'A definition for option .* is not of type .*' \ config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix ## Freeform modules @@ -216,7 +216,7 @@ checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.n # No freeform assigments shouldn't make it error checkConfigOutput '{ }' config ./freeform-attrsOf.nix # but only if the type matches -checkConfigError 'The option value .* in .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix +checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix # and properties should be applied checkConfigOutput yes config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix # Options should still be declarable, and be able to have a type that doesn't match the freeform type @@ -233,6 +233,35 @@ checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf. checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix checkConfigOutput 24 config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix +## types.anything +# Check that attribute sets are merged recursively +checkConfigOutput null config.value.foo ./types-anything/nested-attrs.nix +checkConfigOutput null config.value.l1.foo ./types-anything/nested-attrs.nix +checkConfigOutput null config.value.l1.l2.foo ./types-anything/nested-attrs.nix +checkConfigOutput null config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix +# Attribute sets that are coercible to strings shouldn't be recursed into +checkConfigOutput foo config.value.outPath ./types-anything/attrs-coercible.nix +# Multiple lists aren't concatenated together +checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix +# Check that all equalizable atoms can be used as long as all definitions are equal +checkConfigOutput 0 config.value.int ./types-anything/equal-atoms.nix +checkConfigOutput false config.value.bool ./types-anything/equal-atoms.nix +checkConfigOutput '""' config.value.string ./types-anything/equal-atoms.nix +checkConfigOutput / config.value.path ./types-anything/equal-atoms.nix +checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix +checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix +# Functions can't be merged together +checkConfigError "The option .* has conflicting definition values" config.value.multiple-lambdas ./types-anything/functions.nix +checkConfigOutput '' config.value.single-lambda ./types-anything/functions.nix +# Check that all mk* modifiers are applied +checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix +checkConfigOutput '{ }' config.value.mkiftrue ./types-anything/mk-mods.nix +checkConfigOutput 1 config.value.mkdefault ./types-anything/mk-mods.nix +checkConfigOutput '{ }' config.value.mkmerge ./types-anything/mk-mods.nix +checkConfigOutput true config.value.mkbefore ./types-anything/mk-mods.nix +checkConfigOutput 1 config.value.nested.foo ./types-anything/mk-mods.nix +checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix + cat < 1 + then throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." + else (listOf anything).merge; + # This is the type of packages, only accept a single definition + stringCoercibleSet = mergeOneOption; + # Otherwise fall back to only allowing all equal definitions + }.${commonType} or mergeEqualOption; + in mergeFunction loc defs; + }; + unspecified = mkOptionType { name = "unspecified"; }; @@ -222,8 +261,10 @@ rec { # Deprecated; should not be used because it quietly concatenates # strings, which is usually not what you want. - string = warn "types.string is deprecated because it quietly concatenates strings" - (separatedString ""); + string = separatedString "" // { + name = "string"; + deprecationMessage = "See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types."; + }; attrs = mkOptionType { name = "attrs"; @@ -252,25 +293,20 @@ rec { merge = mergeEqualOption; }; - # drop this in the future: - list = builtins.trace "`types.list` is deprecated; use `types.listOf` instead" types.listOf; - listOf = elemType: mkOptionType rec { name = "listOf"; description = "list of ${elemType.description}s"; check = isList; merge = loc: defs: map (x: x.value) (filter (x: x ? value) (concatLists (imap1 (n: def: - if isList def.value then - imap1 (m: def': - (mergeDefinitions - (loc ++ ["[definition ${toString n}-entry ${toString m}]"]) - elemType - [{ inherit (def) file; value = def'; }] - ).optionalValue - ) def.value - else - throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs))); + imap1 (m: def': + (mergeDefinitions + (loc ++ ["[definition ${toString n}-entry ${toString m}]"]) + elemType + [{ inherit (def) file; value = def'; }] + ).optionalValue + ) def.value + ) defs))); emptyValue = { value = {}; }; getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; @@ -326,110 +362,13 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; - # List or attribute set of ... - loaOf = elemType: - let - convertAllLists = loc: defs: - let - padWidth = stringLength (toString (length defs)); - unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + "."; - in - imap1 (i: convertIfList loc (unnamedPrefix i)) defs; - convertIfList = loc: unnamedPrefix: def: - if isList def.value then - let - padWidth = stringLength (toString (length def.value)); - unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i; - anyString = placeholder "name"; - nameAttrs = [ - { path = [ "environment" "etc" ]; - name = "target"; - } - { path = [ "containers" anyString "bindMounts" ]; - name = "mountPoint"; - } - { path = [ "programs" "ssh" "knownHosts" ]; - # hostNames is actually a list so we would need to handle it only when singleton - name = "hostNames"; - } - { path = [ "fileSystems" ]; - name = "mountPoint"; - } - { path = [ "boot" "specialFileSystems" ]; - name = "mountPoint"; - } - { path = [ "services" "znapzend" "zetup" ]; - name = "dataset"; - } - { path = [ "services" "znapzend" "zetup" anyString "destinations" ]; - name = "label"; - } - { path = [ "services" "geoclue2" "appConfig" ]; - name = "desktopID"; - } - ]; - matched = let - equals = a: b: b == anyString || a == b; - fallback = { name = "name"; }; - in findFirst ({ path, ... }: all (v: v == true) (zipListsWith equals loc path)) fallback nameAttrs; - nameAttr = matched.name; - nameValueOld = value: - if isList value then - if length value > 0 then - "[ " + concatMapStringsSep " " escapeNixString value + " ]" - else - "[ ]" - else - escapeNixString value; - nameValueNew = value: unnamed: - if isList value then - if length value > 0 then - head value - else - unnamed - else - value; - res = - { inherit (def) file; - value = listToAttrs ( - imap1 (elemIdx: elem: - { name = nameValueNew (elem.${nameAttr} or (unnamed elemIdx)) (unnamed elemIdx); - value = elem; - }) def.value); - }; - option = concatStringsSep "." loc; - sample = take 3 def.value; - more = lib.optionalString (length def.value > 3) "... "; - list = concatMapStrings (x: ''{ ${nameAttr} = ${nameValueOld (x.${nameAttr} or "unnamed")}; ...} '') sample; - set = concatMapStrings (x: ''${nameValueNew (x.${nameAttr} or "unnamed") "unnamed"} = {...}; '') sample; - msg = '' - In file ${def.file} - a list is being assigned to the option config.${option}. - This will soon be an error as type loaOf is deprecated. - See https://github.com/NixOS/nixpkgs/pull/63103 for more information. - Do - ${option} = - { ${set}${more}} - instead of - ${option} = - [ ${list}${more}] - ''; - in - lib.warn msg res - else - def; - attrOnly = attrsOf elemType; - in mkOptionType rec { - name = "loaOf"; - description = "list or attribute set of ${elemType.description}s"; - check = x: isList x || isAttrs x; - merge = loc: defs: attrOnly.merge loc (convertAllLists loc defs); - emptyValue = { value = {}; }; - getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); - getSubModules = elemType.getSubModules; - substSubModules = m: loaOf (elemType.substSubModules m); - functor = (defaultFunctor name) // { wrapped = elemType; }; - }; + # TODO: drop this in the future: + loaOf = elemType: types.attrsOf elemType // { + name = "loaOf"; + deprecationMessage = "Mixing lists with attribute values is no longer" + + " possible; please use `types.attrsOf` instead. See" + + " https://github.com/NixOS/nixpkgs/issues/1800 for the motivation."; + }; # Value of given type but with no merging (i.e. `uniq list`s are not concatenated). uniq = elemType: mkOptionType rec { @@ -522,7 +461,12 @@ rec { # would be used, and use of `<` and `>` would break the XML document. # It shouldn't cause an issue since this is cosmetic for the manual. args.name = "‹name›"; - }).options; + }).options // optionalAttrs (freeformType != null) { + # Expose the sub options of the freeform type. Note that the option + # discovery doesn't care about the attribute name used here, so this + # is just to avoid conflicts with potential options from the submodule + _freeformOptions = freeformType.getSubOptions prefix; + }; getSubModules = modules; substSubModules = m: submoduleWith (attrs // { modules = m; @@ -624,8 +568,9 @@ rec { # declarations from the ‘options’ attribute of containing option # declaration. optionSet = mkOptionType { - name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "optionSet"; + name = "optionSet"; description = "option set"; + deprecationMessage = "Use `types.submodule' instead"; }; # Augment the given type with an additional type check function. addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; }; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 0acf720c4e..7928b6d2ab 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -254,6 +254,12 @@ githubId = 732652; name = "Andreas Herrmann"; }; + ahrzb = { + email = "ahrzb5@gmail.com"; + github = "ahrzb"; + githubId = 5220438; + name = "AmirHossein Roozbahani"; + }; ahuzik = { email = "ales.guzik@gmail.com"; github = "alesguzik"; @@ -466,6 +472,12 @@ githubId = 858965; name = "Andrew Morsillo"; }; + andehen = { + email = "git@andehen.net"; + github = "andehen"; + githubId = 754494; + name = "Anders Asheim Hennum"; + }; andersk = { email = "andersk@mit.edu"; github = "andersk"; @@ -874,9 +886,9 @@ githubId = 1017537; name = "Bruno Bieth"; }; - badi = { - email = "abdulwahidc@gmail.com"; - github = "badi"; + badmutex = { + email = "github@badi.sh"; + github = "badmutex"; githubId = 35324; name = "Badi' Abdul-Wahid"; }; @@ -1188,6 +1200,12 @@ githubId = 5525646; name = "Brice Waegeneire"; }; + bsima = { + email = "ben@bsima.me"; + github = "bsima"; + githubId = 200617; + name = "Ben Sima"; + }; bstrik = { email = "dutchman55@gmx.com"; github = "bstrik"; @@ -1206,6 +1224,12 @@ githubId = 3043718; name = "Brett Lyons"; }; + bryanasdev000 = { + email = "bryanasdev000@gmail.com"; + github = "bryanasdev000"; + githubId = 53131727; + name = "Bryan Albuquerque"; + }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; @@ -1421,6 +1445,12 @@ githubId = 89596; name = "Florian Friesdorf"; }; + charvp = { + email = "nixpkgs@cvpetegem.be"; + github = "charvp"; + githubId = 42220376; + name = "Charlotte Van Petegem"; + }; chattered = { email = "me@philscotted.com"; name = "Phil Scott"; @@ -1623,6 +1653,12 @@ githubId = 5561189; name = "Cody Opel"; }; + cohei = { + email = "a.d.xvii.kal.mai@gmail.com"; + github = "cohei"; + githubId = 3477497; + name = "TANIGUCHI Kohei"; + }; cohencyril = { email = "cyril.cohen@inria.fr"; github = "CohenCyril"; @@ -1861,6 +1897,12 @@ githubId = 1918; name = "David Anderson"; }; + dandellion = { + email = "daniel@dodsorf.as"; + github = "dali99"; + githubId = 990767; + name = "Daniel Olsen"; + }; danharaj = { email = "dan@obsidian.systems"; github = "danharaj"; @@ -2203,6 +2245,12 @@ fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; }]; }; + dpercy = { + email = "dpercy@dpercy.dev"; + github = "dpercy"; + githubId = 349909; + name = "David Percy"; + }; dpflug = { email = "david@pflug.email"; github = "dpflug"; @@ -2705,6 +2753,12 @@ githubId = 857308; name = "Joe Hermaszewski"; }; + extends = { + email = "sharosari@gmail.com"; + github = "ImExtends"; + githubId = 55919390; + name = "Vincent VILLIAUMEY"; + }; eyjhb = { email = "eyjhbb@gmail.com"; github = "eyJhb"; @@ -2763,6 +2817,16 @@ githubId = 541748; name = "Felipe Espinoza"; }; + felschr = { + email = "dev@felschr.com"; + github = "felschr"; + githubId = 3314323; + name = "Felix Tenley"; + keys = [{ + longkeyid = "ed25519/0x910ACB9F6BD26F58"; + fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58"; + }]; + }; ffinkdevs = { email = "fink@h0st.space"; github = "ffinkdevs"; @@ -2861,6 +2925,12 @@ githubId = 5918766; name = "Franz Thoma"; }; + fooker = { + email = "fooker@lab.sh"; + github = "fooker"; + githubId = 405105; + name = "Dustin Frisch"; + }; forkk = { email = "forkk@forkk.net"; github = "forkk"; @@ -3079,6 +3149,12 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + ghuntley = { + email = "ghuntley@ghuntley.com"; + github = "ghuntley"; + githubId = 127353; + name = "Geoffrey Huntley"; + }; gila = { email = "jeffry.molanus@gmail.com"; github = "gila"; @@ -3343,6 +3419,12 @@ githubId = 131599; name = "Martin Weinelt"; }; + hh = { + email = "hh@m-labs.hk"; + github = "HarryMakes"; + githubId = 66358631; + name = "Harry Ho"; + }; hhm = { email = "heehooman+nixpkgs@gmail.com"; github = "hhm0"; @@ -3370,10 +3452,14 @@ name = "Hlodver Sigurdsson"; }; hugoreeves = { - email = "hugolreeves@gmail.com"; + email = "hugo@hugoreeves.com"; github = "hugoreeves"; githubId = 20039091; name = "Hugo Reeves"; + keys = [{ + longkeyid = "rsa4096/0x49FA39F8A7F735F9"; + fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; + }]; }; hodapp = { email = "hodapp87@gmail.com"; @@ -3501,6 +3587,12 @@ githubId = 993484; name = "Greg Hale"; }; + immae = { + email = "ismael@bouya.org"; + github = "immae"; + githubId = 510202; + name = "Ismaël Bouya"; + }; imuli = { email = "i@imu.li"; github = "imuli"; @@ -3599,6 +3691,12 @@ githubId = 26877687; name = "Yurii Izorkin"; }; + j0hax = { + name = "Johannes Arnold"; + email = "johannes.arnold@stud.uni-hannover.de"; + github = "j0hax"; + githubId = 3802620; + }; jacg = { name = "Jacek Generowicz"; email = "jacg@my-post-office.net"; @@ -3647,6 +3745,12 @@ githubId = 5283991; name = "Jake Waksbaum"; }; + jamiemagee = { + email = "jamie.magee@gmail.com"; + github = "JamieMagee"; + githubId = 1358764; + name = "Jamie Magee"; + }; jammerful = { email = "jammerful@gmail.com"; github = "jammerful"; @@ -3715,6 +3819,12 @@ }]; name = "Jiri Daněk"; }; + jdbaldry = { + email = "jack.baldry@grafana.com"; + github = "jdbaldry"; + githubId = 4599384; + name = "Jack Baldry"; + }; jdehaas = { email = "qqlq@nullptr.club"; github = "jeroendehaas"; @@ -3835,6 +3945,12 @@ githubId = 51518420; name = "jitwit"; }; + jjjollyjim = { + email = "jamie@kwiius.com"; + github = "JJJollyjim"; + githubId = 691552; + name = "Jamie McClymont"; + }; jk = { email = "hello+nixpkgs@j-k.io"; github = "06kellyjac"; @@ -4010,12 +4126,6 @@ githubId = 1843676; name = "Jonathan Reeve"; }; - joncojonathan = { - email = "joncojonathan@gmail.com"; - github = "joncojonathan"; - githubId = 11414454; - name = "Jonathan Haddock"; - }; jonringer = { email = "jonringer117@gmail.com"; github = "jonringer"; @@ -4052,6 +4162,12 @@ githubId = 1918771; name = "Joe Doyle"; }; + jperras = { + email = "joel@nerderati.com"; + github = "jperras"; + githubId = 20675; + name = "Joël Perras"; + }; jpierre03 = { email = "nix@prunetwork.fr"; github = "jpierre03"; @@ -4264,6 +4380,12 @@ githubId = 494012; name = "Kevin Cox"; }; + kfollesdal = { + email = "kfollesdal@gmail.com"; + github = "kfollesdal"; + githubId = 546087; + name = "Kristoffer K. Føllesdal"; + }; khumba = { email = "bog@khumba.net"; github = "khumba"; @@ -4836,6 +4958,12 @@ githubId = 1202012; name = "Ignat Loskutov"; }; + lostnet = { + email = "lost.networking@gmail.com"; + github = "lostnet"; + githubId = 1422781; + name = "Will Young"; + }; louisdk1 = { email = "louis@louis.dk"; github = "louisdk1"; @@ -5206,6 +5334,12 @@ githubId = 35892750; name = "Maxine Aubrey"; }; + maxxk = { + email = "maxim.krivchikov@gmail.com"; + github = "maxxk"; + githubId = 1191859; + name = "Maxim Krivchikov"; + }; mbakke = { email = "mbakke@fastmail.com"; github = "mbakke"; @@ -5436,10 +5570,14 @@ name = "Michael Mercier"; }; midchildan = { - email = "midchildan+nix@gmail.com"; + email = "git@midchildan.org"; github = "midchildan"; githubId = 7343721; name = "midchildan"; + keys = [{ + longkeyid = "rsa4096/0x186A1EDAC5C63F83"; + fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; + }]; }; mikefaille = { email = "michael@faille.io"; @@ -5571,6 +5709,12 @@ githubId = 622577; name = "Michael Lieberman"; }; + mlvzk = { + name = "mlvzk"; + email = "mlvzk@users.noreply.github.com"; + github = "mlvzk"; + githubId = 44906333; + }; mmahut = { email = "marek.mahut@gmail.com"; github = "mmahut"; @@ -5583,6 +5727,12 @@ githubId = 117842; name = "Henri Bourcereau"; }; + mmesch = { + email = "mmesch@noreply.github.com"; + github = "mmesch"; + githubId = 2597803; + name = "Matthias Meschede"; + }; mmilata = { email = "martin@martinmilata.cz"; github = "mmilata"; @@ -5799,6 +5949,12 @@ githubId = 2176611; name = "Marko Poikonen"; }; + mtreca = { + email = "maxime@treca.dev"; + name = "Maxime Tréca"; + github = "mtreca"; + githubId = 16440823; + }; mtreskin = { email = "zerthurd@gmail.com"; github = "Zert"; @@ -5957,6 +6113,16 @@ githubId = 8214542; name = "Nicolò Balzarotti"; }; + NieDzejkob = { + email = "kuba@kadziolka.net"; + github = "NieDzejkob"; + githubId = 23580910; + name = "Jakub Kądziołka"; + keys = [{ + longkeyid = "rsa4096/0xE315A75846131564"; + fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; + }]; + }; NikolaMandic = { email = "nikola@mandic.email"; github = "NikolaMandic"; @@ -6011,6 +6177,12 @@ githubId = 6930756; name = "Nicolas Mattia"; }; + nobbz = { + name = "Norbert Melzer"; + email = "timmelzer+nixpkgs@gmail.com"; + github = "NobbZ"; + githubId = 58951; + }; nocent = { email = "nocent@protonmail.ch"; github = "nocent"; @@ -6359,6 +6531,12 @@ githubId = 157610; name = "Piotr Bogdan"; }; + pblkt = { + email = "pebblekite@gmail.com"; + github = "pblkt"; + githubId = 6498458; + name = "pebble kite"; + }; pcarrier = { email = "pc@rrier.ca"; github = "pcarrier"; @@ -6707,6 +6885,12 @@ githubId = 37715; name = "Brian McKenna"; }; + purcell = { + email = "steve@sanityinc.com"; + github = "purcell"; + githubId = 5636; + name = "Steve Purcell"; + }; puzzlewolf = { email = "nixos@nora.pink"; github = "puzzlewolf"; @@ -6743,6 +6927,12 @@ githubId = 115877; name = "Kenny Shen"; }; + quentini = { + email = "quentini@airmail.cc"; + github = "QuentinI"; + githubId = 18196237; + name = "Quentin Inkling"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; @@ -7105,6 +7295,16 @@ githubId = 3621083; name = "Roosembert (Roosemberth) Palacios"; }; + rople380 = { + name = "rople380"; + email = "55679162+rople380@users.noreply.github.com"; + github = "rople380"; + githubId = 55679162; + keys = [{ + longkeyid = "rsa2048/0x8526B7574A536236"; + fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; + }]; + }; royneary = { email = "christian@ulrich.earth"; github = "royneary"; @@ -7291,6 +7491,12 @@ githubId = 1153271; name = "Sander van der Burg"; }; + sarcasticadmin = { + email = "rob@sarcasticadmin.com"; + github = "sarcasticadmin"; + githubId = 30531572; + name = "Robert James Hernandez"; + }; sargon = { email = "danielehlers@mindeye.net"; github = "sargon"; @@ -7737,6 +7943,12 @@ githubId = 3371635; name = "Salar Rahmanian"; }; + sohalt = { + email = "nixos@sohalt.net"; + github = "sohalt"; + githubId = 2157287; + name = "sohalt"; + }; solson = { email = "scott@solson.me"; github = "solson"; @@ -7849,6 +8061,12 @@ githubId = 231788; name = "Stephen Weinberg"; }; + stephenwithph = { + name = "StephenWithPH"; + email = "StephenWithPH@users.noreply.github.com"; + github = "StephenWithPH"; + githubId = 2990492; + }; sterfield = { email = "sterfield@gmail.com"; github = "sterfield"; @@ -7925,6 +8143,18 @@ githubId = 65870; name = "Сухарик"; }; + superbo = { + email = "supernbo@gmail.com"; + github = "SuperBo"; + githubId = 2666479; + name = "Y Nguyen"; + }; + SuperSandro2000 = { + email = "sandro.jaeckel@gmail.com"; + github = "SuperSandro2000"; + githubId = 7258858; + name = "Sandro Jäckel"; + }; SuprDewd = { email = "suprdewd@gmail.com"; github = "SuprDewd"; @@ -8121,6 +8351,12 @@ githubId = 863327; name = "Tyler Benster"; }; + tcbravo = { + email = "tomas.bravo@protonmail.ch"; + github = "tcbravo"; + githubId = 66133083; + name = "Tomas Bravo"; + }; tckmn = { email = "andy@tck.mn"; github = "tckmn"; @@ -8299,6 +8535,12 @@ githubId = 1391883; name = "Tom Hall"; }; + tiagolobocastro = { + email = "tiagolobocastro@gmail.com"; + github = "tiagolobocastro"; + githubId = 1618946; + name = "Tiago Castro"; + }; tilpner = { email = "till@hoeppner.ws"; github = "tilpner"; @@ -8511,6 +8753,12 @@ githubId = 699403; name = "Tomas Vestelind"; }; + tviti = { + email = "tviti@hawaii.edu"; + github = "tviti"; + githubId = 2251912; + name = "Taylor Viti"; + }; tvorog = { email = "marszaripov@gmail.com"; github = "tvorog"; @@ -8726,6 +8974,16 @@ fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A"; }]; }; + vincentbernat = { + email = "vincent@bernat.ch"; + github = "vincentbernat"; + githubId = 631446; + name = "Vincent Bernat"; + keys = [{ + longkeyid = "rsa4096/0x95A42FE8353525F9"; + fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; + }]; + }; vinymeuh = { email = "vinymeuh@gmail.com"; github = "vinymeuh"; @@ -9120,6 +9378,16 @@ fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; }]; }; + yusdacra = { + email = "y.bera003.06@protonmail.com"; + github = "yusdacra"; + githubId = 19897088; + name = "Yusuf Bera Ertan"; + keys = [{ + longkeyid = "rsa2048/0x61807181F60EFCB2"; + fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; + }]; + }; yvesf = { email = "yvesf+nix@xapek.org"; github = "yvesf"; @@ -9392,4 +9660,26 @@ github = "fzakaria"; githubId = 605070; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; + yevhenshymotiuk = { + name = "Yevhen Shymotiuk"; + email = "yevhenshymotiuk@gmail.com"; + github = "yevhenshymotiuk"; + githubId = 44244245; + }; + hmenke = { + name = "Henri Menke"; + email = "henri@henrimenke.de"; + github = "hmenke"; + githubId = 1903556; + keys = [{ + longkeyid = "rsa4096/0xD65C9AFB4C224DA3"; + fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; + }]; + }; } diff --git a/third_party/nixpkgs/maintainers/scripts/build.nix b/third_party/nixpkgs/maintainers/scripts/build.nix index c70993cf13..bc4355d0aa 100644 --- a/third_party/nixpkgs/maintainers/scripts/build.nix +++ b/third_party/nixpkgs/maintainers/scripts/build.nix @@ -13,8 +13,12 @@ let let result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg - then [ (return name pkg) ] + if pkgs.lib.isDerivation pkg && cond name pkg then + # Skip packages whose closure fails on evaluation. + # This happens for pkgs like `python27Packages.djangoql` + # that have disabled Python pkgs as dependencies. + builtins.seq pkg.outPath + [ (return name pkg) ] else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false then packagesWith cond return pkg else [ ] @@ -30,7 +34,7 @@ in packagesWith (name: pkg: ( - if builtins.hasAttr "maintainers" pkg.meta + if builtins.hasAttr "meta" pkg && builtins.hasAttr "maintainers" pkg.meta then ( if builtins.isList pkg.meta.maintainers then builtins.elem maintainer_ pkg.meta.maintainers diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index 4ccb848343..fb90e62769 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -35,6 +35,10 @@ lua-cmsgpack,,,,, lua-iconv,,,,, lua-lsp,,http://luarocks.org/dev,,, lua-messagepack,,,,, +lua-resty-http,,,,, +lua-resty-jwt,,,,, +lua-resty-openidc,,,,, +lua-resty-session,,,,, lua-term,,,,, lua-toml,,,,, lua-zlib,,,,,koral diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index d07f602f0d..9763c78789 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -29,6 +29,13 @@ with lib.maintainers; { scope = "Maintain ACME-related packages and modules."; }; + cinnamon = { + members = [ + mkg20001 + ]; + scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; + }; + freedesktop = { members = [ jtojnar worldofpeace ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; diff --git a/third_party/nixpkgs/nixos/doc/manual/administration/boot-problems.xml b/third_party/nixpkgs/nixos/doc/manual/administration/boot-problems.xml index badc374ebc..e0f6628401 100644 --- a/third_party/nixpkgs/nixos/doc/manual/administration/boot-problems.xml +++ b/third_party/nixpkgs/nixos/doc/manual/administration/boot-problems.xml @@ -58,9 +58,9 @@ Like boot.debug1 or boot.debug1devices, but runs stage1 until all filesystems that are mounted during initrd are mounted (see - + ). As a motivating example, this could be useful if you've forgotten to set - + on a file system. diff --git a/third_party/nixpkgs/nixos/doc/manual/administration/imperative-containers.xml b/third_party/nixpkgs/nixos/doc/manual/administration/imperative-containers.xml index 7ded0c1178..bc19acf9f6 100644 --- a/third_party/nixpkgs/nixos/doc/manual/administration/imperative-containers.xml +++ b/third_party/nixpkgs/nixos/doc/manual/administration/imperative-containers.xml @@ -14,27 +14,27 @@ You create a container with identifier foo as follows: -# nixos-container create foo +# nixos-container create foo This creates the container’s root directory in - /var/lib/containers/foo and a small configuration file - in /etc/containers/foo.conf. It also builds the + /var/lib/containers/foo and a small configuration file + in /etc/containers/foo.conf. It also builds the container’s initial system configuration and stores it in - /nix/var/nix/profiles/per-container/foo/system. You can + /nix/var/nix/profiles/per-container/foo/system. You can modify the initial configuration of the container on the command line. For instance, to create a container that has sshd running, with the given public key for root: -# nixos-container create foo --config ' +# nixos-container create foo --config ' = true; - users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; + users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' By default the next free address in the 10.233.0.0/16 subnet will be chosen as container IP. This behavior can be altered by setting --host-address and --local-address: -# nixos-container create test --config-file test-container.nix \ +# nixos-container create test --config-file test-container.nix \ --local-address 10.235.1.2 --host-address 10.235.1.1 @@ -42,7 +42,7 @@ Creating a container does not start it. To start the container, run: -# nixos-container start foo +# nixos-container start foo This command will return as soon as the container has booted and has reached multi-user.target. On the host, the container runs within @@ -51,7 +51,7 @@ Thus, if something went wrong, you can get status info using systemctl: -# systemctl status container@foo +# systemctl status container@foo @@ -59,22 +59,22 @@ If the container has started successfully, you can log in as root using the root-login operation: -# nixos-container root-login foo -[root@foo:~]# +# nixos-container root-login foo +[root@foo:~]# Note that only root on the host can do this (since there is no authentication). You can also get a regular login prompt using the login operation, which is available to all users on the host: -# nixos-container login foo +# nixos-container login foo foo login: alice Password: *** With nixos-container run, you can execute arbitrary commands in the container: -# nixos-container run foo -- uname -a +# nixos-container run foo -- uname -a Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux @@ -85,18 +85,18 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux /var/lib/container/name/etc/nixos/configuration.nix, and run -# nixos-container update foo +# nixos-container update foo This will build and activate the new configuration. You can also specify a new configuration on the command line: -# nixos-container update foo --config ' +# nixos-container update foo --config ' = true; = "foo@example.org"; = [ 80 ]; ' -# curl http://$(nixos-container show-ip foo)/ +# curl http://$(nixos-container show-ip foo)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… However, note that this will overwrite the container’s @@ -117,7 +117,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux by using systemctl on the container’s service unit. To destroy a container, including its file system, do -# nixos-container destroy foo +# nixos-container destroy foo diff --git a/third_party/nixpkgs/nixos/doc/manual/administration/maintenance-mode.xml b/third_party/nixpkgs/nixos/doc/manual/administration/maintenance-mode.xml index 71e3f9ea66..74abfdd7c6 100644 --- a/third_party/nixpkgs/nixos/doc/manual/administration/maintenance-mode.xml +++ b/third_party/nixpkgs/nixos/doc/manual/administration/maintenance-mode.xml @@ -8,7 +8,7 @@ You can enter rescue mode by running: -# systemctl rescue +# systemctl rescue This will eventually give you a single-user root shell. Systemd will stop (almost) all system services. To get out of maintenance mode, just exit from the rescue shell. diff --git a/third_party/nixpkgs/nixos/doc/manual/administration/network-problems.xml b/third_party/nixpkgs/nixos/doc/manual/administration/network-problems.xml index 570f583588..1035e4e056 100644 --- a/third_party/nixpkgs/nixos/doc/manual/administration/network-problems.xml +++ b/third_party/nixpkgs/nixos/doc/manual/administration/network-problems.xml @@ -16,12 +16,12 @@ disable the use of the binary cache by adding , e.g. -# nixos-rebuild switch --option use-binary-caches false +# nixos-rebuild switch --option use-binary-caches false If you have an alternative binary cache at your disposal, you can use it instead: -# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ +# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ diff --git a/third_party/nixpkgs/nixos/doc/manual/administration/rebooting.xml b/third_party/nixpkgs/nixos/doc/manual/administration/rebooting.xml index a5abd6f025..c57d885c5f 100644 --- a/third_party/nixpkgs/nixos/doc/manual/administration/rebooting.xml +++ b/third_party/nixpkgs/nixos/doc/manual/administration/rebooting.xml @@ -7,20 +7,20 @@ The system can be shut down (and automatically powered off) by doing: -# shutdown +# shutdown This is equivalent to running systemctl poweroff. To reboot the system, run -# reboot +# reboot which is equivalent to systemctl reboot. Alternatively, you can quickly reboot the system using kexec, which bypasses the BIOS by directly loading the new kernel into memory: -# systemctl kexec +# systemctl kexec diff --git a/third_party/nixpkgs/nixos/doc/manual/administration/rollback.xml b/third_party/nixpkgs/nixos/doc/manual/administration/rollback.xml index fb87810ba4..80d79e1a53 100644 --- a/third_party/nixpkgs/nixos/doc/manual/administration/rollback.xml +++ b/third_party/nixpkgs/nixos/doc/manual/administration/rollback.xml @@ -20,16 +20,16 @@ has booted, you can make the selected configuration the default for subsequent boots: -# /run/current-system/bin/switch-to-configuration boot +# /run/current-system/bin/switch-to-configuration boot Second, you can switch to the previous configuration in a running system: -# nixos-rebuild switch --rollback +# nixos-rebuild switch --rollback This is equivalent to running: -# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch +# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch where N is the number of the NixOS system configuration. To get a list of the available configurations, do: diff --git a/third_party/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml b/third_party/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml index 1b9c745eb5..1c5d48a5bc 100644 --- a/third_party/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml +++ b/third_party/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml @@ -58,9 +58,9 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. Units can be stopped, started or restarted: -# systemctl stop postgresql.service -# systemctl start postgresql.service -# systemctl restart postgresql.service +# systemctl stop postgresql.service +# systemctl start postgresql.service +# systemctl restart postgresql.service These operations are synchronous: they wait until the service has finished starting or stopping (or has failed). Starting a unit will cause the diff --git a/third_party/nixpkgs/nixos/doc/manual/administration/user-sessions.xml b/third_party/nixpkgs/nixos/doc/manual/administration/user-sessions.xml index 80daf6bdbf..9acb147ac1 100644 --- a/third_party/nixpkgs/nixos/doc/manual/administration/user-sessions.xml +++ b/third_party/nixpkgs/nixos/doc/manual/administration/user-sessions.xml @@ -39,7 +39,7 @@ c3 - root (0) can terminate a session in a way that ensures that all the session’s processes are gone: -# loginctl terminate-session c3 +# loginctl terminate-session c3 diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml index 02cb78f47e..19eb2429d0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -25,7 +25,7 @@ xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs and you run nixos-rebuild, specifying your own Nixpkgs tree: -# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs +# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/file-systems.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/file-systems.xml index 3ac02a975e..9747433375 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/file-systems.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/file-systems.xml @@ -23,12 +23,12 @@ systemd-fstab-generator. The filesystem will be mounted automatically unless "noauto" is present in options. + linkend="opt-fileSystems._name_.options">options. "noauto" filesystems can be mounted explicitly using systemctl e.g. systemctl start data.mount. Mount points are created automatically if they don’t already exist. For - , + , it’s best to use the topology-independent device aliases in /dev/disk/by-label and /dev/disk/by-uuid, as these don’t change if the @@ -36,7 +36,7 @@ You can usually omit the file system type - (), + (), since mount can usually detect the type and load the necessary kernel module automatically. However, if the file system is needed at early boot (in the initial ramdisk) and is not ext2, @@ -49,7 +49,7 @@ System startup will fail if any of the filesystems fails to mount, dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding - options = [ + options = [ "nofail" ];. diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml index 9928121a56..95ee13f479 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.xml @@ -70,35 +70,12 @@ Platform Vendor Advanced Micro Devices, Inc. Core Next (GCN) GPUs are supported through the rocm-opencl-icd package. Adding this package to enables OpenCL - support. However, OpenCL Image support is provided through the - non-free rocm-runtime-ext package. This package can - be added to the same configuration option, but requires that - allowUnfree option is is enabled for nixpkgs. Full - OpenCL support on supported AMD GPUs is thus enabled as follows: + support: = [ rocm-opencl-icd - rocm-runtime-ext ]; - - - It is also possible to use the OpenCL Image extension without a - system-wide installation of the rocm-runtime-ext - package by setting the ROCR_EXT_DIR environment - variable to the directory that contains the extension: - - $ export \ -ROCR_EXT_DIR=`nix-build '<nixpkgs>' --no-out-link -A rocm-runtime-ext`/lib/rocm-runtime-ext - - - - With either approach, you can verify that OpenCL Image support - is indeed working with the clinfo command: - - $ clinfo | grep Image - Image support Yes -
@@ -206,7 +183,12 @@ GPU1: be forced as follows: = [ - amdvlk + pkgs.amdvlk +]; + +# To enable Vulkan support for 32-bit applications, also add: + = [ + pkgs.driversi686Linux.amdvlk ]; # For amdvlk diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/ipv4-config.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/ipv4-config.xml index 71ddf41491..884becf097 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/ipv4-config.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/ipv4-config.xml @@ -10,7 +10,7 @@ automatically configure network interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ipv4.addresses = [ { +networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml index 675a5d9a26..7b89b4092b 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/ipv6-config.xml @@ -26,7 +26,7 @@ As with IPv4 networking interfaces are automatically configured via DHCPv6. You can configure an interface manually: -networking.interfaces.eth0.ipv6.addresses = [ { +networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/linux-kernel.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/linux-kernel.xml index 644d3a33ff..dbdcc94149 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/linux-kernel.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/linux-kernel.xml @@ -126,13 +126,13 @@ nixpkgs.config.packageOverrides = pkgs: mellanox drivers. -' -A linuxPackages.kernel.dev -$ nix-shell '' -A linuxPackages.kernel -$ unpackPhase -$ cd linux-* -$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules -# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko -]]> + +$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev +$ nix-shell '<nixpkgs>' -A linuxPackages.kernel +$ unpackPhase +$ cd linux-* +$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules +# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko +
diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml index d3007843d6..405a50a9e4 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml @@ -11,7 +11,7 @@ you create an encrypted Ext4 file system on the device /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: -# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d +# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d WARNING! ======== @@ -21,17 +21,17 @@ Are you sure? (Type uppercase yes): YES Enter LUKS passphrase: *** Verify passphrase: *** -# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted +# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** -# mkfs.ext4 /dev/mapper/crypted +# mkfs.ext4 /dev/mapper/crypted To ensure that this file system is automatically mounted at boot time as /, add the following to configuration.nix: -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -."/".device = "/dev/mapper/crypted"; +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +."/".device = "/dev/mapper/crypted"; Should grub be used as bootloader, and /boot is located on an encrypted partition, it is necessary to add the following grub option: @@ -45,11 +45,11 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** and add it as a new key to our existing device /dev/sda2: -# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" -# fido2luks credential "$FIDO2_LABEL" +# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" +# fido2luks credential "$FIDO2_LABEL" f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 -# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 +# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 Password: Password (again): Old password: @@ -60,13 +60,13 @@ Added to key to device /dev/sda2, slot: 2 To ensure that this file system is decrypted using the FIDO2 compatible key, add the following to configuration.nix: boot.initrd.luks.fido2Support = true; -boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; +boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; You can also use the FIDO2 passwordless setup, but for security reasons, you might want to enable it only when your device is PIN protected, such as Trezor. -boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; +boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/network-manager.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/network-manager.xml index 3953e0ffe8..94d229fd80 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/network-manager.xml +++ b/third_party/nixpkgs/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 networkmanager group: -users.users.alice.extraGroups = [ "networkmanager" ]; +users.users.alice.extraGroups = [ "networkmanager" ]; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/ssh.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/ssh.xml index a4af1b9658..95ad3edff9 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/ssh.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/ssh.xml @@ -20,7 +20,7 @@ follows: -users.users.alice.openssh.authorizedKeys.keys = +users.users.alice.openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml index 4b1710f3a2..cbec83814c 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml @@ -11,11 +11,11 @@ that a user account named alice shall exist: .alice = { - isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; Note that alice is a member of the @@ -36,7 +36,7 @@ account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be assigned by setting the user's - hashedPassword + hashedPassword option. A hashed password can be generated using mkpasswd -m sha-512 after installing the mkpasswd package. @@ -62,24 +62,24 @@ uid = 1000; useradd, groupmod and so on. For instance, to create a user account named alice: -# useradd -m alice +# useradd -m alice To make all nix tools available to this new user use `su - USER` which opens a login shell (==shell that loads the profile) for given user. This will create the ~/.nix-defexpr symlink. So run: -# su - alice -c "true" +# su - alice -c "true" The flag causes the creation of a home directory for the new user, which is generally what you want. The user does not have an initial password and therefore cannot log in. A password can be set using the passwd utility: -# passwd alice +# passwd alice Enter new UNIX password: *** Retype new UNIX password: *** A user can be deleted using userdel: -# userdel -r alice +# userdel -r alice The flag deletes the user’s home directory. Accounts can be modified using usermod. Unix groups can be managed using groupadd, groupmod and diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml index 18f0be5e7f..b33f6cf82b 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml @@ -58,7 +58,7 @@ The X server can then be started manually: -# systemctl start display-manager.service +# systemctl start display-manager.service diff --git a/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.xml b/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.xml index 3d019a4987..c626ef30e9 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.xml @@ -57,7 +57,7 @@ linkend="ch-configuration"/>. Changes to a module documentation have to be checked to not break building the NixOS manual: -$ nix-build nixos/release.nix -A manual +$ nix-build nixos/release.nix -A manual diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-types.xml b/third_party/nixpkgs/nixos/doc/manual/development/option-types.xml index 957349ad18..3d2191e2f3 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-types.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-types.xml @@ -21,16 +21,6 @@ - - - types.attrs - - - - A free-form attribute set. - - - types.bool @@ -64,6 +54,64 @@ + + + types.anything + + + + A type that accepts any value and recursively merges attribute sets together. + This type is recommended when the option type is unknown. + + <literal>types.anything</literal> Example + + Two definitions of this type like + +{ + str = lib.mkDefault "foo"; + pkg.hello = pkgs.hello; + fun.fun = x: x + 1; +} + + +{ + str = lib.mkIf true "bar"; + pkg.gcc = pkgs.gcc; + fun.fun = lib.mkForce (x: x + 2); +} + + will get merged to + +{ + str = "bar"; + pkg.gcc = pkgs.gcc; + pkg.hello = pkgs.hello; + fun.fun = x: x + 2; +} + + + + + + + + + types.attrs + + + + A free-form attribute set. + + This type will be deprecated in the future because it doesn't recurse + into attribute sets, silently drops earlier attribute definitions, and + doesn't discharge lib.mkDefault, lib.mkIf + and co. For allowing arbitrary attribute sets, prefer + types.attrsOf types.anything instead which doesn't + have these problems. + + + + @@ -385,17 +433,6 @@ - - - types.loaOf t - - - - An attribute set or a list of t type. Multiple - definitions are merged according to the value. - - - types.nullOr t diff --git a/third_party/nixpkgs/nixos/doc/manual/development/releases.xml b/third_party/nixpkgs/nixos/doc/manual/development/releases.xml index 8abc66dfec..cd68a428a6 100755 --- a/third_party/nixpkgs/nixos/doc/manual/development/releases.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/releases.xml @@ -8,24 +8,26 @@ Release process - Going through an example of releasing NixOS 17.09: + Going through an example of releasing NixOS 19.09:
One month before the beta - + - Send an email to the nix-devel mailinglist as a warning about upcoming - beta "feature freeze" in a month. + Create an announcement on Discourse as a warning about upcoming beta feature freeze in a month. See this post as an example. - Discuss with Eelco Dolstra and the community (via IRC, ML) about what - will reach the deadline. Any issue or Pull Request targeting the release - should be included in the release milestone. + Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline. Any issue or Pull Request targeting the release should be included in the release milestone. + + + + + Remove attributes that we know we will not be able to support, especially if there is a stable alternative. E.g. Check that our Linux kernels’ projected end-of-life are after our release projected end-of-life. @@ -34,113 +36,113 @@
At beta release time - + - Create - an issue for tracking Zero Hydra Failures progress. ZHF is an effort to - get build failures down to zero. + From the master branch run: + + +git checkout -b release-19.09 + + + + + Bump the system.defaultChannel attribute in nixos/modules/misc/version.nix - git tag -a -s -m "Release 17.09-beta" 17.09-beta - && git push origin 17.09-beta + Update versionSuffix in nixos/release.nix + + + + To get the commit count, use the following command: + + + +git rev-list --count release-19.09 + + + - From the master branch run git checkout -b - release-17.09. + Edit changelog at nixos/doc/manual/release-notes/rl-1909.xml. - - - - - Make sure a channel is created at https://nixos.org/channels/. - - - - - - Bump the system.defaultChannel attribute in - nixos/modules/misc/version.nix - - - - - - Update versionSuffix in - nixos/release.nix, use - git rev-list --count 17.09-beta - to get the commit count. - - - - - echo -n "18.03" > .version on master. - - - - - - Pick a new name for the unstable branch. - - - - - Create a new release notes file for the upcoming release + 1, in this - case rl-1803.xml. - - - - - Create two Hydra jobsets: release-17.09 and release-17.09-small with - stableBranch set to false. - - - - - Remove attributes that we know we will not be able to support, - especially if there is a stable alternative. E.g. Check that our - Linux kernels' - - projected end-of-life are after our release projected - end-of-life - - - - - Edit changelog at - nixos/doc/manual/release-notes/rl-1709.xml (double - check desktop versions are noted) - - + - Get all new NixOS modules git diff - release-17.03..release-17.09 nixos/modules/module-list.nix|grep - ^+ + Get all new NixOS modules: + +git diff release-19.03..release-19.09 nixos/modules/module-list.nix | grep ^+ + - Note systemd, kernel, glibc and Nix upgrades. + Note systemd, kernel, glibc, desktop environment, and Nix upgrades. - + + + Tag the release: + + +git tag --annotate --message="Release 19.09-beta" 19.09-beta +git push upstream 19.09-beta + + + + + On the master branch, increment the .version file + + +echo -n "20.03" > .version + + + + + Update codeName in lib/trivial.nix This will be the name for the next release. + + + + + Create a new release notes file for the upcoming release + 1, in our case this is rl-2003.xml. + + + + + Contact the infrastructure team to create the necessary Hydra Jobsets. + + + + + Create a channel at https://nixos.org/channels by creating a PR to nixos-org-configurations, changing channels.nix + + + + + Get all Hydra jobsets for the release to have their first evaluation. + + + + + Create an issue for tracking Zero Hydra Failures progress. ZHF is an effort to get build failures down to zero. + + +
During Beta - + - Monitor the master branch for bugfixes and minor updates and cherry-pick - them to the release branch. + Monitor the master branch for bugfixes and minor updates and cherry-pick them to the release branch. @@ -149,7 +151,7 @@
Before the final release - + Re-check that the release notes are complete. @@ -157,21 +159,17 @@ - Release Nix (currently only Eelco Dolstra can do that). - - Make sure fallback is updated. + Release Nix (currently only Eelco Dolstra can do that). Make sure fallback is updated. - - Update README.md with new stable NixOS version information. + Update README.md with new stable NixOS version information. - Change stableBranch to true in Hydra and wait for - the channel to update. + Change stableBranch to true in Hydra and wait for the channel to update. @@ -180,76 +178,143 @@
At final release time - + - git tag -s -a -m "Release 15.09" 15.09 + Update section of the manual to match new stable release version. - Update "Chapter 4. Upgrading NixOS" section of the manual to match - new stable release version. + Update rl-1909.xml with the release date. - Update the - NIXOS_SERIES - in the - nixos-homepage - repository. + Tag the final release + +git tag --annotate --message="Release 19.09" 19.09 +git push upstream 19.09 + - Get number of commits for the release: git log - release-14.04..release-14.12 --format=%an|wc -l + Update nixos-homepage for the release. + + + + Update NIXOS_SERIES in the Makefile. + + + + + Update nixos-release.tt with the new NixOS version. + + + + + Update the flake.nix input released-nixpkgs to 19.09. + + + + + Run ./update.sh (this updates flake.lock to updated channel). + + + + + Add a compressed version of the NixOS logo for 19.09. + + + + + Compose a news item for the website RSS feed. + + + - Commits by contributor: git log release-14.04..release-14.12 - --format=%an|sort|uniq -c|sort -rn + Create a new topic on the Discourse instance to announce the release. + + + + You should include the following information: + + + + + + Number of commits for the release: + + +bash git log release-19.03..release-19.09 --format=%an | wc -l + + - Create a new topic on the - Discourse instance to announce the release with the above information. - Best to check how previous email was formulated to see what needs to be - included. + Commits by contributor: + +git shortlog --summary --numbered release-19.03..release-19.09 + + + + Best to check how the previous post was formulated to see what needs to be included. +
-
+
Release Management Team + - For each release there are two release managers. After each release the - release manager having managed two releases steps down and the release - management team of the last release appoints a new release manager. + For each release there are two release managers. After each release the release manager having managed two releases steps down and the release management team of the last release appoints a new release manager. + - This makes sure a release management team always consists of one release - manager who already has managed one release and one release manager being - introduced to their role, making it easier to pass on knowledge and - experience. + This makes sure a release management team always consists of one release manager who already has managed one release and one release manager being introduced to their role, making it easier to pass on knowledge and experience. + - Release managers for the current NixOS release are tracked by GitHub team - @NixOS/nixos-release-managers. + Release managers for the current NixOS release are tracked by GitHub team @NixOS/nixos-release-managers. + - A release manager's role and responsibilities are: + A release manager’s role and responsibilities are: + - manage the release process - start discussions about features and changes for a given release - create a roadmap - release in cooperation with Eelco Dolstra - decide which bug fixes, features, etc... get backported after a release + + + manage the release process + + + + + start discussions about features and changes for a given release + + + + + create a roadmap + + + + + release in cooperation with Eelco Dolstra + + + + + decide which bug fixes, features, etc… get backported after a release + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.xml b/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.xml index 2183937ad0..32e00544ce 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.xml @@ -24,8 +24,8 @@ - $ cd /path/to/nixpkgs/nixos/doc/manual - $ make +$ cd /path/to/nixpkgs/nixos/doc/manual +$ make diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml index 74ab23605b..cab4c067e0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml @@ -43,7 +43,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"> console, whether device ownership is correctly maintained when switching between consoles, and so on. On the other hand, nfs.nix, +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix">nfs/simple.nix, which tests NFS client and server functionality in the Linux kernel (including whether locks are maintained across server crashes), requires three machines: a server and two clients. diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/changing-config.xml b/third_party/nixpkgs/nixos/doc/manual/installation/changing-config.xml index 48193d986a..4288806d5e 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/changing-config.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/changing-config.xml @@ -78,7 +78,7 @@ mutableUsers = false. Another way is to temporarily add the following to your configuration: -users.users.your-user.initialHashedPassword = "test"; +users.users.your-user.initialHashedPassword = "test"; Important: delete the $hostname.qcow2 file if you have started the virtual machine at least once without the right users, otherwise diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.xml index c1ef638e87..6788882aa8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing-behind-a-proxy.xml @@ -27,13 +27,13 @@ networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; Setup the proxy environment variables in the shell where you are running nixos-install. - -# proxy_url="http://user:password@proxy:port/" -# export http_proxy="$proxy_url" -# export HTTP_PROXY="$proxy_url" -# export https_proxy="$proxy_url" -# export HTTPS_PROXY="$proxy_url" - + +# proxy_url="http://user:password@proxy:port/" +# export http_proxy="$proxy_url" +# export HTTP_PROXY="$proxy_url" +# export https_proxy="$proxy_url" +# export HTTPS_PROXY="$proxy_url" + diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml index 45d68f8787..8aac322647 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -211,7 +211,7 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable use sudo) -users.users.root.initialHashedPassword = ""; +users.users.root.initialHashedPassword = ""; @@ -325,14 +325,14 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot to boot on a USB rescue disk and do something along these lines: -# mkdir root -# mount /dev/sdaX root -# mkdir root/nixos-root -# mv -v root/* root/nixos-root/ -# mv -v root/nixos-root/old-root/* root/ -# mv -v root/boot.bak root/boot # We had renamed this by hand earlier -# umount root -# reboot +# mkdir root +# mount /dev/sdaX root +# mkdir root/nixos-root +# mv -v root/* root/nixos-root/ +# mv -v root/nixos-root/old-root/* root/ +# mv -v root/boot.bak root/boot # We had renamed this by hand earlier +# umount root +# reboot This may work as is or you might also need to reinstall the boot loader diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml index 5f216df66f..6df1d83034 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing.xml @@ -70,9 +70,13 @@ If you would like to continue the installation from a different machine you - need to activate the SSH daemon via systemctl start - sshd. You then must set a password for either root or - nixos with passwd to be able to login. + can use activated SSH daemon. You need to copy your ssh key to either + /home/nixos/.ssh/authorized_keys or + /root/.ssh/authorized_keys (Tip: For installers with a + modifiable filesystem such as the sd-card installer image a key can be manually + placed by mounting the image on a different machine). Alternatively you must set + a password for either root or nixos with + passwd to be able to login.
@@ -550,7 +554,7 @@ Retype new UNIX password: *** # Note: setting fileSystems is generally not # necessary, since nixos-generate-config figures them out # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; + #fileSystems."/".device = "/dev/disk/by-label/nixos"; # Enable the OpenSSH server. services.sshd.enable = true; diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/upgrading.xml b/third_party/nixpkgs/nixos/doc/manual/installation/upgrading.xml index e5e02aa075..08780051d5 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/upgrading.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/upgrading.xml @@ -67,32 +67,32 @@ nixos-20.03 channel. To see which NixOS channel you’re subscribed to, run the following as root: -# nix-channel --list | grep nixos +# nix-channel --list | grep nixos nixos https://nixos.org/channels/nixos-unstable To switch to a different NixOS channel, do -# nix-channel --add https://nixos.org/channels/channel-name nixos +# nix-channel --add https://nixos.org/channels/channel-name nixos (Be sure to include the nixos parameter at the end.) For instance, to use the NixOS 20.03 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-20.03 nixos +# nix-channel --add https://nixos.org/channels/nixos-20.03 nixos If you have a server, you may want to use the “small” channel instead: -# nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos +# nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos And if you want to live on the bleeding edge: -# nix-channel --add https://nixos.org/channels/nixos-unstable nixos +# nix-channel --add https://nixos.org/channels/nixos-unstable nixos You can then upgrade NixOS to the latest version in your chosen channel by running -# nixos-rebuild switch --upgrade +# nixos-rebuild switch --upgrade which is equivalent to the more verbose nix-channel --update nixos; nixos-rebuild switch. diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-enter.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-enter.xml index c32e1c7f8c..41f0e6b975 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-enter.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-nixos-enter.xml @@ -136,13 +136,13 @@ /mnt: -# nixos-enter /mnt +# nixos-enter --root /mnt Run a shell command: -# nixos-enter -c 'ls -l /; cat /proc/mounts' +# nixos-enter -c 'ls -l /; cat /proc/mounts' Run a non-shell command: diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml index 84849282e9..b205e23096 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-nixos-install.xml @@ -45,6 +45,10 @@ path + + flake-uri + + @@ -199,6 +203,18 @@ + + + flake-uri#name + + + + Build the NixOS system from the specified flake. + The flake must contain an output named + nixosConfigurations.name. + + + diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml index f70f08a0f8..7dab5c69df 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml @@ -521,7 +521,7 @@ - flake-uri[name] + flake-uri#name diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-version.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-version.xml index aada08c5b4..fae25721e3 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-version.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-nixos-version.xml @@ -33,7 +33,7 @@ This command shows the version of the currently active NixOS configuration. For example: -$ nixos-version +$ nixos-version 16.03.1011.6317da4 (Emu) The version consists of the following elements: @@ -111,7 +111,7 @@ Show the full SHA1 hash of the Git commit from which this configuration was built, e.g. -$ nixos-version --hash +$ nixos-version --hash 6317da40006f6bc2480c6781999c52d88dde2acf diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml index e2913b8a53..bf18457c2b 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml @@ -8,6 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml index 0e9ba027a3..87f1228561 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.xml @@ -796,7 +796,7 @@ users.users.me = or any other display manager in NixOS as they all support auto-login. If you used this module specifically because it permitted root auto-login you can override the lightdm-autologin pam module like: -security.pam.services.lightdm-autologin.text = lib.mkForce '' +security.pam.services.lightdm-autologin.text = lib.mkForce '' auth requisite pam_nologin.so auth required pam_succeed_if.so quiet auth required pam_permit.so diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml index 59a4d78c27..511276bcaa 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml @@ -26,6 +26,18 @@ GNOME desktop environment was upgraded to 3.36, see its release notes. + + + The Cinnamon desktop environment (v4.6) has been added. services.xserver.desktopManager.cinnamon.enable = true; to try it out! + Remember that, with any new feature it's possible you could run into issues, so please send all support requests to github.com/NixOS/nixpkgs to notify the maintainers. + + + + + Quickly configure a complete, private, self-hosted video + conferencing solution with the new Jitsi Meet module. + + maxx package removed along with services.xserver.desktopManager.maxx module. @@ -128,7 +140,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; - Two new option documentation.man.generateCaches + The new option documentation.man.generateCaches has been added to automatically generate the man-db caches, which are needed by utilities like whatis and apropos. The caches are generated during the build of the NixOS configuration: since this can be expensive when a large number of packages are installed, the @@ -137,7 +149,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; - services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities which now defaults to system certifcate authorities. + services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities which now defaults to system certificate authorities. @@ -156,6 +168,64 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). hardware.logitech.lcd.enable enables support for all hardware supported by the g15daemon project. + + + Zabbix now defaults to 5.0, updated from 4.4. Please carefully read through + the upgrade guide + and apply any changes required. Be sure to take special note of the section on + enabling extended range of numeric (float) values + as you will need to apply this database migration manually. + + + If you are using Zabbix Server with a MySQL or MariaDB database you should note that using a character set of utf8 and a collate of utf8_bin has become mandatory with + this release. See the upstream issue for further discussion. Before upgrading you should check the character set and collation used by + your database and ensure they are correct: + + SELECT + default_character_set_name, + default_collation_name + FROM + information_schema.schemata + WHERE + schema_name = 'zabbix'; + + If these values are not correct you should take a backup of your database and convert the character set and collation as required. Here is an + example of how to do so, taken from + the Zabbix forums: + + ALTER DATABASE `zabbix` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + + -- the following will produce a list of SQL commands you should subsequently execute + SELECT CONCAT("ALTER TABLE ", TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") AS ExecuteTheString + FROM information_schema.`COLUMNS` + WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ci"; + + + + + + The NixOS module system now supports freeform modules as a mix between types.attrsOf and types.submodule. These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See for how to use them. + + + + + The GRUB module gained support for basic password protection, which + allows to restrict non-default entries in the boot menu to one or more + users. The users and passwords are defined via the option + . + Note: Password support is only avaiable in GRUB version 2. + + + + + Following its deprecation in 20.03, the Perl NixOS test driver has been removed. + All remaining tests have been ported to the Python test framework. + Code outside nixpkgs using make-test.nix or + testing.nix needs to be ported to + make-test-python.nix and + testing-python.nix respectively. + +
@@ -175,6 +245,11 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; There is a new module that provides doas, a lighter alternative to sudo with many of the same features. + + + + Hercules CI Agent is a specialized build agent for projects built with Nix. See the options and setup. + @@ -199,7 +274,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; in the source tree for downloaded modules instead of using go's module proxy protocol. This storage format is simpler and therefore less - likekly to break with future versions of go. As a result + likely to break with future versions of go. As a result buildGoModule switched from modSha256 to the vendorSha256 attribute to pin fetched version data. @@ -211,7 +286,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; deprecated in Grafana and the phantomjs project is currently unmaintained. - It can still be enabled by providing phantomJsSupport = true to the package instanciation: + It can still be enabled by providing phantomJsSupport = true to the package instantiation: { services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec { phantomJsSupport = false; @@ -223,7 +298,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; The supybot module now uses /var/lib/supybot as its default stateDir path if stateVersion - is 20.09 or higher. It also enables number of + is 20.09 or higher. It also enables a number of systemd sandboxing options which may possibly interfere with some plugins. If this is the case you can disable the options through attributes in . @@ -331,6 +406,20 @@ php.override { + + + The ACME module has been overhauled for simplicity and maintainability. + Cert generation now implicitly uses the acme + user, and the security.acme.certs._name_.user option + has been removed. Instead, certificate access from other services is now + managed through group permissions. The module no longer runs lego + twice under certain conditions, and will correctly renew certificates if + their configuration is changed. Services which reload nginx and httpd after + certificate renewal are now properly configured too so you no longer have + to do this manually if you are using HTTPS enabled virtual hosts. A mechanism + for regenerating certs on demand has also been added and documented. + + Gollum received a major update to version 5.x and you may have to change @@ -350,8 +439,8 @@ php.override { - Add option services.nginx.enableSandbox to starting Nginx web server with additional sandbox/hardening options. - By default, write access to services.nginx.stateDir is allowed. To allow writing to other folders, + Nginx web server now starting with additional sandbox/hardening options. By default, write access + to services.nginx.stateDir is allowed. To allow writing to other folders, use systemd.services.nginx.serviceConfig.ReadWritePaths systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; @@ -676,11 +765,19 @@ services.dokuwiki."mywiki" = { The option is now set to "/var/lib/postgresql/${cfg.package.psqlSchema}" regardless of your - . Users with an existing postgresql install that have a of 17.09 or below + . Users with an existing postgresql install that have a of 17.03 or below should double check what the value of their option is (/var/db/postgresql) and then explicitly set this value to maintain compatibility: services.postgresql.dataDir = "/var/db/postgresql"; + + + + The postgresql module now expects there to be a database super user account called postgres regardless of your . Users + with an existing postgresql install that have a of 17.03 or below should run the following SQL statements as a + database super admin user before upgrading: + +CREATE ROLE postgres LOGIN SUPERUSER; @@ -689,6 +786,54 @@ services.postgresql.dataDir = "/var/db/postgresql"; The USBGuard module now removes options and instead hardcodes values for IPCAccessControlFiles, ruleFiles, and auditFilePath. Audit logs can be found in the journal. + + + The NixOS module system now evaluates option definitions more strictly, allowing it to detect a larger set of problems. + As a result, what previously evaluated may not do so anymore. + See the PR that changed this for more info. + + + + + For NixOS configuration options, the type loaOf, after + its initial deprecation in release 20.03, has been removed. In NixOS and + Nixpkgs options using this type have been converted to attrsOf. + For more information on this change have look at these links: + issue #1800, + PR #63103. + + + + + config.systemd.services.${name}.path now returns a list of paths instead of a colon-separated string. + + + + + Caddy module now uses Caddy v2 by default. Caddy v1 can still be used by setting + to pkgs.caddy1. + + + New option has been added. + + + + + The jellyfin module will use and stay on the Jellyfin version 10.5.5 + if stateVersion is lower than 20.09. This is because significant changes were made to the database schema, + and it is highly recommended to backup your instance before upgrading. After making your backup, you can upgrade to the latest version either by + setting your stateVersion to 20.09 or higher, or set the to + pkgs.jellyfin. If you do not wish to upgrade Jellyfin, but want to change your stateVersion, you can set + the value of to pkgs.jellyfin_10_5. + + + + + The security.rngd service is now disabled by default. + This choice was made because there's krngd in the linux kernel space making it (for most usecases) + functionally redundent. + +
@@ -717,6 +862,17 @@ services.postgresql.dataDir = "/var/db/postgresql"; of the default out output anymore - if you relied on the notmuch-emacs-mua binary or the emacs lisp files, access them via the notmuch.emacs output. + + Device tree overlay support was improved in + #79370 + and now uses + instead of . + + configuration was + extended to support .dts files with symbols. + + Device trees can now be filtered by setting + option. @@ -757,6 +913,12 @@ services.postgresql.dataDir = "/var/db/postgresql"; Default algorithm for ZRAM swap was changed to zstd. + + + The installer now enables sshd by default. This improves installation on headless machines especially ARM single-board-computer. + To login through ssh, either a password or an ssh key must be set for the root user or the nixos user. + + The scripted networking system now uses .link files in @@ -907,7 +1069,88 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; - The packages perl, rsync and strace were removed from . If you need them, install them again with = with pkgs; [ perl rsync strace ]; in your configuration.nix. + Nginx module nginxModules.fastcgi-cache-purge renamed to official name nginxModules.cache-purge. + Nginx module nginxModules.ngx_aws_auth renamed to official name nginxModules.aws-auth. + + + + + The option was added. It installs the packages perl, rsync and strace for now. They were added unconditionally to before, but are not strictly necessary for a minimal NixOS install. You can set it to an empty list to have a more minimal system. Be aware that some functionality might still have an impure dependency on those packages, so things might break. + + + + + The undervolt option no longer needs to apply its + settings every 30s. If they still become undone, open an issue and restore + the previous behaviour using undervolt.useTimer. + + + + + Agda has been heavily reworked. + + + + agda.mkDerivation has been heavily changed and + is now located at agdaPackages.mkDerivation. + + + + + New top-level packages agda and + agda.withPackages have been added, the second + of which sets up agda with access to chosen libraries. + + + + + All agda libraries now live under + agdaPackages. + + + + + Many broken libraries have been removed. + + + + See the new + documentation for more information. + + + + + The deepin package set has been removed from + nixpkgs. It was a work in progress to package the + Deepin Desktop Environment (DDE), + including libraries, tools and applications, and it was still + missing a service to lauch the desktop environment. It has shown + to no longer be a feasible goal due to reasons discussed in + issue #94870. + The package netease-cloud-music has also been + removed, as it depends on libraries from deepin. + + + + + The opendkim module now uses systemd sandboxing features + to limit the exposure of the system towards the opendkim service. + + + + + + + + Kubernetes has been upgraded to 1.19.1, which also means that the + golang version to build it has been bumped to 1.15. This may have + consequences for your existing clusters and their certificates. Please + consider + + the release notes for Kubernetes 1.19 carefully + + before upgrading. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml new file mode 100644 index 0000000000..eccf2b69da --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml @@ -0,0 +1,80 @@ +
+ Release 21.03 (“Okapi”, 2021.03/??) + +
+ Highlights + + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + + + + + Support is planned until the end of October 2021, handing over to 21.09. + + + +
+ +
+ New Services + + + The following new services were added since the last release: + + + + + + + + +
+ +
+ Backward Incompatibilities + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + + + + +
+ +
+ Other Notable Changes + + + + + + +
+
diff --git a/third_party/nixpkgs/nixos/lib/build-vms.nix b/third_party/nixpkgs/nixos/lib/build-vms.nix index 1bad63b919..b1575fc13b 100644 --- a/third_party/nixpkgs/nixos/lib/build-vms.nix +++ b/third_party/nixpkgs/nixos/lib/build-vms.nix @@ -3,8 +3,10 @@ minimal ? false , # Ignored config ? null - # Nixpkgs, for qemu, lib and more -, pkgs +, # Nixpkgs, for qemu, lib and more + pkgs +, # !!! See comment about args in lib/modules.nix + specialArgs ? {} , # NixOS configuration to add to the VMs extraConfigurations ? [] }: @@ -31,7 +33,7 @@ rec { nodes: configurations: import ./eval-config.nix { - inherit system; + inherit system specialArgs; modules = configurations ++ extraConfigurations; baseModules = (import ../modules/module-list.nix) ++ [ ../modules/virtualisation/qemu-vm.nix diff --git a/third_party/nixpkgs/nixos/lib/eval-config.nix b/third_party/nixpkgs/nixos/lib/eval-config.nix index c8824c2690..15429a7160 100644 --- a/third_party/nixpkgs/nixos/lib/eval-config.nix +++ b/third_party/nixpkgs/nixos/lib/eval-config.nix @@ -24,11 +24,11 @@ check ? true , prefix ? [] , lib ? import ../../lib +, extraModules ? let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; + in if e == "" then [] else [(import e)] }: let extraArgs_ = extraArgs; pkgs_ = pkgs; - extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; - in if e == "" then [] else [(import e)]; in let diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl b/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl index 72ac89d4ff..18d19fddac 100644 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -20,7 +20,7 @@ Configuration Options - + diff --git a/third_party/nixpkgs/nixos/lib/qemu-flags.nix b/third_party/nixpkgs/nixos/lib/qemu-flags.nix index 0cf6977af4..0f06624589 100644 --- a/third_party/nixpkgs/nixos/lib/qemu-flags.nix +++ b/third_party/nixpkgs/nixos/lib/qemu-flags.nix @@ -22,9 +22,9 @@ rec { else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu host"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; - x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu host"; + x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max"; }.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm"; } diff --git a/third_party/nixpkgs/nixos/lib/test-driver/Logger.pm b/third_party/nixpkgs/nixos/lib/test-driver/Logger.pm deleted file mode 100644 index a3384084a0..0000000000 --- a/third_party/nixpkgs/nixos/lib/test-driver/Logger.pm +++ /dev/null @@ -1,75 +0,0 @@ -package Logger; - -use strict; -use Thread::Queue; -use XML::Writer; -use Encode qw(decode encode); -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); - -sub new { - my ($class) = @_; - - my $logFile = defined $ENV{LOGFILE} ? "$ENV{LOGFILE}" : "/dev/null"; - my $log = new XML::Writer(OUTPUT => new IO::File(">$logFile")); - - my $self = { - log => $log, - logQueue => Thread::Queue->new() - }; - - $self->{log}->startTag("logfile"); - - bless $self, $class; - return $self; -} - -sub close { - my ($self) = @_; - $self->{log}->endTag("logfile"); - $self->{log}->end; -} - -sub drainLogQueue { - my ($self) = @_; - while (defined (my $item = $self->{logQueue}->dequeue_nb())) { - $self->{log}->dataElement("line", sanitise($item->{msg}), 'machine' => $item->{machine}, 'type' => 'serial'); - } -} - -sub maybePrefix { - my ($msg, $attrs) = @_; - $msg = $attrs->{machine} . ": " . $msg if defined $attrs->{machine}; - return $msg; -} - -sub nest { - my ($self, $msg, $coderef, $attrs) = @_; - print STDERR maybePrefix("$msg\n", $attrs); - $self->{log}->startTag("nest"); - $self->{log}->dataElement("head", $msg, %{$attrs}); - my $now = clock_gettime(CLOCK_MONOTONIC); - $self->drainLogQueue(); - eval { &$coderef }; - my $res = $@; - $self->drainLogQueue(); - $self->log(sprintf("(%.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now)); - $self->{log}->endTag("nest"); - die $@ if $@; -} - -sub sanitise { - my ($s) = @_; - $s =~ s/[[:cntrl:]\xff]//g; - $s = decode('UTF-8', $s, Encode::FB_DEFAULT); - return encode('UTF-8', $s, Encode::FB_CROAK); -} - -sub log { - my ($self, $msg, $attrs) = @_; - chomp $msg; - print STDERR maybePrefix("$msg\n", $attrs); - $self->drainLogQueue(); - $self->{log}->dataElement("line", $msg, %{$attrs}); -} - -1; diff --git a/third_party/nixpkgs/nixos/lib/test-driver/Machine.pm b/third_party/nixpkgs/nixos/lib/test-driver/Machine.pm deleted file mode 100644 index 4d3d63cd2d..0000000000 --- a/third_party/nixpkgs/nixos/lib/test-driver/Machine.pm +++ /dev/null @@ -1,734 +0,0 @@ -package Machine; - -use strict; -use threads; -use Socket; -use IO::Handle; -use POSIX qw(dup2); -use FileHandle; -use Cwd; -use File::Basename; -use File::Path qw(make_path); -use File::Slurp; -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); - - -my $showGraphics = defined $ENV{'DISPLAY'}; - -my $sharedDir; - - -sub new { - my ($class, $args) = @_; - - my $startCommand = $args->{startCommand}; - - my $name = $args->{name}; - if (!$name) { - $startCommand =~ /run-(.*)-vm$/ if defined $startCommand; - $name = $1 || "machine"; - } - - if (!$startCommand) { - # !!! merge with qemu-vm.nix. - my $netBackend = "-netdev user,id=net0"; - my $netFrontend = "-device virtio-net-pci,netdev=net0"; - - $netBackend .= "," . $args->{netBackendArgs} - if defined $args->{netBackendArgs}; - - $netFrontend .= "," . $args->{netFrontendArgs} - if defined $args->{netFrontendArgs}; - - $startCommand = - "qemu-kvm -m 384 $netBackend $netFrontend \$QEMU_OPTS "; - - if (defined $args->{hda}) { - if ($args->{hdaInterface} eq "scsi") { - $startCommand .= "-drive id=hda,file=" - . Cwd::abs_path($args->{hda}) - . ",werror=report,if=none " - . "-device scsi-hd,drive=hda "; - } else { - $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) - . ",if=" . $args->{hdaInterface} - . ",werror=report "; - } - } - - $startCommand .= "-cdrom $args->{cdrom} " - if defined $args->{cdrom}; - $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk " - if defined $args->{usb}; - $startCommand .= "-bios $args->{bios} " - if defined $args->{bios}; - $startCommand .= $args->{qemuFlags} || ""; - } - - my $tmpDir = $ENV{'TMPDIR'} || "/tmp"; - unless (defined $sharedDir) { - $sharedDir = $tmpDir . "/xchg-shared"; - make_path($sharedDir, { mode => 0700, owner => $< }); - } - - my $allowReboot = 0; - $allowReboot = $args->{allowReboot} if defined $args->{allowReboot}; - - my $self = { - startCommand => $startCommand, - name => $name, - allowReboot => $allowReboot, - booted => 0, - pid => 0, - connected => 0, - socket => undef, - stateDir => "$tmpDir/vm-state-$name", - monitor => undef, - log => $args->{log}, - redirectSerial => $args->{redirectSerial} // 1, - }; - - mkdir $self->{stateDir}, 0700; - - bless $self, $class; - return $self; -} - - -sub log { - my ($self, $msg) = @_; - $self->{log}->log($msg, { machine => $self->{name} }); -} - - -sub nest { - my ($self, $msg, $coderef, $attrs) = @_; - $self->{log}->nest($msg, $coderef, { %{$attrs || {}}, machine => $self->{name} }); -} - - -sub name { - my ($self) = @_; - return $self->{name}; -} - - -sub stateDir { - my ($self) = @_; - return $self->{stateDir}; -} - - -sub start { - my ($self) = @_; - return if $self->{booted}; - - $self->log("starting vm"); - - # Create a socket pair for the serial line input/output of the VM. - my ($serialP, $serialC); - socketpair($serialP, $serialC, PF_UNIX, SOCK_STREAM, 0) or die; - - # Create a Unix domain socket to which QEMU's monitor will connect. - my $monitorPath = $self->{stateDir} . "/monitor"; - unlink $monitorPath; - my $monitorS; - socket($monitorS, PF_UNIX, SOCK_STREAM, 0) or die; - bind($monitorS, sockaddr_un($monitorPath)) or die "cannot bind monitor socket: $!"; - listen($monitorS, 1) or die; - - # Create a Unix domain socket to which the root shell in the guest will connect. - my $shellPath = $self->{stateDir} . "/shell"; - unlink $shellPath; - my $shellS; - socket($shellS, PF_UNIX, SOCK_STREAM, 0) or die; - bind($shellS, sockaddr_un($shellPath)) or die "cannot bind shell socket: $!"; - listen($shellS, 1) or die; - - # Start the VM. - my $pid = fork(); - die if $pid == -1; - - if ($pid == 0) { - close $serialP; - close $monitorS; - close $shellS; - if ($self->{redirectSerial}) { - open NUL, "{stateDir}; - $ENV{SHARED_DIR} = $sharedDir; - $ENV{USE_TMPDIR} = 1; - $ENV{QEMU_OPTS} = - ($self->{allowReboot} ? "" : "-no-reboot ") . - "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " . - "-device virtio-serial -device virtconsole,chardev=shell " . - "-device virtio-rng-pci " . - ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || ""); - chdir $self->{stateDir} or die; - exec $self->{startCommand}; - die "running VM script: $!"; - } - - # Process serial line output. - close $serialC; - - threads->create(\&processSerialOutput, $self, $serialP)->detach; - - sub processSerialOutput { - my ($self, $serialP) = @_; - while (<$serialP>) { - chomp; - s/\r$//; - print STDERR $self->{name}, "# $_\n"; - $self->{log}->{logQueue}->enqueue({msg => $_, machine => $self->{name}}); # !!! - } - } - - eval { - local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; }; - - # Wait until QEMU connects to the monitor. - accept($self->{monitor}, $monitorS) or die; - - # Wait until QEMU connects to the root shell socket. QEMU - # does so immediately; this doesn't mean that the root shell - # has connected yet inside the guest. - accept($self->{socket}, $shellS) or die; - $self->{socket}->autoflush(1); - }; - die "$@" if $@; - - $self->waitForMonitorPrompt; - - $self->log("QEMU running (pid $pid)"); - - $self->{pid} = $pid; - $self->{booted} = 1; -} - - -# Send a command to the monitor and wait for it to finish. TODO: QEMU -# also has a JSON-based monitor interface now, but it doesn't support -# all commands yet. We should use it once it does. -sub sendMonitorCommand { - my ($self, $command) = @_; - $self->log("sending monitor command: $command"); - syswrite $self->{monitor}, "$command\n"; - return $self->waitForMonitorPrompt; -} - - -# Wait until the monitor sends "(qemu) ". -sub waitForMonitorPrompt { - my ($self) = @_; - my $res = ""; - my $s; - while (sysread($self->{monitor}, $s, 1024)) { - $res .= $s; - last if $res =~ s/\(qemu\) $//; - } - return $res; -} - - -# Call the given code reference repeatedly, with 1 second intervals, -# until it returns 1 or a timeout is reached. -sub retry { - my ($coderef) = @_; - my $n; - for ($n = 899; $n >=0; $n--) { - return if &$coderef($n); - sleep 1; - } - die "action timed out after $n seconds"; -} - - -sub connect { - my ($self) = @_; - return if $self->{connected}; - - $self->nest("waiting for the VM to finish booting", sub { - - $self->start; - - my $now = clock_gettime(CLOCK_MONOTONIC); - local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; }; - alarm 600; - readline $self->{socket} or die "the VM quit before connecting\n"; - alarm 0; - - $self->log("connected to guest root shell"); - # We're interested in tracking how close we are to `alarm`. - $self->log(sprintf("(connecting took %.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now)); - $self->{connected} = 1; - - }); -} - - -sub waitForShutdown { - my ($self) = @_; - return unless $self->{booted}; - - $self->nest("waiting for the VM to power off", sub { - waitpid $self->{pid}, 0; - $self->{pid} = 0; - $self->{booted} = 0; - $self->{connected} = 0; - }); -} - - -sub isUp { - my ($self) = @_; - return $self->{booted} && $self->{connected}; -} - - -sub execute_ { - my ($self, $command) = @_; - - $self->connect; - - print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n"); - - my $out = ""; - - while (1) { - my $line = readline($self->{socket}); - die "connection to VM lost unexpectedly" unless defined $line; - #$self->log("got line: $line"); - if ($line =~ /^(.*)\|\!\=EOF\s+(\d+)$/) { - $out .= $1; - $self->log("exit status $2"); - return ($2, $out); - } - $out .= $line; - } -} - - -sub execute { - my ($self, $command) = @_; - my @res; - $self->nest("running command: $command", sub { - @res = $self->execute_($command); - }); - return @res; -} - - -sub succeed { - my ($self, @commands) = @_; - - my $res; - foreach my $command (@commands) { - $self->nest("must succeed: $command", sub { - my ($status, $out) = $self->execute_($command); - if ($status != 0) { - $self->log("output: $out"); - die "command `$command' did not succeed (exit code $status)\n"; - } - $res .= $out; - }); - } - - return $res; -} - - -sub mustSucceed { - succeed @_; -} - - -sub waitUntilSucceeds { - my ($self, $command) = @_; - $self->nest("waiting for success: $command", sub { - retry sub { - my ($status, $out) = $self->execute($command); - return 1 if $status == 0; - }; - }); -} - - -sub waitUntilFails { - my ($self, $command) = @_; - $self->nest("waiting for failure: $command", sub { - retry sub { - my ($status, $out) = $self->execute($command); - return 1 if $status != 0; - }; - }); -} - - -sub fail { - my ($self, $command) = @_; - $self->nest("must fail: $command", sub { - my ($status, $out) = $self->execute_($command); - die "command `$command' unexpectedly succeeded" - if $status == 0; - }); -} - - -sub mustFail { - fail @_; -} - - -sub getUnitInfo { - my ($self, $unit, $user) = @_; - my ($status, $lines) = $self->systemctl("--no-pager show \"$unit\"", $user); - return undef if $status != 0; - my $info = {}; - foreach my $line (split '\n', $lines) { - $line =~ /^([^=]+)=(.*)$/ or next; - $info->{$1} = $2; - } - return $info; -} - -sub systemctl { - my ($self, $q, $user) = @_; - if ($user) { - $q =~ s/'/\\'/g; - return $self->execute("su -l $user -c \$'XDG_RUNTIME_DIR=/run/user/`id -u` systemctl --user $q'"); - } - - return $self->execute("systemctl $q"); -} - -# Fail if the given systemd unit is not in the "active" state. -sub requireActiveUnit { - my ($self, $unit) = @_; - $self->nest("checking if unit ‘$unit’ has reached state 'active'", sub { - my $info = $self->getUnitInfo($unit); - my $state = $info->{ActiveState}; - if ($state ne "active") { - die "Expected unit ‘$unit’ to to be in state 'active' but it is in state ‘$state’\n"; - }; - }); -} - -# Wait for a systemd unit to reach the "active" state. -sub waitForUnit { - my ($self, $unit, $user) = @_; - $self->nest("waiting for unit ‘$unit’", sub { - retry sub { - my $info = $self->getUnitInfo($unit, $user); - my $state = $info->{ActiveState}; - die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed"; - if ($state eq "inactive") { - # If there are no pending jobs, then assume this unit - # will never reach active state. - my ($status, $jobs) = $self->systemctl("list-jobs --full 2>&1", $user); - if ($jobs =~ /No jobs/) { # FIXME: fragile - # Handle the case where the unit may have started - # between the previous getUnitInfo() and - # list-jobs. - my $info2 = $self->getUnitInfo($unit); - die "unit ‘$unit’ is inactive and there are no pending jobs\n" - if $info2->{ActiveState} eq $state; - } - } - return 1 if $state eq "active"; - }; - }); -} - - -sub waitForJob { - my ($self, $jobName) = @_; - return $self->waitForUnit($jobName); -} - - -# Wait until the specified file exists. -sub waitForFile { - my ($self, $fileName) = @_; - $self->nest("waiting for file ‘$fileName’", sub { - retry sub { - my ($status, $out) = $self->execute("test -e $fileName"); - return 1 if $status == 0; - } - }); -} - -sub startJob { - my ($self, $jobName, $user) = @_; - $self->systemctl("start $jobName", $user); - # FIXME: check result -} - -sub stopJob { - my ($self, $jobName, $user) = @_; - $self->systemctl("stop $jobName", $user); -} - - -# Wait until the machine is listening on the given TCP port. -sub waitForOpenPort { - my ($self, $port) = @_; - $self->nest("waiting for TCP port $port", sub { - retry sub { - my ($status, $out) = $self->execute("nc -z localhost $port"); - return 1 if $status == 0; - } - }); -} - - -# Wait until the machine is not listening on the given TCP port. -sub waitForClosedPort { - my ($self, $port) = @_; - retry sub { - my ($status, $out) = $self->execute("nc -z localhost $port"); - return 1 if $status != 0; - } -} - - -sub shutdown { - my ($self) = @_; - return unless $self->{booted}; - - print { $self->{socket} } ("poweroff\n"); - - $self->waitForShutdown; -} - - -sub crash { - my ($self) = @_; - return unless $self->{booted}; - - $self->log("forced crash"); - - $self->sendMonitorCommand("quit"); - - $self->waitForShutdown; -} - - -# Make the machine unreachable by shutting down eth1 (the multicast -# interface used to talk to the other VMs). We keep eth0 up so that -# the test driver can continue to talk to the machine. -sub block { - my ($self) = @_; - $self->sendMonitorCommand("set_link virtio-net-pci.1 off"); -} - - -# Make the machine reachable. -sub unblock { - my ($self) = @_; - $self->sendMonitorCommand("set_link virtio-net-pci.1 on"); -} - - -# Take a screenshot of the X server on :0.0. -sub screenshot { - my ($self, $filename) = @_; - my $dir = $ENV{'out'} || Cwd::abs_path("."); - $filename = "$dir/${filename}.png" if $filename =~ /^\w+$/; - my $tmp = "${filename}.ppm"; - my $name = basename($filename); - $self->nest("making screenshot ‘$name’", sub { - $self->sendMonitorCommand("screendump $tmp"); - system("pnmtopng $tmp > ${filename}") == 0 - or die "cannot convert screenshot"; - unlink $tmp; - }, { image => $name } ); -} - -# Get the text of TTY -sub getTTYText { - my ($self, $tty) = @_; - - my ($status, $out) = $self->execute("fold -w\$(stty -F /dev/tty${tty} size | awk '{print \$2}') /dev/vcs${tty}"); - return $out; -} - -# Wait until TTY's text matches a particular regular expression -sub waitUntilTTYMatches { - my ($self, $tty, $regexp) = @_; - - $self->nest("waiting for $regexp to appear on tty $tty", sub { - retry sub { - my ($retries_remaining) = @_; - if ($retries_remaining == 0) { - $self->log("Last chance to match /$regexp/ on TTY$tty, which currently contains:"); - $self->log($self->getTTYText($tty)); - } - - return 1 if $self->getTTYText($tty) =~ /$regexp/; - } - }); -} - -# Debugging: Dump the contents of the TTY -sub dumpTTYContents { - my ($self, $tty) = @_; - - $self->execute("fold -w 80 /dev/vcs${tty} | systemd-cat"); -} - -# Take a screenshot and return the result as text using optical character -# recognition. -sub getScreenText { - my ($self) = @_; - - system("command -v tesseract &> /dev/null") == 0 - or die "getScreenText used but enableOCR is false"; - - my $text; - $self->nest("performing optical character recognition", sub { - my $tmpbase = Cwd::abs_path(".")."/ocr"; - my $tmpin = $tmpbase."in.ppm"; - - $self->sendMonitorCommand("screendump $tmpin"); - - my $magickArgs = "-filter Catrom -density 72 -resample 300 " - . "-contrast -normalize -despeckle -type grayscale " - . "-sharpen 1 -posterize 3 -negate -gamma 100 " - . "-blur 1x65535"; - my $tessArgs = "-c debug_file=/dev/null --psm 11 --oem 2"; - - $text = `convert $magickArgs $tmpin tiff:- | tesseract - - $tessArgs`; - my $status = $? >> 8; - unlink $tmpin; - - die "OCR failed with exit code $status" if $status != 0; - }); - return $text; -} - - -# Wait until a specific regexp matches the textual contents of the screen. -sub waitForText { - my ($self, $regexp) = @_; - $self->nest("waiting for $regexp to appear on the screen", sub { - retry sub { - my ($retries_remaining) = @_; - if ($retries_remaining == 0) { - $self->log("Last chance to match /$regexp/ on the screen, which currently contains:"); - $self->log($self->getScreenText); - } - - return 1 if $self->getScreenText =~ /$regexp/; - } - }); -} - - -# Wait until it is possible to connect to the X server. Note that -# testing the existence of /tmp/.X11-unix/X0 is insufficient. -sub waitForX { - my ($self, $regexp) = @_; - $self->nest("waiting for the X11 server", sub { - retry sub { - my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'"); - return 0 if $status != 0; - ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); - return 1 if $status == 0; - } - }); -} - - -sub getWindowNames { - my ($self) = @_; - my $res = $self->mustSucceed( - q{xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'}); - return split /\n/, $res; -} - - -sub waitForWindow { - my ($self, $regexp) = @_; - $self->nest("waiting for a window to appear", sub { - retry sub { - my @names = $self->getWindowNames; - - my ($retries_remaining) = @_; - if ($retries_remaining == 0) { - $self->log("Last chance to match /$regexp/ on the the window list, which currently contains:"); - $self->log(join(", ", @names)); - } - - foreach my $n (@names) { - return 1 if $n =~ /$regexp/; - } - } - }); -} - - -sub copyFileFromHost { - my ($self, $from, $to) = @_; - my $s = `cat $from` or die; - $s =~ s/'/'\\''/g; - $self->mustSucceed("echo '$s' > $to"); -} - - -my %charToKey = ( - 'A' => "shift-a", 'N' => "shift-n", '-' => "0x0C", '_' => "shift-0x0C", '!' => "shift-0x02", - 'B' => "shift-b", 'O' => "shift-o", '=' => "0x0D", '+' => "shift-0x0D", '@' => "shift-0x03", - 'C' => "shift-c", 'P' => "shift-p", '[' => "0x1A", '{' => "shift-0x1A", '#' => "shift-0x04", - 'D' => "shift-d", 'Q' => "shift-q", ']' => "0x1B", '}' => "shift-0x1B", '$' => "shift-0x05", - 'E' => "shift-e", 'R' => "shift-r", ';' => "0x27", ':' => "shift-0x27", '%' => "shift-0x06", - 'F' => "shift-f", 'S' => "shift-s", '\'' => "0x28", '"' => "shift-0x28", '^' => "shift-0x07", - 'G' => "shift-g", 'T' => "shift-t", '`' => "0x29", '~' => "shift-0x29", '&' => "shift-0x08", - 'H' => "shift-h", 'U' => "shift-u", '\\' => "0x2B", '|' => "shift-0x2B", '*' => "shift-0x09", - 'I' => "shift-i", 'V' => "shift-v", ',' => "0x33", '<' => "shift-0x33", '(' => "shift-0x0A", - 'J' => "shift-j", 'W' => "shift-w", '.' => "0x34", '>' => "shift-0x34", ')' => "shift-0x0B", - 'K' => "shift-k", 'X' => "shift-x", '/' => "0x35", '?' => "shift-0x35", - 'L' => "shift-l", 'Y' => "shift-y", ' ' => "spc", - 'M' => "shift-m", 'Z' => "shift-z", "\n" => "ret", -); - - -sub sendKeys { - my ($self, @keys) = @_; - foreach my $key (@keys) { - $key = $charToKey{$key} if exists $charToKey{$key}; - $self->sendMonitorCommand("sendkey $key"); - } -} - - -sub sendChars { - my ($self, $chars) = @_; - $self->nest("sending keys ‘$chars’", sub { - $self->sendKeys(split //, $chars); - }); -} - - -# Sleep N seconds (in virtual guest time, not real time). -sub sleep { - my ($self, $time) = @_; - $self->succeed("sleep $time"); -} - - -# Forward a TCP port on the host to a TCP port on the guest. Useful -# during interactive testing. -sub forwardPort { - my ($self, $hostPort, $guestPort) = @_; - $hostPort = 8080 unless defined $hostPort; - $guestPort = 80 unless defined $guestPort; - $self->sendMonitorCommand("hostfwd_add tcp::$hostPort-:$guestPort"); -} - - -1; diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.pl b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.pl deleted file mode 100644 index a3354fb0e1..0000000000 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.pl +++ /dev/null @@ -1,191 +0,0 @@ -#! /somewhere/perl -w - -use strict; -use Machine; -use Term::ReadLine; -use IO::File; -use IO::Pty; -use Logger; -use Cwd; -use POSIX qw(_exit dup2); -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); - -$SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly - -STDERR->autoflush(1); - -my $log = new Logger; - - -# Start vde_switch for each network required by the test. -my %vlans; -foreach my $vlan (split / /, $ENV{VLANS} || "") { - next if defined $vlans{$vlan}; - # Start vde_switch as a child process. We don't run it in daemon - # mode because we want the child process to be cleaned up when we - # die. Since we have to make sure that the control socket is - # ready, we send a dummy command to vde_switch (via stdin) and - # wait for a reply. Note that vde_switch requires stdin to be a - # TTY, so we create one. - $log->log("starting VDE switch for network $vlan"); - my $socket = Cwd::abs_path "./vde$vlan.ctl"; - my $pty = new IO::Pty; - my ($stdoutR, $stdoutW); pipe $stdoutR, $stdoutW; - my $pid = fork(); die "cannot fork" unless defined $pid; - if ($pid == 0) { - dup2(fileno($pty->slave), 0); - dup2(fileno($stdoutW), 1); - exec "vde_switch -s $socket --dirmode 0700" or _exit(1); - } - close $stdoutW; - print $pty "version\n"; - readline $stdoutR or die "cannot start vde_switch"; - $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket; - $vlans{$vlan} = $pty; - die unless -e "$socket/ctl"; -} - - -my %vms; -my $context = ""; - -sub createMachine { - my ($args) = @_; - my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"}); - $vms{$vm->name} = $vm; - $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; "; - return $vm; -} - -foreach my $vmScript (@ARGV) { - my $vm = createMachine({startCommand => $vmScript}); -} - - -sub startAll { - $log->nest("starting all VMs", sub { - $_->start foreach values %vms; - }); -} - - -# Wait until all VMs have terminated. -sub joinAll { - $log->nest("waiting for all VMs to finish", sub { - $_->waitForShutdown foreach values %vms; - }); -} - - -# In interactive tests, this allows the non-interactive test script to -# be executed conveniently. -sub testScript { - eval "$context $ENV{testScript};\n"; - warn $@ if $@; -} - - -my $nrTests = 0; -my $nrSucceeded = 0; - - -sub subtest { - my ($name, $coderef) = @_; - $log->nest("subtest: $name", sub { - $nrTests++; - eval { &$coderef }; - if ($@) { - $log->log("error: $@", { error => 1 }); - } else { - $nrSucceeded++; - } - }); -} - - -sub runTests { - if (defined $ENV{tests}) { - $log->nest("running the VM test script", sub { - eval "$context $ENV{tests}"; - if ($@) { - $log->log("error: $@", { error => 1 }); - die $@; - } - }, { expanded => 1 }); - } else { - my $term = Term::ReadLine->new('nixos-vm-test'); - $term->ReadHistory; - while (defined ($_ = $term->readline("> "))) { - eval "$context $_\n"; - warn $@ if $@; - } - $term->WriteHistory; - } - - # Copy the kernel coverage data for each machine, if the kernel - # has been compiled with coverage instrumentation. - $log->nest("collecting coverage data", sub { - foreach my $vm (values %vms) { - my $gcovDir = "/sys/kernel/debug/gcov"; - - next unless $vm->isUp(); - - my ($status, $out) = $vm->execute("test -e $gcovDir"); - next if $status != 0; - - # Figure out where to put the *.gcda files so that the - # report generator can find the corresponding kernel - # sources. - my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /run/current-system/kernel))/.build/linux-*"); - chomp $kernelDir; - my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir"; - - # Copy all the *.gcda files. - $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done"); - } - }); - - $log->nest("syncing", sub { - foreach my $vm (values %vms) { - next unless $vm->isUp(); - $vm->execute("sync"); - } - }); - - if ($nrTests != 0) { - $log->log("$nrSucceeded out of $nrTests tests succeeded", - ($nrSucceeded < $nrTests ? { error => 1 } : { })); - } -} - - -# Create an empty raw virtual disk with the given name and size (in -# MiB). -sub createDisk { - my ($name, $size) = @_; - system("qemu-img create -f raw $name ${size}M") == 0 - or die "cannot create image of size $size"; -} - - -END { - $log->nest("cleaning up", sub { - foreach my $vm (values %vms) { - if ($vm->{pid}) { - $log->log("killing " . $vm->{name} . " (pid " . $vm->{pid} . ")"); - kill 9, $vm->{pid}; - } - } - }); - $log->close(); -} - -my $now1 = clock_gettime(CLOCK_MONOTONIC); - -runTests; - -my $now2 = clock_gettime(CLOCK_MONOTONIC); - -printf STDERR "test script finished in %.2fs\n", $now2 - $now1; - -exit ($nrSucceeded < $nrTests ? 1 : 0); diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py index 7b8d5803aa..156392ad1e 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -217,7 +217,7 @@ class Machine: match = re.search("run-(.+)-vm$", cmd) if match: self.name = match.group(1) - + self.logger = args["log"] self.script = args.get("startCommand", self.create_startcommand(args)) tmp_dir = os.environ.get("TMPDIR", tempfile.gettempdir()) @@ -227,7 +227,10 @@ class Machine: os.makedirs(path, mode=0o700, exist_ok=True) return path - self.state_dir = create_dir("vm-state-{}".format(self.name)) + self.state_dir = os.path.join(tmp_dir, f"vm-state-{self.name}") + if not args.get("keepVmState", False): + self.cleanup_statedir() + os.makedirs(self.state_dir, mode=0o700, exist_ok=True) self.shared_dir = create_dir("shared-xchg") self.booted = False @@ -235,7 +238,6 @@ class Machine: self.pid: Optional[int] = None self.socket = None self.monitor: Optional[socket.socket] = None - self.logger: Logger = args["log"] self.allow_reboot = args.get("allowReboot", False) @staticmethod @@ -424,15 +426,18 @@ class Machine: output += out return output - def fail(self, *commands: str) -> None: + def fail(self, *commands: str) -> str: """Execute each command and check that it fails.""" + output = "" for command in commands: with self.nested("must fail: {}".format(command)): - status, output = self.execute(command) + (status, out) = self.execute(command) if status == 0: raise Exception( "command `{}` unexpectedly succeeded".format(command) ) + output += out + return output def wait_until_succeeds(self, command: str) -> str: """Wait until a command returns success and return its output. @@ -777,9 +782,10 @@ class Machine: self.log("QEMU running (pid {})".format(self.pid)) def cleanup_statedir(self) -> None: - self.log("delete the VM state directory") - if os.path.isfile(self.state_dir): + if os.path.isdir(self.state_dir): shutil.rmtree(self.state_dir) + self.logger.log(f"deleting VM state directory {self.state_dir}") + self.logger.log("if you want to keep the VM state, pass --keep-vm-state") def shutdown(self) -> None: if not self.booted: @@ -837,7 +843,8 @@ class Machine: retry(window_is_visible) def sleep(self, secs: int) -> None: - time.sleep(secs) + # We want to sleep in *guest* time, not *host* time. + self.succeed(f"sleep {secs}") def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None: """Forward a TCP port on the host to a TCP port on the guest. @@ -936,10 +943,10 @@ if __name__ == "__main__": for nr, vde_socket, _, _ in vde_sockets: os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket - machines = [create_machine({"startCommand": s}) for s in vm_scripts] - for machine in machines: - if not cli_args.keep_vm_state: - machine.cleanup_statedir() + machines = [ + create_machine({"startCommand": s, "keepVmState": cli_args.keep_vm_state}) + for s in vm_scripts + ] machine_eval = [ "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines) ] diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index c6939c7d69..498f97336c 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -4,10 +4,12 @@ , minimal ? false # Ignored , config ? {} + # !!! See comment about args in lib/modules.nix +, specialArgs ? {} # Modules to add to each VM , extraConfigurations ? [] }: -with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; +with import ./build-vms.nix { inherit system pkgs minimal specialArgs extraConfigurations; }; with pkgs; rec { @@ -63,18 +65,12 @@ rec { mkdir -p $out LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver - - for i in */xchg/coverage-data; do - mkdir -p $out/coverage-data - mv $i $out/coverage-data/$(dirname $(dirname $i)) - done ''; }; makeTest = { testScript - , makeCoverageReport ? false , enableOCR ? false , name ? "unnamed" # Skip linting (mainly intended for faster dev cycles) @@ -153,7 +149,6 @@ rec { }; test = passMeta (runTests driver); - report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; }); nodeNames = builtins.attrNames nodes; invalidNodeNames = lib.filter @@ -169,7 +164,7 @@ rec { Please stick to alphanumeric chars and underscores as separation. '' else - (if makeCoverageReport then report else test) // { + test // { inherit nodes driver test; }; diff --git a/third_party/nixpkgs/nixos/lib/testing.nix b/third_party/nixpkgs/nixos/lib/testing.nix deleted file mode 100644 index 5c784c2f0a..0000000000 --- a/third_party/nixpkgs/nixos/lib/testing.nix +++ /dev/null @@ -1,258 +0,0 @@ -{ system -, pkgs ? import ../.. { inherit system config; } - # Use a minimal kernel? -, minimal ? false - # Ignored -, config ? {} - # Modules to add to each VM -, extraConfigurations ? [] }: - -with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; -with pkgs; - -rec { - - inherit pkgs; - - - testDriver = lib.warn '' - Perl VM tests are deprecated and will be removed for 20.09. - Please update your tests to use the python test driver. - See https://github.com/NixOS/nixpkgs/pull/71684 for details. - '' stdenv.mkDerivation { - name = "nixos-test-driver"; - - buildInputs = [ makeWrapper perl ]; - - dontUnpack = true; - - preferLocalBuild = true; - - installPhase = - '' - mkdir -p $out/bin - cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver - chmod u+x $out/bin/nixos-test-driver - - libDir=$out/${perl.libPrefix} - mkdir -p $libDir - cp ${./test-driver/Machine.pm} $libDir/Machine.pm - cp ${./test-driver/Logger.pm} $libDir/Logger.pm - - wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ - --prefix PERL5LIB : "${with perlPackages; makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/${perl.libPrefix}" - ''; - }; - - - # Run an automated test suite in the given virtual network. - # `driver' is the script that runs the network. - runTests = driver: - stdenv.mkDerivation { - name = "vm-test-run-${driver.testName}"; - - requiredSystemFeatures = [ "kvm" "nixos-test" ]; - - buildCommand = - '' - mkdir -p $out - - LOGFILE=/dev/null tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver - - for i in */xchg/coverage-data; do - mkdir -p $out/coverage-data - mv $i $out/coverage-data/$(dirname $(dirname $i)) - done - ''; - }; - - - makeTest = - { testScript - , makeCoverageReport ? false - , enableOCR ? false - , name ? "unnamed" - , ... - } @ t: - - let - # A standard store path to the vm monitor is built like this: - # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor - # The max filename length of a unix domain socket is 108 bytes. - # This means $name can at most be 50 bytes long. - maxTestNameLen = 50; - testNameLen = builtins.stringLength name; - - testDriverName = with builtins; - if testNameLen > maxTestNameLen then - abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " + - "it's currently ${toString testNameLen} characters long.") - else - "nixos-test-driver-${name}"; - - nodes = buildVirtualNetwork ( - t.nodes or (if t ? machine then { machine = t.machine; } else { })); - - testScript' = - # Call the test script with the computed nodes. - if lib.isFunction testScript - then testScript { inherit nodes; } - else testScript; - - vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes); - - vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); - - ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; }; - - imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; - - # Generate onvenience wrappers for running the test driver - # interactively with the specified network, and for starting the - # VMs from the command line. - driver = runCommand testDriverName - { buildInputs = [ makeWrapper]; - testScript = testScript'; - preferLocalBuild = true; - testName = name; - } - '' - mkdir -p $out/bin - echo "$testScript" > $out/test-script - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) - wrapProgram $out/bin/nixos-test-driver \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR - "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ - --run "export testScript=\"\$(cat $out/test-script)\"" \ - --set VLANS '${toString vlans}' - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms - wrapProgram $out/bin/nixos-run-vms \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ - --set tests 'startAll; joinAll;' \ - --set VLANS '${toString vlans}' \ - ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} - ''; # " - - passMeta = drv: drv // lib.optionalAttrs (t ? meta) { - meta = (drv.meta or {}) // t.meta; - }; - - test = passMeta (runTests driver); - report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; }); - - nodeNames = builtins.attrNames nodes; - invalidNodeNames = lib.filter - (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames; - - in - if lib.length invalidNodeNames > 0 then - throw '' - Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are referenced as perl variables in the testing framework which will break the - script when special characters are used. - - Please stick to alphanumeric chars and underscores as separation. - '' - else - (if makeCoverageReport then report else test) // { - inherit nodes driver test; - }; - - runInMachine = - { drv - , machine - , preBuild ? "" - , postBuild ? "" - , ... # ??? - }: - let - vm = buildVM { } - [ machine - { key = "run-in-machine"; - networking.hostName = "client"; - nix.readOnlyStore = false; - virtualisation.writableStore = false; - } - ]; - - buildrunner = writeText "vm-build" '' - source $1 - - ${coreutils}/bin/mkdir -p $TMPDIR - cd $TMPDIR - - exec $origBuilder $origArgs - ''; - - testScript = '' - startAll; - $client->waitForUnit("multi-user.target"); - ${preBuild} - $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2"); - ${postBuild} - $client->succeed("sync"); # flush all data before pulling the plug - ''; - - vmRunCommand = writeText "vm-run" '' - xchg=vm-state-client/xchg - ${coreutils}/bin/mkdir $out - ${coreutils}/bin/mkdir -p $xchg - - for i in $passAsFile; do - i2=''${i}Path - _basename=$(${coreutils}/bin/basename ''${!i2}) - ${coreutils}/bin/cp ''${!i2} $xchg/$_basename - eval $i2=/tmp/xchg/$_basename - ${coreutils}/bin/ls -la $xchg - done - - unset i i2 _basename - export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env - unset xchg - - export tests='${testScript}' - ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm - ''; # */ - - in - lib.overrideDerivation drv (attrs: { - requiredSystemFeatures = [ "kvm" ]; - builder = "${bash}/bin/sh"; - args = ["-e" vmRunCommand]; - origArgs = attrs.args; - origBuilder = attrs.builder; - }); - - - runInMachineWithX = { require ? [], ... } @ args: - let - client = - { ... }: - { - inherit require; - imports = [ - ../tests/common/auto.nix - ]; - virtualisation.memorySize = 1024; - services.xserver.enable = true; - test-support.displayManager.auto.enable = true; - services.xserver.displayManager.defaultSession = "none+icewm"; - services.xserver.windowManager.icewm.enable = true; - }; - in - runInMachine ({ - machine = client; - preBuild = - '' - $client->waitForX; - ''; - } // args); - - - simpleTest = as: (makeTest as).test; - -} diff --git a/third_party/nixpkgs/nixos/lib/utils.nix b/third_party/nixpkgs/nixos/lib/utils.nix index 543c8a8882..c9dfdbed99 100644 --- a/third_party/nixpkgs/nixos/lib/utils.nix +++ b/third_party/nixpkgs/nixos/lib/utils.nix @@ -2,6 +2,11 @@ pkgs: with pkgs.lib; rec { + # Copy configuration files to avoid having the entire sources in the system closure + copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' + cp ${filePath} $out + ''; + # Check whenever fileSystem is needed for boot. NOTE: Make sure # pathsNeededForBoot is closed under the parent relationship, i.e. if /a/b/c # is in the list, put /a and /a/b in as well. diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh b/third_party/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh index 145eb49ced..89e24f2ccf 100755 --- a/third_party/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/third_party/nixpkgs/nixos/maintainers/scripts/ec2/create-amis.sh @@ -29,7 +29,7 @@ log() { echo "$@" >&2 } -if [ -z "$1" ]; then +if [ "$#" -ne 1 ]; then log "Usage: ./upload-amazon-image.sh IMAGE_OUTPUT" exit 1 fi diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix index 1b6848c652..5b681ca594 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix @@ -1,6 +1,6 @@ /* -Configuration files are linked to /etc/fonts/${pkgs.fontconfig.configVersion}/conf.d/ +Configuration files are linked to /etc/fonts/conf.d/ This module generates a package containing configuration files and link it in /etc/fonts. @@ -35,7 +35,7 @@ let in pkgs.writeText "fc-00-nixos-cache.conf" '' - + ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)} @@ -53,7 +53,7 @@ let # priority 10 renderConf = pkgs.writeText "fc-10-nixos-rendering.conf" '' - + @@ -110,7 +110,7 @@ let in pkgs.writeText "fc-52-nixos-default-fonts.conf" '' - + @@ -129,7 +129,7 @@ let # priority 53 rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" '' - + ${optionalString (!cfg.allowBitmaps) '' @@ -157,7 +157,7 @@ let # priority 53 rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" '' - + @@ -176,27 +176,21 @@ let confPkg = pkgs.runCommand "fontconfig-conf" { preferLocalBuild = true; } '' - dst=$out/etc/fonts/${pkg.configVersion}/conf.d + dst=$out/etc/fonts/conf.d mkdir -p $dst # fonts.conf ln -s ${pkg.out}/etc/fonts/fonts.conf \ $dst/../fonts.conf # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged - ln -s /etc/fonts/${pkg.configVersion}/fonts.conf \ - $out/etc/fonts/fonts.conf + mkdir -p $out/etc/fonts/2.11 + ln -s /etc/fonts/fonts.conf \ + $out/etc/fonts/2.11/fonts.conf # fontconfig default config files ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \ $dst/ - # update 51-local.conf path to look at local.conf - rm $dst/51-local.conf - - substitute ${pkg.out}/etc/fonts/conf.d/51-local.conf \ - $dst/51-local.conf \ - --replace local.conf /etc/fonts/${pkg.configVersion}/local.conf - # 00-nixos-cache.conf ln -s ${cacheConf} $dst/00-nixos-cache.conf @@ -204,10 +198,8 @@ let ln -s ${renderConf} $dst/10-nixos-rendering.conf # 50-user.conf - # Since latest fontconfig looks for default files inside the package, - # we had to move this one elsewhere to be able to exclude it here. - ${optionalString cfg.includeUserConf '' - ln -s ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf $dst/50-user.conf + ${optionalString (!cfg.includeUserConf) '' + rm $dst/50-user.conf ''} # local.conf (indirect priority 51) diff --git a/third_party/nixpkgs/nixos/modules/config/krb5/default.nix b/third_party/nixpkgs/nixos/modules/config/krb5/default.nix index ff16ffcf9c..c2302451d7 100644 --- a/third_party/nixpkgs/nixos/modules/config/krb5/default.nix +++ b/third_party/nixpkgs/nixos/modules/config/krb5/default.nix @@ -41,31 +41,30 @@ let value) else value; - mkIndent = depth: concatStrings (builtins.genList (_: " ") (2 * depth)); + indent = " "; - mkRelation = name: value: "${name} = ${mkVal { inherit value; }}"; + mkRelation = name: value: + if (isList value) then + concatMapStringsSep "\n" (mkRelation name) value + else "${name} = ${mkVal value}"; - mkVal = { value, depth ? 0 }: + mkVal = value: if (value == true) then "true" else if (value == false) then "false" else if (isInt value) then (toString value) - else if (isList value) then - concatMapStringsSep " " mkVal { inherit value depth; } else if (isAttrs value) then - (concatStringsSep "\n${mkIndent (depth + 1)}" - ([ "{" ] ++ (mapAttrsToList - (attrName: attrValue: let - mappedAttrValue = mkVal { - value = attrValue; - depth = depth + 1; - }; - in "${attrName} = ${mappedAttrValue}") - value))) + "\n${mkIndent depth}}" + let configLines = concatLists + (map (splitString "\n") + (mapAttrsToList mkRelation value)); + in + (concatStringsSep "\n${indent}" + ([ "{" ] ++ configLines)) + + "\n}" else value; mkMappedAttrsOrString = value: concatMapStringsSep "\n" (line: if builtins.stringLength line > 0 - then "${mkIndent 1}${line}" + then "${indent}${line}" else line) (splitString "\n" (if isAttrs value then @@ -114,7 +113,10 @@ in { { "ATHENA.MIT.EDU" = { admin_server = "athena.mit.edu"; - kdc = "athena.mit.edu"; + kdc = [ + "athena01.mit.edu" + "athena02.mit.edu" + ]; }; }; ''; diff --git a/third_party/nixpkgs/nixos/modules/config/system-path.nix b/third_party/nixpkgs/nixos/modules/config/system-path.nix index b3c5c6f93f..67305e8499 100644 --- a/third_party/nixpkgs/nixos/modules/config/system-path.nix +++ b/third_party/nixpkgs/nixos/modules/config/system-path.nix @@ -41,6 +41,12 @@ let pkgs.zstd ]; + defaultPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg) + [ pkgs.perl + pkgs.rsync + pkgs.strace + ]; + in { @@ -63,6 +69,21 @@ in ''; }; + defaultPackages = mkOption { + type = types.listOf types.package; + default = defaultPackages; + example = literalExample "[]"; + description = '' + Set of packages users expect from a minimal linux istall. + Like systemPackages, they appear in + /run/current-system/sw. These packages are + automatically available to all users, and are + automatically updated every time you rebuild the system + configuration. + If you want a more minimal system, set it to an empty list. + ''; + }; + pathsToLink = mkOption { type = types.listOf types.str; # Note: We need `/lib' to be among `pathsToLink' for NSS modules @@ -102,7 +123,7 @@ in config = { - environment.systemPackages = requiredPackages; + environment.systemPackages = requiredPackages ++ config.environment.defaultPackages; environment.pathsToLink = [ "/bin" diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 56b7af98b6..0ab303d0ae 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -463,7 +463,7 @@ in { users.users = mkOption { default = {}; - type = with types; loaOf (submodule userOpts); + type = with types; attrsOf (submodule userOpts); example = { alice = { uid = 1234; @@ -487,7 +487,7 @@ in { { students.gid = 1001; hackers = { }; }; - type = with types; loaOf (submodule groupOpts); + type = with types; attrsOf (submodule groupOpts); description = '' Additional groups to be created automatically by the system. ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix index b3f1dda98c..e0ab37bca6 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix @@ -4,7 +4,114 @@ with lib; let cfg = config.hardware.deviceTree; -in { + + overlayType = types.submodule { + options = { + name = mkOption { + type = types.str; + description = '' + Name of this overlay + ''; + }; + + dtsFile = mkOption { + type = types.nullOr types.path; + description = '' + Path to .dts overlay file, overlay is applied to + each .dtb file matching "compatible" of the overlay. + ''; + default = null; + example = literalExample "./dts/overlays.dts"; + }; + + dtsText = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Literal DTS contents, overlay is applied to + each .dtb file matching "compatible" of the overlay. + ''; + example = literalExample '' + /dts-v1/; + /plugin/; + / { + compatible = "raspberrypi"; + fragment@0 { + target-path = "/soc"; + __overlay__ { + pps { + compatible = "pps-gpio"; + status = "okay"; + }; + }; + }; + }; + ''; + }; + + dtboFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to .dtbo compiled overlay file. + ''; + }; + }; + }; + + # this requires kernel package + dtbsWithSymbols = pkgs.stdenv.mkDerivation { + name = "dtbs-with-symbols"; + inherit (cfg.kernelPackage) src nativeBuildInputs depsBuildBuild; + patches = map (patch: patch.patch) cfg.kernelPackage.kernelPatches; + buildPhase = '' + patchShebangs scripts/* + substituteInPlace scripts/Makefile.lib \ + --replace 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget))' 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) -@' + make ${pkgs.stdenv.hostPlatform.platform.kernelBaseConfig} ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + make dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + ''; + installPhase = '' + make dtbs_install INSTALL_DTBS_PATH=$out/dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + ''; + }; + + filterDTBs = src: if isNull cfg.filter + then "${src}/dtbs" + else + pkgs.runCommand "dtbs-filtered" {} '' + mkdir -p $out + cd ${src}/dtbs + find . -type f -name '${cfg.filter}' -print0 \ + | xargs -0 cp -v --no-preserve=mode --target-directory $out --parents + ''; + + # Compile single Device Tree overlay source + # file (.dts) into its compiled variant (.dtbo) + compileDTS = name: f: pkgs.callPackage({ dtc }: pkgs.stdenv.mkDerivation { + name = "${name}-dtbo"; + + nativeBuildInputs = [ dtc ]; + + buildCommand = '' + dtc -I dts ${f} -O dtb -@ -o $out + ''; + }) {}; + + # Fill in `dtboFile` for each overlay if not set already. + # Existence of one of these is guarded by assertion below + withDTBOs = xs: flip map xs (o: o // { dtboFile = + if isNull o.dtboFile then + if !isNull o.dtsFile then compileDTS o.name o.dtsFile + else compileDTS o.name (pkgs.writeText "dts" o.dtsText) + else o.dtboFile; } ); + +in +{ + imports = [ + (mkRemovedOptionModule [ "hardware" "deviceTree" "base" ] "Use hardware.deviceTree.kernelPackage instead") + ]; + options = { hardware.deviceTree = { enable = mkOption { @@ -16,13 +123,13 @@ in { ''; }; - base = mkOption { - default = "${config.boot.kernelPackages.kernel}/dtbs"; - defaultText = "\${config.boot.kernelPackages.kernel}/dtbs"; - example = literalExample "pkgs.device-tree_rpi"; + kernelPackage = mkOption { + default = config.boot.kernelPackages.kernel; + defaultText = "config.boot.kernelPackages.kernel"; + example = literalExample "pkgs.linux_latest"; type = types.path; description = '' - The path containing the base device-tree (.dtb) to boot. Contains + Kernel package containing the base device-tree (.dtb) to boot. Uses device trees bundled with the Linux kernel by default. ''; }; @@ -38,14 +145,32 @@ in { ''; }; + filter = mkOption { + type = types.nullOr types.str; + default = null; + example = "*rpi*.dtb"; + description = '' + Only include .dtb files matching glob expression. + ''; + }; + overlays = mkOption { default = []; - example = literalExample - "[\"\${pkgs.device-tree_rpi.overlays}/w1-gpio.dtbo\"]"; - type = types.listOf types.path; + example = literalExample '' + [ + { name = "pps"; dtsFile = ./dts/pps.dts; } + { name = "spi"; + dtsText = "..."; + } + { name = "precompiled"; dtboFile = ./dtbos/example.dtbo; } + ] + ''; + type = types.listOf (types.coercedTo types.path (path: { + name = baseNameOf path; + dtboFile = path; + }) overlayType); description = '' - A path containing device tree overlays (.dtbo) to be applied to all - base device-trees. + List of overlays to apply to base device-tree (.dtb) files. ''; }; @@ -54,14 +179,27 @@ in { type = types.nullOr types.path; internal = true; description = '' - A path containing the result of applying `overlays` to `base`. + A path containing the result of applying `overlays` to `kernelPackage`. ''; }; }; }; config = mkIf (cfg.enable) { + + assertions = let + invalidOverlay = o: isNull o.dtsFile && isNull o.dtsText && isNull o.dtboFile; + in lib.singleton { + assertion = lib.all (o: !invalidOverlay o) cfg.overlays; + message = '' + deviceTree overlay needs one of dtsFile, dtsText or dtboFile set. + Offending overlay(s): + ${toString (map (o: o.name) (builtins.filter invalidOverlay cfg.overlays))} + ''; + }; + hardware.deviceTree.package = if (cfg.overlays != []) - then pkgs.deviceTree.applyOverlays cfg.base cfg.overlays else cfg.base; + then pkgs.deviceTree.applyOverlays (filterDTBs dtbsWithSymbols) (withDTBOs cfg.overlays) + else (filterDTBs cfg.kernelPackage); }; } diff --git a/third_party/nixpkgs/nixos/modules/hardware/onlykey.nix b/third_party/nixpkgs/nixos/modules/hardware/onlykey.nix index b6820fe019..07358c8a87 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/onlykey.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/onlykey.nix @@ -26,7 +26,7 @@ with lib; ####### implementation config = mkIf config.hardware.onlykey.enable { - services.udev.extraRules = builtin.readFile ./onlykey.udev; + services.udev.extraRules = builtins.readFile ./onlykey.udev; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/system-76.nix b/third_party/nixpkgs/nixos/modules/hardware/system-76.nix new file mode 100644 index 0000000000..48eb63f4f2 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/system-76.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkOption mkEnableOption types mkIf mkMerge optional versionOlder; + cfg = config.hardware.system76; + + kpkgs = config.boot.kernelPackages; + modules = [ "system76" "system76-io" ] ++ (optional (versionOlder kpkgs.kernel.version "5.5") "system76-acpi"); + modulePackages = map (m: kpkgs.${m}) modules; + moduleConfig = mkIf cfg.kernel-modules.enable { + boot.extraModulePackages = modulePackages; + + boot.kernelModules = modules; + + services.udev.packages = modulePackages; + }; + + firmware-pkg = pkgs.system76-firmware; + firmwareConfig = mkIf cfg.firmware-daemon.enable { + services.dbus.packages = [ firmware-pkg ]; + + systemd.services.system76-firmware-daemon = { + description = "The System76 Firmware Daemon"; + + serviceConfig = { + ExecStart = "${firmware-pkg}/bin/system76-firmware-daemon"; + + Restart = "on-failure"; + }; + + wantedBy = [ "multi-user.target" ]; + }; + }; +in { + options = { + hardware.system76 = { + enableAll = mkEnableOption "all recommended configuration for system76 systems"; + + firmware-daemon.enable = mkOption { + default = cfg.enableAll; + example = true; + description = "Whether to enable the system76 firmware daemon"; + type = types.bool; + }; + + kernel-modules.enable = mkOption { + default = cfg.enableAll; + example = true; + description = "Whether to make the system76 out-of-tree kernel modules available"; + type = types.bool; + }; + }; + }; + + config = mkMerge [ moduleConfig firmwareConfig ]; +} diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index 6328971492..2acb891f1a 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -16,6 +16,8 @@ let kernelPackages.nvidia_x11 else if elem "nvidiaBeta" drivers then kernelPackages.nvidia_x11_beta + else if elem "nvidiaVulkanBeta" drivers then + kernelPackages.nvidia_x11_vulkan_beta else if elem "nvidiaLegacy304" drivers then kernelPackages.nvidia_x11_legacy304 else if elem "nvidiaLegacy340" drivers then diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix index 79c835dc39..87545e8420 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix @@ -27,7 +27,7 @@ }; fileSystems."/boot/firmware" = { - # This effectively "renames" the loaOf entry set in sd-image.nix + # This effectively "renames" the attrsOf entry set in sd-image.nix mountPoint = "/boot"; neededForBoot = true; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix index ddad1116c9..231c7bf0a6 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix @@ -108,6 +108,15 @@ in ''; }; + postBuildCommands = mkOption { + example = literalExample "'' dd if=\${pkgs.myBootLoader}/SPL of=$img bs=1024 seek=1 conv=notrunc ''"; + default = ""; + description = '' + Shell commands to run after the image is built. + Can be used for boards requiring to dd u-boot SPL before actual partitions. + ''; + }; + compressImage = mkOption { type = types.bool; default = true; @@ -197,6 +206,9 @@ in # Verify the FAT partition before copying it. fsck.vfat -vn firmware_part.img dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS + + ${config.sdImage.postBuildCommands} + if test -n "$compressImage"; then zstd -T$NIX_BUILD_CORES --rm $img fi diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh index e0252befdf..a180d1bc4c 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh @@ -10,6 +10,7 @@ umask 0022 # Parse the command line for the -I flag extraBuildFlags=() +flakeFlags=() mountPoint=/mnt channelPath= @@ -34,6 +35,23 @@ while [ "$#" -gt 0 ]; do --system|--closure) system="$1"; shift 1 ;; + --flake) + flake="$1" + flakeFlags=(--experimental-features 'nix-command flakes') + shift 1 + ;; + --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) + lockFlags+=("$i") + ;; + --update-input) + j="$1"; shift 1 + lockFlags+=("$i" "$j") + ;; + --override-input) + j="$1"; shift 1 + k="$1"; shift 1 + lockFlags+=("$i" "$j" "$k") + ;; --channel) channelPath="$1"; shift 1 ;; @@ -92,14 +110,32 @@ if [[ ${NIXOS_CONFIG:0:1} != / ]]; then exit 1 fi -if [[ ! -e $NIXOS_CONFIG && -z $system ]]; then +if [[ -n $flake ]]; then + if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then + flake="${BASH_REMATCH[1]}" + flakeAttr="${BASH_REMATCH[2]}" + fi + if [[ -z "$flakeAttr" ]]; then + echo "Please specify the name of the NixOS configuration to be installed, as a URI fragment in the flake-uri." + echo "For example, to use the output nixosConfigurations.foo from the flake.nix, append \"#foo\" to the flake-uri." + exit 1 + fi + flakeAttr="nixosConfigurations.\"$flakeAttr\"" +fi + +# Resolve the flake. +if [[ -n $flake ]]; then + flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url) +fi + +if [[ ! -e $NIXOS_CONFIG && -z $system && -z $flake ]]; then echo "configuration file $NIXOS_CONFIG doesn't exist" exit 1 fi # A place to drop temporary stuff. -tmpdir="$(mktemp -d -p $mountPoint)" -trap "rm -rf $tmpdir" EXIT +tmpdir="$(mktemp -d -p "$mountPoint")" +trap 'rm -rf $tmpdir' EXIT # store temporary files on target filesystem by default export TMPDIR=${TMPDIR:-$tmpdir} @@ -108,12 +144,19 @@ sub="auto?trusted=1" # Build the system configuration in the target filesystem. if [[ -z $system ]]; then - echo "building the configuration in $NIXOS_CONFIG..." outLink="$tmpdir/system" - nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ - --extra-substituters "$sub" \ - '' -A system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]} - system=$(readlink -f $outLink) + if [[ -z $flake ]]; then + echo "building the configuration in $NIXOS_CONFIG..." + nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ + --extra-substituters "$sub" \ + '' -A system -I "nixos-config=$NIXOS_CONFIG" "${verbosity[@]}" + else + echo "building the flake in $flake..." + nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \ + --extra-substituters "$sub" "${verbosity[@]}" \ + "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link "$outLink" + fi + system=$(readlink -f "$outLink") fi # Set the system profile to point to the configuration. TODO: combine @@ -121,7 +164,7 @@ fi # a progress bar. nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \ --extra-substituters "$sub" \ - -p $mountPoint/nix/var/nix/profiles/system --set "$system" ${verbosity[@]} + -p "$mountPoint"/nix/var/nix/profiles/system --set "$system" "${verbosity[@]}" # Copy the NixOS/Nixpkgs sources to the target as the initial contents # of the NixOS channel. @@ -131,12 +174,12 @@ if [[ -z $noChannelCopy ]]; then fi if [[ -n $channelPath ]]; then echo "copying channel..." - mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root + mkdir -p "$mountPoint"/nix/var/nix/profiles/per-user/root nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \ - -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \ - ${verbosity[@]} - install -m 0700 -d $mountPoint/root/.nix-defexpr - ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels + -p "$mountPoint"/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \ + "${verbosity[@]}" + install -m 0700 -d "$mountPoint"/root/.nix-defexpr + ln -sfn /nix/var/nix/profiles/per-user/root/channels "$mountPoint"/root/.nix-defexpr/channels fi fi @@ -150,7 +193,7 @@ touch "$mountPoint/etc/NIXOS" if [[ -z $noBootLoader ]]; then echo "installing the boot loader..." # Grub needs an mtab. - ln -sfn /proc/mounts $mountPoint/etc/mtab + ln -sfn /proc/mounts "$mountPoint"/etc/mtab NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot fi diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-option/nixos-option.cc index 1a7b07a74f..f779d82edb 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-option/nixos-option.cc +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-option/nixos-option.cc @@ -224,7 +224,7 @@ bool optionTypeIs(Context & ctx, Value & v, const std::string & soughtType) bool isAggregateOptionType(Context & ctx, Value & v) { - return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf") || optionTypeIs(ctx, v, "loaOf"); + return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf"); } MakeError(OptionPathError, EvalError); diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-rebuild.sh b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-rebuild.sh index 437199bae1..909e8b229c 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-rebuild.sh @@ -17,6 +17,7 @@ showSyntax() { origArgs=("$@") extraBuildFlags=() lockFlags=() +flakeFlags=() action= buildNix=1 fast= @@ -99,6 +100,7 @@ while [ "$#" -gt 0 ]; do ;; --flake) flake="$1" + flakeFlags=(--experimental-features 'nix-command flakes') shift 1 ;; --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) @@ -281,16 +283,19 @@ fi # Resolve the flake. if [[ -n $flake ]]; then - flake=$(nix flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url) + flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url) fi # Find configuration.nix and open editor instead of building. if [ "$action" = edit ]; then if [[ -z $flake ]]; then NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} - exec "${EDITOR:-nano}" "$NIXOS_CONFIG" + if [[ -d $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$NIXOS_CONFIG/default.nix + fi + exec ${EDITOR:-nano} "$NIXOS_CONFIG" else - exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr" + exec nix "${flakeFlags[@]}" edit "${lockFlags[@]}" -- "$flake#$flakeAttr" fi exit 1 fi @@ -416,7 +421,7 @@ if [ -z "$rollback" ]; then pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" else outLink=$tmpDir/result - nix build "$flake#$flakeAttr.config.system.build.toplevel" \ + nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \ "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink pathToConfig="$(readlink -f $outLink)" fi @@ -426,22 +431,24 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" else - nix build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}" + nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}" pathToConfig="$(readlink -f ./result)" fi elif [ "$action" = build-vm ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" else - echo "$0: 'build-vm' is not supported with '--flake'" >&2 - exit 1 + nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vm" \ + "${extraBuildFlags[@]}" "${lockFlags[@]}" + pathToConfig="$(readlink -f ./result)" fi elif [ "$action" = build-vm-with-bootloader ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" else - echo "$0: 'build-vm-with-bootloader' is not supported with '--flake'" >&2 - exit 1 + nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vmWithBootLoader" \ + "${extraBuildFlags[@]}" "${lockFlags[@]}" + pathToConfig="$(readlink -f ./result)" fi else showSyntax diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix index abfa2b9264..e1e1b47aaf 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -22,7 +22,11 @@ let src = ./nixos-install.sh; inherit (pkgs) runtimeShell; nix = config.nix.package.out; - path = makeBinPath [ nixos-enter ]; + path = makeBinPath [ + pkgs.nixUnstable + pkgs.jq + nixos-enter + ]; }; nixos-rebuild = @@ -91,7 +95,7 @@ in ''; }; - config = mkIf config.nix.enable { + config = { system.nixos-generate-config.configuration = mkDefault '' # Edit this configuration file to define what should be installed on diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index bdb7fa3b12..3fabe8b42c 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -184,7 +184,7 @@ in consul = 145; mailpile = 146; redmine = 147; - seeks = 148; + #seeks = 148; # removed 2020-06-21 prosody = 149; i2pd = 150; systemd-network = 152; @@ -321,7 +321,7 @@ in monetdb = 290; restic = 291; openvpn = 292; - meguca = 293; + # meguca = 293; # removed 2020-08-21 yarn = 294; hdfs = 295; mapred = 296; @@ -497,7 +497,7 @@ in #consul = 145; # unused mailpile = 146; redmine = 147; - seeks = 148; + #seeks = 148; # removed 2020-06-21 prosody = 149; i2pd = 150; systemd-network = 152; @@ -622,7 +622,7 @@ in monetdb = 290; restic = 291; openvpn = 292; - meguca = 293; + # meguca = 293; # removed 2020-08-21 yarn = 294; hdfs = 295; mapred = 296; diff --git a/third_party/nixpkgs/nixos/modules/misc/locate.nix b/third_party/nixpkgs/nixos/modules/misc/locate.nix index dc668796c7..92aa3be0a3 100644 --- a/third_party/nixpkgs/nixos/modules/misc/locate.nix +++ b/third_party/nixpkgs/nixos/modules/misc/locate.nix @@ -127,7 +127,7 @@ in { { LOCATE_PATH = cfg.output; }; - warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root" + warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)" ++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component" ++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts"; diff --git a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix index 4f5a9250ea..25ac94b8e0 100644 --- a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix +++ b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix @@ -178,8 +178,6 @@ in type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform default = null; example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; - defaultText = literalExample - ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' Specifies the platform for which NixOS should be built. Specify this only if it is different from diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 522a799291..96529424e8 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -60,6 +60,7 @@ ./hardware/printers.nix ./hardware/raid/hpsa.nix ./hardware/steam-hardware.nix + ./hardware/system-76.nix ./hardware/tuxedo-keyboard.nix ./hardware/usb-wwan.nix ./hardware/onlykey.nix @@ -262,6 +263,7 @@ ./services/continuous-integration/buildbot/worker.nix ./services/continuous-integration/buildkite-agents.nix ./services/continuous-integration/hail.nix + ./services/continuous-integration/hercules-ci-agent/default.nix ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/gitlab-runner.nix ./services/continuous-integration/gocd-agent/default.nix @@ -296,10 +298,10 @@ ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix ./services/desktops/blueman.nix - ./services/desktops/deepin/deepin.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix ./services/desktops/pantheon/files.nix + ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix ./services/desktops/gsignond.nix @@ -553,6 +555,7 @@ ./services/monitoring/telegraf.nix ./services/monitoring/thanos.nix ./services/monitoring/tuptime.nix + ./services/monitoring/unifi-poller.nix ./services/monitoring/ups.nix ./services/monitoring/uptime.nix ./services/monitoring/vnstat.nix @@ -586,6 +589,7 @@ ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix ./services/networking/babeld.nix + ./services/networking/biboumi.nix ./services/networking/bind.nix ./services/networking/bitcoind.nix ./services/networking/autossh.nix @@ -634,7 +638,6 @@ ./services/networking/gvpe.nix ./services/networking/hans.nix ./services/networking/haproxy.nix - ./services/networking/heyefi.nix ./services/networking/hostapd.nix ./services/networking/htpdate.nix ./services/networking/hylafax/default.nix @@ -717,11 +720,11 @@ ./services/networking/rdnssd.nix ./services/networking/redsocks.nix ./services/networking/resilio.nix + ./services/networking/robustirc-bridge.nix ./services/networking/rpcbind.nix ./services/networking/rxe.nix ./services/networking/sabnzbd.nix ./services/networking/searx.nix - ./services/networking/seeks.nix ./services/networking/skydns.nix ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix @@ -834,6 +837,7 @@ ./services/ttys/gpm.nix ./services/ttys/kmscon.nix ./services/wayland/cage.nix + ./services/video/epgstation/default.nix ./services/video/mirakurun.nix ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix @@ -886,7 +890,6 @@ ./services/web-servers/lighttpd/collectd.nix ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/gitweb.nix - ./services/web-servers/meguca.nix ./services/web-servers/mighttpd2.nix ./services/web-servers/minio.nix ./services/web-servers/molly-brown.nix @@ -1024,6 +1027,7 @@ ./virtualisation/podman.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix + ./virtualisation/spice-usb-redirection.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/hardened.nix b/third_party/nixpkgs/nixos/modules/profiles/hardened.nix index ef8c0d74f0..7bff79e827 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/hardened.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/hardened.nix @@ -1,7 +1,7 @@ # A profile with most (vanilla) hardening options enabled by default, # potentially at the cost of features and performance. -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -27,6 +27,9 @@ with lib; security.forcePageTableIsolation = mkDefault true; + # This is required by podman to run containers in rootless mode. + security.unprivilegedUsernsClone = mkDefault config.virtualisation.containers.enable; + security.virtualisation.flushL1DataCache = mkDefault "always"; security.apparmor.enable = mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix index d05c0c50e8..e68ea1b087 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix @@ -51,22 +51,23 @@ with lib; services.mingetty.helpLine = '' The "nixos" and "root" accounts have empty passwords. - Type `sudo systemctl start sshd` to start the SSH daemon. - You then must set a password for either "root" or "nixos" - with `passwd` to be able to login. + An ssh daemon is running. You then must set a password + for either "root" or "nixos" with `passwd` or add an ssh key + to /home/nixos/.ssh/authorized_keys be able to login. '' + optionalString config.services.xserver.enable '' Type `sudo systemctl start display-manager' to start the graphical user interface. ''; - # Allow sshd to be started manually through "systemctl start sshd". + # We run sshd by default. Login via root is only possible after adding a + # password via "passwd" or by adding a ssh key to /home/nixos/.ssh/authorized_keys. + # The latter one is particular useful if keys are manually added to + # installation device for head-less systems i.e. arm boards by manually + # mounting the storage in a different system. services.openssh = { enable = true; - # Allow password login to the installation, if the user sets a password via "passwd" - # It is safe as root doesn't have a password by default and SSH is disabled by default permitRootLogin = "yes"; }; - systemd.services.sshd.wantedBy = mkOverride 50 []; # Enable wpa_supplicant, but don't start it by default. networking.wireless.enable = mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/programs/environment.nix b/third_party/nixpkgs/nixos/modules/programs/environment.nix index 38bdabb4fa..8877356360 100644 --- a/third_party/nixpkgs/nixos/modules/programs/environment.nix +++ b/third_party/nixpkgs/nixos/modules/programs/environment.nix @@ -33,7 +33,6 @@ in { PATH = [ "/bin" ]; INFOPATH = [ "/info" "/share/info" ]; KDEDIRS = [ "" ]; - STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ]; QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/gpaste.nix b/third_party/nixpkgs/nixos/modules/programs/gpaste.nix index 4f6deb77e5..8bc52c28d8 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gpaste.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gpaste.nix @@ -30,5 +30,7 @@ with lib; environment.systemPackages = [ pkgs.gnome3.gpaste ]; services.dbus.packages = [ pkgs.gnome3.gpaste ]; systemd.packages = [ pkgs.gnome3.gpaste ]; + # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. + services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/nm-applet.nix b/third_party/nixpkgs/nixos/modules/programs/nm-applet.nix index 273a6dec59..5bcee30125 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nm-applet.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nm-applet.nix @@ -5,14 +5,25 @@ maintainers = lib.teams.freedesktop.members; }; - options.programs.nm-applet.enable = lib.mkEnableOption "nm-applet"; + options.programs.nm-applet = { + enable = lib.mkEnableOption "nm-applet"; + + indicator = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to use indicator instead of status icon. + It is needed for Appindicator environments, like Enlightenment. + ''; + }; + }; config = lib.mkIf config.programs.nm-applet.enable { systemd.user.services.nm-applet = { description = "Network manager applet"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; - serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet"; + serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet ${lib.optionalString config.programs.nm-applet.indicator "--indicator"}"; }; services.dbus.packages = [ pkgs.gcr ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/qt5ct.nix b/third_party/nixpkgs/nixos/modules/programs/qt5ct.nix index aeb7fc5084..3f2bcf6228 100644 --- a/third_party/nixpkgs/nixos/modules/programs/qt5ct.nix +++ b/third_party/nixpkgs/nixos/modules/programs/qt5ct.nix @@ -26,6 +26,6 @@ with lib; ###### implementation config = mkIf config.programs.qt5ct.enable { environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct"; - environment.systemPackages = with pkgs; [ qt5ct libsForQt5.qtstyleplugins ]; + environment.systemPackages = with pkgs; [ qt5ct ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/ssh.nix b/third_party/nixpkgs/nixos/modules/programs/ssh.nix index a983ffa4b8..40af4d0ff5 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ssh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ssh.nix @@ -131,7 +131,7 @@ in knownHosts = mkOption { default = {}; - type = types.loaOf (types.submodule ({ name, ... }: { + type = types.attrsOf (types.submodule ({ name, ... }: { options = { certAuthority = mkOption { type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix b/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix index eb6f124752..7ac4086d5f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix +++ b/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix @@ -7,7 +7,7 @@ let inherit (lib.modules) mkDefault mkIf; inherit (lib.options) literalExample mkEnableOption mkOption; inherit (lib.strings) concatStringsSep optionalString toLower; - inherit (lib.types) addCheck attrsOf lines loaOf nullOr package path port str strMatching submodule; + inherit (lib.types) addCheck attrsOf lines nullOr package path port str strMatching submodule; # Checks if given list of strings contains unique # elements when compared without considering case. @@ -178,7 +178,7 @@ let client system-options file "dsm.sys" ''; servers = mkOption { - type = loaOf (submodule [ serverOptions ]); + type = attrsOf (submodule [ serverOptions ]); default = {}; example.mainTsmServer = { server = "tsmserver.company.com"; diff --git a/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix b/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix index a7ad9b89db..83ed713864 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix @@ -34,7 +34,7 @@ in partOf = [ "graphical-session.target" ]; serviceConfig.ExecStart = with lib; strings.concatStringsSep " " ([ - "${pkgs.xss-lock}/bin/xss-lock" + "${pkgs.xss-lock}/bin/xss-lock" "--session \${XDG_SESSION_ID}" ] ++ (map escapeShellArg cfg.extraOptions) ++ [ "--" cfg.lockerCommand diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.xml b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.xml index 568c2de655..14a7228ad9 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.xml +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -73,7 +73,7 @@ { pkgs, ... }: { - programs.zsh.ohMyZsh.customPkgs = with pkgs; [ + programs.zsh.ohMyZsh.customPkgs = [ pkgs.nix-zsh-completions # and even more... ]; diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 86cd3bf8dc..a87db475e0 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -19,6 +19,7 @@ with lib; # Completely removed modules (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") @@ -48,6 +49,7 @@ with lib; instead, or any other display manager in NixOS as they all support auto-login. '') (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") + (mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs") (mkRemovedOptionModule ["hardware" "brightnessctl" ] '' The brightnessctl module was removed because newer versions of brightnessctl don't require the udev rules anymore (they can use the @@ -66,6 +68,8 @@ with lib; to handle FIDO security tokens, so this isn't necessary anymore. '') + (mkRemovedOptionModule [ "services" "seeks" ] "") + # Do NOT add any option renames here, see top of the file ]; } diff --git a/third_party/nixpkgs/nixos/modules/security/acme.nix b/third_party/nixpkgs/nixos/modules/security/acme.nix index 1f63e7b88b..8e67d4ff87 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme.nix @@ -1,11 +1,314 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, options, ... }: with lib; let - cfg = config.security.acme; + # Used to calculate timer accuracy for coalescing + numCerts = length (builtins.attrNames cfg.certs); + _24hSecs = 60 * 60 * 24; + + # There are many services required to make cert renewals work. + # They all follow a common structure: + # - They inherit this commonServiceConfig + # - They all run as the acme user + # - They all use BindPath and StateDirectory where possible + # to set up a sort of build environment in /tmp + # The Group can vary depending on what the user has specified in + # security.acme.certs..group on some of the services. + commonServiceConfig = { + Type = "oneshot"; + User = "acme"; + Group = mkDefault "acme"; + UMask = 0027; + StateDirectoryMode = 750; + ProtectSystem = "full"; + PrivateTmp = true; + + WorkingDirectory = "/tmp"; + }; + + # In order to avoid race conditions creating the CA for selfsigned certs, + # we have a separate service which will create the necessary files. + selfsignCAService = { + description = "Generate self-signed certificate authority"; + + path = with pkgs; [ minica ]; + + unitConfig = { + ConditionPathExists = "!/var/lib/acme/.minica/key.pem"; + }; + + serviceConfig = commonServiceConfig // { + StateDirectory = "acme/.minica"; + BindPaths = "/var/lib/acme/.minica:/tmp/ca"; + }; + + # Working directory will be /tmp + script = '' + minica \ + --ca-key ca/key.pem \ + --ca-cert ca/cert.pem \ + --domains selfsigned.local + + chmod 600 ca/* + ''; + }; + + # Previously, all certs were owned by whatever user was configured in + # config.security.acme.certs..user. Now everything is owned by and + # run by the acme user. + userMigrationService = { + description = "Fix owner and group of all ACME certificates"; + + script = with builtins; concatStringsSep "\n" (mapAttrsToList (cert: data: '' + for fixpath in /var/lib/acme/${escapeShellArg cert} /var/lib/acme/.lego/${escapeShellArg cert}; do + if [ -d "$fixpath" ]; then + chmod -R 750 "$fixpath" + chown -R acme:${data.group} "$fixpath" + fi + done + '') certConfigs); + + # We don't want this to run every time a renewal happens + serviceConfig.RemainAfterExit = true; + }; + + certToConfig = cert: data: let + acmeServer = if data.server != null then data.server else cfg.server; + useDns = data.dnsProvider != null; + destPath = "/var/lib/acme/${cert}"; + selfsignedDeps = optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ]; + + # Minica and lego have a "feature" which replaces * with _. We need + # to make this substitution to reference the output files from both programs. + # End users never see this since we rename the certs. + keyName = builtins.replaceStrings ["*"] ["_"] data.domain; + + # FIXME when mkChangedOptionModule supports submodules, change to that. + # This is a workaround + extraDomains = data.extraDomainNames ++ ( + optionals + (data.extraDomains != "_mkMergedOptionModule") + (builtins.attrNames data.extraDomains) + ); + + # Create hashes for cert data directories based on configuration + # Flags are separated to avoid collisions + hashData = with builtins; '' + ${concatStringsSep " " data.extraLegoFlags} - + ${concatStringsSep " " data.extraLegoRunFlags} - + ${concatStringsSep " " data.extraLegoRenewFlags} - + ${toString acmeServer} ${toString data.dnsProvider} + ${toString data.ocspMustStaple} ${data.keyType} + ''; + mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); + certDir = mkHash hashData; + domainHash = mkHash "${concatStringsSep " " extraDomains} ${data.domain}"; + othersHash = mkHash "${toString acmeServer} ${data.keyType}"; + accountDir = "/var/lib/acme/.lego/accounts/" + othersHash; + + protocolOpts = if useDns then ( + [ "--dns" data.dnsProvider ] + ++ optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ] + ) else ( + [ "--http" "--http.webroot" data.webroot ] + ); + + commonOpts = [ + "--accept-tos" # Checking the option is covered by the assertions + "--path" "." + "-d" data.domain + "--email" data.email + "--key-type" data.keyType + ] ++ protocolOpts + ++ optionals data.ocspMustStaple [ "--must-staple" ] + ++ optionals (acmeServer != null) [ "--server" acmeServer ] + ++ concatMap (name: [ "-d" name ]) extraDomains + ++ data.extraLegoFlags; + + runOpts = escapeShellArgs ( + commonOpts + ++ [ "run" ] + ++ data.extraLegoRunFlags + ); + renewOpts = escapeShellArgs ( + commonOpts + ++ [ "renew" "--reuse-key" ] + ++ data.extraLegoRenewFlags + ); + + in { + inherit accountDir selfsignedDeps; + + webroot = data.webroot; + group = data.group; + + renewTimer = { + description = "Renew ACME Certificate for ${cert}"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfg.renewInterval; + Unit = "acme-${cert}.service"; + Persistent = "yes"; + + # Allow systemd to pick a convenient time within the day + # to run the check. + # This allows the coalescing of multiple timer jobs. + # We divide by the number of certificates so that if you + # have many certificates, the renewals are distributed over + # the course of the day to avoid rate limits. + AccuracySec = "${toString (_24hSecs / numCerts)}s"; + + # Skew randomly within the day, per https://letsencrypt.org/docs/integration-guide/. + RandomizedDelaySec = "24h"; + }; + }; + + selfsignService = { + description = "Generate self-signed certificate for ${cert}"; + after = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ]; + requires = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ]; + + path = with pkgs; [ minica ]; + + unitConfig = { + ConditionPathExists = "!/var/lib/acme/${cert}/key.pem"; + }; + + serviceConfig = commonServiceConfig // { + Group = data.group; + + StateDirectory = "acme/${cert}"; + + BindPaths = "/var/lib/acme/.minica:/tmp/ca /var/lib/acme/${cert}:/tmp/${keyName}"; + }; + + # Working directory will be /tmp + # minica will output to a folder sharing the name of the first domain + # in the list, which will be ${data.domain} + script = '' + minica \ + --ca-key ca/key.pem \ + --ca-cert ca/cert.pem \ + --domains ${escapeShellArg (builtins.concatStringsSep "," ([ data.domain ] ++ extraDomains))} + + # Create files to match directory layout for real certificates + cd '${keyName}' + cp ../ca/cert.pem chain.pem + cat cert.pem chain.pem > fullchain.pem + cat key.pem fullchain.pem > full.pem + + chmod 640 * + + # Group might change between runs, re-apply it + chown 'acme:${data.group}' * + ''; + }; + + renewService = { + description = "Renew ACME certificate for ${cert}"; + after = [ "network.target" "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps; + wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps; + + # https://github.com/NixOS/nixpkgs/pull/81371#issuecomment-605526099 + wantedBy = optionals (!config.boot.isContainer) [ "multi-user.target" ]; + + path = with pkgs; [ lego coreutils diffutils ]; + + serviceConfig = commonServiceConfig // { + Group = data.group; + + # AccountDir dir will be created by tmpfiles to ensure correct permissions + # And to avoid deletion during systemctl clean + # acme/.lego/${cert} is listed so that it is deleted during systemctl clean + StateDirectory = "acme/${cert} acme/.lego/${cert} acme/.lego/${cert}/${certDir}"; + + # Needs to be space separated, but can't use a multiline string because that'll include newlines + BindPaths = + "${accountDir}:/tmp/accounts " + + "/var/lib/acme/${cert}:/tmp/out " + + "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates "; + + # Only try loading the credentialsFile if the dns challenge is enabled + EnvironmentFile = mkIf useDns data.credentialsFile; + + # Run as root (Prefixed with +) + ExecStartPost = "+" + (pkgs.writeShellScript "acme-postrun" '' + cd /var/lib/acme/${escapeShellArg cert} + if [ -e renewed ]; then + rm renewed + ${data.postRun} + fi + ''); + }; + + # Working directory will be /tmp + script = '' + set -euo pipefail + + echo '${domainHash}' > domainhash.txt + + # Check if we can renew + if [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' ]; then + + # When domains are updated, there's no need to do a full + # Lego run, but it's likely renew won't work if days is too low. + if [ -e certificates/domainhash.txt ] && cmp -s domainhash.txt certificates/domainhash.txt; then + lego ${renewOpts} --days ${toString cfg.validMinDays} + else + # Any number > 90 works, but this one is over 9000 ;-) + lego ${renewOpts} --days 9001 + fi + + # Otherwise do a full run + else + lego ${runOpts} + fi + + mv domainhash.txt certificates/ + chmod 640 certificates/* + chmod -R 700 accounts/* + + # Group might change between runs, re-apply it + chown 'acme:${data.group}' certificates/* + + # Copy all certs to the "real" certs directory + CERT='certificates/${keyName}.crt' + if [ -e "$CERT" ] && ! cmp -s "$CERT" out/fullchain.pem; then + touch out/renewed + echo Installing new certificate + cp -vp 'certificates/${keyName}.crt' out/fullchain.pem + cp -vp 'certificates/${keyName}.key' out/key.pem + cp -vp 'certificates/${keyName}.issuer.crt' out/chain.pem + ln -sf fullchain.pem out/cert.pem + cat out/key.pem out/fullchain.pem > out/full.pem + fi + ''; + }; + }; + + certConfigs = mapAttrs certToConfig cfg.certs; + certOpts = { name, ... }: { options = { + # user option has been removed + user = mkOption { + visible = false; + default = "_mkRemovedOptionModule"; + }; + + # allowKeysForGroup option has been removed + allowKeysForGroup = mkOption { + visible = false; + default = "_mkRemovedOptionModule"; + }; + + # extraDomains was replaced with extraDomainNames + extraDomains = mkOption { + visible = false; + default = "_mkMergedOptionModule"; + }; + webroot = mkOption { type = types.nullOr types.str; default = null; @@ -41,35 +344,19 @@ let description = "Contact email address for the CA to be able to reach you."; }; - user = mkOption { - type = types.str; - default = "root"; - description = "User running the ACME client."; - }; - group = mkOption { type = types.str; - default = "root"; + default = "acme"; description = "Group running the ACME client."; }; - allowKeysForGroup = mkOption { - type = types.bool; - default = false; - description = '' - Give read permissions to the specified group - () to read SSL private certificates. - ''; - }; - postRun = mkOption { type = types.lines; default = ""; - example = "systemctl reload nginx.service"; + example = "cp full.pem backup.pem"; description = '' - Commands to run after new certificates go live. Typically - the web server and other servers using certificates need to - be reloaded. + Commands to run after new certificates go live. Note that + these commands run as the root user. Executed in the same directory with the new certificate. ''; @@ -82,18 +369,17 @@ let description = "Directory where certificate and other state is stored."; }; - extraDomains = mkOption { - type = types.attrsOf (types.nullOr types.str); - default = {}; + extraDomainNames = mkOption { + type = types.listOf types.str; + default = []; example = literalExample '' - { - "example.org" = null; - "mydomain.org" = null; - } + [ + "example.org" + "mydomain.org" + ] ''; description = '' A list of extra domain names, which are included in the one certificate to be issued. - Setting a distinct server root is deprecated and not functional in 20.03+ ''; }; @@ -150,6 +436,14 @@ let ''; }; + extraLegoFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Additional global flags to pass to all lego commands. + ''; + }; + extraLegoRenewFlags = mkOption { type = types.listOf types.str; default = []; @@ -157,27 +451,19 @@ let Additional flags to pass to lego renew. ''; }; + + extraLegoRunFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Additional flags to pass to lego run. + ''; + }; }; }; -in +in { -{ - - ###### interface - imports = [ - (mkRemovedOptionModule [ "security" "acme" "production" ] '' - Use security.acme.server to define your staging ACME server URL instead. - - To use Let's Encrypt's staging server, use security.acme.server = - "https://acme-staging-v02.api.letsencrypt.org/directory". - '' - ) - (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") - (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") - (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") - (mkChangedOptionModule [ "security" "acme" "validMin"] [ "security" "acme" "validMinDays"] (config: config.security.acme.validMin / (24 * 3600))) - ]; options = { security.acme = { @@ -250,7 +536,7 @@ in "example.com" = { webroot = "/var/www/challenges/"; email = "foo@example.com"; - extraDomains = { "www.example.com" = null; "foo.example.com" = null; }; + extraDomainNames = [ "www.example.com" "foo.example.com" ]; }; "bar.example.com" = { webroot = "/var/www/challenges/"; @@ -262,25 +548,40 @@ in }; }; - ###### implementation + imports = [ + (mkRemovedOptionModule [ "security" "acme" "production" ] '' + Use security.acme.server to define your staging ACME server URL instead. + + To use the let's encrypt staging server, use security.acme.server = + "https://acme-staging-v02.api.letsencrypt.org/directory". + '' + ) + (mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") + (mkRemovedOptionModule [ "security" "acme" "preDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") + (mkRemovedOptionModule [ "security" "acme" "activationDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") + (mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600))) + ]; + config = mkMerge [ (mkIf (cfg.certs != { }) { + # FIXME Most of these custom warnings and filters for security.acme.certs.* are required + # because using mkRemovedOptionModule/mkChangedOptionModule with attrsets isn't possible. + warnings = filter (w: w != "") (mapAttrsToList (cert: data: if data.extraDomains != "_mkMergedOptionModule" then '' + The option definition `security.acme.certs.${cert}.extraDomains` has changed + to `security.acme.certs.${cert}.extraDomainNames` and is now a list of strings. + Setting a custom webroot for extra domains is not possible, instead use separate certs. + '' else "") cfg.certs); + assertions = let - certs = (mapAttrsToList (k: v: v) cfg.certs); + certs = attrValues cfg.certs; in [ - { - assertion = all (certOpts: certOpts.dnsProvider == null || certOpts.webroot == null) certs; - message = '' - Options `security.acme.certs..dnsProvider` and - `security.acme.certs..webroot` are mutually exclusive. - ''; - } { assertion = cfg.email != null || all (certOpts: certOpts.email != null) certs; message = '' You must define `security.acme.certs..email` or - `security.acme.email` to register with the CA. + `security.acme.email` to register with the CA. Note that using + many different addresses for certs may trigger account rate limits. ''; } { @@ -291,183 +592,78 @@ in to `true`. For Let's Encrypt's ToS see https://letsencrypt.org/repository/ ''; } - ]; + ] ++ (builtins.concatLists (mapAttrsToList (cert: data: [ + { + assertion = data.user == "_mkRemovedOptionModule"; + message = '' + The option definition `security.acme.certs.${cert}.user' no longer has any effect; Please remove it. + Certificate user is now hard coded to the "acme" user. If you would + like another user to have access, consider adding them to the + "acme" group or changing security.acme.certs.${cert}.group. + ''; + } + { + assertion = data.allowKeysForGroup == "_mkRemovedOptionModule"; + message = '' + The option definition `security.acme.certs.${cert}.allowKeysForGroup' no longer has any effect; Please remove it. + All certs are readable by the configured group. If this is undesired, + consider changing security.acme.certs.${cert}.group to an unused group. + ''; + } + # * in the cert value breaks building of systemd services, and makes + # referencing them as a user quite weird too. Best practice is to use + # the domain option. + { + assertion = ! hasInfix "*" cert; + message = '' + The cert option path `security.acme.certs.${cert}.dnsProvider` + cannot contain a * character. + Instead, set `security.acme.certs.${cert}.domain = "${cert}";` + and remove the wildcard from the path. + ''; + } + { + assertion = data.dnsProvider == null || data.webroot == null; + message = '' + Options `security.acme.certs.${cert}.dnsProvider` and + `security.acme.certs.${cert}.webroot` are mutually exclusive. + ''; + } + ]) cfg.certs)); - systemd.services = let - services = concatLists servicesLists; - servicesLists = mapAttrsToList certToServices cfg.certs; - certToServices = cert: data: - let - # StateDirectory must be relative, and will be created under /var/lib by systemd - lpath = "acme/${cert}"; - apath = "/var/lib/${lpath}"; - spath = "/var/lib/acme/.lego/${cert}"; - keyName = builtins.replaceStrings ["*"] ["_"] data.domain; - requestedDomains = pipe ([ data.domain ] ++ (attrNames data.extraDomains)) [ - (domains: sort builtins.lessThan domains) - (domains: concatStringsSep "," domains) - ]; - fileMode = if data.allowKeysForGroup then "640" else "600"; - globalOpts = [ "-d" data.domain "--email" data.email "--path" "." "--key-type" data.keyType ] - ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] - ++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ] - ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains) - ++ (if data.dnsProvider != null then [ "--dns" data.dnsProvider ] else [ "--http" "--http.webroot" data.webroot ]) - ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)]; - certOpts = optionals data.ocspMustStaple [ "--must-staple" ]; - runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts); - renewOpts = escapeShellArgs (globalOpts ++ - [ "renew" "--days" (toString cfg.validMinDays) ] ++ - certOpts ++ data.extraLegoRenewFlags); - acmeService = { - description = "Renew ACME Certificate for ${cert}"; - path = with pkgs; [ openssl ]; - after = [ "network.target" "network-online.target" ]; - wants = [ "network-online.target" ]; - wantedBy = mkIf (!config.boot.isContainer) [ "multi-user.target" ]; - serviceConfig = { - Type = "oneshot"; - User = data.user; - Group = data.group; - PrivateTmp = true; - StateDirectory = "acme/.lego/${cert} acme/.lego/accounts ${lpath}"; - StateDirectoryMode = if data.allowKeysForGroup then "750" else "700"; - WorkingDirectory = spath; - # Only try loading the credentialsFile if the dns challenge is enabled - EnvironmentFile = if data.dnsProvider != null then data.credentialsFile else null; - ExecStart = pkgs.writeScript "acme-start" '' - #!${pkgs.runtimeShell} -e - test -L ${spath}/accounts -o -d ${spath}/accounts || ln -s ../accounts ${spath}/accounts - LEGO_ARGS=(${runOpts}) - if [ -e ${spath}/certificates/${keyName}.crt ]; then - REQUESTED_DOMAINS="${requestedDomains}" - EXISTING_DOMAINS="$(openssl x509 -in ${spath}/certificates/${keyName}.crt -noout -ext subjectAltName | tail -n1 | sed -e 's/ *DNS://g')" - if [ "''${REQUESTED_DOMAINS}" == "''${EXISTING_DOMAINS}" ]; then - LEGO_ARGS=(${renewOpts}) - fi - fi - ${pkgs.lego}/bin/lego ''${LEGO_ARGS[@]} - ''; - ExecStartPost = - let - script = pkgs.writeScript "acme-post-start" '' - #!${pkgs.runtimeShell} -e - cd ${apath} + users.users.acme = { + home = "/var/lib/acme"; + group = "acme"; + isSystemUser = true; + }; - # Test that existing cert is older than new cert - KEY=${spath}/certificates/${keyName}.key - KEY_CHANGED=no - if [ -e $KEY -a $KEY -nt key.pem ]; then - KEY_CHANGED=yes - cp -p ${spath}/certificates/${keyName}.key key.pem - cp -p ${spath}/certificates/${keyName}.crt fullchain.pem - cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem - ln -sf fullchain.pem cert.pem - cat key.pem fullchain.pem > full.pem - fi + users.groups.acme = {}; - chmod ${fileMode} *.pem - chown '${data.user}:${data.group}' *.pem + systemd.services = { + "acme-fixperms" = userMigrationService; + } // (mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewService) certConfigs) + // (optionalAttrs (cfg.preliminarySelfsigned) ({ + "acme-selfsigned-ca" = selfsignCAService; + } // (mapAttrs' (cert: conf: nameValuePair "acme-selfsigned-${cert}" conf.selfsignService) certConfigs))); - if [ "$KEY_CHANGED" = "yes" ]; then - : # noop in case postRun is empty - ${data.postRun} - fi - ''; - in - "+${script}"; - }; + systemd.timers = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewTimer) certConfigs; - }; - selfsignedService = { - description = "Create preliminary self-signed certificate for ${cert}"; - path = [ pkgs.openssl ]; - script = - '' - workdir="$(mktemp -d)" + # .lego and .lego/accounts specified to fix any incorrect permissions + systemd.tmpfiles.rules = [ + "d /var/lib/acme/.lego - acme acme" + "d /var/lib/acme/.lego/accounts - acme acme" + ] ++ (unique (concatMap (conf: [ + "d ${conf.accountDir} - acme acme" + ] ++ (optional (conf.webroot != null) "d ${conf.webroot}/.well-known/acme-challenge - acme ${conf.group}") + ) (attrValues certConfigs))); - # Create CA - openssl genrsa -des3 -passout pass:xxxx -out $workdir/ca.pass.key 2048 - openssl rsa -passin pass:xxxx -in $workdir/ca.pass.key -out $workdir/ca.key - openssl req -new -key $workdir/ca.key -out $workdir/ca.csr \ - -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=Security Department/CN=example.com" - openssl x509 -req -days 1 -in $workdir/ca.csr -signkey $workdir/ca.key -out $workdir/ca.crt - - # Create key - openssl genrsa -des3 -passout pass:xxxx -out $workdir/server.pass.key 2048 - openssl rsa -passin pass:xxxx -in $workdir/server.pass.key -out $workdir/server.key - openssl req -new -key $workdir/server.key -out $workdir/server.csr \ - -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com" - openssl x509 -req -days 1 -in $workdir/server.csr -CA $workdir/ca.crt \ - -CAkey $workdir/ca.key -CAserial $workdir/ca.srl -CAcreateserial \ - -out $workdir/server.crt - - # Copy key to destination - cp $workdir/server.key ${apath}/key.pem - - # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates) - cat $workdir/{server.crt,ca.crt} > "${apath}/fullchain.pem" - - # Create full.pem for e.g. lighttpd - cat $workdir/{server.key,server.crt,ca.crt} > "${apath}/full.pem" - - # Give key acme permissions - chown '${data.user}:${data.group}' "${apath}/"{key,fullchain,full}.pem - chmod ${fileMode} "${apath}/"{key,fullchain,full}.pem - ''; - serviceConfig = { - Type = "oneshot"; - PrivateTmp = true; - StateDirectory = lpath; - User = data.user; - Group = data.group; - }; - unitConfig = { - # Do not create self-signed key when key already exists - ConditionPathExists = "!${apath}/key.pem"; - }; - }; - in ( - [ { name = "acme-${cert}"; value = acmeService; } ] - ++ optional cfg.preliminarySelfsigned { name = "acme-selfsigned-${cert}"; value = selfsignedService; } - ); - servicesAttr = listToAttrs services; - in - servicesAttr; - - systemd.tmpfiles.rules = - map (data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}") (filter (data: data.webroot != null) (attrValues cfg.certs)); - - systemd.timers = let - # Allow systemd to pick a convenient time within the day - # to run the check. - # This allows the coalescing of multiple timer jobs. - # We divide by the number of certificates so that if you - # have many certificates, the renewals are distributed over - # the course of the day to avoid rate limits. - numCerts = length (attrNames cfg.certs); - _24hSecs = 60 * 60 * 24; - AccuracySec = "${toString (_24hSecs / numCerts)}s"; - in flip mapAttrs' cfg.certs (cert: data: nameValuePair - ("acme-${cert}") - ({ - description = "Renew ACME Certificate for ${cert}"; - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = cfg.renewInterval; - Unit = "acme-${cert}.service"; - Persistent = "yes"; - inherit AccuracySec; - # Skew randomly within the day, per https://letsencrypt.org/docs/integration-guide/. - RandomizedDelaySec = "24h"; - }; - }) - ); - - systemd.targets.acme-selfsigned-certificates = mkIf cfg.preliminarySelfsigned {}; - systemd.targets.acme-certificates = {}; + # Create some targets which can be depended on to be "active" after cert renewals + systemd.targets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" { + wantedBy = [ "default.target" ]; + requires = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; + after = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; + }) certConfigs; }) - ]; meta = { diff --git a/third_party/nixpkgs/nixos/modules/security/acme.xml b/third_party/nixpkgs/nixos/modules/security/acme.xml index f802faee97..17e94bc12f 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme.xml +++ b/third_party/nixpkgs/nixos/modules/security/acme.xml @@ -72,7 +72,7 @@ services.nginx = { "foo.example.com" = { forceSSL = true; enableACME = true; - # All serverAliases will be added as extra domains on the certificate. + # All serverAliases will be added as extra domain names on the certificate. serverAliases = [ "bar.example.com" ]; locations."/" = { root = "/var/www"; @@ -80,8 +80,8 @@ services.nginx = { }; # We can also add a different vhost and reuse the same certificate - # but we have to append extraDomains manually. - security.acme.certs."foo.example.com".extraDomains."baz.example.com" = null; + # but we have to append extraDomainNames manually. + security.acme.certs."foo.example.com".extraDomainNames = [ "baz.example.com" ]; "baz.example.com" = { forceSSL = true; useACMEHost = "foo.example.com"; @@ -165,7 +165,7 @@ services.httpd = { # Since we have a wildcard vhost to handle port 80, # we can generate certs for anything! # Just make sure your DNS resolves them. - extraDomains = [ "mail.example.com" ]; + extraDomainNames = [ "mail.example.com" ]; }; @@ -251,4 +251,16 @@ chmod 400 /var/lib/secrets/certs.secret journalctl -fu acme-example.com.service and watching its log output. +
+ Regenerating certificates + + + Should you need to regenerate a particular certificate in a hurry, such + as when a vulnerability is found in Let's Encrypt, there is now a convenient + mechanism for doing so. Running systemctl clean acme-example.com.service + will remove all certificate files for the given domain, allowing you to then + systemctl start acme-example.com.service to generate fresh + ones. + +
diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor.nix b/third_party/nixpkgs/nixos/modules/security/apparmor.nix index cfc65b347b..2ee10454fd 100644 --- a/third_party/nixpkgs/nixos/modules/security/apparmor.nix +++ b/third_party/nixpkgs/nixos/modules/security/apparmor.nix @@ -23,11 +23,17 @@ in default = []; description = "List of packages to be added to apparmor's include path"; }; + parserConfig = mkOption { + type = types.str; + default = ""; + description = "AppArmor parser configuration file content"; + }; }; }; config = mkIf cfg.enable { environment.systemPackages = [ pkgs.apparmor-utils ]; + environment.etc."apparmor/parser.conf".text = cfg.parserConfig; boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; diff --git a/third_party/nixpkgs/nixos/modules/security/duosec.nix b/third_party/nixpkgs/nixos/modules/security/duosec.nix index 71428b82f5..c47be80b9d 100644 --- a/third_party/nixpkgs/nixos/modules/security/duosec.nix +++ b/third_party/nixpkgs/nixos/modules/security/duosec.nix @@ -51,7 +51,7 @@ in }; secretKeyFile = mkOption { - type = types.path; + type = types.nullOr types.path; default = null; description = '' A file containing your secret key. The security of your Duo application is tied to the security of your secret key. diff --git a/third_party/nixpkgs/nixos/modules/security/misc.nix b/third_party/nixpkgs/nixos/modules/security/misc.nix index 16e3bfb141..d51dbbb77f 100644 --- a/third_party/nixpkgs/nixos/modules/security/misc.nix +++ b/third_party/nixpkgs/nixos/modules/security/misc.nix @@ -27,6 +27,16 @@ with lib; ''; }; + security.unprivilegedUsernsClone = mkOption { + type = types.bool; + default = false; + description = '' + When disabled, unprivileged users will not be able to create new namespaces. + By default unprivileged user namespaces are disabled. + This option only works in a hardened profile. + ''; + }; + security.protectKernelImage = mkOption { type = types.bool; default = false; @@ -115,6 +125,10 @@ with lib; ]; }) + (mkIf config.security.unprivilegedUsernsClone { + boot.kernel.sysctl."kernel.unprivileged_userns_clone" = mkDefault true; + }) + (mkIf config.security.protectKernelImage { # Disable hibernation (allows replacing the running kernel) boot.kernelParams = [ "nohibernate" ]; diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 565c15dec2..4141a17c50 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -394,7 +394,7 @@ let "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString cfg.enableKwallet ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} ${optionalString cfg.googleAuthenticator.enable @@ -471,7 +471,7 @@ let "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} ${optionalString (cfg.enableKwallet) ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString (cfg.enableGnomeKeyring) "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} ${optionalString (config.virtualisation.lxc.lxcfs.enable) @@ -544,7 +544,7 @@ in security.pam.services = mkOption { default = []; - type = with types; loaOf (submodule pamOpts); + type = with types; attrsOf (submodule pamOpts); description = '' This option defines the PAM services. A service typically diff --git a/third_party/nixpkgs/nixos/modules/security/rngd.nix b/third_party/nixpkgs/nixos/modules/security/rngd.nix index cffa1a5849..cb885c4762 100644 --- a/third_party/nixpkgs/nixos/modules/security/rngd.nix +++ b/third_party/nixpkgs/nixos/modules/security/rngd.nix @@ -10,11 +10,10 @@ in security.rngd = { enable = mkOption { type = types.bool; - default = true; + default = false; description = '' - Whether to enable the rng daemon, which adds entropy from - hardware sources of randomness to the kernel entropy pool when - available. + Whether to enable the rng daemon. Devices that the kernel recognises + as entropy sources are handled automatically by krngd. ''; }; debug = mkOption { @@ -26,12 +25,6 @@ in }; config = mkIf cfg.enable { - services.udev.extraRules = '' - KERNEL=="random", TAG+="systemd" - SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" - KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" - ''; - systemd.services.rngd = { bindsTo = [ "dev-random.device" ]; diff --git a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix index 0a400f1d53..2927d424a8 100644 --- a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix +++ b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix @@ -135,7 +135,7 @@ in { ]; execPkgs = lib.concatMap (opt: let isSet = config.serviceConfig ? ${opt}; - in lib.optional isSet config.serviceConfig.${opt}) execOpts; + in lib.flatten (lib.optional isSet config.serviceConfig.${opt})) execOpts; unitAttrs = toplevelConfig.systemd.units."${name}.service"; allPkgs = lib.singleton (builtins.toJSON unitAttrs); unitPkgs = if fullUnit then allPkgs else execPkgs; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/icecast.nix b/third_party/nixpkgs/nixos/modules/services/audio/icecast.nix index f40ea6be29..6ca20a7a10 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/icecast.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/icecast.nix @@ -47,7 +47,7 @@ in { enable = mkEnableOption "Icecast server"; hostname = mkOption { - type = types.str; + type = types.nullOr types.str; description = "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided."; default = config.networking.domain; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix index 1d2a982ac5..ba20b1b98d 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix @@ -11,6 +11,10 @@ let cfg = config.services.mpd; mpdConf = pkgs.writeText "mpd.conf" '' + # This file was automatically generated by NixOS. Edit mpd's configuration + # via NixOS' configuration.nix, as this file will be rewritten upon mpd's + # restart. + music_directory "${cfg.musicDirectory}" playlist_directory "${cfg.playlistDirectory}" ${lib.optionalString (cfg.dbFile != null) '' @@ -140,6 +144,18 @@ in { ''; }; + credentialsFile = mkOption { + type = types.path; + description = '' + Path to a file to be merged with the settings during the service startup. + Useful to merge a file which is better kept out of the Nix store + because it contains sensible data like MPD's password. Example may look like this: + password "myMpdPassword@read,add,control,admin" + ''; + default = "/dev/null"; + example = "/var/lib/secrets/mpd.conf"; + }; + fluidsynth = mkOption { type = types.bool; default = false; @@ -181,7 +197,12 @@ in { serviceConfig = { User = "${cfg.user}"; - ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon ${mpdConf}"; + ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf"; + ExecStartPre = pkgs.writeScript "mpd-start-pre" '' + #!${pkgs.runtimeShell} + set -euo pipefail + cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf + ''; Type = "notify"; LimitRTPRIO = 50; LimitRTTIME = "infinity"; @@ -195,6 +216,14 @@ in { Restart = "always"; }; }; + environment.etc."mpd.conf" = { + mode = "0640"; + group = cfg.group; + user = cfg.user; + # To be modified by the service' ExecStartPre + text = '' + ''; + }; users.users = optionalAttrs (cfg.user == name) { ${name} = { diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.xml b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.xml index bef7db608f..8f623c9365 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.xml +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.xml @@ -69,10 +69,10 @@ access this single repository. You need the output of the generate pub file. - -# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo -# cat /run/keys/id_ed25519_my_borg_repo -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos + +# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo +# cat /run/keys/id_ed25519_my_borg_repo +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos Add the following snippet to your NixOS configuration: @@ -197,26 +197,8 @@ sudo borg init --encryption=repokey-blake2 \ disk failure, ransomware and theft. - It is available as a flatpak package. To enable it you must set the - following two configuration items. - - - -services.flatpak.enable = true ; -# next line is needed to avoid the Error -# Error deploying: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: -services.accounts-daemon.enable = true; - - - As a normal user you must first install, then run vorta using the - following commands: - -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -flatpak install flathub com.borgbase.Vorta -flatpak run --branch=stable --arch=x86_64 --command=vorta com.borgbase.Vorta - - After running flatpak install you can start Vorta also via - the KDE application menu. + It can be installed in NixOS e.g. by adding pkgs.vorta + to . Details about using Vorta can be found under x86_64-linux + to allow for import from derivation. + ''; + type = types.int; + default = 4; + }; + workDirectory = mkOption { + description = '' + The directory in which temporary subdirectories are created for task state. This includes sources for Nix evaluation. + ''; + type = types.path; + default = config.baseDirectory + "/work"; + defaultText = literalExample ''baseDirectory + "/work"''; + }; + staticSecretsDirectory = mkOption { + description = '' + This is the default directory to look for statically configured secrets like cluster-join-token.key. + ''; + type = types.path; + default = config.baseDirectory + "/secrets"; + defaultText = literalExample ''baseDirectory + "/secrets"''; + }; + clusterJoinTokenPath = mkOption { + description = '' + Location of the cluster-join-token.key file. + ''; + type = types.path; + default = config.staticSecretsDirectory + "/cluster-join-token.key"; + defaultText = literalExample ''staticSecretsDirectory + "/cluster-join-token.key"''; + # internal: It's a bit too detailed to show by default in the docs, + # but useful to define explicitly to allow reuse by other modules. + internal = true; + }; + binaryCachesPath = mkOption { + description = '' + Location of the binary-caches.json file. + ''; + type = types.path; + default = config.staticSecretsDirectory + "/binary-caches.json"; + defaultText = literalExample ''staticSecretsDirectory + "/binary-caches.json"''; + # internal: It's a bit too detailed to show by default in the docs, + # but useful to define explicitly to allow reuse by other modules. + internal = true; + }; + }; + }; + + checkNix = + if !cfg.checkNix + then "" + else if lib.versionAtLeast config.nix.package.version "2.4.0" + then "" + else pkgs.stdenv.mkDerivation { + name = "hercules-ci-check-system-nix-src"; + inherit (config.nix.package) src patches; + configurePhase = ":"; + buildPhase = '' + echo "Checking in-memory pathInfoCache expiry" + if ! grep 'struct PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then + cat 1>&2 <Hercules CI is a + continuous integation service that is centered around Nix. + + Support is available at help@hercules-ci.com. + ''; + }; + patchNix = mkOption { + type = types.bool; + default = false; + description = '' + Fix Nix 2.3 cache path metadata caching behavior. Has the effect of nix.package = patch pkgs.nix; + + This option will be removed when Hercules CI Agent moves to Nix 2.4 (upcoming Nix release). + ''; + }; + checkNix = mkOption { + type = types.bool; + default = true; + description = '' + Whether to make sure that the system's Nix (nix-daemon) is compatible. + + If you set this to false, please keep up with the change log. + ''; + }; + package = mkOption { + description = '' + Package containing the bin/hercules-ci-agent executable. + ''; + type = types.package; + default = pkgs.hercules-ci-agent; + defaultText = literalExample "pkgs.hercules-ci-agent"; + }; + settings = mkOption { + description = '' + These settings are written to the agent.toml file. + + Not all settings are listed as options, can be set nonetheless. + + For the exhaustive list of settings, see . + ''; + type = types.submoduleWith { modules = [ settingsModule ]; }; + }; + + /* + Internal and/or computed values. + + These are written as options instead of let binding to allow sharing with + default.nix on both NixOS and nix-darwin. + */ + tomlFile = mkOption { + type = types.path; + internal = true; + defaultText = "generated hercules-ci-agent.toml"; + description = '' + The fully assembled config file. + ''; + }; + }; + + config = mkIf cfg.enable { + nix.extraOptions = lib.addContextFrom checkNix '' + # A store path that was missing at first may well have finished building, + # even shortly after the previous lookup. This *also* applies to the daemon. + narinfo-cache-negative-ttl = 0 + ''; + nix.package = mkIf cfg.patchNix patchedNix; + services.hercules-ci-agent.tomlFile = + format.generate "hercules-ci-agent.toml" cfg.settings; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix new file mode 100644 index 0000000000..d2e7e8e18f --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -0,0 +1,86 @@ +/* + +This file is for NixOS-specific options and configs. + +Code that is shared with nix-darwin goes in common.nix. + + */ + +{ pkgs, config, lib, ... }: + +let + + inherit (lib) mkIf mkDefault; + + cfg = config.services.hercules-ci-agent; + + command = "${cfg.package}/bin/hercules-ci-agent --config ${cfg.tomlFile}"; + testCommand = "${command} --test-configuration"; + +in +{ + imports = [ + ./common.nix + (lib.mkRenamedOptionModule ["services" "hercules-ci-agent" "user"] ["systemd" "services" "hercules-ci-agent" "serviceConfig" "User"]) + ]; + + config = mkIf cfg.enable { + + systemd.services.hercules-ci-agent = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + path = [ config.nix.package ]; + serviceConfig = { + User = "hercules-ci-agent"; + ExecStart = command; + ExecStartPre = testCommand; + Restart = "on-failure"; + RestartSec = 120; + StartLimitBurst = 30 * 1000000; # practically infinite + }; + }; + + # Changes in the secrets do not affect the unit in any way that would cause + # a restart, which is currently necessary to reload the secrets. + systemd.paths.hercules-ci-agent-restart-files = { + wantedBy = [ "hercules-ci-agent.service" ]; + pathConfig = { + Unit = "hercules-ci-agent-restarter.service"; + PathChanged = [ cfg.settings.clusterJoinTokenPath cfg.settings.binaryCachesPath ]; + }; + }; + systemd.services.hercules-ci-agent-restarter = { + serviceConfig.Type = "oneshot"; + script = '' + # Wait a bit, with the effect of bundling up file changes into a single + # run of this script and hopefully a single restart. + sleep 10 + if systemctl is-active --quiet hercules-ci-agent.service; then + if ${testCommand}; then + systemctl restart hercules-ci-agent.service + else + echo 1>&2 "WARNING: Not restarting agent because config is not valid at this time." + fi + else + echo 1>&2 "Not restarting hercules-ci-agent despite config file update, because it is not already active." + fi + ''; + }; + + # Trusted user allows simplified configuration and better performance + # when operating in a cluster. + nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ]; + services.hercules-ci-agent.settings.nixUserIsTrusted = true; + + users.users.hercules-ci-agent = { + home = cfg.settings.baseDirectory; + createHome = true; + group = "hercules-ci-agent"; + description = "Hercules CI Agent system user"; + isSystemUser = true; + }; + + users.groups.hercules-ci-agent = {}; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix index 53224db1d8..f385331e87 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix @@ -11,7 +11,13 @@ let database_dir = ${cfg.databaseDir} uri_file = ${cfg.uriFile} view_index_dir = ${cfg.viewIndexDir} - '' + (if useVersion2 then + '' + (if cfg.adminPass != null then + '' + [admins] + ${cfg.adminUser} = ${cfg.adminPass} + '' else + '' + '') + (if useVersion2 then '' [chttpd] '' else @@ -54,6 +60,23 @@ in { ''; }; + adminUser = mkOption { + type = types.str; + default = "admin"; + description = '' + Couchdb (i.e. fauxton) account with permission for all dbs and + tasks. + ''; + }; + + adminPass = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Couchdb (i.e. fauxton) account with permission for all dbs and + tasks. + ''; + }; user = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index 3e16b5907d..5056d50153 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -11,23 +11,23 @@ let then cfg.package else cfg.package.withPackages (_: cfg.extraPlugins); + toStr = value: + if true == value then "yes" + else if false == value then "no" + else if isString value then "'${lib.replaceStrings ["'"] ["''"] value}'" + else toString value; + # 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' - log_line_prefix = '${cfg.logLinePrefix}' - listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}' - port = ${toString cfg.port} - ${cfg.extraConfig} - ''; + configFile = pkgs.writeText "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings)); groupAccessAvailable = versionAtLeast postgresql.version "11.0"; in { + imports = [ + (mkRemovedOptionModule [ "services" "postgresql" "extraConfig" ] "Use services.postgresql.settings instead.") + ]; ###### interface @@ -212,10 +212,28 @@ in ''; }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Additional text to be appended to postgresql.conf."; + settings = mkOption { + type = with types; attrsOf (oneOf [ bool float int str ]); + default = {}; + description = '' + PostgreSQL configuration. Refer to + + for an overview of postgresql.conf. + + + String values will automatically be enclosed in single quotes. Single quotes will be + escaped with two single quotes as described by the upstream documentation linked above. + + ''; + example = literalExample '' + { + log_connections = true; + log_statement = "all"; + logging_collector = true + log_disconnections = true + log_destination = lib.mkForce "syslog"; + } + ''; }; recoveryConfig = mkOption { @@ -225,14 +243,15 @@ in Contents of the recovery.conf file. ''; }; + superUser = mkOption { type = types.str; - default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root"; + default = "postgres"; internal = true; + readOnly = true; description = '' - NixOS traditionally used 'root' as superuser, most other distros use 'postgres'. - From 17.09 we also try to follow this standard. Internal since changing this value - would lead to breakage while setting up databases. + PostgreSQL superuser account to use for various operations. Internal since changing + this value would lead to breakage while setting up databases. ''; }; }; @@ -244,6 +263,16 @@ in config = mkIf cfg.enable { + services.postgresql.settings = + { + hba_file = "${pkgs.writeText "pg_hba.conf" cfg.authentication}"; + ident_file = "${pkgs.writeText "pg_ident.conf" cfg.identMap}"; + log_destination = "stderr"; + log_line_prefix = cfg.logLinePrefix; + listen_addresses = if cfg.enableTCPIP then "*" else "localhost"; + port = cfg.port; + }; + services.postgresql.package = # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing @@ -310,6 +339,35 @@ in ''} ''; + # Wait for PostgreSQL to be ready to accept connections. + postStart = + '' + PSQL="psql --port=${toString cfg.port}" + + while ! $PSQL -d postgres -c "" 2> /dev/null; do + if ! kill -0 "$MAINPID"; then exit 1; fi + sleep 0.1 + done + + if test -e "${cfg.dataDir}/.first_startup"; then + ${optionalString (cfg.initialScript != null) '' + $PSQL -f "${cfg.initialScript}" -d postgres + ''} + rm -f "${cfg.dataDir}/.first_startup" + fi + '' + optionalString (cfg.ensureDatabases != []) '' + ${concatMapStrings (database: '' + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"' + '') cfg.ensureDatabases} + '' + '' + ${concatMapStrings (user: '' + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' + ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' + $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' + '') user.ensurePermissions)} + '') cfg.ensureUsers} + ''; + serviceConfig = mkMerge [ { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "postgres"; @@ -329,40 +387,6 @@ in TimeoutSec = 120; ExecStart = "${postgresql}/bin/postgres"; - - # Wait for PostgreSQL to be ready to accept connections. - ExecStartPost = - let - setupScript = pkgs.writeScript "postgresql-setup" ('' - #!${pkgs.runtimeShell} -e - - PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}" - - while ! $PSQL -d postgres -c "" 2> /dev/null; do - if ! kill -0 "$MAINPID"; then exit 1; fi - sleep 0.1 - done - - if test -e "${cfg.dataDir}/.first_startup"; then - ${optionalString (cfg.initialScript != null) '' - $PSQL -f "${cfg.initialScript}" -d postgres - ''} - rm -f "${cfg.dataDir}/.first_startup" - fi - '' + optionalString (cfg.ensureDatabases != []) '' - ${concatMapStrings (database: '' - $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"' - '') cfg.ensureDatabases} - '' + '' - ${concatMapStrings (user: '' - $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' - ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' - $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' - '') user.ensurePermissions)} - '') cfg.ensureUsers} - ''); - in - "+${setupScript}"; } (mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") { StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}"; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix b/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix index cb6bf8508f..0af5d2adf3 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix @@ -49,8 +49,8 @@ let cfg = config.services.victoriametrics; in ExecStart = '' ${cfg.package}/bin/victoria-metrics \ -storageDataPath=/var/lib/victoriametrics \ - -httpListenAddr ${cfg.listenAddress} - -retentionPeriod ${toString cfg.retentionPeriod} + -httpListenAddr ${cfg.listenAddress} \ + -retentionPeriod ${toString cfg.retentionPeriod} \ ${lib.escapeShellArgs cfg.extraOptions} ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix b/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix deleted file mode 100644 index f8fb73701a..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix +++ /dev/null @@ -1,123 +0,0 @@ -# deepin - -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - services.deepin.core.enable = lib.mkEnableOption " - Basic dbus and systemd services, groups and users needed by the - Deepin Desktop Environment. - "; - - services.deepin.deepin-menu.enable = lib.mkEnableOption " - DBus service for unified menus in Deepin Desktop Environment. - "; - - services.deepin.deepin-turbo.enable = lib.mkEnableOption " - Turbo service for the Deepin Desktop Environment. It is a daemon - that helps to launch applications faster. - "; - - }; - - - ###### implementation - - config = lib.mkMerge [ - - (lib.mkIf config.services.deepin.core.enable { - environment.systemPackages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-calendar - pkgs.deepin.dde-control-center - pkgs.deepin.dde-daemon - pkgs.deepin.dde-dock - pkgs.deepin.dde-launcher - pkgs.deepin.dde-file-manager - pkgs.deepin.dde-session-ui - pkgs.deepin.deepin-anything - pkgs.deepin.deepin-image-viewer - ]; - - services.dbus.packages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-calendar - pkgs.deepin.dde-control-center - pkgs.deepin.dde-daemon - pkgs.deepin.dde-dock - pkgs.deepin.dde-launcher - pkgs.deepin.dde-file-manager - pkgs.deepin.dde-session-ui - pkgs.deepin.deepin-anything - pkgs.deepin.deepin-image-viewer - ]; - - systemd.packages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-daemon - pkgs.deepin.dde-file-manager - pkgs.deepin.deepin-anything - ]; - - boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything ]; - - boot.kernelModules = [ "vfs_monitor" ]; - - users.groups.deepin-sound-player = { }; - - users.users.deepin-sound-player = { - description = "Deepin sound player"; - group = "deepin-sound-player"; - isSystemUser = true; - }; - - users.groups.deepin-daemon = { }; - - users.users.deepin-daemon = { - description = "Deepin daemon user"; - group = "deepin-daemon"; - isSystemUser = true; - }; - - users.groups.deepin_anything_server = { }; - - users.users.deepin_anything_server = { - description = "Deepin Anything Server"; - group = "deepin_anything_server"; - isSystemUser = true; - }; - - security.pam.services.deepin-auth-keyboard.text = '' - # original at ${pkgs.deepin.dde-daemon}/etc/pam.d/deepin-auth-keyboard - auth [success=2 default=ignore] pam_lsass.so - auth [success=1 default=ignore] pam_unix.so nullok_secure try_first_pass - auth requisite pam_deny.so - auth required pam_permit.so - ''; - - environment.etc = { - "polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla".source = "${pkgs.deepin.dde-api}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla"; - "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla"; - "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla"; - }; - - services.deepin.deepin-menu.enable = true; - services.deepin.deepin-turbo.enable = true; - }) - - (lib.mkIf config.services.deepin.deepin-menu.enable { - services.dbus.packages = [ pkgs.deepin.deepin-menu ]; - }) - - (lib.mkIf config.services.deepin.deepin-turbo.enable { - environment.systemPackages = [ pkgs.deepin.deepin-turbo ]; - systemd.packages = [ pkgs.deepin.deepin-turbo ]; - }) - - ]; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/espanso.nix b/third_party/nixpkgs/nixos/modules/services/desktops/espanso.nix new file mode 100644 index 0000000000..cd2eadf881 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/desktops/espanso.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; +let cfg = config.services.espanso; +in { + meta = { maintainers = with lib.maintainers; [ numkem ]; }; + + options = { + services.espanso = { enable = options.mkEnableOption "Espanso"; }; + }; + + config = mkIf cfg.enable { + systemd.user.services.espanso = { + description = "Espanso daemon"; + path = with pkgs; [ espanso libnotify xclip ]; + serviceConfig = { + ExecStart = "${pkgs.espanso}/bin/espanso daemon"; + Restart = "on-failure"; + }; + wantedBy = [ "default.target" ]; + }; + + environment.systemPackages = [ pkgs.espanso ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix index 542b2ead41..6702bd395a 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix @@ -160,7 +160,7 @@ in }; appConfig = mkOption { - type = types.loaOf appConfigModule; + type = types.attrsOf appConfigModule; default = {}; example = literalExample '' "com.github.app" = { diff --git a/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix b/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix index be6aaed93a..f1dcab68b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix @@ -15,7 +15,7 @@ let jupyterhubConfig = pkgs.writeText "jupyterhub_config.py" '' c.JupyterHub.bind_url = "http://${cfg.host}:${toString cfg.port}" - c.JupyterHub.authentication_class = "${cfg.authentication}" + c.JupyterHub.authenticator_class = "${cfg.authentication}" c.JupyterHub.spawner_class = "${cfg.spawner}" c.SystemdSpawner.default_url = '/lab' diff --git a/third_party/nixpkgs/nixos/modules/services/development/lorri.nix b/third_party/nixpkgs/nixos/modules/services/development/lorri.nix index c843aa56d1..fc576e4c18 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/lorri.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/lorri.nix @@ -15,6 +15,15 @@ in { issued by the `lorri` command. ''; }; + package = lib.mkOption { + default = pkgs.lorri; + type = lib.types.package; + description = '' + The lorri package to use. + ''; + defaultText = lib.literalExample "pkgs.lorri"; + example = lib.literalExample "pkgs.lorri"; + }; }; }; @@ -34,7 +43,7 @@ in { after = [ "lorri.socket" ]; path = with pkgs; [ config.nix.package git gnutar gzip ]; serviceConfig = { - ExecStart = "${pkgs.lorri}/bin/lorri daemon"; + ExecStart = "${cfg.package}/bin/lorri daemon"; PrivateTmp = true; ProtectSystem = "strict"; ProtectHome = "read-only"; @@ -42,6 +51,6 @@ in { }; }; - environment.systemPackages = [ pkgs.lorri ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.xml b/third_party/nixpkgs/nixos/modules/services/editors/emacs.xml index 74c60014dc..302aa1ed7c 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.xml +++ b/third_party/nixpkgs/nixos/modules/services/editors/emacs.xml @@ -53,11 +53,11 @@ emacs - emacs25 + emacs - The latest stable version of Emacs 25 using the + The latest stable version of Emacs using the GTK 2 widget toolkit. @@ -66,11 +66,11 @@ - emacs25-nox + emacs-nox - Emacs 25 built without any dependency on X11 libraries. + Emacs built without any dependency on X11 libraries. @@ -79,11 +79,11 @@ emacsMacport - emacs25Macport + emacsMacport - Emacs 25 with the "Mac port" patches, providing a more native look and + Emacs with the "Mac port" patches, providing a more native look and feel under macOS. @@ -322,7 +322,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides If you want, you can tweak the Emacs package itself from your emacs.nix. For example, if you want to have a GTK 3-based Emacs instead of the default GTK 2-based binary and remove the - automatically generated emacs.desktop (useful is you + automatically generated emacs.desktop (useful if you only use emacsclient), you can change your file emacs.nix in this way: diff --git a/third_party/nixpkgs/nixos/modules/services/games/terraria.nix b/third_party/nixpkgs/nixos/modules/services/games/terraria.nix index 413660321e..34c8ff137d 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/terraria.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/terraria.nix @@ -25,7 +25,7 @@ let exit 0 fi - ${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter exit Enter + ${getBin pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/terraria.sock send-keys Enter exit Enter ${getBin pkgs.coreutils}/bin/tail --pid="$1" -f /dev/null ''; in @@ -36,7 +36,7 @@ in type = types.bool; default = false; description = '' - If enabled, starts a Terraria server. The server can be connected to via tmux -S /var/lib/terraria/terraria.sock attach + If enabled, starts a Terraria server. The server can be connected to via tmux -S ${cfg.dataDir}/terraria.sock attach for administration by users who are a part of the terraria group (use C-b d shortcut to detach again). ''; }; @@ -111,13 +111,19 @@ in default = false; description = "Disables automatic Universal Plug and Play."; }; + dataDir = mkOption { + type = types.str; + default = "/var/lib/terraria"; + example = "/srv/terraria"; + description = "Path to variable state data directory for terraria."; + }; }; }; config = mkIf cfg.enable { users.users.terraria = { description = "Terraria server service user"; - home = "/var/lib/terraria"; + home = cfg.dataDir; createHome = true; uid = config.ids.uids.terraria; }; @@ -136,13 +142,13 @@ in User = "terraria"; Type = "forking"; GuessMainPID = true; - ExecStart = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}"; + ExecStart = "${getBin pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}"; ExecStop = "${stopScript} $MAINPID"; }; postStart = '' - ${pkgs.coreutils}/bin/chmod 660 /var/lib/terraria/terraria.sock - ${pkgs.coreutils}/bin/chgrp terraria /var/lib/terraria/terraria.sock + ${pkgs.coreutils}/bin/chmod 660 ${cfg.dataDir}/terraria.sock + ${pkgs.coreutils}/bin/chgrp terraria ${cfg.dataDir}/terraria.sock ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix b/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix index bb4541a784..e1ce11a5ae 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix @@ -12,7 +12,7 @@ in{ config = mkOption { default = null; - type = types.lines; + type = types.nullOr types.lines; description = "Fancontrol configuration file content. See pwmconfig8 from the lm_sensors package."; example = '' # Configuration file generated by pwmconfig diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix index 6f49a1ab6d..a6afa01dd8 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix @@ -81,7 +81,7 @@ in { office1 = { model = "MFC-7860DW"; ip = "192.168.1.2"; }; office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; }; }; - type = with types; loaOf (submodule netDeviceOpts); + type = with types; attrsOf (submodule netDeviceOpts); description = '' The list of network devices that will be registered against the brscan4 sane backend. diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix index ecb529e9bf..b7be0e89d0 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix @@ -23,6 +23,15 @@ in { default = null; description = "the thermald manual configuration file."; }; + + adaptive = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable adaptive mode, only working on kernel versions greater than 5.8. + Thermald will detect this itself, safe to enable on kernel versions below 5.8. + ''; + }; }; }; @@ -39,6 +48,7 @@ in { --no-daemon \ ${optionalString cfg.debug "--loglevel=debug"} \ ${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \ + ${optionalString cfg.adaptive "--adaptive"} \ --dbus-enable ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix b/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix index 828032dc57..054ffa3505 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix @@ -103,6 +103,17 @@ in The temperature target on battery power in Celsius degrees. ''; }; + + useTimer = mkOption { + type = types.bool; + default = false; + description = '' + Whether to set a timer that applies the undervolt settings every 30s. + This will cause spam in the journal but might be required for some + hardware under specific conditions. + Enable this if your undervolt settings don't hold. + ''; + }; }; config = mkIf cfg.enable { @@ -114,6 +125,11 @@ in path = [ pkgs.undervolt ]; description = "Intel Undervolting Service"; + + # Apply undervolt on boot, nixos generation switch and resume + wantedBy = [ "multi-user.target" "post-resume.target" ]; + after = [ "post-resume.target" ]; # Not sure why but it won't work without this + serviceConfig = { Type = "oneshot"; Restart = "no"; @@ -121,7 +137,7 @@ in }; }; - systemd.timers.undervolt = { + systemd.timers.undervolt = mkIf cfg.useTimer { description = "Undervolt timer to ensure voltage settings are always applied"; partOf = [ "undervolt.service" ]; wantedBy = [ "multi-user.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix index 565618b27a..7d6102b825 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix @@ -5,54 +5,93 @@ with lib; let cfg = config.services.logrotate; - pathOptions = { + pathOpts = { options = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable log rotation for this path. This can be used to explicitly disable + logging that has been configured by NixOS. + ''; + }; + path = mkOption { type = types.str; - description = "The path to log files to be rotated"; + description = '' + The path to log files to be rotated. + ''; }; + user = mkOption { - type = types.str; - description = "The user account to use for rotation"; + type = with types; nullOr str; + default = null; + description = '' + The user account to use for rotation. + ''; }; + group = mkOption { - type = types.str; - description = "The group to use for rotation"; + type = with types; nullOr str; + default = null; + description = '' + The group to use for rotation. + ''; }; + frequency = mkOption { - type = types.enum [ - "daily" "weekly" "monthly" "yearly" - ]; + type = types.enum [ "daily" "weekly" "monthly" "yearly" ]; default = "daily"; - description = "How often to rotate the logs"; + description = '' + How often to rotate the logs. + ''; }; + keep = mkOption { type = types.int; default = 20; - description = "How many rotations to keep"; + description = '' + How many rotations to keep. + ''; }; + extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra logrotate config options for this path"; + description = '' + Extra logrotate config options for this path. Refer to + for details. + ''; + }; + + priority = mkOption { + type = types.int; + default = 1000; + description = '' + Order of this logrotate block in relation to the others. The semantics are + the same as with `lib.mkOrder`. Smaller values have a greater priority. + ''; }; }; - }; - pathConfig = options: '' - "${options.path}" { - su ${options.user} ${options.group} - ${options.frequency} + config.extraConfig = '' missingok notifempty - rotate ${toString options.keep} - ${options.extraConfig} + ''; + }; + + mkConf = pathOpts: '' + # generated by NixOS using the `services.logrotate.paths.${pathOpts.name}` attribute set + "${pathOpts.path}" { + ${optionalString (pathOpts.user != null || pathOpts.group != null) "su ${pathOpts.user} ${pathOpts.group}"} + ${pathOpts.frequency} + rotate ${toString pathOpts.keep} + ${pathOpts.extraConfig} } ''; - configFile = pkgs.writeText "logrotate.conf" ( - (concatStringsSep "\n" ((map pathConfig cfg.paths) ++ [cfg.extraConfig])) - ); + paths = sortProperties (mapAttrsToList (name: pathOpts: pathOpts // { name = name; }) (filterAttrs (_: pathOpts: pathOpts.enable) cfg.paths)); + configFile = pkgs.writeText "logrotate.conf" (concatStringsSep "\n" ((map mkConf paths) ++ [ cfg.extraConfig ])); in { @@ -65,41 +104,66 @@ in enable = mkEnableOption "the logrotate systemd service"; paths = mkOption { - type = types.listOf (types.submodule pathOptions); - default = []; - description = "List of attribute sets with paths to rotate"; - example = { - "/var/log/myapp/*.log" = { - user = "myuser"; - group = "mygroup"; - rotate = "weekly"; - keep = 5; - }; - }; + type = with types; attrsOf (submodule pathOpts); + default = {}; + description = '' + Attribute set of paths to rotate. The order each block appears in the generated configuration file + can be controlled by the priority option + using the same semantics as `lib.mkOrder`. Smaller values have a greater priority. + ''; + example = literalExample '' + { + httpd = { + path = "/var/log/httpd/*.log"; + user = config.services.httpd.user; + group = config.services.httpd.group; + keep = 7; + }; + + myapp = { + path = "/var/log/myapp/*.log"; + user = "myuser"; + group = "mygroup"; + frequency = "weekly"; + keep = 5; + priority = 1; + }; + } + ''; }; extraConfig = mkOption { default = ""; type = types.lines; description = '' - Extra contents to add to the logrotate config file. - See https://linux.die.net/man/8/logrotate + Extra contents to append to the logrotate configuration file. Refer to + for details. ''; }; }; }; config = mkIf cfg.enable { - systemd.services.logrotate = { - description = "Logrotate Service"; - wantedBy = [ "multi-user.target" ]; - startAt = "*-*-* *:05:00"; + assertions = mapAttrsToList (name: pathOpts: + { assertion = (pathOpts.user != null) == (pathOpts.group != null); + message = '' + If either of `services.logrotate.paths.${name}.user` or `services.logrotate.paths.${name}.group` are specified then *both* must be specified. + ''; + } + ) cfg.paths; - serviceConfig.Restart = "no"; - serviceConfig.User = "root"; + systemd.services.logrotate = { + description = "Logrotate Service"; + wantedBy = [ "multi-user.target" ]; + startAt = "*-*-* *:05:00"; script = '' exec ${pkgs.logrotate}/sbin/logrotate ${configFile} ''; + + serviceConfig = { + Restart = "no"; + User = "root"; + }; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix b/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix index 21a83803fd..bf92425f99 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix @@ -4,13 +4,9 @@ with lib; let cfg = config.services.logstash; - pluginPath = lib.concatStringsSep ":" cfg.plugins; - havePluginPath = lib.length cfg.plugins > 0; ops = lib.optionalString; verbosityFlag = "--log.level " + cfg.logLevel; - pluginsPath = "--path.plugins ${pluginPath}"; - logstashConf = pkgs.writeText "logstash.conf" '' input { ${cfg.inputConfig} @@ -173,7 +169,7 @@ in ExecStart = concatStringsSep " " (filter (s: stringLength s != 0) [ "${cfg.package}/bin/logstash" "-w ${toString cfg.filterWorkers}" - (ops havePluginPath pluginsPath) + (concatMapStringsSep " " (x: "--path.plugins ${x}") cfg.plugins) "${verbosityFlag}" "-f ${logstashConf}" "--path.settings ${logstashSettingsDir}" diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix index 51cbcbf1cb..c166ef68f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: with lib; @@ -83,11 +83,11 @@ let ) ( - optionalString (cfg.mailboxes != []) '' + optionalString (cfg.mailboxes != {}) '' protocol imap { namespace inbox { inbox=yes - ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)} + ${concatStringsSep "\n" (map mailboxConfig (attrValues cfg.mailboxes))} } } '' @@ -131,12 +131,13 @@ let special_use = \${toString mailbox.specialUse} '' + "}"; - mailboxes = { ... }: { + mailboxes = { name, ... }: { options = { name = mkOption { - type = types.nullOr (types.strMatching ''[^"]+''); + type = types.strMatching ''[^"]+''; example = "Spam"; - default = null; + default = name; + readOnly = true; description = "The name of the mailbox."; }; auto = mkOption { @@ -335,19 +336,11 @@ in }; mailboxes = mkOption { - type = with types; let m = submodule mailboxes; in either (listOf m) (attrsOf m); + type = with types; coercedTo + (listOf unspecified) + (list: listToAttrs (map (entry: { name = entry.name; value = removeAttrs entry ["name"]; }) list)) + (attrsOf (submodule mailboxes)); default = {}; - apply = x: - if isList x then warn "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03!" x - else mapAttrsToList (name: value: - if value.name != null - then throw '' - When specifying dovecot2 mailboxes as attributes, declaring - a `name'-attribute is prohibited! The name ${value.name} should - be the attribute key! - '' - else value // { inherit name; } - ) x; example = literalExample '' { Spam = { specialUse = "Junk"; auto = "create"; }; @@ -471,6 +464,10 @@ in environment.systemPackages = [ dovecotPkg ]; + warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [ + "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03! See the release notes for more info for migration." + ]; + assertions = [ { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailhog.nix b/third_party/nixpkgs/nixos/modules/services/mail/mailhog.nix index 0f998c6d0e..b113f4ff3d 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mailhog.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mailhog.nix @@ -4,17 +4,59 @@ with lib; let cfg = config.services.mailhog; -in { + + args = lib.concatStringsSep " " ( + [ + "-api-bind-addr :${toString cfg.apiPort}" + "-smtp-bind-addr :${toString cfg.smtpPort}" + "-ui-bind-addr :${toString cfg.uiPort}" + "-storage ${cfg.storage}" + ] ++ lib.optional (cfg.storage == "maildir") + "-maildir-path $STATE_DIRECTORY" + ++ cfg.extraArgs + ); + +in +{ ###### interface + imports = [ + (mkRemovedOptionModule [ "services" "mailhog" "user" ] "") + ]; + options = { services.mailhog = { enable = mkEnableOption "MailHog"; - user = mkOption { - type = types.str; - default = "mailhog"; - description = "User account under which mailhog runs."; + + storage = mkOption { + type = types.enum [ "maildir" "memory" ]; + default = "memory"; + description = "Store mails on disk or in memory."; + }; + + apiPort = mkOption { + type = types.port; + default = 8025; + description = "Port on which the API endpoint will listen."; + }; + + smtpPort = mkOption { + type = types.port; + default = 1025; + description = "Port on which the SMTP endpoint will listen."; + }; + + uiPort = mkOption { + type = types.port; + default = 8025; + description = "Port on which the HTTP UI will listen."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + description = "List of additional arguments to pass to the MailHog process."; }; }; }; @@ -24,20 +66,16 @@ in { config = mkIf cfg.enable { - users.users.mailhog = { - name = cfg.user; - description = "MailHog service user"; - isSystemUser = true; - }; - systemd.services.mailhog = { - description = "MailHog service"; + description = "MailHog - Web and API based SMTP testing"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.mailhog}/bin/MailHog"; - User = cfg.user; + Type = "exec"; + ExecStart = "${pkgs.mailhog}/bin/MailHog ${args}"; + DynamicUser = true; + Restart = "on-failure"; + StateDirectory = "mailhog"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/opendkim.nix b/third_party/nixpkgs/nixos/modules/services/mail/opendkim.nix index eb6a426684..9bf6f338d9 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/opendkim.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/opendkim.nix @@ -129,6 +129,36 @@ in { User = cfg.user; Group = cfg.group; RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim"; + StateDirectory = "opendkim"; + StateDirectoryMode = "0700"; + ReadWritePaths = [ cfg.keyPath ]; + + AmbientCapabilities = []; + CapabilityBoundingSet = []; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6 AF_UNIX" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged @resources" ]; + UMask = "0077"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/beanstalkd.nix b/third_party/nixpkgs/nixos/modules/services/misc/beanstalkd.nix index bcd133c974..1c674a5b23 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/beanstalkd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/beanstalkd.nix @@ -28,6 +28,12 @@ in example = "0.0.0.0"; }; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Whether to open ports in the firewall for the server."; + }; }; }; @@ -35,6 +41,10 @@ in config = mkIf cfg.enable { + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listen.port ]; + }; + environment.systemPackages = [ pkg ]; systemd.services.beanstalkd = { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix b/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix index 84c04f403d..2467d34b52 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix @@ -9,24 +9,42 @@ let in { + imports = [ + (mkChangedOptionModule [ "services" "calibre-server" "libraryDir" ] [ "services" "calibre-server" "libraries" ] + (config: + let libraryDir = getAttrFromPath [ "services" "calibre-server" "libraryDir" ] config; + in [ libraryDir ] + ) + ) + ]; ###### interface options = { - services.calibre-server = { enable = mkEnableOption "calibre-server"; - libraryDir = mkOption { + libraries = mkOption { description = '' - The directory where the Calibre library to serve is. - ''; - type = types.path; + The directories of the libraries to serve. They must be readable for the user under which the server runs. + ''; + type = types.listOf types.path; + }; + + user = mkOption { + description = "The user under which calibre-server runs."; + type = types.str; + default = "calibre-server"; + }; + + group = mkOption { + description = "The group under which calibre-server runs."; + type = types.str; + default = "calibre-server"; }; }; - }; @@ -34,29 +52,34 @@ in config = mkIf cfg.enable { - systemd.services.calibre-server = - { + systemd.services.calibre-server = { description = "Calibre Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = "calibre-server"; + User = cfg.user; Restart = "always"; - ExecStart = "${pkgs.calibre}/bin/calibre-server ${cfg.libraryDir}"; + ExecStart = "${pkgs.calibre}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries}"; }; }; environment.systemPackages = [ pkgs.calibre ]; - users.users.calibre-server = { + users.users = optionalAttrs (cfg.user == "calibre-server") { + calibre-server = { + home = "/var/lib/calibre-server"; + createHome = true; uid = config.ids.uids.calibre-server; - group = "calibre-server"; + group = cfg.group; }; + }; - users.groups.calibre-server = { + users.groups = optionalAttrs (cfg.group == "calibre-server") { + calibre-server = { gid = config.ids.gids.calibre-server; }; + }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix b/third_party/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix index 3057d7fd1a..552725f138 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix @@ -172,7 +172,7 @@ in { }; database = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = "Database name to store sms data"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index 5d8de3b1bb..9896b8023e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -54,7 +54,7 @@ let '') gitlabConfig.production.repositories.storages))} ''; - gitlabShellConfig = { + gitlabShellConfig = flip recursiveUpdate cfg.extraShellConfig { user = cfg.user; gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}"; http_settings.self_signed_cert = false; @@ -517,6 +517,12 @@ in { ''; }; + extraShellConfig = mkOption { + type = types.attrs; + default = {}; + description = "Extra configuration to merge into shell-config.yml"; + }; + extraConfig = mkOption { type = types.attrs; default = {}; @@ -777,6 +783,23 @@ in { }; }; + systemd.services.gitlab-mailroom = mkIf (gitlabConfig.production.incoming_email.enabled or false) { + description = "GitLab incoming mail daemon"; + after = [ "network.target" "redis.service" "gitlab.service" ]; # gitlab.service creates configs + wantedBy = [ "multi-user.target" ]; + environment = gitlabEnv; + serviceConfig = { + Type = "simple"; + TimeoutSec = "infinity"; + Restart = "on-failure"; + + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec mail_room -c ${cfg.packages.gitlab}/share/gitlab/config.dist/mail_room.yml"; + WorkingDirectory = gitlabEnv.HOME; + }; + }; + systemd.services.gitlab = { after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "gitlab-postgresql.service" "redis.service" ]; requires = [ "gitlab-sidekiq.service" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml index b6171a9a19..19a3df0a5f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml @@ -97,6 +97,12 @@ services.gitlab = { state folder. + + When icoming_mail.enabled is set to true + in extraConfig an additional + service called gitlab-mailroom is enabled for fetching incoming mail. + + Refer to for all available configuration options for the diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix index 8842e1e4d9..0c9c754830 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix @@ -50,6 +50,12 @@ in description = "Parse and interpret emoji tags"; }; + h1-title = mkOption { + type = types.bool; + default = false; + description = "Use the first h1 as page title"; + }; + branch = mkOption { type = types.str; default = "master"; @@ -102,6 +108,7 @@ in --ref ${cfg.branch} \ ${optionalString cfg.mathjax "--mathjax"} \ ${optionalString cfg.emoji "--emoji"} \ + ${optionalString cfg.h1-title "--h1-title"} \ ${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \ ${cfg.stateDir} ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index d6a437ad65..2680b1cc0d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -81,14 +81,6 @@ in nix = { - enable = mkOption { - type = types.bool; - default = true; - description = '' - If disabled, Nix will not be available on the built NixOS system. - ''; - }; - package = mkOption { type = types.package; default = pkgs.nix; @@ -506,14 +498,7 @@ in ###### implementation - config = mkIf cfg.enable { - - assertions = [ - { - assertion = config.nix.distributedBuilds || config.nix.buildMachines == []; - message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines"; - } - ]; + config = { nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.binaryCaches = [ "https://cache.nixos.org/" ]; @@ -602,16 +587,10 @@ in nix.systemFeatures = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) ( - # a x86_64 builder can run code for `platform.gcc.arch` and minor architectures: - [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ { - sandybridge = [ "gccarch-westmere" ]; - ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ]; - haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ]; - broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ]; - skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ]; - skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ]; - }.${pkgs.hostPlatform.platform.gcc.arch} or [] + optionals (pkgs.hostPlatform.platform ? gcc.arch) ( + # a builder can run code for `platform.gcc.arch` and inferior architectures + [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch} ) ); diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix index f5faf357c3..12bed05757 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix @@ -48,7 +48,7 @@ in ###### implementation - config = mkIf config.nix.enable { + config = { systemd.services.nix-gc = { description = "Nix Garbage Collector"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-optimise.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-optimise.nix index 129d9c8e39..e02026d5f7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-optimise.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-optimise.nix @@ -36,7 +36,7 @@ in ###### implementation - config = mkIf config.nix.enable { + config = { systemd.services.nix-optimise = { description = "Nix Store Optimiser"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix index 7a71d2c8c6..e2fbd3b401 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix @@ -68,8 +68,8 @@ in plugins = mkOption { default = plugins: []; defaultText = "plugins: []"; - example = literalExample "plugins: [ m3d-fio ]"; - description = "Additional plugins."; + example = literalExample "plugins: with plugins; [ m33-fio stlviewer ]"; + description = "Additional plugins to be used. Available plugins are passed through the plugins input."; }; extraConfig = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix index 0e71cf9256..1313bdaccc 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkDefault mkEnableOption mkIf mkOption types; + inherit (lib) mkBefore mkDefault mkEnableOption mkIf mkOption mkRemovedOptionModule types; inherit (lib) concatStringsSep literalExample mapAttrsToList; - inherit (lib) optional optionalAttrs optionalString singleton versionAtLeast; + inherit (lib) optional optionalAttrs optionalString; cfg = config.services.redmine; - + format = pkgs.formats.yaml {}; bundle = "${cfg.package}/share/redmine/bin/bundle"; databaseYml = pkgs.writeText "database.yml" '' @@ -20,24 +20,8 @@ let ${optionalString (cfg.database.type == "mysql2" && cfg.database.socket != null) "socket: ${cfg.database.socket}"} ''; - configurationYml = pkgs.writeText "configuration.yml" '' - default: - scm_subversion_command: ${pkgs.subversion}/bin/svn - scm_mercurial_command: ${pkgs.mercurial}/bin/hg - scm_git_command: ${pkgs.gitAndTools.git}/bin/git - scm_cvs_command: ${pkgs.cvs}/bin/cvs - scm_bazaar_command: ${pkgs.breezy}/bin/bzr - scm_darcs_command: ${pkgs.darcs}/bin/darcs - - ${cfg.extraConfig} - ''; - - additionalEnvironment = pkgs.writeText "additional_environment.rb" '' - config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) - config.logger.level = Logger::INFO - - ${cfg.extraEnv} - ''; + configurationYml = format.generate "configuration.yml" cfg.settings; + additionalEnvironment = pkgs.writeText "additional_environment.rb" cfg.extraEnv; unpackTheme = unpack "theme"; unpackPlugin = unpack "plugin"; @@ -56,8 +40,13 @@ let pgsqlLocal = cfg.database.createLocally && cfg.database.type == "postgresql"; in - { + imports = [ + (mkRemovedOptionModule [ "services" "redmine" "extraConfig" ] "Use services.redmine.settings instead.") + (mkRemovedOptionModule [ "services" "redmine" "database" "password" ] "Use services.redmine.database.passwordFile instead.") + ]; + + # interface options = { services.redmine = { enable = mkEnableOption "Redmine"; @@ -93,21 +82,24 @@ in description = "The state directory, logs and plugins are stored here."; }; - extraConfig = mkOption { - type = types.lines; - default = ""; + settings = mkOption { + type = format.type; + default = {}; description = '' - Extra configuration in configuration.yml. - - See + Redmine configuration (configuration.yml). Refer to + for details. ''; example = literalExample '' - email_delivery: - delivery_method: smtp - smtp_settings: - address: mail.example.com - port: 25 + { + email_delivery = { + delivery_method = "smtp"; + smtp_settings = { + address = "mail.example.com"; + port = 25; + }; + }; + } ''; }; @@ -186,16 +178,6 @@ in description = "Database user."; }; - password = mkOption { - type = types.str; - default = ""; - description = '' - The password corresponding to . - Warning: this is stored in cleartext in the Nix store! - Use instead. - ''; - }; - passwordFile = mkOption { type = types.nullOr types.path; default = null; @@ -226,11 +208,12 @@ in }; }; + # implementation config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.passwordFile != null || cfg.database.password != "" || cfg.database.socket != null; - message = "one of services.redmine.database.socket, services.redmine.database.passwordFile, or services.redmine.database.password must be set"; + { assertion = cfg.database.passwordFile != null || cfg.database.socket != null; + message = "one of services.redmine.database.socket or services.redmine.database.passwordFile must be set"; } { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user; message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true"; @@ -243,6 +226,22 @@ in } ]; + services.redmine.settings = { + production = { + scm_subversion_command = "${pkgs.subversion}/bin/svn"; + scm_mercurial_command = "${pkgs.mercurial}/bin/hg"; + scm_git_command = "${pkgs.gitAndTools.git}/bin/git"; + scm_cvs_command = "${pkgs.cvs}/bin/cvs"; + scm_bazaar_command = "${pkgs.breezy}/bin/bzr"; + scm_darcs_command = "${pkgs.darcs}/bin/darcs"; + }; + }; + + services.redmine.extraEnv = mkBefore '' + config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) + config.logger.level = Logger::INFO + ''; + services.mysql = mkIf mysqlLocal { enable = true; package = mkDefault pkgs.mariadb; @@ -338,7 +337,7 @@ in # handle database.passwordFile & permissions - DBPASS=$(head -n1 ${cfg.database.passwordFile}) + DBPASS=${optionalString (cfg.database.passwordFile != null) "$(head -n1 ${cfg.database.passwordFile})"} cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml" sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml" chmod 440 "${cfg.stateDir}/config/database.yml" @@ -379,17 +378,6 @@ in redmine.gid = config.ids.gids.redmine; }; - warnings = optional (cfg.database.password != "") - ''config.services.redmine.database.password will be stored as plaintext - in the Nix store. Use database.passwordFile instead.''; - - # Create database passwordFile default when password is configured. - services.redmine.database.passwordFile = - (mkDefault (toString (pkgs.writeTextFile { - name = "redmine-database-password"; - text = cfg.database.password; - }))); - }; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix b/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix index f7c05deeec..00e806695f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix @@ -29,13 +29,15 @@ in { config = mkIf cfg.enable { systemd.services.ssm-agent = { + users.extraUsers.ssm-user = {}; + inherit (cfg.package.meta) description; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ fake-lsb-release ]; + path = [ fake-lsb-release pkgs.coreutils ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/agent"; + ExecStart = "${cfg.package}/bin/amazon-ssm-agent"; KillMode = "process"; Restart = "on-failure"; RestartSec = "15min"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix index 3da99a3b38..386281e2b7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix @@ -69,7 +69,7 @@ in { mode = "0400"; }; - system.nssModules = pkgs.sssd; + system.nssModules = [ pkgs.sssd ]; system.nssDatabases = { group = [ "sss" ]; passwd = [ "sss" ]; @@ -92,4 +92,6 @@ in { services.openssh.authorizedKeysCommand = "/etc/ssh/authorized_keys_command"; services.openssh.authorizedKeysCommandUser = "nobody"; })]; + + meta.maintainers = with maintainers; [ bbigras ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix index f1cb890794..673bc7b02b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix @@ -6,7 +6,7 @@ let cfg = config.services.datadog-agent; ddConf = { - dd_url = "https://app.datadoghq.com"; + dd_url = cfg.ddUrl; skip_ssl_validation = false; confd_path = "/etc/datadog-agent/conf.d"; additional_checksd = "/etc/datadog-agent/checks.d"; @@ -77,6 +77,18 @@ in { type = types.path; }; + ddUrl = mkOption { + description = '' + Custom dd_url to configure the agent with. + Useful when you want to point datadog to another endpoint, either + because you need a proxy to send out data, or because you use their EU + endpoint. + ''; + default = "https://app.datadoghq.com"; + example = "https://app.datadoghq.eu"; + type = types.str; + }; + tags = mkOption { description = "The tags to mark this Datadog agent"; example = [ "test" "service" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/monit.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/monit.nix index ca93522721..379ee96762 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/monit.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/monit.nix @@ -43,4 +43,6 @@ in }; }; + + meta.maintainers = with maintainers; [ ryantm ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index 84a72afac2..bfd4951ef4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -46,7 +46,7 @@ let cmdlineArgs = cfg.extraFlags ++ [ "--storage.tsdb.path=${workingDir}/data/" "--config.file=${prometheusYml}" - "--web.listen-address=${cfg.listenAddress}" + "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}" "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" ] ++ @@ -489,9 +489,17 @@ in { ''; }; + port = mkOption { + type = types.port; + default = 9090; + description = '' + Port to listen on. + ''; + }; + listenAddress = mkOption { type = types.str; - default = "0.0.0.0:9090"; + default = "0.0.0.0"; description = '' Address to listen on for the web interface, API, and telemetry. ''; @@ -619,6 +627,23 @@ in { }; config = mkIf cfg.enable { + assertions = [ + ( let + # Match something with dots (an IPv4 address) or something ending in + # a square bracket (an IPv6 addresses) followed by a port number. + legacy = builtins.match "(.*\\..*|.*]):([[:digit:]]+)" cfg.listenAddress; + in { + assertion = legacy == null; + message = '' + Do not specify the port for Prometheus to listen on in the + listenAddress option; use the port option instead: + services.prometheus.listenAddress = ${builtins.elemAt legacy 0}; + services.prometheus.port = ${builtins.elemAt legacy 1}; + ''; + } + ) + ]; + users.groups.prometheus.gid = config.ids.gids.prometheus; users.users.prometheus = { description = "Prometheus daemon user"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index 59748efe0d..cc71451bf2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -46,6 +46,7 @@ let "surfboard" "tor" "unifi" + "unifi-poller" "varnish" "wireguard" ] (name: @@ -84,7 +85,8 @@ let }; firewallFilter = mkOption { type = types.str; - default = "-p tcp -m tcp --dport ${toString port}"; + default = "-p tcp -m tcp --dport ${toString cfg.${name}.port}"; + defaultText = "-p tcp -m tcp --dport ${toString port}"; example = literalExample '' "-i eth0 -p tcp -m tcp --dport ${toString port}" ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix new file mode 100644 index 0000000000..394e6e201f --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix @@ -0,0 +1,34 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.unifi-poller; + + configFile = pkgs.writeText "prometheus-unifi-poller-exporter.json" (generators.toJSON {} { + poller = { inherit (cfg.log) debug quiet; }; + unifi = { inherit (cfg) controllers; }; + influxdb.disable = true; + prometheus = { + http_listen = "${cfg.listenAddress}:${toString cfg.port}"; + report_errors = cfg.log.prometheusErrors; + }; + }); + +in { + port = 9130; + + extraOpts = { + inherit (options.services.unifi-poller.unifi) controllers; + log = { + debug = mkEnableOption "debug logging including line numbers, high resolution timestamps, per-device logs."; + quiet = mkEnableOption "startup and error logs only."; + prometheusErrors = mkEnableOption "emitting errors to prometheus."; + }; + }; + + serviceOpts.serviceConfig = { + ExecStart = "${pkgs.unifi-poller}/bin/unifi-poller --config ${configFile}"; + DynamicUser = false; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix index a3612be3cc..c72b4abfcd 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix @@ -20,7 +20,7 @@ let ${pkgs.coreutils}/bin/cat << EOF From: smartd on ${host} <${nm.sender}> To: undisclosed-recipients:; - Subject: SMART error on $SMARTD_DEVICESTRING: $SMARTD_FAILTYPE + Subject: $SMARTD_SUBJECT $SMARTD_FULLMESSAGE EOF @@ -239,11 +239,7 @@ in systemd.services.smartd = { description = "S.M.A.R.T. Daemon"; - wantedBy = [ "multi-user.target" ]; - - path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd - serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix new file mode 100644 index 0000000000..208f5e4875 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix @@ -0,0 +1,242 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.unifi-poller; + + configFile = pkgs.writeText "unifi-poller.json" (generators.toJSON {} { + inherit (cfg) poller influxdb prometheus unifi; + }); + +in { + options.services.unifi-poller = { + enable = mkEnableOption "unifi-poller"; + + poller = { + debug = mkOption { + type = types.bool; + default = false; + description = '' + Turns on line numbers, microsecond logging, and a per-device log. + This may be noisy if you have a lot of devices. It adds one line per device. + ''; + }; + quiet = mkOption { + type = types.bool; + default = false; + description = '' + Turns off per-interval logs. Only startup and error logs will be emitted. + ''; + }; + plugins = mkOption { + type = with types; listOf str; + default = []; + description = '' + Load additional plugins. + ''; + }; + }; + + prometheus = { + disable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to disable the prometheus ouput plugin. + ''; + }; + http_listen = mkOption { + type = types.str; + default = "[::]:9130"; + description = '' + Bind the prometheus exporter to this IP or hostname. + ''; + }; + report_errors = mkOption { + type = types.bool; + default = false; + description = '' + Whether to report errors. + ''; + }; + }; + + influxdb = { + disable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to disable the influxdb ouput plugin. + ''; + }; + url = mkOption { + type = types.str; + default = "http://127.0.0.1:8086"; + description = '' + URL of the influxdb host. + ''; + }; + user = mkOption { + type = types.str; + default = "unifipoller"; + description = '' + Username for the influxdb. + ''; + }; + pass = mkOption { + type = types.path; + default = pkgs.writeText "unifi-poller-influxdb-default.password" "unifipoller"; + defaultText = "unifi-poller-influxdb-default.password"; + description = '' + Path of a file containing the password for influxdb. + This file needs to be readable by the unifi-poller user. + ''; + apply = v: "file://${v}"; + }; + db = mkOption { + type = types.str; + default = "unifi"; + description = '' + Database name. Database should exist. + ''; + }; + verify_ssl = mkOption { + type = types.bool; + default = true; + description = '' + Verify the influxdb's certificate. + ''; + }; + interval = mkOption { + type = types.str; + default = "30s"; + description = '' + Setting this lower than the Unifi controller's refresh + interval may lead to zeroes in your database. + ''; + }; + }; + + unifi = let + controllerOptions = { + user = mkOption { + type = types.str; + default = "unifi"; + description = '' + Unifi service user name. + ''; + }; + pass = mkOption { + type = types.path; + default = pkgs.writeText "unifi-poller-unifi-default.password" "unifi"; + defaultText = "unifi-poller-unifi-default.password"; + description = '' + Path of a file containing the password for the unifi service user. + This file needs to be readable by the unifi-poller user. + ''; + apply = v: "file://${v}"; + }; + url = mkOption { + type = types.str; + default = "https://unifi:8443"; + description = '' + URL of the Unifi controller. + ''; + }; + sites = mkOption { + type = with types; either (enum [ "default" "all" ]) (listOf str); + default = "all"; + description = '' + List of site names for which statistics should be exported. + Or the string "default" for the default site or the string "all" for all sites. + ''; + apply = toList; + }; + save_ids = mkOption { + type = types.bool; + default = false; + description = '' + Collect and save data from the intrusion detection system to influxdb. + ''; + }; + save_dpi = mkOption { + type = types.bool; + default = false; + description = '' + Collect and save data from deep packet inspection. + Adds around 150 data points and impacts performance. + ''; + }; + save_sites = mkOption { + type = types.bool; + default = true; + description = '' + Collect and save site data. + ''; + }; + hash_pii = mkOption { + type = types.bool; + default = false; + description = '' + Hash, with md5, client names and MAC addresses. This attempts + to protect personally identifiable information. + ''; + }; + verify_ssl = mkOption { + type = types.bool; + default = true; + description = '' + Verify the Unifi controller's certificate. + ''; + }; + }; + + in { + dynamic = mkOption { + type = types.bool; + default = false; + description = '' + Let prometheus select which controller to poll when scraping. + Use with default credentials. See unifi-poller wiki for more. + ''; + }; + + defaults = controllerOptions; + + controllers = mkOption { + type = with types; listOf (submodule { options = controllerOptions; }); + default = []; + description = '' + List of Unifi controllers to poll. Use defaults if empty. + ''; + apply = map (flip removeAttrs [ "_module" ]); + }; + }; + }; + + config = mkIf cfg.enable { + users.groups.unifi-poller = { }; + users.users.unifi-poller = { + description = "unifi-poller Service User"; + group = "unifi-poller"; + isSystemUser = true; + }; + + systemd.services.unifi-poller = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.unifi-poller}/bin/unifi-poller --config ${configFile}"; + Restart = "always"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "full"; + DevicePolicy = "closed"; + NoNewPrivileges = true; + User = "unifi-poller"; + WorkingDirectory = "/tmp"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix index d51507c91a..2c8b8b92cb 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -5,8 +5,8 @@ let pgsql = config.services.postgresql; mysql = config.services.mysql; - inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption; - inherit (lib) attrValues concatMapStringsSep literalExample optional optionalAttrs optionalString types; + inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption; + inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types; inherit (lib.generators) toKeyValue; user = "zabbix"; @@ -232,14 +232,15 @@ in services.mysql = optionalAttrs mysqlLocal { enable = true; package = mkDefault pkgs.mariadb; - ensureDatabases = [ cfg.database.name ]; - ensureUsers = [ - { name = cfg.database.user; - ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; - } - ]; }; + systemd.services.mysql.postStart = mkAfter (optionalString mysqlLocal '' + ( echo "CREATE DATABASE IF NOT EXISTS \`${cfg.database.name}\` CHARACTER SET utf8 COLLATE utf8_bin;" + echo "CREATE USER IF NOT EXISTS '${cfg.database.user}'@'localhost' IDENTIFIED WITH ${if (getName config.services.mysql.package == getName pkgs.mariadb) then "unix_socket" else "auth_socket"};" + echo "GRANT ALL PRIVILEGES ON \`${cfg.database.name}\`.* TO '${cfg.database.user}'@'localhost';" + ) | ${config.services.mysql.package}/bin/mysql -N + ''); + services.postgresql = optionalAttrs pgsqlLocal { enable = true; ensureDatabases = [ cfg.database.name ]; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix index df09488a8c..c8658634ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix @@ -5,8 +5,8 @@ let pgsql = config.services.postgresql; mysql = config.services.mysql; - inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption; - inherit (lib) attrValues concatMapStringsSep literalExample optional optionalAttrs optionalString types; + inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption; + inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types; inherit (lib.generators) toKeyValue; user = "zabbix"; @@ -220,14 +220,15 @@ in services.mysql = optionalAttrs mysqlLocal { enable = true; package = mkDefault pkgs.mariadb; - ensureDatabases = [ cfg.database.name ]; - ensureUsers = [ - { name = cfg.database.user; - ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; - } - ]; }; + systemd.services.mysql.postStart = mkAfter (optionalString mysqlLocal '' + ( echo "CREATE DATABASE IF NOT EXISTS \`${cfg.database.name}\` CHARACTER SET utf8 COLLATE utf8_bin;" + echo "CREATE USER IF NOT EXISTS '${cfg.database.user}'@'localhost' IDENTIFIED WITH ${if (getName config.services.mysql.package == getName pkgs.mariadb) then "unix_socket" else "auth_socket"};" + echo "GRANT ALL PRIVILEGES ON \`${cfg.database.name}\`.* TO '${cfg.database.user}'@'localhost';" + ) | ${config.services.mysql.package}/bin/mysql -N + ''); + services.postgresql = optionalAttrs pgsqlLocal { enable = true; ensureDatabases = [ cfg.database.name ]; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix index 6198134084..229c966541 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix @@ -43,17 +43,21 @@ in config = mkIf cfg.enable { + boot.kernelModules = [ "cachefiles" ]; + systemd.services.cachefilesd = { description = "Local network file caching management daemon"; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.kmod pkgs.cachefilesd ]; - script = '' - modprobe -qab cachefiles - mkdir -p ${cfg.cacheDir} - chmod 700 ${cfg.cacheDir} - exec cachefilesd -n -f ${cfgFile} - ''; + serviceConfig = { + Type = "exec"; + ExecStart = "${pkgs.cachefilesd}/bin/cachefilesd -n -f ${cfgFile}"; + Restart = "on-failure"; + PrivateTmp = true; + }; }; + systemd.tmpfiles.rules = [ + "d ${cfg.cacheDir} 0700 root root - -" + ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix index 74ebdc1340..8eb754fe61 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -83,14 +83,14 @@ in { }; dataStorageSpace = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; example = "/data/storage"; description = "Directory for data storage."; }; metadataStorageSpace = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; example = "/data/meta"; description = "Directory for meta data storage."; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix index 08c912e0fc..7d3c601d6c 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix @@ -248,7 +248,7 @@ in }; security.pam.services.samba = {}; - + environment.systemPackages = [ config.services.samba.package ]; }) ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix new file mode 100644 index 0000000000..66ddca93d8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix @@ -0,0 +1,269 @@ +{ config, lib, pkgs, options, ... }: +with lib; +let + cfg = config.services.biboumi; + inherit (config.environment) etc; + rootDir = "/run/biboumi/mnt-root"; + stateDir = "/var/lib/biboumi"; + settingsFile = pkgs.writeText "biboumi.cfg" ( + generators.toKeyValue { + mkKeyValue = k: v: + if v == null then "" + else generators.mkKeyValueDefault {} "=" k v; + } cfg.settings); + need_CAP_NET_BIND_SERVICE = cfg.settings.identd_port != 0 && cfg.settings.identd_port < 1024; +in +{ + options = { + services.biboumi = { + enable = mkEnableOption "the Biboumi XMPP gateway to IRC"; + + settings = mkOption { + description = '' + See biboumi 8.5 + for documentation. + ''; + default = {}; + type = types.submodule { + freeformType = with types; + (attrsOf (nullOr (oneOf [str int bool]))) // { + description = "settings option"; + }; + options.admin = mkOption { + type = with types; listOf str; + default = []; + example = ["admin@example.org"]; + apply = concatStringsSep ":"; + description = '' + The bare JID of the gateway administrator. This JID will have more + privileges than other standard users, for example some administration + ad-hoc commands will only be available to that JID. + ''; + }; + options.ca_file = mkOption { + type = types.path; + default = "/etc/ssl/certs/ca-certificates.crt"; + description = '' + Specifies which file should be used as the list of trusted CA + when negociating a TLS session. + ''; + }; + options.db_name = mkOption { + type = with types; either path str; + default = "${stateDir}/biboumi.sqlite"; + description = '' + The name of the database to use. + ''; + example = "postgresql://user:secret@localhost"; + }; + options.hostname = mkOption { + type = types.str; + example = "biboumi.example.org"; + description = '' + The hostname served by the XMPP gateway. + This domain must be configured in the XMPP server + as an external component. + ''; + }; + options.identd_port = mkOption { + type = types.port; + default = 113; + example = 0; + description = '' + The TCP port on which to listen for identd queries. + ''; + }; + options.log_level = mkOption { + type = types.ints.between 0 3; + default = 1; + description = '' + Indicate what type of log messages to write in the logs. + 0 is debug, 1 is info, 2 is warning, 3 is error. + ''; + }; + options.password = mkOption { + type = with types; nullOr str; + description = '' + The password used to authenticate the XMPP component to your XMPP server. + This password must be configured in the XMPP server, + associated with the external component on + hostname. + + Set it to null and use credentialsFile + if you do not want this password to go into the Nix store. + ''; + }; + options.persistent_by_default = mkOption { + type = types.bool; + default = false; + description = '' + Whether all rooms will be persistent by default: + the value of the “persistent” option in the global configuration of each + user will be “true”, but the value of each individual room will still + default to false. This means that a user just needs to change the global + “persistent” configuration option to false in order to override this. + ''; + }; + options.policy_directory = mkOption { + type = types.path; + default = "${pkgs.biboumi}/etc/biboumi"; + description = '' + A directory that should contain the policy files, + used to customize Botan’s behaviour + when negociating the TLS connections with the IRC servers. + ''; + }; + options.port = mkOption { + type = types.port; + default = 5347; + description = '' + The TCP port to use to connect to the local XMPP component. + ''; + }; + options.realname_customization = mkOption { + type = types.bool; + default = true; + description = '' + Whether the users will be able to use + the ad-hoc commands that lets them configure + their realname and username. + ''; + }; + options.realname_from_jid = mkOption { + type = types.bool; + default = false; + description = '' + Whether the realname and username of each biboumi + user will be extracted from their JID. + Otherwise they will be set to the nick + they used to connect to the IRC server. + ''; + }; + options.xmpp_server_ip = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + The IP address to connect to the XMPP server on. + The connection to the XMPP server is unencrypted, + so the biboumi instance and the server should + normally be on the same host. + ''; + }; + }; + }; + + credentialsFile = mkOption { + type = types.path; + description = '' + Path to a configuration file to be merged with the settings. + Beware not to surround "=" with spaces when setting biboumi's options in this file. + Useful to merge a file which is better kept out of the Nix store + because it contains sensible data like + password. + ''; + default = "/dev/null"; + example = "/run/keys/biboumi.cfg"; + }; + + openFirewall = mkEnableOption "opening of the identd port in the firewall"; + }; + }; + + config = mkIf cfg.enable { + networking.firewall = mkIf (cfg.openFirewall && cfg.settings.identd_port != 0) + { allowedTCPPorts = [ cfg.settings.identd_port ]; }; + + systemd.services.biboumi = { + description = "Biboumi, XMPP to IRC gateway"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "notify"; + # Biboumi supports systemd's watchdog. + WatchdogSec = 20; + Restart = "always"; + # Use "+" because credentialsFile may not be accessible to User= or Group=. + ExecStartPre = [("+" + pkgs.writeShellScript "biboumi-prestart" '' + set -eux + cat ${settingsFile} '${cfg.credentialsFile}' | + install -m 644 /dev/stdin /run/biboumi/biboumi.cfg + '')]; + ExecStart = "${pkgs.biboumi}/bin/biboumi /run/biboumi/biboumi.cfg"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; + # Firewalls needing opening for output connections can still do that + # selectively for biboumi with: + # users.users.biboumi.isSystemUser = true; + # and, for example: + # networking.nftables.ruleset = '' + # add rule inet filter output meta skuid biboumi tcp accept + # ''; + DynamicUser = true; + RootDirectory = rootDir; + RootDirectoryStartOnly = true; + InaccessiblePaths = [ "-+${rootDir}" ]; + RuntimeDirectory = [ "biboumi" (removePrefix "/run/" rootDir) ]; + RuntimeDirectoryMode = "700"; + StateDirectory = "biboumi"; + StateDirectoryMode = "700"; + MountAPIVFS = true; + UMask = "0066"; + BindPaths = [ + stateDir + # This is for Type="notify" + # See https://github.com/systemd/systemd/issues/3544 + "/run/systemd/notify" + "/run/systemd/journal/socket" + ]; + BindReadOnlyPaths = [ + builtins.storeDir + "/etc" + ]; + # The following options are only for optimizing: + # systemd-analyze security biboumi + AmbientCapabilities = [ (optionalString need_CAP_NET_BIND_SERVICE "CAP_NET_BIND_SERVICE") ]; + CapabilityBoundingSet = [ (optionalString need_CAP_NET_BIND_SERVICE "CAP_NET_BIND_SERVICE") ]; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = mkDefault false; + PrivateTmp = true; + # PrivateUsers=true breaks AmbientCapabilities=CAP_NET_BIND_SERVICE + # See https://bugs.archlinux.org/task/65921 + PrivateUsers = !need_CAP_NET_BIND_SERVICE; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + # AF_UNIX is for /run/systemd/notify + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallFilter = [ + "@system-service" + # Groups in @system-service which do not contain a syscall + # listed by perf stat -e 'syscalls:sys_enter_*' biboumi biboumi.cfg + # in tests, and seem likely not necessary for biboumi. + # To run such a perf in ExecStart=, you have to: + # - AmbientCapabilities="CAP_SYS_ADMIN" + # - mount -o remount,mode=755 /sys/kernel/debug/{,tracing} + "~@aio" "~@chown" "~@ipc" "~@keyring" "~@resources" "~@setuid" "~@timer" + ]; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + }; + }; + }; + + meta.maintainers = with maintainers; [ julm ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/heyefi.nix b/third_party/nixpkgs/nixos/modules/services/networking/heyefi.nix deleted file mode 100644 index fc2b5a8485..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/heyefi.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.heyefi; -in - -{ - - ###### interface - - options = { - - services.heyefi = { - - enable = mkEnableOption "heyefi"; - - cardMacaddress = mkOption { - default = ""; - description = '' - An Eye-Fi card MAC address. - ''; - }; - - uploadKey = mkOption { - default = ""; - description = '' - An Eye-Fi card's upload key. - ''; - }; - - uploadDir = mkOption { - example = "/home/username/pictures"; - description = '' - The directory to upload the files to. - ''; - }; - - user = mkOption { - default = "root"; - description = '' - heyefi will be run under this user (user must exist, - this can be your user name). - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - systemd.services.heyefi = - { - description = "heyefi service"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "${cfg.user}"; - Restart = "always"; - ExecStart = "${pkgs.heyefi}/bin/heyefi"; - }; - - }; - - environment.etc."heyefi/heyefi.config".text = - '' - # /etc/heyefi/heyefi.conf: DO NOT EDIT -- this file has been generated automatically. - cards = [["${config.services.heyefi.cardMacaddress}","${config.services.heyefi.uploadKey}"]] - upload_dir = "${toString config.services.heyefi.uploadDir}" - ''; - - environment.systemPackages = [ pkgs.heyefi ]; - - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix index 4ac6d3fa84..9e28d09dff 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix @@ -3,7 +3,7 @@ let inherit (lib.options) literalExample mkEnableOption mkOption; - inherit (lib.types) bool enum int lines loaOf nullOr path str submodule; + inherit (lib.types) bool enum int lines attrsOf nullOr path str submodule; inherit (lib.modules) mkDefault mkIf mkMerge; commonDescr = '' @@ -248,7 +248,7 @@ in }; modems = mkOption { - type = loaOf (submodule [ modemConfigOptions ]); + type = attrsOf (submodule [ modemConfigOptions ]); default = {}; example.ttyS1 = { type = "cirrus"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/monero.nix b/third_party/nixpkgs/nixos/modules/services/networking/monero.nix index 97af299783..fde3293fc1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/monero.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/monero.nix @@ -87,7 +87,7 @@ in }; rpc.password = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = '' Password for RPC connections. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/namecoind.nix b/third_party/nixpkgs/nixos/modules/services/networking/namecoind.nix index 6ca99e1321..16f85df2e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/namecoind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/namecoind.nix @@ -89,7 +89,7 @@ in }; rpc.password = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = '' Password for RPC connections. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index cc789897b2..17c549d42c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -458,7 +458,7 @@ in { systemd.services.NetworkManager-dispatcher = { wantedBy = [ "network.target" ]; - restartTriggers = [ configFile ]; + restartTriggers = [ configFile overrideNameserversScript ]; # useful binaries for user-specified hooks path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index b7e4c89a15..78de50583f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -117,7 +117,6 @@ in ProtectHome = "yes"; ProtectSystem = "full"; PrivateTmp = "yes"; - StateDirectory = "chrony"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nylon.nix b/third_party/nixpkgs/nixos/modules/services/networking/nylon.nix index 7c171281a9..bfc358cb12 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nylon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nylon.nix @@ -140,7 +140,7 @@ in services.nylon = mkOption { default = {}; description = "Collection of named nylon instances"; - type = with types; loaOf (submodule nylonOpts); + type = with types; attrsOf (submodule nylonOpts); internal = true; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix index 210d2217b2..c52f920bae 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix @@ -53,7 +53,7 @@ in { serviceConfig = { Type = "simple"; ExecStart = '' - ${cfg.package}/bin/onedrive --monitor --verbose --confdir=%h/.config/%i + ${cfg.package}/bin/onedrive --monitor --confdir=%h/.config/%i ''; Restart="on-failure"; RestartSec=3; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix index dcd7e9e5fa..650f9c84ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix @@ -11,7 +11,7 @@ let makeOpenVPNJob = cfg: name: let - path = (getAttr "openvpn-${name}" config.systemd.services).path; + path = makeBinPath (getAttr "openvpn-${name}" config.systemd.services).path; upScript = '' #! /bin/sh diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix index e53d7093be..a6c1cb0f47 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix @@ -655,7 +655,7 @@ in description = "Define the virtual hosts"; - type = with types; loaOf (submodule vHostOpts); + type = with types; attrsOf (submodule vHostOpts); example = { myhost = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml b/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml index 7859cb1578..471240cd14 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml +++ b/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml @@ -43,10 +43,10 @@ services.prosody = { ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; ssl.key = "/var/lib/acme/example.org/key.pem"; virtualHosts."example.org" = { - enabled = true; - domain = "example.org"; - ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; - ssl.key = "/var/lib/acme/example.org/key.pem"; + enabled = true; + domain = "example.org"; + ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; + ssl.key = "/var/lib/acme/example.org/key.pem"; }; muc = [ { domain = "conference.example.org"; @@ -65,7 +65,7 @@ services.prosody = { you'll need a single TLS certificate covering your main endpoint, the MUC one as well as the HTTP Upload one. We can generate such a certificate by leveraging the ACME - extraDomains module option. + extraDomainNames module option. Provided the setup detailed in the previous section, you'll need the following acme configuration to generate @@ -78,8 +78,7 @@ security.acme = { "example.org" = { webroot = "/var/www/example.org"; email = "root@example.org"; - extraDomains."conference.example.org" = null; - extraDomains."upload.example.org" = null; + extraDomainNames = [ "conference.example.org" "upload.example.org" ]; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/robustirc-bridge.nix b/third_party/nixpkgs/nixos/modules/services/networking/robustirc-bridge.nix new file mode 100644 index 0000000000..255af79ec0 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/robustirc-bridge.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.robustirc-bridge; +in +{ + options = { + services.robustirc-bridge = { + enable = mkEnableOption "RobustIRC bridge"; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = ''Extra flags passed to the robustirc-bridge command. See RobustIRC Documentation or robustirc-bridge(1) for details.''; + example = [ + "-network robustirc.net" + ]; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.robustirc-bridge = { + description = "RobustIRC bridge"; + documentation = [ + "man:robustirc-bridge(1)" + "https://robustirc.net/" + ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.robustirc-bridge}/bin/robustirc-bridge ${concatStringsSep " " cfg.extraFlags}"; + Restart = "on-failure"; + + # Hardening + PrivateDevices = true; + ProtectSystem = true; + ProtectHome = true; + PrivateTmp = true; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/seeks.nix b/third_party/nixpkgs/nixos/modules/services/networking/seeks.nix deleted file mode 100644 index 40729225b6..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/seeks.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.seeks; - - confDir = cfg.confDir; - - seeks = pkgs.seeks.override { seeks_confDir = confDir; }; - -in - -{ - - ###### interface - - options = { - - services.seeks = { - - enable = mkOption { - default = false; - type = types.bool; - description = " - Whether to enable the Seeks server. - "; - }; - - confDir = mkOption { - default = ""; - type = types.str; - description = " - The Seeks server configuration. If it is not specified, - a default configuration is used. - "; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.services.seeks.enable { - - users.users.seeks = - { uid = config.ids.uids.seeks; - description = "Seeks user"; - createHome = true; - home = "/var/lib/seeks"; - }; - - users.groups.seeks = - { gid = config.ids.gids.seeks; - }; - - systemd.services.seeks = - { - description = "Seeks server, the p2p search engine."; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "seeks"; - ExecStart = "${seeks}/bin/seeks"; - }; - }; - - environment.systemPackages = [ seeks ]; - - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix b/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix index af12db590f..d2541f9a6d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix @@ -11,8 +11,13 @@ let method = cfg.encryptionMethod; mode = cfg.mode; user = "nobody"; - fast_open = true; - } // optionalAttrs (cfg.password != null) { password = cfg.password; }; + fast_open = cfg.fastOpen; + } // optionalAttrs (cfg.plugin != null) { + plugin = cfg.plugin; + plugin_opts = cfg.pluginOpts; + } // optionalAttrs (cfg.password != null) { + password = cfg.password; + } // cfg.extraConfig; configFile = pkgs.writeText "shadowsocks.json" (builtins.toJSON opts); @@ -74,6 +79,14 @@ in ''; }; + fastOpen = mkOption { + type = types.bool; + default = true; + description = '' + use TCP fast-open + ''; + }; + encryptionMethod = mkOption { type = types.str; default = "chacha20-ietf-poly1305"; @@ -82,6 +95,41 @@ in ''; }; + plugin = mkOption { + type = types.nullOr types.str; + default = null; + example = "\${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"; + description = '' + SIP003 plugin for shadowsocks + ''; + }; + + pluginOpts = mkOption { + type = types.str; + default = ""; + example = "server;host=example.com"; + description = '' + Options to pass to the plugin if one was specified + ''; + }; + + extraConfig = mkOption { + type = types.attrs; + default = {}; + example = '' + { + nameserver = "8.8.8.8"; + } + ''; + description = '' + Additional configuration for shadowsocks that is not covered by the + provided options. The provided attrset will be serialized to JSON and + has to contain valid shadowsocks options. Unfortunately most + additional options are undocumented but it's easy to find out what is + available by looking into the source code of + + ''; + }; }; }; @@ -99,7 +147,7 @@ in description = "shadowsocks-libev Daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.shadowsocks-libev ] ++ optional (cfg.passwordFile != null) pkgs.jq; + path = [ pkgs.shadowsocks-libev ] ++ optional (cfg.plugin != null) cfg.plugin ++ optional (cfg.passwordFile != null) pkgs.jq; serviceConfig.PrivateTmp = true; script = '' ${optionalString (cfg.passwordFile != null) '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index 17f31e3a48..5365b8b9b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -232,6 +232,14 @@ in ''; }; + banner = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + Message to display to the remote user before authentication is allowed. + ''; + }; + authorizedKeysFiles = mkOption { type = types.listOf types.str; default = []; @@ -361,7 +369,7 @@ in }; users.users = mkOption { - type = with types; loaOf (submodule userOptions); + type = with types; attrsOf (submodule userOptions); }; }; @@ -474,6 +482,8 @@ in '' UsePAM yes + Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner} + AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} ${concatMapStrings (port: '' Port ${toString port} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix index e717d78fee..28348c7893 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -18,6 +18,7 @@ let fsWatcherEnabled = folder.watch; fsWatcherDelayS = folder.watchDelay; ignorePerms = folder.ignorePerms; + ignoreDelete = folder.ignoreDelete; versioning = folder.versioning; }) (filterAttrs ( _: folder: @@ -284,8 +285,6 @@ in { }); }; - - rescanInterval = mkOption { type = types.int; default = 3600; @@ -327,6 +326,16 @@ in { ''; }; + ignoreDelete = mkOption { + type = types.bool; + default = false; + description = '' + Whether to delete files in destination. See + upstream's docs. + ''; + }; + }; })); }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 08a17d20ed..3951398790 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -233,6 +233,9 @@ in { path = [ pkgs.wpa_supplicant ]; script = '' + if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ] + then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." + fi iface_args="-s -u -D${cfg.driver} -c ${configFile}" ${if ifaces == [] then '' for i in $(cd /sys/class/net && echo *); do diff --git a/third_party/nixpkgs/nixos/modules/services/security/bitwarden_rs/default.nix b/third_party/nixpkgs/nixos/modules/services/security/bitwarden_rs/default.nix index 903a532703..a04bc883bf 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/bitwarden_rs/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/bitwarden_rs/default.nix @@ -81,6 +81,23 @@ in { the environment template file. ''; }; + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/root/bitwarden_rs.env"; + description = '' + Additional environment file as defined in + systemd.exec5 + . + + Secrets like ADMIN_TOKEN and SMTP_PASSWORD + may be passed to the service without adding them to the world-readable Nix store. + + Note that this file needs to be available on the host on which + bitwarden_rs is running. + ''; + }; }; config = mkIf cfg.enable { @@ -101,7 +118,7 @@ in { serviceConfig = { User = user; Group = group; - EnvironmentFile = configFile; + EnvironmentFile = [ configFile ] ++ optional (cfg.environmentFile != null) cfg.environmentFile; ExecStart = "${bitwarden_rs}/bin/bitwarden_rs"; LimitNOFILE = "1048576"; LimitNPROC = "64"; diff --git a/third_party/nixpkgs/nixos/modules/services/security/physlock.nix b/third_party/nixpkgs/nixos/modules/services/security/physlock.nix index 690eb70079..da5c22a90a 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/physlock.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/physlock.nix @@ -52,6 +52,14 @@ in ''; }; + lockMessage = mkOption { + type = types.str; + default = ""; + description = '' + Message to show on physlock login terminal. + ''; + }; + lockOn = { suspend = mkOption { @@ -111,7 +119,7 @@ in ++ cfg.lockOn.extraTargets; serviceConfig = { Type = "forking"; - ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}"; + ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\""}"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/tor.nix b/third_party/nixpkgs/nixos/modules/services/security/tor.nix index b33e905c67..38dc378887 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/tor.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/tor.nix @@ -34,8 +34,8 @@ let User tor DataDirectory ${torDirectory} ${optionalString cfg.enableGeoIP '' - GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip - GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6 + GeoIPFile ${cfg.package.geoip}/share/tor/geoip + GeoIPv6File ${cfg.package.geoip}/share/tor/geoip6 ''} ${optint "ControlPort" cfg.controlPort} @@ -123,6 +123,16 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.tor; + defaultText = "pkgs.tor"; + example = literalExample "pkgs.tor"; + description = '' + Tor package to use + ''; + }; + enableGeoIP = mkOption { type = types.bool; default = true; @@ -597,7 +607,7 @@ in ]; } ''; - type = types.loaOf (types.submodule ({name, ...}: { + type = types.attrsOf (types.submodule ({name, ...}: { options = { name = mkOption { @@ -749,8 +759,8 @@ in 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}"; + ExecStartPre = "${cfg.package}/bin/tor -f ${torRcFile} --verify-config"; + ExecStart = "${cfg.package}/bin/tor -f ${torRcFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillSignal = "SIGINT"; TimeoutSec = 30; @@ -773,7 +783,7 @@ in }; }; - environment.systemPackages = [ pkgs.tor ]; + environment.systemPackages = [ cfg.package ]; services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) { enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix b/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix new file mode 100644 index 0000000000..8d6d431fa5 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix @@ -0,0 +1,295 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.epgstation; + + username = config.users.users.epgstation.name; + groupname = config.users.users.epgstation.group; + + settingsFmt = pkgs.formats.json {}; + settingsTemplate = settingsFmt.generate "config.json" cfg.settings; + preStartScript = pkgs.writeScript "epgstation-prestart" '' + #!${pkgs.runtimeShell} + + PASSWORD="$(head -n1 "${cfg.basicAuth.passwordFile}")" + DB_PASSWORD="$(head -n1 "${cfg.database.passwordFile}")" + + # setup configuration + touch /etc/epgstation/config.json + chmod 640 /etc/epgstation/config.json + sed \ + -e "s,@password@,$PASSWORD,g" \ + -e "s,@dbPassword@,$DB_PASSWORD,g" \ + ${settingsTemplate} > /etc/epgstation/config.json + chown "${username}:${groupname}" /etc/epgstation/config.json + + # NOTE: Use password authentication, since mysqljs does not yet support auth_socket + if [ ! -e /var/lib/epgstation/db-created ]; then + ${pkgs.mysql}/bin/mysql -e \ + "GRANT ALL ON \`${cfg.database.name}\`.* TO '${username}'@'localhost' IDENTIFIED by '$DB_PASSWORD';" + touch /var/lib/epgstation/db-created + fi + ''; + + streamingConfig = builtins.fromJSON (builtins.readFile ./streaming.json); + logConfig = { + appenders.stdout.type = "stdout"; + categories = { + default = { appenders = [ "stdout" ]; level = "info"; }; + system = { appenders = [ "stdout" ]; level = "info"; }; + access = { appenders = [ "stdout" ]; level = "info"; }; + stream = { appenders = [ "stdout" ]; level = "info"; }; + }; + }; + + defaultPassword = "INSECURE_GO_CHECK_CONFIGURATION_NIX\n"; +in +{ + options.services.epgstation = { + enable = mkEnableOption pkgs.epgstation.meta.description; + + usePreconfiguredStreaming = mkOption { + type = types.bool; + default = true; + description = '' + Use preconfigured default streaming options. + + Upstream defaults: + + ''; + }; + + port = mkOption { + type = types.port; + default = 20772; + description = '' + HTTP port for EPGStation to listen on. + ''; + }; + + socketioPort = mkOption { + type = types.port; + default = cfg.port + 1; + description = '' + Socket.io port for EPGStation to listen on. + ''; + }; + + clientSocketioPort = mkOption { + type = types.port; + default = cfg.socketioPort; + description = '' + Socket.io port that the web client is going to connect to. This may be + different from if EPGStation is hidden + behind a reverse proxy. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the EPGStation web interface. + + + + Exposing EPGStation to the open internet is generally advised + against. Only use it inside a trusted local network, or consider + putting it behind a VPN if you want remote access. + + + ''; + }; + + basicAuth = { + user = mkOption { + type = with types; nullOr str; + default = null; + example = "epgstation"; + description = '' + Basic auth username for EPGStation. If null, basic + auth will be disabled. + + + + Basic authentication has known weaknesses, the most critical being + that it sends passwords over the network in clear text. Use this + feature to control access to EPGStation within your family and + friends, but don't rely on it for security. + + + ''; + }; + + passwordFile = mkOption { + type = types.path; + default = pkgs.writeText "epgstation-password" defaultPassword; + example = "/run/keys/epgstation-password"; + description = '' + A file containing the password for . + ''; + }; + }; + + database = { + name = mkOption { + type = types.str; + default = "epgstation"; + description = '' + Name of the MySQL database that holds EPGStation's data. + ''; + }; + + passwordFile = mkOption { + type = types.path; + default = pkgs.writeText "epgstation-db-password" defaultPassword; + example = "/run/keys/epgstation-db-password"; + description = '' + A file containing the password for the database named + . + ''; + }; + }; + + settings = mkOption { + description = '' + Options to add to config.json. + + Documentation: + + ''; + + default = {}; + example = { + recPriority = 20; + conflictPriority = 10; + }; + + type = types.submodule { + freeformType = settingsFmt.type; + + options.readOnlyOnce = mkOption { + type = types.bool; + default = false; + description = "Don't reload configuration files at runtime."; + }; + + options.mirakurunPath = mkOption (let + sockPath = config.services.mirakurun.unixSocket; + in { + type = types.str; + default = "http+unix://${replaceStrings ["/"] ["%2F"] sockPath}"; + example = "http://localhost:40772"; + description = "URL to connect to Mirakurun."; + }); + + options.encode = mkOption { + type = with types; listOf attrs; + description = "Encoding presets for recorded videos."; + default = [ + { name = "H264"; + cmd = "${pkgs.epgstation}/libexec/enc.sh main"; + suffix = ".mp4"; + default = true; } + { name = "H264-sub"; + cmd = "${pkgs.epgstation}/libexec/enc.sh sub"; + suffix = "-sub.mp4"; } + ]; + }; + }; + }; + }; + + config = mkIf cfg.enable { + environment.etc = { + "epgstation/operatorLogConfig.json".text = builtins.toJSON logConfig; + "epgstation/serviceLogConfig.json".text = builtins.toJSON logConfig; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = with cfg; [ port socketioPort ]; + }; + + users.users.epgstation = { + description = "EPGStation user"; + group = config.users.groups.epgstation.name; + isSystemUser = true; + }; + + users.groups.epgstation = {}; + + services.mirakurun.enable = mkDefault true; + + services.mysql = { + enable = mkDefault true; + package = mkDefault pkgs.mysql; + ensureDatabases = [ cfg.database.name ]; + # FIXME: enable once mysqljs supports auth_socket + # ensureUsers = [ { + # name = username; + # ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + # } ]; + }; + + services.epgstation.settings = let + defaultSettings = { + serverPort = cfg.port; + socketioPort = cfg.socketioPort; + clientSocketioPort = cfg.clientSocketioPort; + + dbType = mkDefault "mysql"; + mysql = { + user = username; + database = cfg.database.name; + socketPath = mkDefault "/run/mysqld/mysqld.sock"; + password = mkDefault "@dbPassword@"; + connectTimeout = mkDefault 1000; + connectionLimit = mkDefault 10; + }; + + basicAuth = mkIf (cfg.basicAuth.user != null) { + user = mkDefault cfg.basicAuth.user; + password = mkDefault "@password@"; + }; + + ffmpeg = mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg"; + ffprobe = mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe"; + + fileExtension = mkDefault ".m2ts"; + maxEncode = mkDefault 2; + maxStreaming = mkDefault 2; + }; + in + mkMerge [ + defaultSettings + (mkIf cfg.usePreconfiguredStreaming streamingConfig) + ]; + + systemd.tmpfiles.rules = [ + "d '/var/lib/epgstation/streamfiles' - ${username} ${groupname} - -" + "d '/var/lib/epgstation/recorded' - ${username} ${groupname} - -" + "d '/var/lib/epgstation/thumbnail' - ${username} ${groupname} - -" + ]; + + systemd.services.epgstation = { + description = pkgs.epgstation.meta.description; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + ] ++ optional config.services.mirakurun.enable "mirakurun.service" + ++ optional config.services.mysql.enable "mysql.service"; + + serviceConfig = { + ExecStart = "${pkgs.epgstation}/bin/epgstation start"; + ExecStartPre = "+${preStartScript}"; + User = username; + Group = groupname; + StateDirectory = "epgstation"; + LogsDirectory = "epgstation"; + ConfigurationDirectory = "epgstation"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/video/epgstation/generate b/third_party/nixpkgs/nixos/modules/services/video/epgstation/generate new file mode 100755 index 0000000000..2940768b6d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/video/epgstation/generate @@ -0,0 +1,31 @@ +#!/usr/bin/env -S nix-build --no-out-link + +# Script to generate default streaming configurations for EPGStation. There's +# no need to run this script directly since generate.sh in the EPGStation +# package directory would run this script for you. +# +# Usage: ./generate | xargs cat > streaming.json + +{ pkgs ? (import ../../../../.. {}) }: + +let + sampleConfigPath = "${pkgs.epgstation.src}/config/config.sample.json"; + sampleConfig = builtins.fromJSON (builtins.readFile sampleConfigPath); + streamingConfig = { + inherit (sampleConfig) + mpegTsStreaming + mpegTsViewer + liveHLS + liveMP4 + liveWebM + recordedDownloader + recordedStreaming + recordedViewer + recordedHLS; + }; +in +pkgs.runCommand "streaming.json" { nativeBuildInputs = [ pkgs.jq ]; } '' + jq . <<<'${builtins.toJSON streamingConfig}' > $out +'' + +# vim:set ft=nix: diff --git a/third_party/nixpkgs/nixos/modules/services/video/epgstation/streaming.json b/third_party/nixpkgs/nixos/modules/services/video/epgstation/streaming.json new file mode 100644 index 0000000000..37957f6cb6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/video/epgstation/streaming.json @@ -0,0 +1,119 @@ +{ + "liveHLS": [ + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%", + "name": "480p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 48k -ac 2 -c:v libx264 -vf yadif,scale=-2:180 -b:v 100k -preset veryfast -maxrate 110k -bufsize 1000k -flags +loop-global_header %OUTPUT%", + "name": "180p" + } + ], + "liveMP4": [ + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "name": "480p" + } + ], + "liveWebM": [ + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "name": "480p" + } + ], + "mpegTsStreaming": [ + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1", + "name": "480p" + }, + { + "name": "Original" + } + ], + "mpegTsViewer": { + "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end", + "ios": "vlc-x-callback://x-callback-url/stream?url=http://ADDRESS" + }, + "recordedDownloader": { + "android": "intent://ADDRESS#Intent;package=com.dv.adm;type=video;scheme=http;end", + "ios": "vlc-x-callback://x-callback-url/download?url=http://ADDRESS&filename=FILENAME" + }, + "recordedHLS": [ + { + "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%", + "name": "720p" + }, + { + "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%", + "name": "480p" + }, + { + "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_type fmp4 -hls_fmp4_init_filename stream%streamNum%-init.mp4 -hls_segment_filename stream%streamNum%-%09d.m4s -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx265 -vf yadif,scale=-2:480 -b:v 350k -preset veryfast -tag:v hvc1 %OUTPUT%", + "name": "480p(h265)" + } + ], + "recordedStreaming": { + "mp4": [ + { + "ab": "192k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "name": "720p", + "vb": "3000k" + }, + { + "ab": "128k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "name": "360p", + "vb": "1500k" + } + ], + "mpegTs": [ + { + "ab": "192k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", + "name": "720p (H.264)", + "vb": "3000k" + }, + { + "ab": "128k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", + "name": "360p (H.264)", + "vb": "1500k" + } + ], + "webm": [ + { + "ab": "192k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "name": "720p", + "vb": "3000k" + }, + { + "ab": "128k", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "name": "360p", + "vb": "1500k" + } + ] + }, + "recordedViewer": { + "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end", + "ios": "infuse://x-callback-url/play?url=http://ADDRESS" + } +} diff --git a/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix b/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix index 675b67f6eb..ce1dabe6bf 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix @@ -18,7 +18,8 @@ in type = with types; nullOr port; default = 40772; description = '' - Port to listen on. If null, it won't listen on any port. + Port to listen on. If null, it won't listen on + any port. ''; }; @@ -27,6 +28,23 @@ in default = false; description = '' Open ports in the firewall for Mirakurun. + + + + Exposing Mirakurun to the open internet is generally advised + against. Only use it inside a trusted local network, or + consider putting it behind a VPN if you want remote access. + + + ''; + }; + + unixSocket = mkOption { + type = with types; nullOr path; + default = "/var/run/mirakurun/mirakurun.sock"; + description = '' + Path to unix socket to listen on. If null, it + won't listen on any unix sockets. ''; }; @@ -121,8 +139,8 @@ in services.mirakurun.serverSettings = { logLevel = mkDefault 2; - path = mkDefault "/var/run/mirakurun/mirakurun.sock"; - port = mkIf (cfg.port != null) (mkDefault cfg.port); + path = mkIf (cfg.unixSocket != null) cfg.unixSocket; + port = mkIf (cfg.port != null) cfg.port; }; systemd.tmpfiles.rules = [ diff --git a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix index 50e424fccb..14d84c4ce0 100644 --- a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix +++ b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix @@ -82,6 +82,7 @@ in { auth required pam_unix.so nullok account required pam_unix.so session required pam_unix.so + session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 session required ${pkgs.systemd}/lib/security/pam_systemd.so ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix index ab922a38e5..c787c36b87 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/codimd.nix @@ -877,6 +877,37 @@ in description = "Configure the SAML integration."; }; }; + + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/var/lib/codimd/codimd.env"; + description = '' + Environment file as defined in + systemd.exec5 + . + + Secrets may be passed to the service without adding them to the world-readable + Nix store, by specifying placeholder variables as the option value in Nix and + setting these variables accordingly in the environment file. + + + # snippet of CodiMD-related config + services.codimd.configuration.dbURL = "postgres://codimd:\''${DB_PASSWORD}@db-host:5432/codimddb"; + services.codimd.configuration.minio.secretKey = "$MINIO_SECRET_KEY"; + + + + # content of the environment file + DB_PASSWORD=verysecretdbpassword + MINIO_SECRET_KEY=verysecretminiokey + + + Note that this file needs to be available on the host on which + CodiMD is running. + ''; + }; }; config = mkIf cfg.enable { @@ -900,11 +931,17 @@ in description = "CodiMD Service"; wantedBy = [ "multi-user.target" ]; after = [ "networking.target" ]; + preStart = '' + ${pkgs.envsubst}/bin/envsubst \ + -o ${cfg.workDir}/config.json \ + -i ${prettyJSON cfg.configuration} + ''; serviceConfig = { WorkingDirectory = cfg.workDir; ExecStart = "${pkgs.codimd}/bin/codimd"; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; Environment = [ - "CMD_CONFIG_FILE=${prettyJSON cfg.configuration}" + "CMD_CONFIG_FILE=${cfg.workDir}/config.json" "NODE_ENV=production" ]; Restart = "always"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix index 3b2b244049..2df762882f 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix @@ -329,5 +329,6 @@ in }; }; + meta.doc = ./jitsi-meet.xml; meta.maintainers = lib.teams.jitsi.members; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.xml new file mode 100644 index 0000000000..97373bc6d9 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.xml @@ -0,0 +1,55 @@ + + Jitsi Meet + + With Jitsi Meet on NixOS you can quickly configure a complete, + private, self-hosted video conferencing solution. + + +
+ Basic usage + + A minimal configuration using Let's Encrypt for TLS certificates looks like this: +{ + services.jitsi-meet = { + enable = true; + hostName = "jitsi.example.com"; + }; + services.jitsi-videobridge.openFirewall = true; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + security.acme.email = "me@example.com"; + security.acme.acceptTerms = true; +} + +
+ +
+ Configuration + + Here is the minimal configuration with additional configurations: +{ + services.jitsi-meet = { + enable = true; + hostName = "jitsi.example.com"; + config = { + enableWelcomePage = false; + prejoinPageEnabled = true; + defaultLang = "fi"; + }; + interfaceConfig = { + SHOW_JITSI_WATERMARK = false; + SHOW_WATERMARK_FOR_GUESTS = false; + }; + }; + services.jitsi-videobridge.openFirewall = true; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + security.acme.email = "me@example.com"; + security.acme.acceptTerms = true; +} + +
+ + diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix index 5f30124dd6..4610bb96cb 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix @@ -77,7 +77,6 @@ in { // Paths WOSendMail = "/run/wrappers/bin/sendmail"; SOGoMailSpoolPath = "/var/lib/sogo/spool"; - SOGoZipPath = "${pkgs.zip}/bin/zip"; // Enable CSRF protection SOGoXSRFValidationEnabled = YES; // Remove dates from log (jornald does that) diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix index 46660151f7..6dd1c85132 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -6,6 +6,8 @@ let cfg = config.services.httpd; + certs = config.security.acme.certs; + runtimeDir = "/run/httpd"; pkg = cfg.package.out; @@ -26,6 +28,13 @@ let vhosts = attrValues cfg.virtualHosts; + # certName is used later on to determine systemd service names. + acmeEnabledVhosts = map (hostOpts: hostOpts // { + certName = if hostOpts.useACMEHost != null then hostOpts.useACMEHost else hostOpts.hostName; + }) (filter (hostOpts: hostOpts.enableACME || hostOpts.useACMEHost != null) vhosts); + + dependentCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts); + mkListenInfo = hostOpts: if hostOpts.listen != [] then hostOpts.listen else ( @@ -125,13 +134,13 @@ let useACME = hostOpts.enableACME || hostOpts.useACMEHost != null; sslCertDir = - if hostOpts.enableACME then config.security.acme.certs.${hostOpts.hostName}.directory - else if hostOpts.useACMEHost != null then config.security.acme.certs.${hostOpts.useACMEHost}.directory + if hostOpts.enableACME then certs.${hostOpts.hostName}.directory + else if hostOpts.useACMEHost != null then certs.${hostOpts.useACMEHost}.directory else abort "This case should never happen."; - sslServerCert = if useACME then "${sslCertDir}/full.pem" else hostOpts.sslServerCert; + sslServerCert = if useACME then "${sslCertDir}/fullchain.pem" else hostOpts.sslServerCert; sslServerKey = if useACME then "${sslCertDir}/key.pem" else hostOpts.sslServerKey; - sslServerChain = if useACME then "${sslCertDir}/fullchain.pem" else hostOpts.sslServerChain; + sslServerChain = if useACME then "${sslCertDir}/chain.pem" else hostOpts.sslServerChain; acmeChallenge = optionalString useACME '' Alias /.well-known/acme-challenge/ "${hostOpts.acmeRoot}/.well-known/acme-challenge/" @@ -347,7 +356,6 @@ let cat ${php.phpIni} > $out echo "$options" >> $out ''; - in @@ -647,20 +655,42 @@ in wwwrun.gid = config.ids.gids.wwwrun; }; - security.acme.certs = mapAttrs (name: hostOpts: { - user = cfg.user; - group = mkDefault cfg.group; - email = if hostOpts.adminAddr != null then hostOpts.adminAddr else cfg.adminAddr; - webroot = hostOpts.acmeRoot; - extraDomains = genAttrs hostOpts.serverAliases (alias: null); - postRun = "systemctl reload httpd.service"; - }) (filterAttrs (name: hostOpts: hostOpts.enableACME) cfg.virtualHosts); + security.acme.certs = let + acmePairs = map (hostOpts: nameValuePair hostOpts.hostName { + group = mkDefault cfg.group; + webroot = hostOpts.acmeRoot; + extraDomainNames = hostOpts.serverAliases; + # Use the vhost-specific email address if provided, otherwise let + # security.acme.email or security.acme.certs..email be used. + email = mkOverride 2000 (if hostOpts.adminAddr != null then hostOpts.adminAddr else cfg.adminAddr); + # Filter for enableACME-only vhosts. Don't want to create dud certs + }) (filter (hostOpts: hostOpts.useACMEHost == null) acmeEnabledVhosts); + in listToAttrs acmePairs; environment.systemPackages = [ apachectl pkg ]; + services.logrotate = optionalAttrs (cfg.logFormat != "none") { + enable = mkDefault true; + paths.httpd = { + path = "${cfg.logDir}/*.log"; + user = cfg.user; + group = cfg.group; + frequency = "daily"; + keep = 28; + extraConfig = '' + sharedscripts + compress + delaycompress + postrotate + systemctl reload httpd.service > /dev/null 2>/dev/null || true + endscript + ''; + }; + }; + services.httpd.phpOptions = '' ; Needed for PHP's mail() function. @@ -705,16 +735,12 @@ in "Z '${cfg.logDir}' - ${svc.User} ${svc.Group}" ]; - systemd.services.httpd = - let - vhostsACME = filter (hostOpts: hostOpts.enableACME) vhosts; - in - { description = "Apache HTTPD"; - + systemd.services.httpd = { + description = "Apache HTTPD"; wantedBy = [ "multi-user.target" ]; - wants = concatLists (map (hostOpts: [ "acme-${hostOpts.hostName}.service" "acme-selfsigned-${hostOpts.hostName}.service" ]) vhostsACME); - after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME; - before = map (hostOpts: "acme-${hostOpts.hostName}.service") vhostsACME; + wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) dependentCertNames); + after = [ "network.target" ] ++ map (certName: "acme-selfsigned-${certName}.service") dependentCertNames; + before = map (certName: "acme-${certName}.service") dependentCertNames; path = [ pkg pkgs.coreutils pkgs.gnugrep ]; @@ -748,5 +774,31 @@ in }; }; + # postRun hooks on cert renew can't be used to restart Apache since renewal + # runs as the unprivileged acme user. sslTargets are added to wantedBy + before + # which allows the acme-finished-$cert.target to signify the successful updating + # of certs end-to-end. + systemd.services.httpd-config-reload = let + sslServices = map (certName: "acme-${certName}.service") dependentCertNames; + sslTargets = map (certName: "acme-finished-${certName}.target") dependentCertNames; + in mkIf (sslServices != []) { + wantedBy = sslServices ++ [ "multi-user.target" ]; + # Before the finished targets, after the renew services. + # This service might be needed for HTTP-01 challenges, but we only want to confirm + # certs are updated _after_ config has been reloaded. + before = sslTargets; + after = sslServices; + # Block reloading if not all certs exist yet. + # Happens when config changes add new vhosts/certs. + unitConfig.ConditionPathExists = map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames; + serviceConfig = { + Type = "oneshot"; + TimeoutSec = 60; + ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active httpd.service"; + ExecStartPre = "${pkg}/bin/httpd -f ${httpdConf} -t"; + ExecStart = "/run/current-system/systemd/bin/systemctl reload httpd.service"; + }; + }; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix index 0e6e10a5f4..dda26fe491 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy.nix @@ -5,6 +5,26 @@ with lib; let cfg = config.services.caddy; configFile = pkgs.writeText "Caddyfile" cfg.config; + + # v2-specific options + isCaddy2 = versionAtLeast cfg.package.version "2.0"; + tlsConfig = { + apps.tls.automation.policies = [{ + issuer = { + inherit (cfg) ca email; + module = "acme"; + }; + }]; + }; + + adaptedConfig = pkgs.runCommand "caddy-config-adapted.json" { } '' + ${cfg.package}/bin/caddy adapt \ + --config ${configFile} --adapter ${cfg.adapter} > $out + ''; + tlsJSON = pkgs.writeText "tls.json" (builtins.toJSON tlsConfig); + configJSON = pkgs.runCommand "caddy-config.json" { } '' + ${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${adaptedConfig} ${tlsJSON} > $out + ''; in { options.services.caddy = { enable = mkEnableOption "Caddy web server"; @@ -13,15 +33,26 @@ in { default = ""; example = '' example.com { - gzip - minify - log syslog - - root /srv/http + encode gzip + log + root /srv/http } ''; type = types.lines; - description = "Verbatim Caddyfile to use"; + description = '' + Verbatim Caddyfile to use. + Caddy v2 supports multiple config formats via adapters (see ). + ''; + }; + + adapter = mkOption { + default = "caddyfile"; + example = "nginx"; + type = types.str; + description = '' + Name of the config adapter to use. Not applicable to Caddy v1. + See https://caddyserver.com/docs/config-adapters for the full list. + ''; }; ca = mkOption { @@ -50,33 +81,46 @@ in { The data directory, for storing certificates. Before 17.09, this would create a .caddy directory. With 17.09 the contents of the .caddy directory are in the specified data directory instead. + + Caddy v2 replaced CADDYPATH with XDG directories. + See https://caddyserver.com/docs/conventions#file-locations. ''; }; package = mkOption { default = pkgs.caddy; defaultText = "pkgs.caddy"; + example = "pkgs.caddy1"; type = types.package; - description = "Caddy package to use."; + description = '' + Caddy package to use. + To use Caddy v1 (obsolete), set this to pkgs.caddy1. + ''; }; }; config = mkIf cfg.enable { systemd.services.caddy = { description = "Caddy web server"; - # upstream unit: https://github.com/caddyserver/caddy/blob/master/dist/init/linux-systemd/caddy.service + # upstream unit: https://github.com/caddyserver/dist/blob/master/init/caddy.service after = [ "network-online.target" ]; wants = [ "network-online.target" ]; # systemd-networkd-wait-online.service wantedBy = [ "multi-user.target" ]; - environment = mkIf (versionAtLeast config.system.stateVersion "17.09") + environment = mkIf (versionAtLeast config.system.stateVersion "17.09" && !isCaddy2) { CADDYPATH = cfg.dataDir; }; serviceConfig = { - ExecStart = '' + ExecStart = if isCaddy2 then '' + ${cfg.package}/bin/caddy run --config ${configJSON} + '' else '' ${cfg.package}/bin/caddy -log stdout -log-timestamps=false \ -root=/var/tmp -conf=${configFile} \ -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} ''; - ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; + ExecReload = + if isCaddy2 then + "${cfg.package}/bin/caddy reload --config ${configJSON}" + else + "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; Type = "simple"; User = "caddy"; Group = "caddy"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/meguca.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/meguca.nix deleted file mode 100644 index 5a00070dc9..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/meguca.nix +++ /dev/null @@ -1,174 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.services.meguca; - postgres = config.services.postgresql; -in with lib; { - options.services.meguca = { - enable = mkEnableOption "meguca"; - - dataDir = mkOption { - type = types.path; - default = "/var/lib/meguca"; - example = "/home/okina/meguca"; - description = "Location where meguca stores it's database and links."; - }; - - password = mkOption { - type = types.str; - default = "meguca"; - example = "dumbpass"; - description = "Password for the meguca database."; - }; - - passwordFile = mkOption { - type = types.path; - default = "/run/keys/meguca-password-file"; - example = "/home/okina/meguca/keys/pass"; - description = "Password file for the meguca database."; - }; - - reverseProxy = mkOption { - type = types.nullOr types.str; - default = null; - example = "192.168.1.5"; - description = "Reverse proxy IP."; - }; - - sslCertificate = mkOption { - type = types.nullOr types.str; - default = null; - example = "/home/okina/meguca/ssl.cert"; - description = "Path to the SSL certificate."; - }; - - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "127.0.0.1:8000"; - description = "Listen on a specific IP address and port."; - }; - - cacheSize = mkOption { - type = types.nullOr types.int; - default = null; - example = 256; - description = "Cache size in MB."; - }; - - postgresArgs = mkOption { - type = types.str; - example = "user=meguca password=dumbpass dbname=meguca sslmode=disable"; - description = "Postgresql connection arguments."; - }; - - postgresArgsFile = mkOption { - type = types.path; - default = "/run/keys/meguca-postgres-args"; - example = "/home/okina/meguca/keys/postgres"; - description = "Postgresql connection arguments file."; - }; - - compressTraffic = mkOption { - type = types.bool; - default = false; - description = "Compress all traffic with gzip."; - }; - - assumeReverseProxy = mkOption { - type = types.bool; - default = false; - description = "Assume the server is behind a reverse proxy, when resolving client IPs."; - }; - - httpsOnly = mkOption { - type = types.bool; - default = false; - description = "Serve and listen only through HTTPS."; - }; - - videoPaths = mkOption { - type = types.listOf types.path; - default = []; - example = [ "/home/okina/Videos/tehe_pero.webm" ]; - description = "Videos that will be symlinked into www/videos."; - }; - }; - - config = mkIf cfg.enable { - security.sudo.enable = cfg.enable; - services.postgresql.enable = cfg.enable; - services.postgresql.package = pkgs.postgresql_11; - services.meguca.passwordFile = mkDefault (pkgs.writeText "meguca-password-file" cfg.password); - services.meguca.postgresArgsFile = mkDefault (pkgs.writeText "meguca-postgres-args" cfg.postgresArgs); - services.meguca.postgresArgs = mkDefault "user=meguca password=${cfg.password} dbname=meguca sslmode=disable"; - - systemd.services.meguca = { - description = "meguca"; - after = [ "network.target" "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - - preStart = '' - # Ensure folder exists or create it and links and permissions are correct - mkdir -p ${escapeShellArg cfg.dataDir}/www - rm -rf ${escapeShellArg cfg.dataDir}/www/videos - ln -sf ${pkgs.meguca}/share/meguca/www/* ${escapeShellArg cfg.dataDir}/www - unlink ${escapeShellArg cfg.dataDir}/www/videos - mkdir -p ${escapeShellArg cfg.dataDir}/www/videos - - for vid in ${escapeShellArg cfg.videoPaths}; do - ln -sf $vid ${escapeShellArg cfg.dataDir}/www/videos - done - - chmod 750 ${escapeShellArg cfg.dataDir} - chown -R meguca:meguca ${escapeShellArg cfg.dataDir} - - # 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/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 ${escapeShellArg cfg.passwordFile})';" || true - ''; - - script = '' - cd ${escapeShellArg cfg.dataDir} - - ${pkgs.meguca}/bin/meguca -d "$(cat ${escapeShellArg cfg.postgresArgsFile})"'' - + optionalString (cfg.reverseProxy != null) " -R ${cfg.reverseProxy}" - + optionalString (cfg.sslCertificate != null) " -S ${cfg.sslCertificate}" - + optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}" - + optionalString (cfg.cacheSize != null) " -c ${toString cfg.cacheSize}" - + optionalString (cfg.compressTraffic) " -g" - + optionalString (cfg.assumeReverseProxy) " -r" - + optionalString (cfg.httpsOnly) " -s" + " start"; - - serviceConfig = { - PermissionsStartOnly = true; - Type = "forking"; - User = "meguca"; - Group = "meguca"; - ExecStop = "${pkgs.meguca}/bin/meguca stop"; - }; - }; - - users = { - groups.meguca.gid = config.ids.gids.meguca; - - users.meguca = { - description = "meguca server service user"; - home = cfg.dataDir; - createHome = true; - group = "meguca"; - uid = config.ids.uids.meguca; - }; - }; - }; - - imports = [ - (mkRenamedOptionModule [ "services" "meguca" "baseDir" ] [ "services" "meguca" "dataDir" ]) - ]; - - meta.maintainers = with maintainers; [ chiiruno ]; -} diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 461888c4cc..39bcb14e5a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -6,23 +6,23 @@ let cfg = config.services.nginx; certs = config.security.acme.certs; vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts; - acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME && vhostConfig.useACMEHost == null) vhostsConfigs; + acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME || vhostConfig.useACMEHost != null) vhostsConfigs; + dependentCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts); virtualHosts = mapAttrs (vhostName: vhostConfig: let serverName = if vhostConfig.serverName != null then vhostConfig.serverName else vhostName; + certName = if vhostConfig.useACMEHost != null + then vhostConfig.useACMEHost + else serverName; in vhostConfig // { - inherit serverName; - } // (optionalAttrs vhostConfig.enableACME { - sslCertificate = "${certs.${serverName}.directory}/fullchain.pem"; - sslCertificateKey = "${certs.${serverName}.directory}/key.pem"; - sslTrustedCertificate = "${certs.${serverName}.directory}/full.pem"; - }) // (optionalAttrs (vhostConfig.useACMEHost != null) { - sslCertificate = "${certs.${vhostConfig.useACMEHost}.directory}/fullchain.pem"; - sslCertificateKey = "${certs.${vhostConfig.useACMEHost}.directory}/key.pem"; - sslTrustedCertificate = "${certs.${vhostConfig.useACMEHost}.directory}/fullchain.pem"; + inherit serverName certName; + } // (optionalAttrs (vhostConfig.enableACME || vhostConfig.useACMEHost != null) { + sslCertificate = "${certs.${certName}.directory}/fullchain.pem"; + sslCertificateKey = "${certs.${certName}.directory}/key.pem"; + sslTrustedCertificate = "${certs.${certName}.directory}/chain.pem"; }) ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; @@ -463,14 +463,6 @@ in ''; }; - enableSandbox = mkOption { - default = false; - type = types.bool; - description = '' - Starting Nginx web server with additional sandbox/hardening options. - ''; - }; - user = mkOption { type = types.str; default = "nginx"; @@ -691,12 +683,12 @@ in systemd.services.nginx = { description = "Nginx Web Server"; wantedBy = [ "multi-user.target" ]; - wants = concatLists (map (vhostConfig: ["acme-${vhostConfig.serverName}.service" "acme-selfsigned-${vhostConfig.serverName}.service"]) acmeEnabledVhosts); - after = [ "network.target" ] ++ map (vhostConfig: "acme-selfsigned-${vhostConfig.serverName}.service") acmeEnabledVhosts; + wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) dependentCertNames); + after = [ "network.target" ] ++ map (certName: "acme-selfsigned-${certName}.service") dependentCertNames; # Nginx needs to be started in order to be able to request certificates # (it's hosting the acme challenge after all) # This fixes https://github.com/NixOS/nixpkgs/issues/81842 - before = map (vhostConfig: "acme-${vhostConfig.serverName}.service") acmeEnabledVhosts; + before = map (certName: "acme-${certName}.service") dependentCertNames; stopIfChanged = false; preStart = '' ${cfg.preStart} @@ -728,7 +720,6 @@ in CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ]; # Security NoNewPrivileges = true; - } // optionalAttrs cfg.enableSandbox { # Sandboxing ProtectSystem = "strict"; ProtectHome = mkDefault true; @@ -753,37 +744,41 @@ in source = configFile; }; - systemd.services.nginx-config-reload = mkIf cfg.enableReload { - wants = [ "nginx.service" ]; - wantedBy = [ "multi-user.target" ]; - restartTriggers = [ configFile ]; - # commented, because can cause extra delays during activate for this config: - # services.nginx.virtualHosts."_".locations."/".proxyPass = "http://blabla:3000"; - # stopIfChanged = false; - serviceConfig.Type = "oneshot"; - serviceConfig.TimeoutSec = 60; - script = '' - if /run/current-system/systemd/bin/systemctl -q is-active nginx.service ; then - /run/current-system/systemd/bin/systemctl reload nginx.service - fi - ''; - serviceConfig.RemainAfterExit = true; + # postRun hooks on cert renew can't be used to restart Nginx since renewal + # runs as the unprivileged acme user. sslTargets are added to wantedBy + before + # which allows the acme-finished-$cert.target to signify the successful updating + # of certs end-to-end. + systemd.services.nginx-config-reload = let + sslServices = map (certName: "acme-${certName}.service") dependentCertNames; + sslTargets = map (certName: "acme-finished-${certName}.target") dependentCertNames; + in mkIf (cfg.enableReload || sslServices != []) { + wants = optionals (cfg.enableReload) [ "nginx.service" ]; + wantedBy = sslServices ++ [ "multi-user.target" ]; + # Before the finished targets, after the renew services. + # This service might be needed for HTTP-01 challenges, but we only want to confirm + # certs are updated _after_ config has been reloaded. + before = sslTargets; + after = sslServices; + restartTriggers = optionals (cfg.enableReload) [ configFile ]; + # Block reloading if not all certs exist yet. + # Happens when config changes add new vhosts/certs. + unitConfig.ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames); + serviceConfig = { + Type = "oneshot"; + TimeoutSec = 60; + ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active nginx.service"; + ExecStart = "/run/current-system/systemd/bin/systemctl reload nginx.service"; + }; }; - security.acme.certs = filterAttrs (n: v: v != {}) ( - let - acmePairs = map (vhostConfig: { name = vhostConfig.serverName; value = { - user = cfg.user; - group = lib.mkDefault cfg.group; - webroot = vhostConfig.acmeRoot; - extraDomains = genAttrs vhostConfig.serverAliases (alias: null); - postRun = '' - /run/current-system/systemd/bin/systemctl reload nginx - ''; - }; }) acmeEnabledVhosts; - in - listToAttrs acmePairs - ); + security.acme.certs = let + acmePairs = map (vhostConfig: nameValuePair vhostConfig.serverName { + group = mkDefault cfg.group; + webroot = vhostConfig.acmeRoot; + extraDomainNames = vhostConfig.serverAliases; + # Filter for enableACME-only vhosts. Don't want to create dud certs + }) (filter (vhostConfig: vhostConfig.useACMEHost == null) acmeEnabledVhosts); + in listToAttrs acmePairs; users.users = optionalAttrs (cfg.user == "nginx") { nginx = { diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix index d090885a8c..759eebf768 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix @@ -277,6 +277,7 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; RuntimeDirectory = "phpfpm"; RuntimeDirectoryPreserve = true; # Relevant when multiple processes are running + Restart = "always"; }; } ) cfg.pools; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix new file mode 100644 index 0000000000..a404143a03 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -0,0 +1,205 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xserver.desktopManager.cinnamon; + serviceCfg = config.services.cinnamon; + + nixos-gsettings-overrides = pkgs.cinnamon.cinnamon-gsettings-overrides.override { + extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages; + extraGSettingsOverrides = cfg.extraGSettingsOverrides; + }; + +in + +{ + options = { + services.cinnamon = { + apps.enable = mkEnableOption "Cinnamon default applications"; + }; + + services.xserver.desktopManager.cinnamon = { + enable = mkEnableOption "the cinnamon desktop manager"; + + sessionPath = mkOption { + default = []; + example = literalExample "[ pkgs.gnome3.gpaste ]"; + description = '' + Additional list of packages to be added to the session search path. + Useful for GSettings-conditional autostart. + + Note that this should be a last resort; patching the package is preferred (see GPaste). + ''; + }; + + extraGSettingsOverrides = mkOption { + default = ""; + type = types.lines; + description = "Additional gsettings overrides."; + }; + + extraGSettingsOverridePackages = mkOption { + default = []; + type = types.listOf types.path; + description = "List of packages for which gsettings are overridden."; + }; + }; + + environment.cinnamon.excludePackages = mkOption { + default = []; + example = literalExample "[ pkgs.cinnamon.blueberry ]"; + type = types.listOf types.package; + description = "Which packages cinnamon should exclude from the default environment"; + }; + + }; + + config = mkMerge [ + (mkIf (cfg.enable && config.services.xserver.displayManager.lightdm.enable && config.services.xserver.displayManager.lightdm.greeters.gtk.enable) { + services.xserver.displayManager.lightdm.greeters.gtk.extraConfig = mkDefault (builtins.readFile "${pkgs.cinnamon.mint-artwork}/etc/lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf"); + }) + + (mkIf cfg.enable { + services.xserver.displayManager.sessionPackages = [ pkgs.cinnamon.cinnamon-common ]; + + services.xserver.displayManager.sessionCommands = '' + if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then + true + ${concatMapStrings (p: '' + if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} + fi + + if [ -d "${p}/lib/girepository-1.0" ]; then + export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib + fi + '') cfg.sessionPath} + fi + ''; + + # Default services + hardware.bluetooth.enable = mkDefault true; + hardware.pulseaudio.enable = mkDefault true; + security.polkit.enable = true; + services.accounts-daemon.enable = true; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.dbus.packages = with pkgs.cinnamon; [ + cinnamon-common + cinnamon-screensaver + nemo + xapps + ]; + services.cinnamon.apps.enable = mkDefault true; + services.gnome3.glib-networking.enable = true; + services.gnome3.gnome-keyring.enable = true; + services.gvfs.enable = true; + services.udisks2.enable = true; + services.upower.enable = mkDefault config.powerManagement.enable; + services.xserver.libinput.enable = mkDefault true; + services.xserver.updateDbusEnvironment = true; + networking.networkmanager.enable = mkDefault true; + + # Enable colord server + services.colord.enable = true; + + # Enable dconf + programs.dconf.enable = true; + + # Enable org.a11y.Bus + services.gnome3.at-spi2-core.enable = true; + + # Fix lockscreen + security.pam.services = { + cinnamon-screensaver = {}; + }; + + environment.systemPackages = with pkgs.cinnamon // pkgs; [ + desktop-file-utils + nixos-artwork.wallpapers.simple-dark-gray + onboard + sound-theme-freedesktop + + # common-files + cinnamon-common + cinnamon-session + cinnamon-desktop + cinnamon-menus + + # utils needed by some scripts + killall + + # session requirements + cinnamon-screensaver + # cinnamon-killer-daemon: provided by cinnamon-common + gnome3.networkmanagerapplet # session requirement - also nm-applet not needed + + # packages + nemo + cinnamon-control-center + cinnamon-settings-daemon + gnome3.libgnomekbd + orca + + # theme + gnome3.adwaita-icon-theme + hicolor-icon-theme + gnome3.gnome-themes-extra + gtk3.out + mint-artwork + mint-themes + mint-x-icons + mint-y-icons + vanilla-dmz + + # other + glib # for gsettings + shared-mime-info # for update-mime-database + xdg-user-dirs + ]; + + # Override GSettings schemas + environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; + + environment.pathsToLink = [ + # FIXME: modules should link subdirs of `/share` rather than relying on this + "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173 + ]; + + # Shell integration for VTE terminals + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; + + # Harmonize Qt5 applications under Pantheon + qt5.enable = true; + qt5.platformTheme = "gnome"; + qt5.style = "adwaita"; + + # Default Fonts + fonts.fonts = with pkgs; [ + source-code-pro # Default monospace font in 3.32 + ubuntu_font_family # required for default theme + ]; + }) + + (mkIf serviceCfg.apps.enable { + programs.geary.enable = mkDefault true; + programs.gnome-disks.enable = mkDefault true; + programs.gnome-terminal.enable = mkDefault true; + programs.evince.enable = mkDefault true; + programs.file-roller.enable = mkDefault true; + + environment.systemPackages = (with pkgs // pkgs.gnome3 // pkgs.cinnamon; pkgs.gnome3.removePackagesByName [ + # cinnamon team apps + blueberry + warpinator + + # external apps shipped with linux-mint + hexchat + gnome-calculator + ] config.environment.cinnamon.excludePackages); + }) + ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix index 5d3a84d713..f5559eb535 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix @@ -21,6 +21,7 @@ in ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix + ./cinnamon.nix ]; options = { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index 6dabca6bf0..e67e216f90 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -240,6 +240,8 @@ in # Otherwise you can't store NetworkManager Secrets with # "Store the password only for this user" programs.nm-applet.enable = true; + # Pantheon has its own network indicator + programs.nm-applet.indicator = false; # Shell integration for VTE terminals programs.bash.vteIntegration = mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 75bf55a263..149f6cbb76 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -7,7 +7,9 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; - inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5; + inherit (pkgs) kdeApplications kdeFrameworks plasma5; + libsForQt5 = pkgs.libsForQt514; + qt5 = pkgs.qt514; inherit (pkgs) writeText; pulseaudio = config.hardware.pulseaudio; @@ -83,7 +85,7 @@ let # recognize that software that has been removed. rm -fv $HOME/.cache/ksycoca* - ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5 + ${libsForQt5.kservice}/bin/kbuildsycoca5 ''; set_XDG_CONFIG_HOME = '' @@ -203,7 +205,9 @@ in KERNEL=="i2c-[0-9]*", TAG+="uaccess" ''; - environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications; + environment.systemPackages = + with qt5; with libsForQt5; + with plasma5; with kdeApplications; with kdeFrameworks; [ frameworkintegration kactivities @@ -293,7 +297,7 @@ in qtvirtualkeyboard - xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ + pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ] # Phonon audio backend @@ -301,13 +305,13 @@ in ++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc # Optional hardware support features - ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt openobex obexftp ] + ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt pkgs.openobex pkgs.obexftp ] ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil - ++ lib.optional config.services.colord.enable colord-kde + ++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] - ++ lib.optional config.services.xserver.wacom.enable wacomtablet; + ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet; environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index b8b36aa053..08ce8edd66 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -55,13 +55,6 @@ let exec &> >(tee ~/.xsession-errors) ''} - # Tell systemd about our $DISPLAY and $XAUTHORITY. - # This is needed by the ssh-agent unit. - # - # Also tell systemd about the dbus session bus address. - # This is required by user units using the session bus. - /run/current-system/systemd/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS - # Load X defaults. This should probably be safe on wayland too. ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} if test -e ~/.Xresources; then @@ -70,6 +63,12 @@ let ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults fi + # Import environment variables into the systemd user environment. + ${optionalString (cfg.displayManager.importedVariables != []) ( + "/run/current-system/systemd/bin/systemctl --user import-environment " + + toString (unique cfg.displayManager.importedVariables) + )} + # Speed up application start by 50-150ms according to # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html rm -rf "$HOME/.compose-cache" @@ -289,6 +288,14 @@ in ''; }; + importedVariables = mkOption { + type = types.listOf (types.strMatching "[a-zA-Z_][a-zA-Z0-9_]*"); + visible = false; + description = '' + Environment variables to import into the systemd user environment. + ''; + }; + job = { preStart = mkOption { @@ -393,6 +400,16 @@ in services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X"; + services.xserver.displayManager.importedVariables = [ + # This is required by user units using the session bus. + "DBUS_SESSION_BUS_ADDRESS" + # These are needed by the ssh-agent unit. + "DISPLAY" + "XAUTHORITY" + # This is required to specify session within user units (e.g. loginctl lock-session). + "XDG_SESSION_ID" + ]; + systemd.user.targets.graphical-session = { unitConfig = { RefuseManualStart = false; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 23ab7f2ae4..eae70a57c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -64,13 +64,9 @@ in services.xserver.displayManager.gdm = { - enable = mkEnableOption '' - GDM, the GNOME Display Manager - ''; + enable = mkEnableOption "GDM, the GNOME Display Manager"; - debug = mkEnableOption '' - debugging messages in GDM - ''; + debug = mkEnableOption "debugging messages in GDM"; # Auto login options specific to GDM autoLogin.delay = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix b/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix index 3923df498e..51f72dadbd 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix @@ -61,7 +61,8 @@ in "--kill" ] ++ cfg.extraOptions); ExecStop = "${pkgs.procps}/bin/pkill imwheel"; - Restart = "on-failure"; + RestartSec = 3; + Restart = "always"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix index 30c59b88f8..dba25da826 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix @@ -16,6 +16,7 @@ let cfg.extraPackages cfg.haskellPackages ++ optionals cfg.enableContribAndExtras (with cfg.haskellPackages; [ xmonad-contrib xmonad-extras ]); + inherit (cfg) ghcArgs; } cfg.config; in @@ -76,18 +77,35 @@ in } ''; }; + + xmonadCliArgs = mkOption { + default = []; + type = with lib.types; listOf str; + description = '' + Command line arguments passed to the xmonad binary. + ''; + }; + + ghcArgs = mkOption { + default = []; + type = with lib.types; listOf str; + description = '' + Command line arguments passed to the compiler (ghc) + invocation when xmonad.config is set. + ''; + }; + }; }; config = mkIf cfg.enable { services.xserver.windowManager = { session = [{ name = "xmonad"; - start = if (cfg.config != null) then '' - ${xmonadBin} - waitPID=$! - '' else '' - systemd-cat -t xmonad ${xmonad}/bin/xmonad & - waitPID=$! + start = let + xmonadCommand = if (cfg.config != null) then xmonadBin else "${xmonad}/bin/xmonad"; + in '' + systemd-cat -t xmonad -- ${xmonadCommand} ${lib.escapeShellArgs cfg.xmonadCliArgs} & + waitPID=$! ''; }]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index 400173745d..0552095ba9 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -113,14 +113,14 @@ let in concatMapStrings (getAttr "value") monitors; configFile = pkgs.runCommand "xserver.conf" - { xfs = optionalString (cfg.useXFS != false) - ''FontPath "${toString cfg.useXFS}"''; + { fontpath = optionalString (cfg.fontPath != null) + ''FontPath "${cfg.fontPath}"''; inherit (cfg) config; preferLocalBuild = true; } '' echo 'Section "Files"' >> $out - echo $xfs >> $out + echo $fontpath >> $out for i in ${toString fontsForXServer}; do if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then @@ -151,6 +151,8 @@ in ./desktop-managers/default.nix (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ] "See the 16.09 release notes for more information.") + (mkRemovedOptionModule ["services" "xserver" "useXFS" ] + "Use services.xserver.fontPath instead of useXFS") ]; @@ -481,11 +483,15 @@ in description = "Default colour depth."; }; - useXFS = mkOption { - # FIXME: what's the type of this option? - default = false; + fontPath = mkOption { + type = types.nullOr types.str; + default = null; example = "unix/:7100"; - description = "Determines how to connect to the X Font Server."; + description = '' + Set the X server FontPath. Defaults to null, which + means the compiled in defaults will be used. See + man xorg.conf for details. + ''; }; tty = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index fb8644dd13..2724d9f9cb 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -159,9 +159,9 @@ in To switch to a specialised configuration (e.g. fewJobsManyCores) at runtime, run: - - # sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test - + + # sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test + ''; type = types.attrsOf (types.submodule ( { ... }: { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix index e75aa9d138..7eb52e3d02 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix @@ -3,8 +3,8 @@ pkgs.substituteAll { src = ./raspberrypi-builder.sh; isExecutable = true; - inherit (pkgs.buildPackages) bash; - path = with pkgs.buildPackages; [coreutils gnused gnugrep]; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; firmware = pkgs.raspberrypifw; inherit configTxt; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 13a5af9452..65c7b825f8 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -124,19 +124,18 @@ def mkdir_p(path): raise def get_generations(profile=None): - generation_dir = "/nix/var/nix/profiles/%s" % ("system-profiles" if profile else "",) - profile_name = profile if profile else "system" - generations = [] - for gen_entry in os.scandir(generation_dir): - gen_name = gen_entry.name - if not (gen_name.startswith(profile_name + '-') and gen_name.endswith('-link')): - continue - gen_num = gen_name[len(profile_name+'-'):-len('-link')] - generations.append(int(gen_num)) - generations.sort() + gen_list = subprocess.check_output([ + "@nix@/bin/nix-env", + "--list-generations", + "-p", + "/nix/var/nix/profiles/%s" % ("system-profiles/" + profile if profile else "system"), + "--option", "build-users-group", ""], + universal_newlines=True) + gen_lines = gen_list.split('\n') + gen_lines.pop() configurationLimit = @configurationLimit@ - return [ (profile, gen_num) for gen_num in sorted(generations) ][-configurationLimit:] + return [ (profile, int(line.split()[0])) for line in gen_lines ][-configurationLimit:] def remove_old_entries(gens): rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$") @@ -201,7 +200,9 @@ def main(): else: # Update bootloader to latest if needed systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] - sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True) + # Ideally this should use check_output as well, but as a temporary + # work-around for #97433 we ignore any errors. + sdboot_status = subprocess.run(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True, stdout=subprocess.PIPE).stdout # See status_binaries() in systemd bootctl.c for code which generates this m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$", diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 96d5a6cd51..f0bd76a3c1 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -16,6 +16,8 @@ let systemd = config.systemd.package; + nix = config.nix.package.out; + timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else ""; editor = if cfg.editor then "True" else "False"; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index 166f89c706..88190e8200 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -516,7 +516,7 @@ in /dev/mapper/name. ''; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, ... }: { options = { name = mkOption { @@ -641,7 +641,7 @@ in credential = mkOption { default = null; example = "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2"; - type = types.str; + type = types.nullOr types.str; description = "The FIDO2 credential ID."; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh index 54e3a691b2..f7c2940049 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh @@ -218,6 +218,7 @@ done # Create device nodes in /dev. @preDeviceCommands@ echo "running udev..." +ln -sfn /proc/self/fd /dev/fd mkdir -p /etc/systemd ln -sfn @linkUnits@ /etc/systemd/network mkdir -p /etc/udev @@ -378,12 +379,14 @@ mountFS() { mkdir -p "/mnt-root$mountPoint" - # For CIFS mounts, retry a few times before giving up. + # For ZFS and CIFS mounts, retry a few times before giving up. + # We do this for ZFS as a workaround for issue NixOS/nixpkgs#25383. local n=0 while true; do mount "/mnt-root$mountPoint" && break - if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi + if [ \( "$fsType" != cifs -a "$fsType" != zfs \) -o "$n" -ge 10 ]; then fail; break; fi echo "retrying..." + sleep 1 n=$((n + 1)) done diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index a04660fb56..6823e12847 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -36,7 +36,7 @@ let set -euo pipefail declare -A seen - declare -a left + left=() patchelf="${pkgs.buildPackages.patchelf}/bin/patchelf" @@ -48,7 +48,7 @@ let done } - add_needed $1 + add_needed "$1" while [ ''${#left[@]} -ne 0 ]; do next=''${left[0]} @@ -119,12 +119,13 @@ let copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon # Copy udev. - copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd - copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl copy_bin_and_libs ${udev}/bin/udevadm + copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl for BIN in ${udev}/lib/udev/*_id; do copy_bin_and_libs $BIN done + # systemd-udevd is only a symlink to udevadm these days + ln -sf udevadm $out/bin/systemd-udevd # Copy modprobe. copy_bin_and_libs ${pkgs.kmod}/bin/kmod @@ -555,7 +556,7 @@ in }; fileSystems = mkOption { - type = with lib.types; loaOf (submodule { + type = with lib.types; attrsOf (submodule { options.neededForBoot = mkOption { default = false; type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd-unit-options.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd-unit-options.nix index ac6fed440a..5addc6f9ca 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd-unit-options.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd-unit-options.nix @@ -234,7 +234,6 @@ in rec { path = mkOption { default = []; type = with types; listOf (oneOf [ package str ]); - apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}"; description = '' Packages added to the service's PATH environment variable. Both the bin diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 96304ff6ce..74d6957678 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -25,7 +25,7 @@ let "nss-lookup.target" "nss-user-lookup.target" "time-sync.target" - #"cryptsetup.target" + "cryptsetup.target" "sigpwr.target" "timers.target" "paths.target" @@ -257,7 +257,7 @@ let pkgs.gnused systemd ]; - environment.PATH = config.path; + environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}"; } (mkIf (config.preStart != "") { serviceConfig.ExecStartPre = @@ -903,11 +903,9 @@ in ) ]); passwd = (mkMerge [ - [ "mymachines" ] (mkAfter [ "systemd" ]) ]); group = (mkMerge [ - [ "mymachines" ] (mkAfter [ "systemd" ]) ]); }; @@ -1008,7 +1006,7 @@ in "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; - "tmpfiles.d".source = pkgs.symlinkJoin { + "tmpfiles.d".source = (pkgs.symlinkJoin { name = "tmpfiles.d"; paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages; postBuild = '' @@ -1018,8 +1016,10 @@ in exit 1 ) done - ''; - }; + '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) '' + rm -f $out/${removePrefix "tmpfiles.d/" name} + '') config.system.build.etc.targets; + }) + "/*"; "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix index 1f4d54a1ae..7478e3e807 100644 --- a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix @@ -46,7 +46,7 @@ in Set of files that have to be linked in /etc. ''; - type = with types; loaOf (submodule ( + type = with types; attrsOf (submodule ( { name, config, ... }: { options = { diff --git a/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix b/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix index 9c3f2d8fcc..dd337de986 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix @@ -54,7 +54,7 @@ in options = { fileSystems = mkOption { - type = with lib.types; loaOf (submodule encryptedFSOptions); + type = with lib.types; attrsOf (submodule encryptedFSOptions); }; swapDevices = mkOption { type = with lib.types; listOf (submodule encryptedFSOptions); diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix index 0ade74b957..3ea67dac71 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix @@ -159,7 +159,7 @@ in "/bigdisk".label = "bigdisk"; } ''; - type = types.loaOf (types.submodule [coreFileSystemOpts fileSystemOpts]); + type = types.attrsOf (types.submodule [coreFileSystemOpts fileSystemOpts]); description = '' The file systems to be mounted. It must include an entry for the root directory (mountPoint = "/"). Each @@ -193,7 +193,7 @@ in boot.specialFileSystems = mkOption { default = {}; - type = types.loaOf (types.submodule coreFileSystemOpts); + type = types.attrsOf (types.submodule coreFileSystemOpts); internal = true; description = '' Special filesystems that are mounted very early during boot. diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index 565868724a..c0e4d3979f 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -519,7 +519,7 @@ in is true, then every interface not listed here will be configured using DHCP. ''; - type = with types; loaOf (submodule interfaceOpts); + type = with types; attrsOf (submodule interfaceOpts); }; networking.vswitches = mkOption { @@ -544,7 +544,7 @@ in interfaces = mkOption { example = [ "eth0" "eth1" ]; description = "The physical network interfaces connected by the vSwitch."; - type = with types; loaOf (submodule vswitchInterfaceOpts); + type = with types; attrsOf (submodule vswitchInterfaceOpts); }; controllers = mkOption { @@ -1129,7 +1129,6 @@ in ++ optionals config.networking.wireless.enable [ pkgs.wirelesstools # FIXME: obsolete? pkgs.iw - pkgs.rfkill ] ++ bridgeStp; diff --git a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix index 30ffb12cba..c0ec76e8a3 100644 --- a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix +++ b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix @@ -74,15 +74,8 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; # OOM killer randomly get rid of processes, since this leads # to failures that are hard to diagnose. echo 2 > /proc/sys/vm/panic_on_oom - - # Coverage data is written into /tmp/coverage-data. - mkdir -p /tmp/xchg/coverage-data ''; - # If the kernel has been built with coverage instrumentation, make - # it available under /proc/gcov. - boot.kernelModules = [ "gcov-proc" ]; - # Panic if an error occurs in stage 1 (rather than waiting for # user intervention). boot.kernelParams = @@ -111,8 +104,6 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; networking.defaultGateway = mkOverride 150 ""; networking.nameservers = mkOverride 150 [ ]; - systemd.globalEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data"; - system.requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "SERIAL_8250_CONSOLE") (isYes "SERIAL_8250") diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix index 3a6767d84a..997edf77ba 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: let cfg = config.virtualisation.containers; @@ -13,10 +13,6 @@ let json2toml "$valuePath" "$out" ''; - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' - cp ${filePath} $out - ''; in { meta = { @@ -43,6 +39,12 @@ in ''; }; + ociSeccompBpfHook.enable = mkOption { + type = types.bool; + default = false; + description = "Enable the OCI seccomp BPF hook"; + }; + containersConf = mkOption { default = {}; description = "containers.conf configuration"; @@ -116,6 +118,12 @@ in [network] cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + ${lib.optionalString (cfg.ociSeccompBpfHook.enable == true) '' + [engine] + hooks_dir = [ + "${config.boot.kernelPackages.oci-seccomp-bpf-hook}", + ] + ''} '' + cfg.containersConf.extraConfig; environment.etc."containers/registries.conf".source = toTOML "registries.conf" { @@ -124,7 +132,7 @@ in environment.etc."containers/policy.json".source = if cfg.policy != {} then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) - else copyFile "${pkgs.skopeo.src}/default-policy.json"; + else utils.copyFile "${pkgs.skopeo.src}/default-policy.json"; }; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix index f267c97b17..aa416e7990 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix @@ -1,16 +1,11 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; - let cfg = config.virtualisation.cri-o; crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; }); - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' - cp ${filePath} $out - ''; in { imports = [ @@ -78,14 +73,21 @@ in The final CRI-O package (including extra packages). ''; }; + + networkDir = mkOption { + type = types.nullOr types.path; + default = null; + description = "Override the network_dir option."; + internal = true; + }; }; config = mkIf cfg.enable { environment.systemPackages = [ cfg.package pkgs.cri-tools ]; - environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; + environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; - environment.etc."crio/crio.conf".text = '' + environment.etc."crio/crio.conf.d/00-default.conf".text = '' [crio] storage_driver = "${cfg.storageDriver}" @@ -95,11 +97,13 @@ in [crio.network] plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + ${optionalString (cfg.networkDir != null) ''network_dir = "${cfg.networkDir}"''} [crio.runtime] cgroup_manager = "systemd" log_level = "${cfg.logLevel}" - manage_ns_lifecycle = true + pinns_path = "${cfg.package}/bin/pinns" + hooks_dir = [] ${optionalString (cfg.runtime != null) '' default_runtime = "${cfg.runtime}" @@ -108,7 +112,8 @@ in ''} ''; - environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; + environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; + environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker-preloader.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker-preloader.nix deleted file mode 100644 index 6ab83058de..0000000000 --- a/third_party/nixpkgs/nixos/modules/virtualisation/docker-preloader.nix +++ /dev/null @@ -1,134 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -with builtins; - -let - cfg = config.virtualisation; - - sanitizeImageName = image: replaceStrings ["/"] ["-"] image.imageName; - hash = drv: head (split "-" (baseNameOf drv.outPath)); - # The label of an ext4 FS is limited to 16 bytes - labelFromImage = image: substring 0 16 (hash image); - - # The Docker image is loaded and some files from /var/lib/docker/ - # are written into a qcow image. - preload = image: pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "docker-preload-image-${sanitizeImageName image}" { - buildInputs = with pkgs; [ docker e2fsprogs utillinux curl kmod ]; - preVM = pkgs.vmTools.createEmptyImage { - size = cfg.dockerPreloader.qcowSize; - fullName = "docker-deamon-image.qcow2"; - }; - } - '' - mkfs.ext4 /dev/vda - e2label /dev/vda ${labelFromImage image} - mkdir -p /var/lib/docker - mount -t ext4 /dev/vda /var/lib/docker - - modprobe overlay - - # from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount - mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup - cd /sys/fs/cgroup - for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do - mkdir -p $sys - if ! mountpoint -q $sys; then - if ! mount -n -t cgroup -o $sys cgroup $sys; then - rmdir $sys || true - fi - fi - done - - dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock & - - until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do - printf '.' - sleep 1 - done - - docker load -i ${image} - - kill %1 - find /var/lib/docker/ -maxdepth 1 -mindepth 1 -not -name "image" -not -name "overlay2" | xargs rm -rf - ''); - - preloadedImages = map preload cfg.dockerPreloader.images; - -in - -{ - options.virtualisation.dockerPreloader = { - images = mkOption { - default = [ ]; - type = types.listOf types.package; - description = - '' - A list of Docker images to preload (in the /var/lib/docker directory). - ''; - }; - qcowSize = mkOption { - default = 1024; - type = types.int; - description = - '' - The size (MB) of qcow files. - ''; - }; - }; - - config = mkIf (cfg.dockerPreloader.images != []) { - assertions = [{ - # If docker.storageDriver is null, Docker choose the storage - # driver. So, in this case, we cannot be sure overlay2 is used. - assertion = cfg.docker.storageDriver == "overlay2" - || cfg.docker.storageDriver == "overlay" - || cfg.docker.storageDriver == null; - message = "The Docker image Preloader only works with overlay2 storage driver!"; - }]; - - virtualisation.qemu.options = - map (path: "-drive if=virtio,file=${path}/disk-image.qcow2,readonly,media=cdrom,format=qcow2") - preloadedImages; - - - # All attached QCOW files are mounted and their contents are linked - # to /var/lib/docker/ in order to make image available. - systemd.services.docker-preloader = { - description = "Preloaded Docker images"; - wantedBy = ["docker.service"]; - after = ["network.target"]; - path = with pkgs; [ mount rsync jq ]; - script = '' - mkdir -p /var/lib/docker/overlay2/l /var/lib/docker/image/overlay2 - echo '{}' > /tmp/repositories.json - - for i in ${concatStringsSep " " (map labelFromImage cfg.dockerPreloader.images)}; do - mkdir -p /mnt/docker-images/$i - - # The ext4 label is limited to 16 bytes - mount /dev/disk/by-label/$(echo $i | cut -c1-16) -o ro,noload /mnt/docker-images/$i - - find /mnt/docker-images/$i/overlay2/ -maxdepth 1 -mindepth 1 -not -name l\ - -exec ln -s '{}' /var/lib/docker/overlay2/ \; - cp -P /mnt/docker-images/$i/overlay2/l/* /var/lib/docker/overlay2/l/ - - rsync -a /mnt/docker-images/$i/image/ /var/lib/docker/image/ - - # Accumulate image definitions - cp /tmp/repositories.json /tmp/repositories.json.tmp - jq -s '.[0] * .[1]' \ - /tmp/repositories.json.tmp \ - /mnt/docker-images/$i/image/overlay2/repositories.json \ - > /tmp/repositories.json - done - - mv /tmp/repositories.json /var/lib/docker/image/overlay2/repositories.json - ''; - serviceConfig = { - Type = "oneshot"; - }; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix index b0fa03917c..8fbb4efd20 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix @@ -627,7 +627,7 @@ in }; bindMounts = mkOption { - type = with types; loaOf (submodule bindMountOpts); + type = with types; attrsOf (submodule bindMountOpts); default = {}; example = literalExample '' { "/home" = { hostPath = "/home/alice"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix index 828419fb4b..55605b388b 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix @@ -32,7 +32,7 @@ in }; package = mkOption { - type = types.package; + type = types.nullOr types.package; default = config.boot.kernelPackages.prl-tools; defaultText = "config.boot.kernelPackages.prl-tools"; example = literalExample "config.boot.kernelPackages.prl-tools"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix index e0e2f04e24..f554aeffb4 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: let cfg = config.virtualisation.podman; @@ -21,11 +21,6 @@ let done ''; - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' - cp ${filePath} $out - ''; - in { imports = [ @@ -88,7 +83,7 @@ in environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index a650dd72c2..42e43f5ee0 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -264,7 +264,6 @@ in { imports = [ ../profiles/qemu-guest.nix - ./docker-preloader.nix ]; options = { diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/railcar.nix b/third_party/nixpkgs/nixos/modules/virtualisation/railcar.nix index 3f188fc68e..10464f6289 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/railcar.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/railcar.nix @@ -41,7 +41,7 @@ let description = "Source for the in-container mount"; }; options = mkOption { - type = loaOf (str); + type = attrsOf (str); default = [ "bind" ]; description = '' Mount options of the filesystem to be used. @@ -61,7 +61,7 @@ in containers = mkOption { default = {}; description = "Declarative container configuration"; - type = with types; loaOf (submodule ({ name, config, ... }: { + type = with types; attrsOf (submodule ({ name, config, ... }: { options = { cmd = mkOption { type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix b/third_party/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix new file mode 100644 index 0000000000..4168cebe79 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix @@ -0,0 +1,24 @@ +{ config, pkgs, lib, ... }: +{ + options.virtualisation.spiceUSBRedirection.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Install the SPICE USB redirection helper with setuid + privileges. This allows unprivileged users to pass USB devices + connected to this machine to libvirt VMs, both local and + remote. Note that this allows users arbitrary access to USB + devices. + ''; + }; + + config = lib.mkIf config.virtualisation.spiceUSBRedirection.enable { + environment.systemPackages = [ pkgs.spice-gtk ]; # For polkit actions + security.wrappers.spice-client-glib-usb-acl-helper ={ + source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; + capabilities = "cap_fowner+ep"; + }; + }; + + meta.maintainers = [ lib.maintainers.lheckemann ]; +} diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix index ece2d091f5..945ba90e34 100644 --- a/third_party/nixpkgs/nixos/release-combined.nix +++ b/third_party/nixpkgs/nixos/release-combined.nix @@ -106,11 +106,29 @@ in rec { (onFullSupported "nixos.tests.networking.scripted.bridge") (onFullSupported "nixos.tests.networking.scripted.dhcpOneIf") (onFullSupported "nixos.tests.networking.scripted.dhcpSimple") + (onFullSupported "nixos.tests.networking.scripted.link") (onFullSupported "nixos.tests.networking.scripted.loopback") (onFullSupported "nixos.tests.networking.scripted.macvlan") + (onFullSupported "nixos.tests.networking.scripted.privacy") + (onFullSupported "nixos.tests.networking.scripted.routes") (onFullSupported "nixos.tests.networking.scripted.sit") (onFullSupported "nixos.tests.networking.scripted.static") + (onFullSupported "nixos.tests.networking.scripted.virtual") (onFullSupported "nixos.tests.networking.scripted.vlan") + (onFullSupported "nixos.tests.networking.networkd.bond") + (onFullSupported "nixos.tests.networking.networkd.bridge") + (onFullSupported "nixos.tests.networking.networkd.dhcpOneIf") + (onFullSupported "nixos.tests.networking.networkd.dhcpSimple") + (onFullSupported "nixos.tests.networking.networkd.link") + (onFullSupported "nixos.tests.networking.networkd.loopback") + # Fails nondeterministically (https://github.com/NixOS/nixpkgs/issues/96709) + #(onFullSupported "nixos.tests.networking.networkd.macvlan") + (onFullSupported "nixos.tests.networking.networkd.privacy") + (onFullSupported "nixos.tests.networking.networkd.routes") + (onFullSupported "nixos.tests.networking.networkd.sit") + (onFullSupported "nixos.tests.networking.networkd.static") + (onFullSupported "nixos.tests.networking.networkd.virtual") + (onFullSupported "nixos.tests.networking.networkd.vlan") (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation") (onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") diff --git a/third_party/nixpkgs/nixos/tests/3proxy.nix b/third_party/nixpkgs/nixos/tests/3proxy.nix index 3e2061d7e4..de3056f671 100644 --- a/third_party/nixpkgs/nixos/tests/3proxy.nix +++ b/third_party/nixpkgs/nixos/tests/3proxy.nix @@ -134,6 +134,10 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; testScript = '' + start_all() + + peer0.wait_for_unit("network-online.target") + peer1.wait_for_unit("3proxy.service") peer1.wait_for_open_port("9999") diff --git a/third_party/nixpkgs/nixos/tests/acme.nix b/third_party/nixpkgs/nixos/tests/acme.nix index a818847372..64193ed849 100644 --- a/third_party/nixpkgs/nixos/tests/acme.nix +++ b/third_party/nixpkgs/nixos/tests/acme.nix @@ -1,29 +1,43 @@ let commonConfig = ./common/acme/client; - dnsScript = {writeScript, dnsAddress, bash, curl}: writeScript "dns-hook.sh" '' - #!${bash}/bin/bash + dnsServerIP = nodes: nodes.dnsserver.config.networking.primaryIPAddress; + + dnsScript = {pkgs, nodes}: let + dnsAddress = dnsServerIP nodes; + in pkgs.writeShellScript "dns-hook.sh" '' set -euo pipefail echo '[INFO]' "[$2]" 'dns-hook.sh' $* if [ "$1" = "present" ]; then - ${curl}/bin/curl --data '{"host": "'"$2"'", "value": "'"$3"'"}' http://${dnsAddress}:8055/set-txt + ${pkgs.curl}/bin/curl --data '{"host": "'"$2"'", "value": "'"$3"'"}' http://${dnsAddress}:8055/set-txt else - ${curl}/bin/curl --data '{"host": "'"$2"'"}' http://${dnsAddress}:8055/clear-txt + ${pkgs.curl}/bin/curl --data '{"host": "'"$2"'"}' http://${dnsAddress}:8055/clear-txt fi ''; + documentRoot = pkgs: pkgs.runCommand "docroot" {} '' + mkdir -p "$out" + echo hello world > "$out/index.html" + ''; + + vhostBase = pkgs: { + forceSSL = true; + locations."/".root = documentRoot pkgs; + }; + in import ./make-test-python.nix ({ lib, ... }: { name = "acme"; meta.maintainers = lib.teams.acme.members; - nodes = rec { + nodes = { + # The fake ACME server which will respond to client requests acme = { nodes, lib, ... }: { imports = [ ./common/acme/server ]; - networking.nameservers = lib.mkForce [ - nodes.dnsserver.config.networking.primaryIPAddress - ]; + networking.nameservers = lib.mkForce [ (dnsServerIP nodes) ]; }; + # A fake DNS server which can be configured with records as desired + # Used to test DNS-01 challenge dnsserver = { nodes, pkgs, ... }: { networking.firewall.allowedTCPPorts = [ 8055 53 ]; networking.firewall.allowedUDPPorts = [ 53 ]; @@ -39,112 +53,97 @@ in import ./make-test-python.nix ({ lib, ... }: { }; }; - acmeStandalone = { nodes, lib, config, pkgs, ... }: { - imports = [ commonConfig ]; - networking.nameservers = lib.mkForce [ - nodes.dnsserver.config.networking.primaryIPAddress - ]; - networking.firewall.allowedTCPPorts = [ 80 ]; - security.acme.certs."standalone.test" = { - webroot = "/var/lib/acme/acme-challenges"; - }; - systemd.targets."acme-finished-standalone.test" = { - after = [ "acme-standalone.test.service" ]; - wantedBy = [ "acme-standalone.test.service" ]; - }; - services.nginx.enable = true; - services.nginx.virtualHosts."standalone.test" = { - locations."/.well-known/acme-challenge".root = "/var/lib/acme/acme-challenges"; - }; - }; - - webserver = { nodes, config, pkgs, lib, ... }: { + # A web server which will be the node requesting certs + webserver = { pkgs, nodes, lib, config, ... }: { imports = [ commonConfig ]; + networking.nameservers = lib.mkForce [ (dnsServerIP nodes) ]; networking.firewall.allowedTCPPorts = [ 80 443 ]; - networking.nameservers = lib.mkForce [ - nodes.dnsserver.config.networking.primaryIPAddress - ]; - # A target remains active. Use this to probe the fact that - # a service fired eventhough it is not RemainAfterExit - systemd.targets."acme-finished-a.example.test" = { - after = [ "acme-a.example.test.service" ]; - wantedBy = [ "acme-a.example.test.service" ]; + # OpenSSL will be used for more thorough certificate validation + environment.systemPackages = [ pkgs.openssl ]; + + # Set log level to info so that we can see when the service is reloaded + services.nginx.enable = true; + services.nginx.logError = "stderr info"; + + # First tests configure a basic cert and run a bunch of openssl checks + services.nginx.virtualHosts."a.example.test" = (vhostBase pkgs) // { + enableACME = true; }; - services.nginx.enable = true; + # Used to determine if service reload was triggered + systemd.targets.test-renew-nginx = { + wants = [ "acme-a.example.test.service" ]; + after = [ "acme-a.example.test.service" "nginx-config-reload.service" ]; + }; - services.nginx.virtualHosts."a.example.test" = { - enableACME = true; - forceSSL = true; - locations."/".root = pkgs.runCommand "docroot" {} '' - mkdir -p "$out" - echo hello world > "$out/index.html" + # Cert config changes will not cause the nginx configuration to change. + # This tests that the reload service is correctly triggered. + # It also tests that postRun is exec'd as root + specialisation.cert-change.configuration = { pkgs, ... }: { + security.acme.certs."a.example.test".keyType = "ec384"; + security.acme.certs."a.example.test".postRun = '' + set -euo pipefail + touch test + chown root:root test + echo testing > test ''; }; - security.acme.server = "https://acme.test/dir"; - - specialisation.second-cert.configuration = {pkgs, ...}: { - systemd.targets."acme-finished-b.example.test" = { - after = [ "acme-b.example.test.service" ]; - wantedBy = [ "acme-b.example.test.service" ]; - }; - services.nginx.virtualHosts."b.example.test" = { - enableACME = true; - forceSSL = true; - locations."/".root = pkgs.runCommand "docroot" {} '' - mkdir -p "$out" - echo hello world > "$out/index.html" - ''; + # Now adding an alias to ensure that the certs are updated + specialisation.nginx-aliases.configuration = { pkgs, ... }: { + services.nginx.virtualHosts."a.example.test" = { + serverAliases = [ "b.example.test" ]; }; }; - specialisation.dns-01.configuration = {pkgs, config, nodes, lib, ...}: { + # Test using Apache HTTPD + specialisation.httpd-aliases.configuration = { pkgs, config, lib, ... }: { + services.nginx.enable = lib.mkForce false; + services.httpd.enable = true; + services.httpd.adminAddr = config.security.acme.email; + services.httpd.virtualHosts."c.example.test" = { + serverAliases = [ "d.example.test" ]; + forceSSL = true; + enableACME = true; + documentRoot = documentRoot pkgs; + }; + + # Used to determine if service reload was triggered + systemd.targets.test-renew-httpd = { + wants = [ "acme-c.example.test.service" ]; + after = [ "acme-c.example.test.service" "httpd-config-reload.service" ]; + }; + }; + + # Validation via DNS-01 challenge + specialisation.dns-01.configuration = { pkgs, config, nodes, ... }: { security.acme.certs."example.test" = { domain = "*.example.test"; + group = config.services.nginx.group; dnsProvider = "exec"; dnsPropagationCheck = false; - credentialsFile = with pkgs; writeText "wildcard.env" '' - EXEC_PATH=${dnsScript { inherit writeScript bash curl; dnsAddress = nodes.dnsserver.config.networking.primaryIPAddress; }} + credentialsFile = pkgs.writeText "wildcard.env" '' + EXEC_PATH=${dnsScript { inherit pkgs nodes; }} ''; - user = config.services.nginx.user; - group = config.services.nginx.group; }; - systemd.targets."acme-finished-example.test" = { - after = [ "acme-example.test.service" ]; - wantedBy = [ "acme-example.test.service" ]; - }; - systemd.services."acme-example.test" = { - before = [ "nginx.service" ]; - wantedBy = [ "nginx.service" ]; - }; - services.nginx.virtualHosts."c.example.test" = { - forceSSL = true; - sslCertificate = config.security.acme.certs."example.test".directory + "/cert.pem"; - sslTrustedCertificate = config.security.acme.certs."example.test".directory + "/full.pem"; - sslCertificateKey = config.security.acme.certs."example.test".directory + "/key.pem"; - locations."/".root = pkgs.runCommand "docroot" {} '' - mkdir -p "$out" - echo hello world > "$out/index.html" - ''; + + services.nginx.virtualHosts."dns.example.test" = (vhostBase pkgs) // { + useACMEHost = "example.test"; }; }; - # When nginx depends on a service that is slow to start up, requesting used to fail - # certificates fail. Reproducer for https://github.com/NixOS/nixpkgs/issues/81842 - specialisation.slow-startup.configuration = { pkgs, config, nodes, lib, ...}: { + # Validate service relationships by adding a slow start service to nginx' wants. + # Reproducer for https://github.com/NixOS/nixpkgs/issues/81842 + specialisation.slow-startup.configuration = { pkgs, config, nodes, lib, ... }: { systemd.services.my-slow-service = { wantedBy = [ "multi-user.target" "nginx.service" ]; before = [ "nginx.service" ]; preStart = "sleep 5"; script = "${pkgs.python3}/bin/python -m http.server"; }; - systemd.targets."acme-finished-d.example.com" = { - after = [ "acme-d.example.com.service" ]; - wantedBy = [ "acme-d.example.com.service" ]; - }; - services.nginx.virtualHosts."d.example.com" = { + + services.nginx.virtualHosts."slow.example.com" = { forceSSL = true; enableACME = true; locations."/".proxyPass = "http://localhost:8000"; @@ -152,11 +151,13 @@ in import ./make-test-python.nix ({ lib, ... }: { }; }; - client = {nodes, lib, ...}: { + # The client will be used to curl the webserver to validate configuration + client = {nodes, lib, pkgs, ...}: { imports = [ commonConfig ]; - networking.nameservers = lib.mkForce [ - nodes.dnsserver.config.networking.primaryIPAddress - ]; + networking.nameservers = lib.mkForce [ (dnsServerIP nodes) ]; + + # OpenSSL will be used for more thorough certificate validation + environment.systemPackages = [ pkgs.openssl ]; }; }; @@ -167,73 +168,168 @@ in import ./make-test-python.nix ({ lib, ... }: { in # Note, wait_for_unit does not work for oneshot services that do not have RemainAfterExit=true, # this is because a oneshot goes from inactive => activating => inactive, and never - # reaches the active state. To work around this, we create some mock target units which - # get pulled in by the oneshot units. The target units linger after activation, and hence we - # can use them to probe that a oneshot fired. It is a bit ugly, but it is the best we can do + # reaches the active state. Targets do not have this issue. + '' + import time + + + has_switched = False + + + def switch_to(node, name): + global has_switched + if has_switched: + node.succeed( + "${switchToNewServer}" + ) + has_switched = True + node.succeed( + f"/run/current-system/specialisation/{name}/bin/switch-to-configuration test" + ) + + + # Ensures the issuer of our cert matches the chain + # and matches the issuer we expect it to be. + # It's a good validation to ensure the cert.pem and fullchain.pem + # are not still selfsigned afer verification + def check_issuer(node, cert_name, issuer): + for fname in ("cert.pem", "fullchain.pem"): + actual_issuer = node.succeed( + f"openssl x509 -noout -issuer -in /var/lib/acme/{cert_name}/{fname}" + ).partition("=")[2] + print(f"{fname} issuer: {actual_issuer}") + assert issuer.lower() in actual_issuer.lower() + + + # Ensure cert comes before chain in fullchain.pem + def check_fullchain(node, cert_name): + subject_data = node.succeed( + f"openssl crl2pkcs7 -nocrl -certfile /var/lib/acme/{cert_name}/fullchain.pem" + " | openssl pkcs7 -print_certs -noout" + ) + for line in subject_data.lower().split("\n"): + if "subject" in line: + print(f"First subject in fullchain.pem: ", line) + assert cert_name.lower() in line + return + + assert False + + + def check_connection(node, domain, retries=3): + assert retries >= 0 + + result = node.succeed( + "openssl s_client -brief -verify 2 -CAfile /tmp/ca.crt" + f" -servername {domain} -connect {domain}:443 < /dev/null 2>&1" + ) + + for line in result.lower().split("\n"): + if "verification" in line and "error" in line: + time.sleep(1) + return check_connection(node, domain, retries - 1) + + + def check_connection_key_bits(node, domain, bits, retries=3): + assert retries >= 0 + + result = node.succeed( + "openssl s_client -CAfile /tmp/ca.crt" + f" -servername {domain} -connect {domain}:443 < /dev/null" + " | openssl x509 -noout -text | grep -i Public-Key" + ) + print("Key type:", result) + + if bits not in result: + time.sleep(1) + return check_connection_key_bits(node, domain, bits, retries - 1) + + client.start() dnsserver.start() - acme.wait_for_unit("default.target") dnsserver.wait_for_unit("pebble-challtestsrv.service") + client.wait_for_unit("default.target") + client.succeed( - 'curl --data \'{"host": "acme.test", "addresses": ["${nodes.acme.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a' - ) - client.succeed( - 'curl --data \'{"host": "standalone.test", "addresses": ["${nodes.acmeStandalone.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a' + 'curl --data \'{"host": "acme.test", "addresses": ["${nodes.acme.config.networking.primaryIPAddress}"]}\' http://${dnsServerIP nodes}:8055/add-a' ) acme.start() - acmeStandalone.start() + webserver.start() acme.wait_for_unit("default.target") acme.wait_for_unit("pebble.service") - with subtest("can request certificate with HTTPS-01 challenge"): - acmeStandalone.wait_for_unit("default.target") - acmeStandalone.succeed("systemctl start acme-standalone.test.service") - acmeStandalone.wait_for_unit("acme-finished-standalone.test.target") - - client.wait_for_unit("default.target") - client.succeed("curl https://acme.test:15000/roots/0 > /tmp/ca.crt") client.succeed("curl https://acme.test:15000/intermediate-keys/0 >> /tmp/ca.crt") - with subtest("Can request certificate for nginx service"): + with subtest("Can request certificate with HTTPS-01 challenge"): webserver.wait_for_unit("acme-finished-a.example.test.target") - client.succeed( - "curl --cacert /tmp/ca.crt https://a.example.test/ | grep -qF 'hello world'" - ) + check_fullchain(webserver, "a.example.test") + check_issuer(webserver, "a.example.test", "pebble") + check_connection(client, "a.example.test") - with subtest("Can add another certificate for nginx service"): - webserver.succeed( - "/run/current-system/specialisation/second-cert/bin/switch-to-configuration test" - ) - webserver.wait_for_unit("acme-finished-b.example.test.target") - client.succeed( - "curl --cacert /tmp/ca.crt https://b.example.test/ | grep -qF 'hello world'" - ) + with subtest("Can generate valid selfsigned certs"): + webserver.succeed("systemctl clean acme-a.example.test.service --what=state") + webserver.succeed("systemctl start acme-selfsigned-a.example.test.service") + check_fullchain(webserver, "a.example.test") + check_issuer(webserver, "a.example.test", "minica") + # Will succeed if nginx can load the certs + webserver.succeed("systemctl start nginx-config-reload.service") + + with subtest("Can reload nginx when timer triggers renewal"): + webserver.succeed("systemctl start test-renew-nginx.target") + check_issuer(webserver, "a.example.test", "pebble") + check_connection(client, "a.example.test") + + with subtest("Can reload web server when cert configuration changes"): + switch_to(webserver, "cert-change") + webserver.wait_for_unit("acme-finished-a.example.test.target") + check_connection_key_bits(client, "a.example.test", "384") + webserver.succeed("grep testing /var/lib/acme/a.example.test/test") + + with subtest("Can request certificate with HTTPS-01 when nginx startup is delayed"): + switch_to(webserver, "slow-startup") + webserver.wait_for_unit("acme-finished-slow.example.com.target") + check_issuer(webserver, "slow.example.com", "pebble") + check_connection(client, "slow.example.com") + + with subtest("Can request certificate for vhost + aliases (nginx)"): + # Check the key hash before and after adding an alias. It should not change. + # The previous test reverts the ed384 change + webserver.wait_for_unit("acme-finished-a.example.test.target") + keyhash_old = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem") + switch_to(webserver, "nginx-aliases") + webserver.wait_for_unit("acme-finished-a.example.test.target") + check_issuer(webserver, "a.example.test", "pebble") + check_connection(client, "a.example.test") + check_connection(client, "b.example.test") + keyhash_new = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem") + assert keyhash_old == keyhash_new + + with subtest("Can request certificates for vhost + aliases (apache-httpd)"): + switch_to(webserver, "httpd-aliases") + webserver.wait_for_unit("acme-finished-c.example.test.target") + check_issuer(webserver, "c.example.test", "pebble") + check_connection(client, "c.example.test") + check_connection(client, "d.example.test") + + with subtest("Can reload httpd when timer triggers renewal"): + # Switch to selfsigned first + webserver.succeed("systemctl clean acme-c.example.test.service --what=state") + webserver.succeed("systemctl start acme-selfsigned-c.example.test.service") + check_issuer(webserver, "c.example.test", "minica") + webserver.succeed("systemctl start httpd-config-reload.service") + webserver.succeed("systemctl start test-renew-httpd.target") + check_issuer(webserver, "c.example.test", "pebble") + check_connection(client, "c.example.test") with subtest("Can request wildcard certificates using DNS-01 challenge"): - webserver.succeed( - "${switchToNewServer}" - ) - webserver.succeed( - "/run/current-system/specialisation/dns-01/bin/switch-to-configuration test" - ) + switch_to(webserver, "dns-01") webserver.wait_for_unit("acme-finished-example.test.target") - client.succeed( - "curl --cacert /tmp/ca.crt https://c.example.test/ | grep -qF 'hello world'" - ) - - with subtest("Can request certificate of nginx when startup is delayed"): - webserver.succeed( - "${switchToNewServer}" - ) - webserver.succeed( - "/run/current-system/specialisation/slow-startup/bin/switch-to-configuration test" - ) - webserver.wait_for_unit("acme-finished-d.example.com.target") - client.succeed("curl --cacert /tmp/ca.crt https://d.example.com/") + check_issuer(webserver, "example.test", "pebble") + check_connection(client, "dns.example.test") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index a4a62d85a5..8048c885e1 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -34,6 +34,7 @@ in bind = handleTest ./bind.nix {}; bitcoind = handleTest ./bitcoind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; + bitwarden = handleTest ./bitwarden.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 @@ -48,6 +49,7 @@ in ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; certmgr = handleTest ./certmgr.nix {}; cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {}; + charliecloud = handleTest ./charliecloud.nix {}; chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {}; cjdns = handleTest ./cjdns.nix {}; clickhouse = handleTest ./clickhouse.nix {}; @@ -65,11 +67,13 @@ in containers-macvlans = handleTest ./containers-macvlans.nix {}; containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {}; containers-portforward = handleTest ./containers-portforward.nix {}; + containers-reloadable = handleTest ./containers-reloadable.nix {}; containers-restart_networking = handleTest ./containers-restart_networking.nix {}; containers-tmpfs = handleTest ./containers-tmpfs.nix {}; convos = handleTest ./convos.nix {}; corerad = handleTest ./corerad.nix {}; couchdb = handleTest ./couchdb.nix {}; + cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {}; deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; @@ -78,15 +82,13 @@ in docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {}; - docker-preloader = handleTestOn ["x86_64-linux"] ./docker-preloader.nix {}; docker-registry = handleTest ./docker-registry.nix {}; docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {}; docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; documize = handleTest ./documize.nix {}; dokuwiki = handleTest ./dokuwiki.nix {}; dovecot = handleTest ./dovecot.nix {}; - # ec2-config doesn't work in a sandbox as the simulated ec2 instance needs network access - #ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; + ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; ejabberd = handleTest ./xmpp/ejabberd.nix {}; @@ -296,6 +298,7 @@ in redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; restic = handleTest ./restic.nix {}; + robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; @@ -306,6 +309,7 @@ in sanoid = handleTest ./sanoid.nix {}; sddm = handleTest ./sddm.nix {}; service-runner = handleTest ./service-runner.nix {}; + shadowsocks = handleTest ./shadowsocks {}; shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {}; shiori = handleTest ./shiori.nix {}; signal-desktop = handleTest ./signal-desktop.nix {}; @@ -320,6 +324,8 @@ in spike = handleTest ./spike.nix {}; sonarr = handleTest ./sonarr.nix {}; sslh = handleTest ./sslh.nix {}; + sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; + sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; @@ -357,6 +363,7 @@ in unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; uwsgi = handleTest ./uwsgi.nix {}; + v2ray = handleTest ./v2ray.nix {}; vault = handleTest ./vault.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/bitwarden.nix b/third_party/nixpkgs/nixos/tests/bitwarden.nix new file mode 100644 index 0000000000..a47c77cec2 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/bitwarden.nix @@ -0,0 +1,188 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +# These tests will: +# * Set up a bitwarden-rs server +# * Have Firefox use the web vault to create an account, log in, and save a password to the valut +# * Have the bw cli log in and read that password from the vault +# +# Note that Firefox must be on the same machine as the server for WebCrypto APIs to be available (or HTTPS must be configured) +# +# The same tests should work without modification on the official bitwarden server, if we ever package that. + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; +let + backends = [ "sqlite" "mysql" "postgresql" ]; + + dbPassword = "please_dont_hack"; + + userEmail = "meow@example.com"; + userPassword = "also_super_secret_ZJWpBKZi668QGt"; # Must be complex to avoid interstitial warning on the signup page + + storedPassword = "seeeecret"; + + makeBitwardenTest = backend: makeTest { + name = "bitwarden_rs-${backend}"; + meta = { + maintainers = with pkgs.stdenv.lib.maintainers; [ jjjollyjim ]; + }; + + nodes = { + server = { pkgs, ... }: + let backendConfig = { + mysql = { + services.mysql = { + enable = true; + initialScript = pkgs.writeText "mysql-init.sql" '' + CREATE DATABASE bitwarden; + CREATE USER 'bitwardenuser'@'localhost' IDENTIFIED BY '${dbPassword}'; + GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost'; + FLUSH PRIVILEGES; + ''; + package = pkgs.mysql; + }; + + services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden"; + + systemd.services.bitwarden_rs.after = [ "mysql.service" ]; + }; + + postgresql = { + services.postgresql = { + enable = true; + initialScript = pkgs.writeText "postgresql-init.sql" '' + CREATE DATABASE bitwarden; + CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}'; + GRANT ALL PRIVILEGES ON DATABASE bitwarden TO bitwardenuser; + ''; + }; + + services.bitwarden_rs.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden"; + + systemd.services.bitwarden_rs.after = [ "postgresql.service" ]; + }; + + sqlite = { }; + }; + in + mkMerge [ + backendConfig.${backend} + { + services.bitwarden_rs = { + enable = true; + dbBackend = backend; + config.rocketPort = 80; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + + environment.systemPackages = + let + testRunner = pkgs.writers.writePython3Bin "test-runner" + { + libraries = [ pkgs.python3Packages.selenium ]; + } '' + from selenium.webdriver import Firefox + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC + + options = Options() + options.add_argument('--headless') + driver = Firefox(options=options) + + driver.implicitly_wait(20) + driver.get('http://localhost/#/register') + + wait = WebDriverWait(driver, 10) + + wait.until(EC.title_contains("Create Account")) + + driver.find_element_by_css_selector('input#email').send_keys( + '${userEmail}' + ) + driver.find_element_by_css_selector('input#name').send_keys( + 'A Cat' + ) + driver.find_element_by_css_selector('input#masterPassword').send_keys( + '${userPassword}' + ) + driver.find_element_by_css_selector('input#masterPasswordRetype').send_keys( + '${userPassword}' + ) + + driver.find_element_by_xpath("//button[contains(., 'Submit')]").click() + + wait.until_not(EC.title_contains("Create Account")) + + driver.find_element_by_css_selector('input#masterPassword').send_keys( + '${userPassword}' + ) + driver.find_element_by_xpath("//button[contains(., 'Log In')]").click() + + wait.until(EC.title_contains("My Vault")) + + driver.find_element_by_xpath("//button[contains(., 'Add Item')]").click() + + driver.find_element_by_css_selector('input#name').send_keys( + 'secrets' + ) + driver.find_element_by_css_selector('input#loginPassword').send_keys( + '${storedPassword}' + ) + + driver.find_element_by_xpath("//button[contains(., 'Save')]").click() + ''; + in + [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ]; + + virtualisation.memorySize = 768; + } + ]; + + client = { pkgs, ... }: + { + environment.systemPackages = [ pkgs.bitwarden-cli ]; + }; + }; + + testScript = '' + start_all() + server.wait_for_unit("bitwarden_rs.service") + server.wait_for_open_port(80) + + with subtest("configure the cli"): + client.succeed("bw --nointeraction config server http://server") + + with subtest("can't login to nonexistant account"): + client.fail( + "bw --nointeraction --raw login ${userEmail} ${userPassword}" + ) + + with subtest("use the web interface to sign up, log in, and save a password"): + server.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") + + with subtest("log in with the cli"): + key = client.succeed( + "bw --nointeraction --raw login ${userEmail} ${userPassword}" + ).strip() + + with subtest("sync with the cli"): + client.succeed(f"bw --nointeraction --raw --session {key} sync -f") + + with subtest("get the password with the cli"): + password = client.succeed( + f"bw --nointeraction --raw --session {key} list items | ${pkgs.jq}/bin/jq -r .[].login.password" + ) + assert password.strip() == "${storedPassword}" + ''; + }; +in +builtins.listToAttrs ( + map + (backend: { name = backend; value = makeBitwardenTest backend; }) + backends +) diff --git a/third_party/nixpkgs/nixos/tests/caddy.nix b/third_party/nixpkgs/nixos/tests/caddy.nix index 144d83179a..445a7fa6b0 100644 --- a/third_party/nixpkgs/nixos/tests/caddy.nix +++ b/third_party/nixpkgs/nixos/tests/caddy.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "caddy"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ xfix ]; + maintainers = [ xfix filalex77 ]; }; nodes = { @@ -9,9 +9,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { services.caddy.enable = true; services.caddy.config = '' http://localhost { - gzip + encode gzip - root ${ + file_server + root * ${ pkgs.runCommand "testdir" {} '' mkdir "$out" echo hello world > "$out/example.html" @@ -23,9 +24,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { specialisation.etag.configuration = { services.caddy.config = lib.mkForce '' http://localhost { - gzip + encode gzip - root ${ + file_server + root * ${ pkgs.runCommand "testdir2" {} '' mkdir "$out" echo changed > "$out/example.html" @@ -59,9 +61,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) etag = etag.replace("\r\n", " ") http_code = webserver.succeed( - "curl -w \"%{{http_code}}\" -X HEAD -H 'If-None-Match: {}' {}".format(etag, url) + "curl --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( + etag, url + ) ) - assert int(http_code) == 304, "HTTP code is not 304" + assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code) return etag diff --git a/third_party/nixpkgs/nixos/tests/charliecloud.nix b/third_party/nixpkgs/nixos/tests/charliecloud.nix new file mode 100644 index 0000000000..acba41e228 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/charliecloud.nix @@ -0,0 +1,43 @@ +# This test checks charliecloud image construction and run + +import ./make-test-python.nix ({ pkgs, ...} : let + + dockerfile = pkgs.writeText "Dockerfile" '' + FROM nix + RUN mkdir /home /tmp + RUN touch /etc/passwd /etc/group + CMD ["true"] + ''; + +in { + name = "charliecloud"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bzizou ]; + }; + + nodes = { + host = { ... }: { + environment.systemPackages = [ pkgs.charliecloud ]; + virtualisation.docker.enable = true; + users.users.alice = { + isNormalUser = true; + extraGroups = [ "docker" ]; + }; + }; + }; + + testScript = '' + host.start() + host.wait_for_unit("docker.service") + host.succeed( + 'su - alice -c "docker load --input=${pkgs.dockerTools.examples.nix}"' + ) + host.succeed( + "cp ${dockerfile} /home/alice/Dockerfile" + ) + host.succeed('su - alice -c "ch-build -t hello ."') + host.succeed('su - alice -c "ch-builder2tar hello /var/tmp"') + host.succeed('su - alice -c "ch-tar2dir /var/tmp/hello.tar.gz /var/tmp"') + host.succeed('su - alice -c "ch-run /var/tmp/hello -- echo Running_From_Container_OK"') + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/codimd.nix b/third_party/nixpkgs/nixos/tests/codimd.nix index b1acbf4a83..aa581dfeb5 100644 --- a/third_party/nixpkgs/nixos/tests/codimd.nix +++ b/third_party/nixpkgs/nixos/tests/codimd.nix @@ -21,7 +21,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: services = { codimd = { enable = true; - configuration.dbURL = "postgres://codimd:snakeoilpassword@localhost:5432/codimddb"; + configuration.dbURL = "postgres://codimd:\${DB_PASSWORD}@localhost:5432/codimddb"; + + /* + * Do not use pkgs.writeText for secrets as + * they will end up in the world-readable Nix store. + */ + environmentFile = pkgs.writeText "codimd-env" '' + DB_PASSWORD=snakeoilpassword + ''; }; postgresql = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/common/acme/client/default.nix b/third_party/nixpkgs/nixos/tests/common/acme/client/default.nix index 80893da025..1e9885e375 100644 --- a/third_party/nixpkgs/nixos/tests/common/acme/client/default.nix +++ b/third_party/nixpkgs/nixos/tests/common/acme/client/default.nix @@ -1,15 +1,14 @@ { lib, nodes, pkgs, ... }: - let - acme-ca = nodes.acme.config.test-support.acme.caCert; -in + caCert = nodes.acme.config.test-support.acme.caCert; + caDomain = nodes.acme.config.test-support.acme.caDomain; -{ +in { security.acme = { - server = "https://acme.test/dir"; + server = "https://${caDomain}/dir"; email = "hostmaster@example.test"; acceptTerms = true; }; - security.pki.certificateFiles = [ acme-ca ]; + security.pki.certificateFiles = [ caCert ]; } diff --git a/third_party/nixpkgs/nixos/tests/common/acme/server/default.nix b/third_party/nixpkgs/nixos/tests/common/acme/server/default.nix index 1a0ee88257..4d8e664c4e 100644 --- a/third_party/nixpkgs/nixos/tests/common/acme/server/default.nix +++ b/third_party/nixpkgs/nixos/tests/common/acme/server/default.nix @@ -3,7 +3,7 @@ # config.test-support.acme.caCert # # This value can be used inside the configuration of other test nodes to inject -# the snakeoil certificate into security.pki.certificateFiles or into package +# the test certificate into security.pki.certificateFiles or into package # overlays. # # Another value that's needed if you don't use a custom resolver (see below for @@ -50,19 +50,13 @@ # Also make sure that whenever you use a resolver from a different test node # that it has to be started _before_ the ACME service. { config, pkgs, lib, ... }: - - let - snakeOilCerts = import ./snakeoil-certs.nix; + testCerts = import ./snakeoil-certs.nix { + minica = pkgs.minica; + mkDerivation = pkgs.stdenv.mkDerivation; + }; + domain = testCerts.domain; - wfeDomain = "acme.test"; - wfeCertFile = snakeOilCerts.${wfeDomain}.cert; - wfeKeyFile = snakeOilCerts.${wfeDomain}.key; - - siteDomain = "acme.test"; - siteCertFile = snakeOilCerts.${siteDomain}.cert; - siteKeyFile = snakeOilCerts.${siteDomain}.key; - pebble = pkgs.pebble; resolver = let message = "You need to define a resolver for the acme test module."; firstNS = lib.head config.networking.nameservers; @@ -71,8 +65,9 @@ let pebbleConf.pebble = { listenAddress = "0.0.0.0:443"; managementListenAddress = "0.0.0.0:15000"; - certificate = snakeOilCerts.${wfeDomain}.cert; - privateKey = snakeOilCerts.${wfeDomain}.key; + # These certs and keys are used for the Web Front End (WFE) + certificate = testCerts.${domain}.cert; + privateKey = testCerts.${domain}.key; httpPort = 80; tlsPort = 443; ocspResponderURL = "http://0.0.0.0:4002"; @@ -80,18 +75,30 @@ let }; pebbleConfFile = pkgs.writeText "pebble.conf" (builtins.toJSON pebbleConf); - pebbleDataDir = "/root/pebble"; in { imports = [ ../../resolver.nix ]; - options.test-support.acme.caCert = lib.mkOption { - type = lib.types.path; - description = '' - A certificate file to use with the nodes attribute to - inject the snakeoil CA certificate used in the ACME server into - . - ''; + options.test-support.acme = with lib; { + caDomain = mkOption { + type = types.str; + readOnly = true; + default = domain; + description = '' + A domain name to use with the nodes attribute to + identify the CA server. + ''; + }; + caCert = mkOption { + type = types.path; + readOnly = true; + default = testCerts.ca.cert; + description = '' + A certificate file to use with the nodes attribute to + inject the test CA certificate used in the ACME server into + . + ''; + }; }; config = { @@ -99,35 +106,32 @@ in { resolver.enable = let isLocalResolver = config.networking.nameservers == [ "127.0.0.1" ]; in lib.mkOverride 900 isLocalResolver; - acme.caCert = snakeOilCerts.ca.cert; }; # This has priority 140, because modules/testing/test-instrumentation.nix # already overrides this with priority 150. networking.nameservers = lib.mkOverride 140 [ "127.0.0.1" ]; - networking.firewall.enable = false; + networking.firewall.allowedTCPPorts = [ 80 443 15000 4002 ]; networking.extraHosts = '' - 127.0.0.1 ${wfeDomain} - ${config.networking.primaryIPAddress} ${wfeDomain} ${siteDomain} + 127.0.0.1 ${domain} + ${config.networking.primaryIPAddress} ${domain} ''; systemd.services = { pebble = { enable = true; description = "Pebble ACME server"; - requires = [ ]; wantedBy = [ "network.target" ]; - preStart = '' - mkdir ${pebbleDataDir} - ''; - script = '' - cd ${pebbleDataDir} - ${pebble}/bin/pebble -config ${pebbleConfFile} - ''; + serviceConfig = { + RuntimeDirectory = "pebble"; + WorkingDirectory = "/run/pebble"; + # Required to bind on privileged ports. AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + + ExecStart = "${pkgs.pebble}/bin/pebble -config ${pebbleConfFile}"; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/common/acme/server/mkcerts.nix b/third_party/nixpkgs/nixos/tests/common/acme/server/mkcerts.nix deleted file mode 100644 index 2474019cba..0000000000 --- a/third_party/nixpkgs/nixos/tests/common/acme/server/mkcerts.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ pkgs ? import {} -, lib ? pkgs.lib -, domains ? [ "acme.test" ] -}: - -pkgs.runCommand "acme-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/third_party/nixpkgs/nixos/tests/common/acme/server/mkcerts.sh b/third_party/nixpkgs/nixos/tests/common/acme/server/mkcerts.sh deleted file mode 100755 index cc7f8ca650..0000000000 --- a/third_party/nixpkgs/nixos/tests/common/acme/server/mkcerts.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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/third_party/nixpkgs/nixos/tests/common/acme/server/snakeoil-certs.nix b/third_party/nixpkgs/nixos/tests/common/acme/server/snakeoil-certs.nix index fd537c3260..4b6a38b8fa 100644 --- a/third_party/nixpkgs/nixos/tests/common/acme/server/snakeoil-certs.nix +++ b/third_party/nixpkgs/nixos/tests/common/acme/server/snakeoil-certs.nix @@ -1,171 +1,37 @@ -# Generated via mkcert.sh in the same directory. -{ - ca.key = builtins.toFile "ca.key" '' - -----BEGIN PRIVATE KEY----- - MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDCnVZGEn68ezXl - DWE5gjsCPqutR4nxw/wvIbAxB2Vk2WeQ6HGvt2Jdrz5qer2IXd76YtpQeqd+ffet - aLtMeFTr+Xy9yqEpx2AfvmEEcLnuiWbsUGZzsHwW7/4kPgAFBy9TwJn/k892lR6u - QYa0QS39CX85kLMZ/LZXUyClIBa+IxT1OovmGqMOr4nGASRQP6d/nnyn41Knat/d - tpyaa5zgfYwA6YW6UxcywvBSpMOXM0/82BFZGyALt3nQ+ffmrtKcvMjsNLBFaslV - +zYO1PMbLbTCW8SmJTjhzuapXtBHruvoe24133XWlvcP1ylaTx0alwiQWJr1XEOU - WLEFTgOTeRyiVDxDunpz+7oGcwzcdOG8nCgd6w0aYaECz1zvS3FYTQz+MiqmEkx6 - s4bj1U90I0kwUJbeWjjrGO7Y9Qq4i19GafDg7cAMn9eHCiNbNrPj6t/gfaVbCrbk - m3ZVjkvLTQ2mb2lv7+tVii45227iNPuNS6lx2FVlr/DXiRrOVfghPvoOxUfXzogJ - hZLV4Zki+ycbGQa5w8YMDYCv4c08dKA7AatVhNS60c1zgQNjuWF3BvocSySyGUon - VT6h1DYlJ9YAqgqNpedgNR9kpp034SMhB7dj9leB6LRMA+c1fG/T+1lDbkA+vope - pt4+30oDcCTYfEifl1HwqNw/bXDm1wIDAQABAoICABPbd/UYaAQVUk93yQbUKe81 - s9CvbvzTMYUhm9e02Hyszitz/D2gqZHDksvMkFA8u8aylXIGwdZfRglUmV/ZG1kk - kLzQ0xbvN/ilNUL9uYsETBMqtPly9YZloHnUNa5NqF+UVGJGk7GWz5WaLANybx3V - fTzDbfLl3TkVy0vt9UQbUkUfXyzwZNjXwmgIr8rcY9vasP90a3eXqRX3Tw1Wk6A4 - TzO8oB994O0WBO150Fc6Lhwvc72yzddENlLDXq8UAXtqq9mmGqJKnhZ+1mo3AkMw - q7P1JyCIxcAMm26GtRvLVljXV0x5640kxDrCin6jeeW/qWkJEW6dpmuZjR5scmLI - /9n8H+fGzdZH8bOPPotMy12doj3vJqvew3p0eIkmVctYMJKD0j/CWjvKJNE3Yx4O - Ls47X/dEypX6anR1HQUXcpd6JfRWdIJANo2Duaz+HYbyA88bHcJL9shFYcjLs3sX - R/TvnnKHvw/ud7XBgvLGwGAf/cDEuLI2tv+V7tkMGrMUv+gUJNZaJaCpdt+1iUwO - QFq8APyBNn6FFw54TwXWfSjfSNh3geIMLHuErYVu9MIXvB7Yhh+ZvLcfLbmckhAX - wb39RRHnCWvnw5Bm9hnsDhqfDsIoP+2wvUkViyHOmrKi8nSJhSk19C8AuQtSVcJg - 5op+epEmjt70GHt52nuBAoIBAQD2a4Ftp4QxWE2d6oAFI6WPrX7nAwI5/ezCbO/h - yoYAn6ucTVnn5/5ITJ8V4WTWZ4lkoZP3YSJiCyBhs8fN63J+RaJ/bFRblHDns1HA - 2nlMVdNLg6uOfjgUJ8Y6xVM0J2dcFtwIFyK5pfZ7loxMZfvuovg74vDOi2vnO3dO - 16DP3zUx6B/yIt57CYn8NWTq+MO2bzKUnczUQRx0yEzPOfOmVbcqGP8f7WEdDWXm - 7scjjN53OPyKzLOVEhOMsUhIMBMO25I9ZpcVkyj3/nj+fFLf/XjOTM00M/S/KnOj - RwaWffx6mSYS66qNc5JSsojhIiYyiGVEWIznBpNWDU35y/uXAoIBAQDKLj0dyig2 - kj1r3HvdgK4sRULqBQFMqE9ylxDmpJxAj6/A8hJ0RCBR57vnIIZMzK4+6K0l3VBJ - ukzXJHJLPkZ0Uuo2zLuRLkyjBECH6KYznyTkUVRn50Oq6IoP6WTCfd3Eg+7AKYY1 - VFo2iR8sxeSQQ+AylFy6QcQ1xPIW30Jj1/LFjrRdRggapPEekpJec0pEqhasT8rR - UFhRL2NdZnL5b7ZlsJc7gZKEJgNfxgzaCzloqLcjCgGpOhLKx0fFsNOqHcbIGMwG - 6wQCOyNghQJ6AZtRD5TYCJow92FchWjoTIaMJ8RjMKQmxpiwM6wQG4J78Hd3mbhf - q0hiQhPHaNbBAoIBAFeIeMFq8BpXM7sUwcURlI4lIx8Mgo33FVM7PzsFpfQyw9MR - 5w3p6vnjvd8X4aoHvVZxzw3hA0WwjiAmrKMJL/KK6d45rP2bDUBBAplvAgeLtTLt - 4tMLIwCF4HSgA55TIPQlaqO1FDC+M4BTSiMZVxS970/WnZPBEuNgzFDFZ+pvb4X6 - 3t40ZLNwAAQHM4IEPAFiHqWMKGZ9eo5BWIeEHnjHmfjqSDYfLJAVYk1WJIcMUzom - lA76CBC8CxW/I94AtcRhWuFUv/Z5/+OYEYLUxtuqPm+J+JrCmf4OJmWppT1wI2+p - V00BSeRVWXTm1piieM8ahF5y1hp6y3uV3k0NmKECggEBAMC42Ms3s6NpPSE+99eJ - 3P0YPJOkl7uByNGbTKH+kW89SDRsy8iGVCSe9892gm5cwU/4LWyljO3qp2qBNG2i - /DfP/bCk8bqPXsAZwoWK8DrO3bTCDepJWYhlx40pVkHLBwVXGdOVAXh+YswPY2cj - cB9QhDrSj52AKU9z36yLvtY7uBA3Wph6tCjpx2n0H4/m6AmR9LDmEpf5tWYV/OrA - SKKaqUw/y7kOZyKOtbKqr/98qYmpIYFF/ZVZZSZkVXcNeoZzgdOlR37ksVqLEsrj - nxu7wli/uItBj/FTLjyqcvjUUYDyO1KtwBuyPUPgzYhBIN2Rt9+K6WRQelwnToFL - 30ECggEBALzozykZj2sr3z8tQQRZuXLGotUFGsQCB8ikeqoeB8FbNNkC+qgflQGv - zLRB2KWOvnboc94wVgBJH43xG0HBibZnBhUO8/HBI/WlmyEj9KQ/ZskUK4GVZkB6 - r/81ASLwH+P/rqrLEjcp1SIPPevjzCWD9VYR5m/qPHLNxStwGSrPjtPzgaFxhq84 - Jl+YVmNqVlrOKYYfIPh8exPLiTti3wfM61pVYFv56PI2gd5ysMWYnuN+vK0sbmZh - cIWwykcKlODIngI7IzYqt8NuIJI0jrYyHgtUw4jaJzdF4mEOplGONxdz15jAGHtg - JUsBXFNz132nP4iIr3UKrPedQZijSi4= - -----END PRIVATE KEY----- - ''; - ca.cert = builtins.toFile "ca.cert" '' - -----BEGIN CERTIFICATE----- - MIIFDzCCAvegAwIBAgIUTRDYSWJvmlhwIR3pzVrIQfnboLEwDQYJKoZIhvcNAQEL - BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwMzIyMjI1NjE3WhgPMjEy - MDAyMjcyMjU2MTdaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG - 9w0BAQEFAAOCAg8AMIICCgKCAgEAwp1WRhJ+vHs15Q1hOYI7Aj6rrUeJ8cP8LyGw - MQdlZNlnkOhxr7diXa8+anq9iF3e+mLaUHqnfn33rWi7THhU6/l8vcqhKcdgH75h - BHC57olm7FBmc7B8Fu/+JD4ABQcvU8CZ/5PPdpUerkGGtEEt/Ql/OZCzGfy2V1Mg - pSAWviMU9TqL5hqjDq+JxgEkUD+nf558p+NSp2rf3bacmmuc4H2MAOmFulMXMsLw - UqTDlzNP/NgRWRsgC7d50Pn35q7SnLzI7DSwRWrJVfs2DtTzGy20wlvEpiU44c7m - qV7QR67r6HtuNd911pb3D9cpWk8dGpcIkFia9VxDlFixBU4Dk3kcolQ8Q7p6c/u6 - BnMM3HThvJwoHesNGmGhAs9c70txWE0M/jIqphJMerOG49VPdCNJMFCW3lo46xju - 2PUKuItfRmnw4O3ADJ/XhwojWzaz4+rf4H2lWwq25Jt2VY5Ly00Npm9pb+/rVYou - Odtu4jT7jUupcdhVZa/w14kazlX4IT76DsVH186ICYWS1eGZIvsnGxkGucPGDA2A - r+HNPHSgOwGrVYTUutHNc4EDY7lhdwb6HEskshlKJ1U+odQ2JSfWAKoKjaXnYDUf - ZKadN+EjIQe3Y/ZXgei0TAPnNXxv0/tZQ25APr6KXqbePt9KA3Ak2HxIn5dR8Kjc - P21w5tcCAwEAAaNTMFEwHQYDVR0OBBYEFCIoeYSYjtMiPrmxfHmcrsZkyTpvMB8G - A1UdIwQYMBaAFCIoeYSYjtMiPrmxfHmcrsZkyTpvMA8GA1UdEwEB/wQFMAMBAf8w - DQYJKoZIhvcNAQELBQADggIBAHPdwOgAxyhIhbqFObNftW8K3sptorB/Fj6jwYCm - mHleFueqQnjTHMWsflOjREvQp1M307FWooGj+KQkjwvAyDc/Hmy7WgJxBg9p3vc+ - /Xf/e7ZfBl8rv7vH8VXW/BC1vVsILdFncrgTrP8/4psV50/cl1F4+nPBiekvvxwZ - k+R7SgeSvcWT7YlOG8tm1M3al4F4mWzSRkYjkrXmwRCKAiya9xcGSt0Bob+LoM/O - mpDGV/PMC1WAoDc1mMuXN2hSc0n68xMcuFs+dj/nQYn8uL5pzOxpX9560ynKyLDv - yOzQlM2VuZ7H2hSIeYOFgrtHJJwhDtzjmUNDQpQdp9Fx+LONQTS1VLCTXND2i/3F - 10X6PkdnLEn09RiPt5qy20pQkICxoEydmlwpFs32musYfJPdBPkZqZWrwINBv2Wb - HfOmEB4xUvXufZ5Ju5icgggBkyNA3PCLo0GZFRrMtvA7i9IXOcXNR+njhKa9246V - QQfeWiz05RmIvgShJYVsnZWtael8ni366d+UXypBYncohimyNlAD1n+Bh3z0PvBB - +FK4JgOSeouM4SuBHdwmlZ/H0mvfUG81Y8Jbrw0yuRHtuCtX5HpN5GKpZPHDE7aQ - fEShVB/GElC3n3DvgK9OJBeVVhYQgUEfJi4rsSxt3cdEI0NrdckUoZbApWVJ3CBc - F8Y7 - -----END CERTIFICATE----- - ''; - "acme.test".key = builtins.toFile "acme.test.key" '' - -----BEGIN RSA PRIVATE KEY----- - MIIJKAIBAAKCAgEAlgQTZjKfs3aHw0J993k7jFAs+hVRPf//zHMAiUkPKUYPTSl1 - TxS/bPbhWzSoom00j4SLhGGGhbd+lnvTg0uvKbxskgATfw5clbm1ZN+gx4DuxwjL - V3xIxpeSY+PKzs5z8w/k+AJh+zOPyXwH3ut3C+ogp1S/5IhmzV3a/yU/6k0zpGxj - N6ZPRTXFrz93I1pPeCkJz90l7tj+2uFc9xtM20NQX52f0Y2oShcG8fKdNZVzuHHk - ZXkrZIhou55/nRy2jKgFeD3GQQfa9rwPWrVybQ6tKMMkoazB/Unky9xcTI2LJarf - xgHDO9v9yFBvmR4UM8B3kM82NHoENtHaZ2mmiMGZzTEQlf8xwYyHFrqBFIVRWEUr - 7rr/O5Qr9gIN0T4u367HCexVYAKzbO2P9h75czzjMMoGkbXze9SMQ/ikrxEmwAHg - r1Xxh6iQYmgPNk8AR3d9+o2I7WJZMUYZARLnuhVr9BNXv510iqZTqX8lcyL5fEj3 - ST4Ab+H7rfevZt6NU26iJLBYAjrA2mSvH+wvkboxrgSS8xYPkOW8NLNEbbodzofI - pB+SaK53OIk0bj9c1YAgrSNER/TDTgDXrWUNrlfVZ/M7+AEdeU06wi7sVhVif6OB - D3OpgKSNjeE6TuJH80Pi5MWugSFBr792Xb6uhVoPiVOFN+qiGB6UkwBgSKkCAwEA - AQKCAgAmN7OZfZwh5DiCDhZ5TXFWNba/n16rJOTN+R5R20L5iNetGLrCAs8hu2N+ - ENRFTPzu8x14BEB5IF4niDRCZq2hPFeMemh9HfOIUV9c63vSV459NkhXaVpA/axV - tlqchQwVCB+U70Z28JPZCLgYmnQhnOvktTqNxhIqj5aTGbJGxpQ5d0Nvkfbv8tsB - 4nE/mGpWel39jqFzT+Tdbjx414Ok+GkpcsacZDJTbbpfOSfD1uc8PgepskzTt8y2 - v5JTPFVlUAjUsSgouQ+XfCGNQlx8XBjRIaXbal+hX4niRald91FTr0yC7UAHp+vn - dFZ586fB526OfbuZctxP+vZhEhFSseQKxHQ0tB8me81xH44daVNr9PPUM69FDT3j - ygJaUJjNEG3vVzePCDzhmxTmz2/rAClp77WTWziBWDoA6YWDDzhgNPrXWzLIbZIx - ue9ZbGEOh/u5ZzrEXxKCz9FjDe9wQu3TeYUe0M+ejzwWgn7zdWDvjjmtLUUuun2Y - wW7WANpu32qvB/V+qssw4O63tbRiwneRCnb8AF2ixgyWr6xyZwch4kacv1KMiixf - gO/5GTj7ba5GcdGoktJb29cUEgz13yPd106RsHK4vcggFxfMbOVauNRIo6ddLwyS - 8UMxLf2i2cToOLkHZrIb8FgimmzRoBd3yYzwVJBydiVcsrHQAQKCAQEAxlzFYCiQ - hjEtblGnrkOC7Hx6HvqMelViOkGN8Y9VczG4GhwntmSE2nbpaAKhFBGdLfuSI3tJ - Lf24f0IGgAhzPmpo2TjbxPO3YSKFTH71fznVBhtQ1iSxwZ1InXktnuhot6VSDx6A - sbHSy1hMFy3nj+Zj5+fQ89tclzBzG9bCShaauO39KrPMwKi6CYoYdGhXBC3+OpHY - zBNvmDTxG2kW8L42rlf14EH4pAlgKs4eeZbpcbZ6fXURP2hToHJ8swyKw/1p12WA - cc19BKFJXL8nNP4uCf/fI0mVYpytz5KwUzG+z+umDqk+RRCH4mNB28xvEEuEyp/e - /C5Is+WrlDAA6QKCAQEAwZsK4AJ/w4Xf4Q/SsnZJO9bfP1ejJjzKElt8rG28JXeb - +FjykZZ6vw2gt2Boest2n9N4fBwaRkaHVtVS4iAmaDXozTlcvCLs2rVjPSguuQtW - 80CKg6+dux+6gFN8IGzDCiX3pWUnhhiXvCcRYEcvgpH6GA5vuCNrXrjH0JFC0kef - aaDMGMTbzhc2IIRztmWU4v8YJSSy5KOkIQLWO+7u9aGx9IqT5/z3gx3XrItyl0Bk - aQmZEh7JOSyhmGhhf5LdeTLu2YgRw3/tzS+lPMX3+UPw99k9MdTOFn2pww5AdRmg - aBIzV+/LBYG0pPRl0D8/6yzGVBPuUDQpmK9Z3gsxwQKCAQEAnNkMZN2Ocd1+6+V7 - LmtJog9HTSmWXMEZG7FsOJ661Yxx44txx2IyPsCaDNlPXxwSaiKrSo0Yr1oZQd8G - XsTPw4HGiETSWijQTulJ99PH8SLck6iTwdBgEhV5LrN75FQnQVdizHu1DUzrvkiC - Wi29FWb6howiCEDjNNVln5SwKn83NpVQgyyK8ag4+oQMlDdQ3wgzJ0Ld53hS3Eq4 - f5EYR6JQgIki7YGcxrB3L0GujTxMONMuhfdEfRvUTGFawwVe0FyYDW7AIrx2Z2vV - I5YuvVNjOhrt6OwtSD1VnnWCITaLh8LwmlUu3NOWbudHUzKSe5MLXGEPo95BNKad - hl5yyQKCAQBNo0gMJtRnawMpdLfwewDJL1SdSR6S0ePS0r8/Qk4l1D5GrByyB183 - yFY/0zhyra7nTt1NH9PlhJj3WFqBdZURSzUNP0iR5YuH9R9Twg5ihEqdB6/EOSOO - i521okTvl83q/ui9ecAMxUXr3NrZ+hHyUWmyRe/FLub6uCzg1a+vNauWpzXRZPgk - QCijh5oDdd7r3JIpKvtWNs01s7aHmDxZYjtDrmK7sDTtboUzm0QbpWXevUuV+aSF - +gDfZlRa3WFVHfisYSWGeYG6O7YOlfDoE7fJHGOu3QC8Ai6Wmtt8Wgd6VHokdHO8 - xJPVZnCBvyt5up3Zz5hMr25S3VazdVfBAoIBAHVteqTGqWpKFxekGwR0RqE30wmN - iIEwFhgOZ8sQ+6ViZJZUR4Nn2fchn2jVwF8V8J1GrJbTknqzAwdXtO3FbgfmmyF2 - 9VbS/GgomXhA9vJkM4KK3Iwo/y/nE9hRhtzuVE0QPudz2fyfaDgnWjcNM59064tH - 88361LVJm3ixyWSBD41UZ7NgWWJX1y2f073vErsfcPpavF5lhn1oSkQnOlgMJsnl - 24qeuzAgTWu/2rFpIA2EK30Bgvsl3pjJxHwyNDAgklV7C783LIoAHi7VO7tzZ6iF - dmD5XLfcUZc3eaB7XehNQKBXDGLJeI5AFmjsHka5GUoitkU2PFrg/3+nJmg= - -----END RSA PRIVATE KEY----- - ''; - "acme.test".cert = builtins.toFile "acme.test.cert" '' - -----BEGIN CERTIFICATE----- - MIIEoTCCAokCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls - IENBMCAXDTIwMDMyMjIyNTYxOFoYDzIxMjAwMjI3MjI1NjE4WjAUMRIwEAYDVQQD - DAlhY21lLnRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCWBBNm - Mp+zdofDQn33eTuMUCz6FVE9///McwCJSQ8pRg9NKXVPFL9s9uFbNKiibTSPhIuE - YYaFt36We9ODS68pvGySABN/DlyVubVk36DHgO7HCMtXfEjGl5Jj48rOznPzD+T4 - AmH7M4/JfAfe63cL6iCnVL/kiGbNXdr/JT/qTTOkbGM3pk9FNcWvP3cjWk94KQnP - 3SXu2P7a4Vz3G0zbQ1BfnZ/RjahKFwbx8p01lXO4ceRleStkiGi7nn+dHLaMqAV4 - PcZBB9r2vA9atXJtDq0owyShrMH9SeTL3FxMjYslqt/GAcM72/3IUG+ZHhQzwHeQ - zzY0egQ20dpnaaaIwZnNMRCV/zHBjIcWuoEUhVFYRSvuuv87lCv2Ag3RPi7frscJ - 7FVgArNs7Y/2HvlzPOMwygaRtfN71IxD+KSvESbAAeCvVfGHqJBiaA82TwBHd336 - jYjtYlkxRhkBEue6FWv0E1e/nXSKplOpfyVzIvl8SPdJPgBv4fut969m3o1TbqIk - sFgCOsDaZK8f7C+RujGuBJLzFg+Q5bw0s0Rtuh3Oh8ikH5Jornc4iTRuP1zVgCCt - I0RH9MNOANetZQ2uV9Vn8zv4AR15TTrCLuxWFWJ/o4EPc6mApI2N4TpO4kfzQ+Lk - xa6BIUGvv3Zdvq6FWg+JU4U36qIYHpSTAGBIqQIDAQABMA0GCSqGSIb3DQEBCwUA - A4ICAQBCDs0V4z00Ze6Ask3qDOLAPo4k85QCfItlRZmwl2XbPZq7kbe13MqF2wxx - yiLalm6veK+ehU9MYN104hJZnuce5iEcZurk+8A+Pwn1Ifz+oWKVbUtUP3uV8Sm3 - chktJ2H1bebXtNJE5TwvdHiUkXU9ywQt2FkxiTSl6+eac7JKEQ8lVN/o6uYxF5ds - +oIZplb7bv2XxsRCzq55F2tJX7fIzqXrSa+lQTnfLGmDVMAQX4TRB/lx0Gqd1a9y - qGfFnZ7xVyW97f6PiL8MoxPfd2I2JzrzGyP/igNbFOW0ho1OwfxVmvZeS7fQSc5e - +qu+nwnFfl0S4cHRif3G3zmz8Ryx9LM5TYkH41qePIHxoEO2sV0DgWJvbSjysV2S - EU2a31dJ0aZ+z6YtZVpHlujKMVzxVTrqj74trS4LvU5h/9hv7e1gjYdox1TO0HMK - mtDfgBevB21Tvxpz67Ijf31HvfTmCerKJEOjGnbYmyYpMeMNSONRDcToWk8sUwvi - OWa5jlUFRAxgXNM09vCTPi9aRUhcFqACqfAd6I1NqGVlfplLWrc7SWaSa+PsLfBf - 4EOZfk8iEKBVeYXNjg+CcD8j8yk/oEs816/jpihIk8haCDRWYWGKyyGnwn6OQb8d - MdRO2b7Oi/AAmEF3jMlICqv286GIYK5qTKk2/CKHlOLPnsWEuA== - -----END CERTIFICATE----- - ''; +# Minica can provide a CA key and cert, plus a key +# and cert for our fake CA server's Web Front End (WFE). +{ minica, mkDerivation }: +let + domain = "acme.test"; + + selfSignedCertData = mkDerivation { + name = "test-certs"; + buildInputs = [ minica ]; + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = '' + mkdir ca + minica \ + --ca-key ca/key.pem \ + --ca-cert ca/cert.pem \ + --domains ${domain} + chmod 600 ca/* + chmod 640 ${domain}/*.pem + ''; + + installPhase = '' + mkdir -p $out + mv ${domain} ca $out/ + ''; + }; +in { + inherit domain; + ca = { + cert = "${selfSignedCertData}/ca/cert.pem"; + key = "${selfSignedCertData}/ca/key.pem"; + }; + "${domain}" = { + cert = "${selfSignedCertData}/${domain}/cert.pem"; + key = "${selfSignedCertData}/${domain}/key.pem"; + }; } diff --git a/third_party/nixpkgs/nixos/tests/common/ec2.nix b/third_party/nixpkgs/nixos/tests/common/ec2.nix index ba087bb600..502fe96231 100644 --- a/third_party/nixpkgs/nixos/tests/common/ec2.nix +++ b/third_party/nixpkgs/nixos/tests/common/ec2.nix @@ -20,30 +20,44 @@ with pkgs.lib; in makeTest { name = "ec2-" + name; nodes = {}; - testScript = - '' - my $imageDir = ($ENV{'TMPDIR'} // "/tmp") . "/vm-state-machine"; - mkdir $imageDir, 0700; - my $diskImage = "$imageDir/machine.qcow2"; - system("qemu-img create -f qcow2 -o backing_file=${image} $diskImage") == 0 or die; - system("qemu-img resize $diskImage 10G") == 0 or die; + testScript = '' + import os + import subprocess - # Note: we use net=169.0.0.0/8 rather than - # net=169.254.0.0/16 to prevent dhcpcd from getting horribly - # confused. (It would get a DHCP lease in the 169.254.* - # range, which it would then configure and prompty delete - # again when it deletes link-local addresses.) Ideally we'd - # turn off the DHCP server, but qemu does not have an option - # to do that. - my $startCommand = "qemu-kvm -m 1024"; - $startCommand .= " -device virtio-net-pci,netdev=vlan0"; - $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; - $startCommand .= " -drive file=$diskImage,if=virtio,werror=report"; - $startCommand .= " \$QEMU_OPTS"; + image_dir = os.path.join( + os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine" + ) + os.makedirs(image_dir, mode=0o700, exist_ok=True) + disk_image = os.path.join(image_dir, "machine.qcow2") + subprocess.check_call( + [ + "qemu-img", + "create", + "-f", + "qcow2", + "-o", + "backing_file=${image}", + disk_image, + ] + ) + subprocess.check_call(["qemu-img", "resize", disk_image, "10G"]) - my $machine = createMachine({ startCommand => $startCommand }); + # Note: we use net=169.0.0.0/8 rather than + # net=169.254.0.0/16 to prevent dhcpcd from getting horribly + # confused. (It would get a DHCP lease in the 169.254.* + # range, which it would then configure and prompty delete + # again when it deletes link-local addresses.) Ideally we'd + # turn off the DHCP server, but qemu does not have an option + # to do that. + start_command = ( + "qemu-kvm -m 1024" + + " -device virtio-net-pci,netdev=vlan0" + + " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'" + + f" -drive file={disk_image},if=virtio,werror=report" + + " $QEMU_OPTS" + ) - ${script} - ''; + machine = create_machine({"startCommand": start_command}) + '' + script; }; } diff --git a/third_party/nixpkgs/nixos/tests/containers-reloadable.nix b/third_party/nixpkgs/nixos/tests/containers-reloadable.nix index 35aff91e85..2d81f16393 100644 --- a/third_party/nixpkgs/nixos/tests/containers-reloadable.nix +++ b/third_party/nixpkgs/nixos/tests/containers-reloadable.nix @@ -9,13 +9,13 @@ let }; }; - # prevent make-test.nix to change IP + # prevent make-test-python.nix to change IP networking.interfaces = { eth1.ipv4.addresses = lib.mkOverride 0 [ ]; }; }; in { - name = "cotnainers-reloadable"; + name = "containers-reloadable"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ danbst ]; }; diff --git a/third_party/nixpkgs/nixos/tests/couchdb.nix b/third_party/nixpkgs/nixos/tests/couchdb.nix index 10e95701ac..57b79e29b4 100644 --- a/third_party/nixpkgs/nixos/tests/couchdb.nix +++ b/third_party/nixpkgs/nixos/tests/couchdb.nix @@ -1,4 +1,19 @@ -import ./make-test-python.nix ({ pkgs, lib, ...}: +let + + makeNode = couchpkg: user: passwd: + { pkgs, ... } : + + { environment.systemPackages = with pkgs; [ jq ]; + services.couchdb.enable = true; + services.couchdb.package = couchpkg; + services.couchdb.adminUser = user; + services.couchdb.adminPass = passwd; + }; + testuser = "testadmin"; + testpass = "cowabunga"; + testlogin = "${testuser}:${testpass}@"; + +in import ./make-test-python.nix ({ pkgs, lib, ...}: with lib; @@ -9,26 +24,15 @@ with lib; }; nodes = { - couchdb1 = - { pkgs, ... }: - - { environment.systemPackages = with pkgs; [ jq ]; - services.couchdb.enable = true; - }; - - couchdb2 = - { pkgs, ... }: - - { environment.systemPackages = with pkgs; [ jq ]; - services.couchdb.enable = true; - services.couchdb.package = pkgs.couchdb2; - }; + couchdb1 = makeNode pkgs.couchdb testuser testpass; + couchdb2 = makeNode pkgs.couchdb2 testuser testpass; + couchdb3 = makeNode pkgs.couchdb3 testuser testpass; }; testScript = let - curlJqCheck = action: path: jqexpr: result: + curlJqCheck = login: action: path: jqexpr: result: pkgs.writeScript "curl-jq-check-${action}-${path}.sh" '' - RESULT=$(curl -X ${action} http://127.0.0.1:5984/${path} | jq -r '${jqexpr}') + RESULT=$(curl -X ${action} http://${login}127.0.0.1:5984/${path} | jq -r '${jqexpr}') echo $RESULT >&2 if [ "$RESULT" != "${result}" ]; then exit 1 @@ -39,38 +43,56 @@ with lib; couchdb1.wait_for_unit("couchdb.service") couchdb1.wait_until_succeeds( - "${curlJqCheck "GET" "" ".couchdb" "Welcome"}" + "${curlJqCheck "" "GET" "" ".couchdb" "Welcome"}" ) couchdb1.wait_until_succeeds( - "${curlJqCheck "GET" "_all_dbs" ". | length" "2"}" + "${curlJqCheck "" "GET" "_all_dbs" ". | length" "2"}" ) - couchdb1.succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}") + couchdb1.succeed("${curlJqCheck testlogin "PUT" "foo" ".ok" "true"}") couchdb1.succeed( - "${curlJqCheck "GET" "_all_dbs" ". | length" "3"}" + "${curlJqCheck "" "GET" "_all_dbs" ". | length" "3"}" ) couchdb1.succeed( - "${curlJqCheck "DELETE" "foo" ".ok" "true"}" + "${curlJqCheck testlogin "DELETE" "foo" ".ok" "true"}" ) couchdb1.succeed( - "${curlJqCheck "GET" "_all_dbs" ". | length" "2"}" + "${curlJqCheck "" "GET" "_all_dbs" ". | length" "2"}" ) couchdb2.wait_for_unit("couchdb.service") couchdb2.wait_until_succeeds( - "${curlJqCheck "GET" "" ".couchdb" "Welcome"}" + "${curlJqCheck "" "GET" "" ".couchdb" "Welcome"}" ) couchdb2.wait_until_succeeds( - "${curlJqCheck "GET" "_all_dbs" ". | length" "0"}" + "${curlJqCheck "" "GET" "_all_dbs" ". | length" "0"}" ) - couchdb2.succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}") + couchdb2.succeed("${curlJqCheck testlogin "PUT" "foo" ".ok" "true"}") couchdb2.succeed( - "${curlJqCheck "GET" "_all_dbs" ". | length" "1"}" + "${curlJqCheck "" "GET" "_all_dbs" ". | length" "1"}" ) couchdb2.succeed( - "${curlJqCheck "DELETE" "foo" ".ok" "true"}" + "${curlJqCheck testlogin "DELETE" "foo" ".ok" "true"}" ) couchdb2.succeed( - "${curlJqCheck "GET" "_all_dbs" ". | length" "0"}" + "${curlJqCheck "" "GET" "_all_dbs" ". | length" "0"}" + ) + + couchdb3.wait_for_unit("couchdb.service") + couchdb3.wait_until_succeeds( + "${curlJqCheck testlogin "GET" "" ".couchdb" "Welcome"}" + ) + couchdb3.wait_until_succeeds( + "${curlJqCheck testlogin "GET" "_all_dbs" ". | length" "0"}" + ) + couchdb3.succeed("${curlJqCheck testlogin "PUT" "foo" ".ok" "true"}") + couchdb3.succeed( + "${curlJqCheck testlogin "GET" "_all_dbs" ". | length" "1"}" + ) + couchdb3.succeed( + "${curlJqCheck testlogin "DELETE" "foo" ".ok" "true"}" + ) + couchdb3.succeed( + "${curlJqCheck testlogin "GET" "_all_dbs" ". | length" "0"}" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/cri-o.nix b/third_party/nixpkgs/nixos/tests/cri-o.nix new file mode 100644 index 0000000000..f13f1bdacb --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/cri-o.nix @@ -0,0 +1,19 @@ +# This test runs CRI-O and verifies via critest +import ./make-test-python.nix ({ pkgs, ... }: { + name = "cri-o"; + maintainers = with pkgs.stdenv.lib.maintainers; teams.podman.members; + + nodes = { + crio = { + virtualisation.cri-o.enable = true; + }; + }; + + testScript = '' + start_all() + crio.wait_for_unit("crio.service") + crio.succeed( + "critest --ginkgo.focus='Runtime info' --runtime-endpoint unix:///var/run/crio/crio.sock" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/docker-preloader.nix b/third_party/nixpkgs/nixos/tests/docker-preloader.nix deleted file mode 100644 index c3e8aced35..0000000000 --- a/third_party/nixpkgs/nixos/tests/docker-preloader.nix +++ /dev/null @@ -1,27 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "docker-preloader"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lewo ]; - }; - - nodes = { - docker = - { pkgs, ... }: - { - virtualisation.docker.enable = true; - virtualisation.dockerPreloader.images = [ pkgs.dockerTools.examples.nix pkgs.dockerTools.examples.bash ]; - - services.openssh.enable = true; - services.openssh.permitRootLogin = "yes"; - services.openssh.extraConfig = "PermitEmptyPasswords yes"; - users.extraUsers.root.password = ""; - }; - }; - testScript = '' - startAll; - - $docker->waitForUnit("sockets.target"); - $docker->succeed("docker run nix nix-store --version"); - $docker->succeed("docker run bash bash --version"); - ''; -}) diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix index 2543801ae8..edb9aec62d 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix @@ -219,18 +219,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) with subtest("Ensure correct behavior when no store is needed"): - # This check tests two requirements simultaneously - # 1. buildLayeredImage can build images that don't need a store. - # 2. Layers of symlinks are eliminated by the customization layer. - # + # This check tests that buildLayeredImage can build images that don't need a store. docker.succeed( "docker load --input='${pkgs.dockerTools.examples.no-store-paths}'" ) - # Busybox will not recognize argv[0] and print an error message with argv[0], - # but it confirms that the custom-true symlink is present. - docker.succeed("docker run --rm no-store-paths custom-true |& grep custom-true") - # This check may be loosened to allow an *empty* store rather than *no* store. docker.succeed("docker run --rm no-store-paths ls /") docker.fail("docker run --rm no-store-paths ls /nix/store") diff --git a/third_party/nixpkgs/nixos/tests/ec2.nix b/third_party/nixpkgs/nixos/tests/ec2.nix index 5a59d65e60..df06724801 100644 --- a/third_party/nixpkgs/nixos/tests/ec2.nix +++ b/third_party/nixpkgs/nixos/tests/ec2.nix @@ -3,58 +3,58 @@ pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; with import common/ec2.nix { inherit makeTest pkgs; }; let - imageCfg = - (import ../lib/eval-config.nix { - inherit system; - modules = [ - ../maintainers/scripts/ec2/amazon-image.nix - ../modules/testing/test-instrumentation.nix - ../modules/profiles/qemu-guest.nix - { ec2.hvm = true; + imageCfg = (import ../lib/eval-config.nix { + inherit system; + modules = [ + ../maintainers/scripts/ec2/amazon-image.nix + ../modules/testing/test-instrumentation.nix + ../modules/profiles/qemu-guest.nix + { + ec2.hvm = true; - # Hack to make the partition resizing work in QEMU. - boot.initrd.postDeviceCommands = mkBefore - '' - ln -s vda /dev/xvda - ln -s vda1 /dev/xvda1 - ''; + # Hack to make the partition resizing work in QEMU. + boot.initrd.postDeviceCommands = mkBefore '' + ln -s vda /dev/xvda + ln -s vda1 /dev/xvda1 + ''; - # Needed by nixos-rebuild due to the lack of network - # access. Determined by trial and error. - system.extraDependencies = - with pkgs; ( - [ - # Needed for a nixos-rebuild. - busybox - stdenv - stdenvNoCC - mkinitcpio-nfs-utils - unionfs-fuse - cloud-utils - desktop-file-utils - texinfo - libxslt.bin - xorg.lndir + # Needed by nixos-rebuild due to the lack of network + # access. Determined by trial and error. + system.extraDependencies = with pkgs; ( [ + # Needed for a nixos-rebuild. + busybox + cloud-utils + desktop-file-utils + libxslt.bin + mkinitcpio-nfs-utils + stdenv + stdenvNoCC + texinfo + unionfs-fuse + xorg.lndir - # These are used in the configure-from-userdata tests - # for EC2. Httpd and valgrind are requested by the - # configuration. - apacheHttpd apacheHttpd.doc apacheHttpd.man valgrind.doc - ] - ); - } - ]; - }).config; + # These are used in the configure-from-userdata tests + # for EC2. Httpd and valgrind are requested by the + # configuration. + apacheHttpd + apacheHttpd.doc + apacheHttpd.man + valgrind.doc + ]); + } + ]; + }).config; image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd"; sshKeys = import ./ssh-keys.nix pkgs; snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; + snakeOilPrivateKeyFile = pkgs.writeText "private-key" snakeOilPrivateKey; snakeOilPublicKey = sshKeys.snakeOilPublicKey; in { @@ -68,43 +68,47 @@ in { SSH_HOST_ED25519_KEY:${replaceStrings ["\n"] ["|"] snakeOilPrivateKey} ''; script = '' - $machine->start; - $machine->waitForFile("/etc/ec2-metadata/user-data"); - $machine->waitForUnit("sshd.service"); + machine.start() + machine.wait_for_file("/etc/ec2-metadata/user-data") + machine.wait_for_unit("sshd.service") - $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path"); + machine.succeed("grep unknown /etc/ec2-metadata/ami-manifest-path") # We have no keys configured on the client side yet, so this should fail - $machine->fail("ssh -o BatchMode=yes localhost exit"); + machine.fail("ssh -o BatchMode=yes localhost exit") # Let's install our client private key - $machine->succeed("mkdir -p ~/.ssh"); + machine.succeed("mkdir -p ~/.ssh") - $machine->succeed("echo '${snakeOilPrivateKey}' > ~/.ssh/id_ed25519"); - $machine->succeed("chmod 600 ~/.ssh/id_ed25519"); + machine.copy_from_host_via_shell( + "${snakeOilPrivateKeyFile}", "~/.ssh/id_ed25519" + ) + machine.succeed("chmod 600 ~/.ssh/id_ed25519") # We haven't configured the host key yet, so this should still fail - $machine->fail("ssh -o BatchMode=yes localhost exit"); + machine.fail("ssh -o BatchMode=yes localhost exit") # Add the host key; ssh should finally succeed - $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"); - $machine->succeed("ssh -o BatchMode=yes localhost exit"); + machine.succeed( + "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts" + ) + machine.succeed("ssh -o BatchMode=yes localhost exit") # Test whether the root disk was resized. - my $blocks = $machine->succeed("stat -c %b -f /"); - my $bsize = $machine->succeed("stat -c %S -f /"); - my $size = $blocks * $bsize; - die "wrong free space $size" if $size < 9.7 * 1024 * 1024 * 1024 || $size > 10 * 1024 * 1024 * 1024; + blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":")) + GB = 1024 ** 3 + assert 9.7 * GB <= blocks * block_size <= 10 * GB # Just to make sure resizing is idempotent. - $machine->shutdown; - $machine->start; - $machine->waitForFile("/etc/ec2-metadata/user-data"); + machine.shutdown() + machine.start() + machine.wait_for_file("/etc/ec2-metadata/user-data") ''; }; boot-ec2-config = makeEc2Test { name = "config-userdata"; + meta.broken = true; # amazon-init wants to download from the internet while building the system inherit image; sshPublicKey = snakeOilPublicKey; @@ -133,17 +137,17 @@ in { } ''; script = '' - $machine->start; + machine.start() # amazon-init must succeed. if it fails, make the test fail - # immediately instead of timing out in waitForFile. - $machine->waitForUnit('amazon-init.service'); + # immediately instead of timing out in wait_for_file. + machine.wait_for_unit("amazon-init.service") - $machine->waitForFile("/etc/testFile"); - $machine->succeed("cat /etc/testFile | grep -q 'whoa'"); + machine.wait_for_file("/etc/testFile") + assert "whoa" in machine.succeed("cat /etc/testFile") - $machine->waitForUnit("httpd.service"); - $machine->succeed("curl http://localhost | grep Valgrind"); + machine.wait_for_unit("httpd.service") + assert "Valgrind" in machine.succeed("curl http://localhost") ''; }; } diff --git a/third_party/nixpkgs/nixos/tests/gnome3.nix b/third_party/nixpkgs/nixos/tests/gnome3.nix index b3d7aff8bd..7e301be49d 100644 --- a/third_party/nixpkgs/nixos/tests/gnome3.nix +++ b/third_party/nixpkgs/nixos/tests/gnome3.nix @@ -23,6 +23,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome3.debug = true; + environment.systemPackages = [ + (pkgs.makeAutostartItem { + name = "org.gnome.Terminal"; + package = pkgs.gnome3.gnome-terminal; + }) + ]; + virtualisation.memorySize = 1024; }; @@ -65,9 +72,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { ) with subtest("Open Gnome Terminal"): - machine.succeed( - "${gnomeTerminalCommand}" - ) # correct output should be (true, '"gnome-terminal-server"') machine.wait_until_succeeds( "${wmClass} | grep -q 'gnome-terminal-server'" diff --git a/third_party/nixpkgs/nixos/tests/gotify-server.nix b/third_party/nixpkgs/nixos/tests/gotify-server.nix index c6e00686ae..c0b8ba4354 100644 --- a/third_party/nixpkgs/nixos/tests/gotify-server.nix +++ b/third_party/nixpkgs/nixos/tests/gotify-server.nix @@ -41,5 +41,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { ) assert title == "Gotify" + + # Ensure that the UI responds with a successfuly code and that the + # response is not empty + result = machine.succeed("curl -fsS localhost:3000") + assert result, "HTTP response from localhost:3000 must not be empty!" ''; }) diff --git a/third_party/nixpkgs/nixos/tests/hardened.nix b/third_party/nixpkgs/nixos/tests/hardened.nix index 5ed0dfcf9a..8d845de70e 100644 --- a/third_party/nixpkgs/nixos/tests/hardened.nix +++ b/third_party/nixpkgs/nixos/tests/hardened.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, latestKernel ? false, ... } : { +import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { name = "hardened"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ joachifm ]; @@ -47,84 +47,88 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... } : { }; in '' - $machine->waitForUnit("multi-user.target"); + machine.wait_for_unit("multi-user.target") + + + with subtest("AppArmor profiles are loaded"): + machine.succeed("systemctl status apparmor.service") - subtest "apparmor-loaded", sub { - $machine->succeed("systemctl status apparmor.service"); - }; # AppArmor securityfs - subtest "apparmor-securityfs", sub { - $machine->succeed("mountpoint -q /sys/kernel/security"); - $machine->succeed("cat /sys/kernel/security/apparmor/profiles"); - }; + with subtest("AppArmor securityfs is mounted"): + machine.succeed("mountpoint -q /sys/kernel/security") + machine.succeed("cat /sys/kernel/security/apparmor/profiles") + # Test loading out-of-tree modules - subtest "extra-module-packages", sub { - $machine->succeed("grep -Fq wireguard /proc/modules"); - }; + with subtest("Out-of-tree modules can be loaded"): + machine.succeed("grep -Fq wireguard /proc/modules") + # Test hidepid - subtest "hidepid", sub { - $machine->succeed("grep -Fq hidepid=2 /proc/mounts"); + with subtest("hidepid=2 option is applied and works"): + machine.succeed("grep -Fq hidepid=2 /proc/mounts") # cannot use pgrep -u here, it segfaults when access to process info is denied - $machine->succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]"); - $machine->succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]"); - }; + machine.succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]") + machine.succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]") + # Test kernel module hardening - subtest "lock-modules", sub { + with subtest("No more kernel modules can be loaded"): # note: this better a be module we normally wouldn't load ... - $machine->fail("modprobe dccp"); - }; + machine.fail("modprobe dccp") + # Test userns - subtest "userns", sub { - $machine->succeed("unshare --user true"); - $machine->fail("su -l alice -c 'unshare --user true'"); - }; + with subtest("User namespaces are restricted"): + machine.succeed("unshare --user true") + machine.fail("su -l alice -c 'unshare --user true'") + # Test dmesg restriction - subtest "dmesg", sub { - $machine->fail("su -l alice -c dmesg"); - }; + with subtest("Regular users cannot access dmesg"): + machine.fail("su -l alice -c dmesg") + # Test access to kcore - subtest "kcore", sub { - $machine->fail("cat /proc/kcore"); - }; + with subtest("Kcore is inaccessible as root"): + machine.fail("cat /proc/kcore") + # Test deferred mount - subtest "mount", sub { - $machine->fail("mountpoint -q /efi"); # was deferred - $machine->execute("mkdir -p /efi"); - $machine->succeed("mount /dev/disk/by-label/EFISYS /efi"); - $machine->succeed("mountpoint -q /efi"); # now mounted - }; + with subtest("Deferred mounts work"): + machine.fail("mountpoint -q /efi") # was deferred + machine.execute("mkdir -p /efi") + machine.succeed("mount /dev/disk/by-label/EFISYS /efi") + machine.succeed("mountpoint -q /efi") # now mounted + # Test Nix dæmon usage - subtest "nix-daemon", sub { - $machine->fail("su -l nobody -s /bin/sh -c 'nix ping-store'"); - $machine->succeed("su -l alice -c 'nix ping-store'") =~ "OK"; - }; + with subtest("nix-daemon cannot be used by all users"): + machine.fail("su -l nobody -s /bin/sh -c 'nix ping-store'") + machine.succeed("su -l alice -c 'nix ping-store'") + # Test kernel image protection - subtest "kernelimage", sub { - $machine->fail("systemctl hibernate"); - $machine->fail("systemctl kexec"); - }; + with subtest("The kernel image is protected"): + machine.fail("systemctl hibernate") + machine.fail("systemctl kexec") + # Test hardened memory allocator - sub runMallocTestProg { - my ($progName, $errorText) = @_; - my $text = "fatal allocator error: " . $errorText; - $machine->fail("${hardened-malloc-tests}/bin/" . $progName) =~ $text; - }; + def runMallocTestProg(prog_name, error_text): + text = "fatal allocator error: " + error_text + if not text in machine.fail( + "${hardened-malloc-tests}/bin/" + + prog_name + + " 2>&1" + ): + raise Exception("Hardened malloc does not work for {}".format(error_text)) - subtest "hardenedmalloc", sub { - runMallocTestProg("double_free_large", "invalid free"); - runMallocTestProg("unaligned_free_small", "invalid unaligned free"); - runMallocTestProg("write_after_free_small", "detected write after free"); - }; + + with subtest("The hardened memory allocator works"): + runMallocTestProg("double_free_large", "invalid free") + runMallocTestProg("unaligned_free_small", "invalid unaligned free") + runMallocTestProg("write_after_free_small", "detected write after free") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/hocker-fetchdocker/default.nix b/third_party/nixpkgs/nixos/tests/hocker-fetchdocker/default.nix index 4f30f01e40..978dbf310b 100644 --- a/third_party/nixpkgs/nixos/tests/hocker-fetchdocker/default.nix +++ b/third_party/nixpkgs/nixos/tests/hocker-fetchdocker/default.nix @@ -1,15 +1,16 @@ -import ../make-test.nix ({ pkgs, ...} : { +import ../make-test-python.nix ({ pkgs, ...} : { name = "test-hocker-fetchdocker"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ixmatus ]; + broken = true; # tries to download from registry-1.docker.io - how did this ever work? }; machine = import ./machine.nix; testScript = '' - startAll; + start_all() - $machine->waitForUnit("sockets.target"); - $machine->waitUntilSucceeds("docker run registry-1.docker.io/v2/library/hello-world:latest"); + machine.wait_for_unit("sockets.target") + machine.wait_until_succeeds("docker run registry-1.docker.io/v2/library/hello-world:latest") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix index 02b839fee3..d80cfb4bd8 100644 --- a/third_party/nixpkgs/nixos/tests/installer.nix +++ b/third_party/nixpkgs/nixos/tests/installer.nix @@ -74,7 +74,7 @@ let throw "Non-EFI boot methods are only supported on i686 / x86_64" else '' def assemble_qemu_flags(): - flags = "-cpu host" + flags = "-cpu max" ${if system == "x86_64-linux" then ''flags += " -m 768"'' else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"'' @@ -285,7 +285,7 @@ let ]; virtualisation.diskSize = 8 * 1024; - virtualisation.memorySize = 1024; + virtualisation.memorySize = 1536; # Use a small /dev/vdb as the root disk for the # installer. This ensures the target disk (/dev/vda) is @@ -633,10 +633,10 @@ in { + " mklabel msdos" + " mkpart primary ext2 1M 100MB" # /boot + " mkpart extended 100M -1s" - + " mkpart logical 102M 2102M" # md0 (root), first device - + " mkpart logical 2103M 4103M" # md0 (root), second device - + " mkpart logical 4104M 4360M" # md1 (swap), first device - + " mkpart logical 4361M 4617M", # md1 (swap), second device + + " mkpart logical 102M 3102M" # md0 (root), first device + + " mkpart logical 3103M 6103M" # md0 (root), second device + + " mkpart logical 6104M 6360M" # md1 (swap), first device + + " mkpart logical 6361M 6617M", # md1 (swap), second device "udevadm settle", "ls -l /dev/vda* >&2", "cat /proc/partitions >&2", @@ -799,7 +799,7 @@ in { "btrfs subvol create /mnt/badpath/boot", "btrfs subvol create /mnt/nixos", "btrfs subvol set-default " - + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt", + + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print $2}') /mnt", "umount /mnt", "mount -o defaults LABEL=root /mnt", "mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism diff --git a/third_party/nixpkgs/nixos/tests/kafka.nix b/third_party/nixpkgs/nixos/tests/kafka.nix index d29c802b47..88e30b62ba 100644 --- a/third_party/nixpkgs/nixos/tests/kafka.nix +++ b/third_party/nixpkgs/nixos/tests/kafka.nix @@ -90,4 +90,5 @@ in with pkgs; { kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2; kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3; kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4; + kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5; } diff --git a/third_party/nixpkgs/nixos/tests/krb5/example-config.nix b/third_party/nixpkgs/nixos/tests/krb5/example-config.nix index be195b5139..e2e10a9fda 100644 --- a/third_party/nixpkgs/nixos/tests/krb5/example-config.nix +++ b/third_party/nixpkgs/nixos/tests/krb5/example-config.nix @@ -18,7 +18,10 @@ import ../make-test-python.nix ({ pkgs, ...} : { realms = { "ATHENA.MIT.EDU" = { admin_server = "athena.mit.edu"; - kdc = "athena.mit.edu"; + kdc = [ + "athena01.mit.edu" + "athena02.mit.edu" + ]; }; }; domain_realm = { @@ -65,7 +68,8 @@ import ../make-test-python.nix ({ pkgs, ...} : { [realms] ATHENA.MIT.EDU = { admin_server = athena.mit.edu - kdc = athena.mit.edu + kdc = athena01.mit.edu + kdc = athena02.mit.edu } [domain_realm] diff --git a/third_party/nixpkgs/nixos/tests/lxd-nftables.nix b/third_party/nixpkgs/nixos/tests/lxd-nftables.nix index 25517914db..4ca02067a0 100644 --- a/third_party/nixpkgs/nixos/tests/lxd-nftables.nix +++ b/third_party/nixpkgs/nixos/tests/lxd-nftables.nix @@ -7,6 +7,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "lxd-nftables"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ patryk27 ]; }; diff --git a/third_party/nixpkgs/nixos/tests/lxd.nix b/third_party/nixpkgs/nixos/tests/lxd.nix index db2d44dff5..d1e642383c 100644 --- a/third_party/nixpkgs/nixos/tests/lxd.nix +++ b/third_party/nixpkgs/nixos/tests/lxd.nix @@ -6,15 +6,14 @@ let # # I've chosen to import Alpine Linux, because its image is turbo-tiny and, # generally, sufficient for our tests. - alpine-meta = pkgs.fetchurl { - url = "https://uk.images.linuxcontainers.org/images/alpine/3.11/i386/default/20200608_13:00/lxd.tar.xz"; - sha256 = "1hkvaj3rr333zmx1759njy435lps33gl4ks8zfm7m4nqvipm26a0"; + url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz"; + hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA="; }; alpine-rootfs = pkgs.fetchurl { - url = "https://uk.images.linuxcontainers.org/images/alpine/3.11/i386/default/20200608_13:00/rootfs.tar.xz"; - sha256 = "1v82zdra4j5xwsff09qlp7h5vbsg54s0j7rdg4rynichfid3r347"; + url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz"; + hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA="; }; lxd-config = pkgs.writeText "config.yaml" '' @@ -44,8 +43,10 @@ let type: disk ''; + in { name = "lxd"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ patryk27 ]; }; @@ -53,7 +54,7 @@ in { machine = { lib, ... }: { virtualisation = { # Since we're testing `limits.cpu`, we've gotta have a known number of - # cores to lay on + # cores to lean on cores = 2; # Ditto, for `limits.memory` @@ -67,6 +68,7 @@ in { testScript = '' machine.wait_for_unit("sockets.target") machine.wait_for_unit("lxd.service") + machine.wait_for_file("/var/lib/lxd/unix.socket") # It takes additional second for lxd to settle machine.sleep(1) diff --git a/third_party/nixpkgs/nixos/tests/magnetico.nix b/third_party/nixpkgs/nixos/tests/magnetico.nix index 6770d32358..e79a728b2a 100644 --- a/third_party/nixpkgs/nixos/tests/magnetico.nix +++ b/third_party/nixpkgs/nixos/tests/magnetico.nix @@ -27,12 +27,13 @@ in start_all() machine.wait_for_unit("magneticod") machine.wait_for_unit("magneticow") + machine.wait_for_open_port(${toString port}) machine.succeed( - "${pkgs.curl}/bin/curl " + "${pkgs.curl}/bin/curl --fail " + "-u user:password http://localhost:${toString port}" ) - assert "Unauthorised." in machine.succeed( - "${pkgs.curl}/bin/curl " + machine.fail( + "${pkgs.curl}/bin/curl --fail " + "-u user:wrongpwd http://localhost:${toString port}" ) machine.shutdown() diff --git a/third_party/nixpkgs/nixos/tests/make-test.nix b/third_party/nixpkgs/nixos/tests/make-test.nix deleted file mode 100644 index cee5da9345..0000000000 --- a/third_party/nixpkgs/nixos/tests/make-test.nix +++ /dev/null @@ -1,9 +0,0 @@ -f: { - system ? builtins.currentSystem, - pkgs ? import ../.. { inherit system; config = {}; }, - ... -} @ args: - -with import ../lib/testing.nix { inherit system pkgs; }; - -makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) diff --git a/third_party/nixpkgs/nixos/tests/nginx-sandbox.nix b/third_party/nixpkgs/nixos/tests/nginx-sandbox.nix index bc9d3ba8ad..514318c945 100644 --- a/third_party/nixpkgs/nixos/tests/nginx-sandbox.nix +++ b/third_party/nixpkgs/nixos/tests/nginx-sandbox.nix @@ -18,7 +18,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { ]; services.nginx.enable = true; services.nginx.package = pkgs.nginx-lua; - services.nginx.enableSandbox = true; services.nginx.virtualHosts.localhost = { extraConfig = '' location /test1-write { diff --git a/third_party/nixpkgs/nixos/tests/openstack-image.nix b/third_party/nixpkgs/nixos/tests/openstack-image.nix index 97c9137fe1..0b57dfb8e7 100644 --- a/third_party/nixpkgs/nixos/tests/openstack-image.nix +++ b/third_party/nixpkgs/nixos/tests/openstack-image.nix @@ -3,30 +3,30 @@ pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; with import common/ec2.nix { inherit makeTest pkgs; }; let - image = - (import ../lib/eval-config.nix { - inherit system; - modules = [ - ../maintainers/scripts/openstack/openstack-image.nix - ../modules/testing/test-instrumentation.nix - ../modules/profiles/qemu-guest.nix - { - # Needed by nixos-rebuild due to lack of network access. - system.extraDependencies = with pkgs; [ - stdenv - ]; - } - ]; - }).config.system.build.openstackImage + "/nixos.qcow2"; + image = (import ../lib/eval-config.nix { + inherit system; + modules = [ + ../maintainers/scripts/openstack/openstack-image.nix + ../modules/testing/test-instrumentation.nix + ../modules/profiles/qemu-guest.nix + { + # Needed by nixos-rebuild due to lack of network access. + system.extraDependencies = with pkgs; [ + stdenv + ]; + } + ]; + }).config.system.build.openstackImage + "/nixos.qcow2"; sshKeys = import ./ssh-keys.nix pkgs; snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; + snakeOilPrivateKeyFile = pkgs.writeText "private-key" snakeOilPrivateKey; snakeOilPublicKey = sshKeys.snakeOilPublicKey; in { @@ -39,32 +39,36 @@ in { SSH_HOST_ED25519_KEY:${replaceStrings ["\n"] ["|"] snakeOilPrivateKey} ''; script = '' - $machine->start; - $machine->waitForFile("/etc/ec2-metadata/user-data"); - $machine->waitForUnit("sshd.service"); + machine.start() + machine.wait_for_file("/etc/ec2-metadata/user-data") + machine.wait_for_unit("sshd.service") - $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path"); + machine.succeed("grep unknown /etc/ec2-metadata/ami-manifest-path") # We have no keys configured on the client side yet, so this should fail - $machine->fail("ssh -o BatchMode=yes localhost exit"); + machine.fail("ssh -o BatchMode=yes localhost exit") # Let's install our client private key - $machine->succeed("mkdir -p ~/.ssh"); + machine.succeed("mkdir -p ~/.ssh") - $machine->succeed("echo '${snakeOilPrivateKey}' > ~/.ssh/id_ed25519"); - $machine->succeed("chmod 600 ~/.ssh/id_ed25519"); + machine.copy_from_host_via_shell( + "${snakeOilPrivateKeyFile}", "~/.ssh/id_ed25519" + ) + machine.succeed("chmod 600 ~/.ssh/id_ed25519") # We haven't configured the host key yet, so this should still fail - $machine->fail("ssh -o BatchMode=yes localhost exit"); + machine.fail("ssh -o BatchMode=yes localhost exit") # Add the host key; ssh should finally succeed - $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"); - $machine->succeed("ssh -o BatchMode=yes localhost exit"); + machine.succeed( + "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts" + ) + machine.succeed("ssh -o BatchMode=yes localhost exit") # Just to make sure resizing is idempotent. - $machine->shutdown; - $machine->start; - $machine->waitForFile("/etc/ec2-metadata/user-data"); + machine.shutdown() + machine.start() + machine.wait_for_file("/etc/ec2-metadata/user-data") ''; }; @@ -86,9 +90,9 @@ in { } ''; script = '' - $machine->start; - $machine->waitForFile("/etc/testFile"); - $machine->succeed("cat /etc/testFile | grep -q 'whoa'"); + machine.start() + machine.wait_for_file("/etc/testFile") + assert "whoa" in machine.succeed("cat /etc/testFile") ''; }; } diff --git a/third_party/nixpkgs/nixos/tests/os-prober.nix b/third_party/nixpkgs/nixos/tests/os-prober.nix index 6a38f5ca53..be0235a417 100644 --- a/third_party/nixpkgs/nixos/tests/os-prober.nix +++ b/third_party/nixpkgs/nixos/tests/os-prober.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({pkgs, lib, ...}: +import ./make-test-python.nix ({pkgs, lib, ...}: let # A filesystem image with a (presumably) bootable debian debianImage = pkgs.vmTools.diskImageFuns.debian9i386 { @@ -34,9 +34,6 @@ let ''; }; - # options to add the disk to the test vm - QEMU_OPTS = "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio"; - # a part of the configuration of the test vm simpleConfig = { boot.loader.grub = { @@ -71,7 +68,7 @@ in { machine = { config, pkgs, ... }: (simpleConfig // { imports = [ ../modules/profiles/installation-device.nix ../modules/profiles/base.nix ]; - virtualisation.memorySize = 1024; + virtualisation.memorySize = 1300; # The test cannot access the network, so any packages # nixos-rebuild needs must be included in the VM. system.extraDependencies = with pkgs; @@ -99,22 +96,28 @@ in { testScript = '' # hack to add the secondary disk - $machine->{startCommand} = "QEMU_OPTS=\"\$QEMU_OPTS \"${lib.escapeShellArg QEMU_OPTS} ".$machine->{startCommand}; + os.environ[ + "QEMU_OPTS" + ] = "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio" - $machine->start; - $machine->succeed("udevadm settle"); - $machine->waitForUnit("multi-user.target"); + machine.start() + machine.succeed("udevadm settle") + machine.wait_for_unit("multi-user.target") + print(machine.succeed("lsblk")) # check that os-prober works standalone - $machine->succeed("${pkgs.os-prober}/bin/os-prober | grep /dev/vdb1"); + machine.succeed( + "${pkgs.os-prober}/bin/os-prober | grep /dev/vdb1" + ) # rebuild and test that debian is available in the grub menu - $machine->succeed("nixos-generate-config"); - $machine->copyFileFromHost( + machine.succeed("nixos-generate-config") + machine.copy_from_host( "${configFile}", - "/etc/nixos/configuration.nix"); - $machine->succeed("nixos-rebuild boot >&2"); + "/etc/nixos/configuration.nix", + ) + machine.succeed("nixos-rebuild boot >&2") - $machine->succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg"); + machine.succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/postfix-raise-smtpd-tls-security-level.nix b/third_party/nixpkgs/nixos/tests/postfix-raise-smtpd-tls-security-level.nix index b3c2156122..5fad1fed75 100644 --- a/third_party/nixpkgs/nixos/tests/postfix-raise-smtpd-tls-security-level.nix +++ b/third_party/nixpkgs/nixos/tests/postfix-raise-smtpd-tls-security-level.nix @@ -1,6 +1,3 @@ -let - certs = import ./common/acme/server/snakeoil-certs.nix; -in import ./make-test-python.nix { name = "postfix"; diff --git a/third_party/nixpkgs/nixos/tests/postfix.nix b/third_party/nixpkgs/nixos/tests/postfix.nix index b0674ca3a0..37ae76afec 100644 --- a/third_party/nixpkgs/nixos/tests/postfix.nix +++ b/third_party/nixpkgs/nixos/tests/postfix.nix @@ -1,5 +1,6 @@ let certs = import ./common/acme/server/snakeoil-certs.nix; + domain = certs.domain; in import ./make-test-python.nix { name = "postfix"; @@ -11,8 +12,8 @@ import ./make-test-python.nix { enableSubmission = true; enableSubmissions = true; sslCACert = certs.ca.cert; - sslCert = certs."acme.test".cert; - sslKey = certs."acme.test".key; + sslCert = certs.${domain}.cert; + sslKey = certs.${domain}.key; submissionsOptions = { smtpd_sasl_auth_enable = "yes"; smtpd_client_restrictions = "permit"; @@ -25,7 +26,7 @@ import ./make-test-python.nix { ]; networking.extraHosts = '' - 127.0.0.1 acme.test + 127.0.0.1 ${domain} ''; environment.systemPackages = let @@ -33,7 +34,7 @@ import ./make-test-python.nix { #!${pkgs.python3.interpreter} import smtplib - with smtplib.SMTP('acme.test') as smtp: + with smtplib.SMTP('${domain}') as smtp: smtp.sendmail('root@localhost', 'alice@localhost', 'Subject: Test\n\nTest data.') smtp.quit() ''; @@ -45,7 +46,7 @@ import ./make-test-python.nix { ctx = ssl.create_default_context() - with smtplib.SMTP('acme.test') as smtp: + with smtplib.SMTP('${domain}') as smtp: smtp.ehlo() smtp.starttls(context=ctx) smtp.ehlo() @@ -60,7 +61,7 @@ import ./make-test-python.nix { ctx = ssl.create_default_context() - with smtplib.SMTP_SSL(host='acme.test', context=ctx) as smtp: + with smtplib.SMTP_SSL(host='${domain}', context=ctx) as smtp: smtp.sendmail('root@localhost', 'alice@localhost', 'Subject: Test SMTPS\n\nTest data.') smtp.quit() ''; diff --git a/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix b/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix index c50746aa83..432b46234f 100644 --- a/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix +++ b/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix @@ -1,103 +1,111 @@ -{ system ? builtins.currentSystem -, config ? { } -, pkgs ? import ../.. { inherit system config; } }: - -with import ../lib/testing.nix { inherit system pkgs; }; -with pkgs.lib; - let - makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: let + # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`. + makePostgresqlWalReceiverTest = postgresqlPackage: + { + name = postgresqlPackage; + value = + import ./make-test-python.nix ({ pkgs, lib, ... }: let - postgresqlDataDir = "/var/db/postgresql/test"; - replicationUser = "wal_receiver_user"; - replicationSlot = "wal_receiver_slot"; - replicationConn = "postgresql://${replicationUser}@localhost"; - baseBackupDir = "/tmp/pg_basebackup"; - walBackupDir = "/tmp/pg_wal"; - atLeast12 = versionAtLeast postgresqlPackage.version "12.0"; - restoreCommand = '' - restore_command = 'cp ${walBackupDir}/%f %p' - ''; + pkg = pkgs."${postgresqlPackage}"; + postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}"; + replicationUser = "wal_receiver_user"; + replicationSlot = "wal_receiver_slot"; + replicationConn = "postgresql://${replicationUser}@localhost"; + baseBackupDir = "/tmp/pg_basebackup"; + walBackupDir = "/tmp/pg_wal"; + atLeast12 = lib.versionAtLeast pkg.version "12.0"; - recoveryFile = if atLeast12 - then pkgs.writeTextDir "recovery.signal" "" - else pkgs.writeTextDir "recovery.conf" "${restoreCommand}"; + recoveryFile = if atLeast12 + then pkgs.writeTextDir "recovery.signal" "" + else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'"; - in makeTest { - name = "postgresql-wal-receiver-${subTestName}"; - meta.maintainers = with maintainers; [ pacien ]; + in { + name = "postgresql-wal-receiver-${postgresqlPackage}"; + meta.maintainers = with lib.maintainers; [ pacien ]; - machine = { ... }: { - # Needed because this test uses a non-default 'services.postgresql.dataDir'. - systemd.tmpfiles.rules = [ - "d /var/db/postgresql 0700 postgres postgres" - ]; - services.postgresql = { - package = postgresqlPackage; - enable = true; - dataDir = postgresqlDataDir; - extraConfig = '' - wal_level = archive # alias for replica on pg >= 9.6 - max_wal_senders = 10 - max_replication_slots = 10 - '' + optionalString atLeast12 '' - ${restoreCommand} - recovery_end_command = 'touch recovery.done' + machine = { ... }: { + services.postgresql = { + package = pkg; + enable = true; + settings = lib.mkMerge [ + { + wal_level = "archive"; # alias for replica on pg >= 9.6 + max_wal_senders = 10; + max_replication_slots = 10; + } + (lib.mkIf atLeast12 { + restore_command = "cp ${walBackupDir}/%f %p"; + recovery_end_command = "touch recovery.done"; + }) + ]; + authentication = '' + host replication ${replicationUser} all trust + ''; + initialScript = pkgs.writeText "init.sql" '' + create user ${replicationUser} replication; + select * from pg_create_physical_replication_slot('${replicationSlot}'); + ''; + }; + + services.postgresqlWalReceiver.receivers.main = { + postgresqlPackage = pkg; + connection = replicationConn; + slot = replicationSlot; + directory = walBackupDir; + }; + # This is only to speedup test, it isn't time racing. Service is set to autorestart always, + # default 60sec is fine for real system, but is too much for a test + systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5; + }; + + testScript = '' + # make an initial base backup + machine.wait_for_unit("postgresql") + machine.wait_for_unit("postgresql-wal-receiver-main") + # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other + # required only for 9.4 + machine.sleep(5) + machine.succeed( + "${pkg}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}" + ) + + # create a dummy table with 100 records + machine.succeed( + "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'" + ) + + # stop postgres and destroy data + machine.systemctl("stop postgresql") + machine.systemctl("stop postgresql-wal-receiver-main") + machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}") + + # restore the base backup + machine.succeed( + "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}" + ) + + # prepare WAL and recovery + machine.succeed("chmod a+rX -R ${walBackupDir}") + machine.execute( + "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done" + ) # make use of partial segments too + machine.succeed( + "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*" + ) + + # replay WAL + machine.systemctl("start postgresql") + machine.wait_for_file("${postgresqlDataDir}/recovery.done") + machine.systemctl("restart postgresql") + machine.wait_for_unit("postgresql") + + # check that our records have been restored + machine.succeed( + "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100" + ) ''; - authentication = '' - host replication ${replicationUser} all trust - ''; - initialScript = pkgs.writeText "init.sql" '' - create user ${replicationUser} replication; - select * from pg_create_physical_replication_slot('${replicationSlot}'); - ''; - }; - - services.postgresqlWalReceiver.receivers.main = { - inherit postgresqlPackage; - connection = replicationConn; - slot = replicationSlot; - directory = walBackupDir; - }; - # This is only to speedup test, it isn't time racing. Service is set to autorestart always, - # default 60sec is fine for real system, but is too much for a test - systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = mkForce 5; + }); }; - testScript = '' - # make an initial base backup - $machine->waitForUnit('postgresql'); - $machine->waitForUnit('postgresql-wal-receiver-main'); - # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other - # required only for 9.4 - $machine->sleep(5); - $machine->succeed('${postgresqlPackage}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}'); - - # create a dummy table with 100 records - $machine->succeed('sudo -u postgres psql --command="create table dummy as select * from generate_series(1, 100) as val;"'); - - # stop postgres and destroy data - $machine->systemctl('stop postgresql'); - $machine->systemctl('stop postgresql-wal-receiver-main'); - $machine->succeed('rm -r ${postgresqlDataDir}/{base,global,pg_*}'); - - # restore the base backup - $machine->succeed('cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}'); - - # prepare WAL and recovery - $machine->succeed('chmod a+rX -R ${walBackupDir}'); - $machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too - $machine->succeed('cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*'); - - # replay WAL - $machine->systemctl('start postgresql'); - $machine->waitForFile('${postgresqlDataDir}/recovery.done'); - $machine->systemctl('restart postgresql'); - $machine->waitForUnit('postgresql'); - - # check that our records have been restored - $machine->succeed('test $(sudo -u postgres psql --pset="pager=off" --tuples-only --command="select count(distinct val) from dummy;") -eq 100'); - ''; - }; - -in mapAttrs makePostgresqlWalReceiverTest (import ../../pkgs/servers/sql/postgresql pkgs) +# Maps the generic function over all attributes of PostgreSQL packages +in builtins.listToAttrs (map makePostgresqlWalReceiverTest (builtins.attrNames (import ../../pkgs/servers/sql/postgresql { }))) diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index b912e3425e..fdcc407213 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -22,6 +22,9 @@ let * `metricProvider` (optional) * this attribute contains additional machine config * + * `nodeName` (optional) + * override an incompatible testnode name + * * Example: * exporterTests. = { * exporterConfig = { @@ -590,6 +593,19 @@ let ''; }; + unifi-poller = { + nodeName = "unifi_poller"; + exporterConfig.enable = true; + exporterConfig.controllers = [ { } ]; + exporterTest = '' + wait_for_unit("prometheus-unifi-poller-exporter.service") + wait_for_open_port(9130) + succeed( + "curl -sSf localhost:9130/metrics | grep -q 'unifipoller_build_info{.\\+} 1'" + ) + ''; + }; + varnish = { exporterConfig = { enable = true; @@ -646,24 +662,27 @@ let }; }; in -mapAttrs (exporter: testConfig: (makeTest { +mapAttrs (exporter: testConfig: (makeTest (let + nodeName = testConfig.nodeName or exporter; + +in { name = "prometheus-${exporter}-exporter"; - nodes.${exporter} = mkMerge [{ + nodes.${nodeName} = mkMerge [{ services.prometheus.exporters.${exporter} = testConfig.exporterConfig; } testConfig.metricProvider or {}]; testScript = '' - ${exporter}.start() + ${nodeName}.start() ${concatStringsSep "\n" (map (line: if (builtins.substring 0 1 line == " " || builtins.substring 0 1 line == ")") then line - else "${exporter}.${line}" + else "${nodeName}.${line}" ) (splitString "\n" (removeSuffix "\n" testConfig.exporterTest)))} - ${exporter}.shutdown() + ${nodeName}.shutdown() ''; meta = with maintainers; { - maintainers = [ willibutz ]; + maintainers = [ willibutz elseym ]; }; -})) exporterTests +}))) exporterTests diff --git a/third_party/nixpkgs/nixos/tests/prometheus.nix b/third_party/nixpkgs/nixos/tests/prometheus.nix index bce489168f..af2aa66a55 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus.nix @@ -158,7 +158,10 @@ in import ./make-test-python.nix { s3 = { pkgs, ... } : { # Minio requires at least 1GiB of free disk space to run. - virtualisation.diskSize = 2 * 1024; + virtualisation = { + diskSize = 2 * 1024; + memorySize = 1024; + }; networking.firewall.allowedTCPPorts = [ minioPort ]; services.minio = { @@ -235,7 +238,7 @@ in import ./make-test-python.nix { # Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket # and check if the blocks have the correct labels: store.succeed( - "thanos bucket ls " + "thanos tools bucket ls " + "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} " + "--output=json | " + "jq .thanos.labels.some_label | " diff --git a/third_party/nixpkgs/nixos/tests/robustirc-bridge.nix b/third_party/nixpkgs/nixos/tests/robustirc-bridge.nix new file mode 100644 index 0000000000..a5c22d73a3 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/robustirc-bridge.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "robustirc-bridge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = + { bridge = + { services.robustirc-bridge = { + enable = true; + extraFlags = [ + "-listen localhost:6667" + "-network example.com" + ]; + }; + }; + }; + + testScript = + '' + start_all() + + bridge.wait_for_unit("robustirc-bridge.service") + bridge.wait_for_open_port(1080) + bridge.wait_for_open_port(6667) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/shadowsocks/common.nix b/third_party/nixpkgs/nixos/tests/shadowsocks/common.nix new file mode 100644 index 0000000000..8cbbc3f206 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/shadowsocks/common.nix @@ -0,0 +1,84 @@ +{ name +, plugin ? null +, pluginOpts ? "" +}: + +import ../make-test-python.nix ({ pkgs, lib, ... }: { + inherit name; + meta = { + maintainers = with lib.maintainers; [ hmenke ]; + }; + + nodes = { + server = { + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + networking.useDHCP = false; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.1"; prefixLength = 24; } + ]; + networking.firewall.rejectPackets = true; + networking.firewall.allowedTCPPorts = [ 8488 ]; + networking.firewall.allowedUDPPorts = [ 8488 ]; + services.shadowsocks = { + enable = true; + encryptionMethod = "chacha20-ietf-poly1305"; + password = "pa$$w0rd"; + localAddress = [ "0.0.0.0" ]; + port = 8488; + fastOpen = false; + mode = "tcp_and_udp"; + } // lib.optionalAttrs (plugin != null) { + inherit plugin; + pluginOpts = "server;${pluginOpts}"; + }; + services.nginx = { + enable = true; + virtualHosts.server = { + locations."/".root = pkgs.writeTextDir "index.html" "It works!"; + }; + }; + }; + + client = { + networking.useDHCP = false; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.2"; prefixLength = 24; } + ]; + systemd.services.shadowsocks-client = { + description = "connect to shadowsocks"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ shadowsocks-libev ]; + script = '' + exec ss-local \ + -s 192.168.0.1 \ + -p 8488 \ + -l 1080 \ + -k 'pa$$w0rd' \ + -m chacha20-ietf-poly1305 \ + -a nobody \ + ${lib.optionalString (plugin != null) '' + --plugin "${plugin}" --plugin-opts "${pluginOpts}" + ''} + ''; + }; + }; + }; + + testScript = '' + start_all() + + server.wait_for_unit("shadowsocks-libev.service") + client.wait_for_unit("shadowsocks-client.service") + + client.fail( + "${pkgs.curl}/bin/curl 192.168.0.1:80" + ) + + msg = client.succeed( + "${pkgs.curl}/bin/curl --socks5 localhost:1080 192.168.0.1:80" + ) + assert msg == "It works!", "Could not connect through shadowsocks" + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/shadowsocks/default.nix b/third_party/nixpkgs/nixos/tests/shadowsocks/default.nix new file mode 100644 index 0000000000..37a8c3c9d0 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/shadowsocks/default.nix @@ -0,0 +1,16 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../../.. { inherit system config; } +}: + +{ + "basic" = import ./common.nix { + name = "basic"; + }; + + "v2ray-plugin" = import ./common.nix { + name = "v2ray-plugin"; + plugin = "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"; + pluginOpts = "host=nixos.org"; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/signal-desktop.nix b/third_party/nixpkgs/nixos/tests/signal-desktop.nix index e4b830e9e2..65ae49a267 100644 --- a/third_party/nixpkgs/nixos/tests/signal-desktop.nix +++ b/third_party/nixpkgs/nixos/tests/signal-desktop.nix @@ -31,8 +31,13 @@ import ./make-test-python.nix ({ pkgs, ...} : # start signal desktop machine.execute("su - alice -c signal-desktop &") - # wait for the "Link your phone to Signal Desktop" message - machine.wait_for_text("Link your phone to Signal Desktop") + # Wait for the Signal window to appear. Since usually the tests + # are run sandboxed and therfore with no internet, we can not wait + # for the message "Link your phone ...". Nor should we wait for + # the "Failed to connect to server" message, because when manually + # running this test it will be not sandboxed. + machine.wait_for_text("Signal") + machine.wait_for_text("File Edit View Window Help") machine.screenshot("signal_desktop") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/sssd-ldap.nix b/third_party/nixpkgs/nixos/tests/sssd-ldap.nix new file mode 100644 index 0000000000..b68403a010 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/sssd-ldap.nix @@ -0,0 +1,78 @@ +import ./make-test-python.nix ({ pkgs, ... }: + let + dbDomain = "example.org"; + dbSuffix = "dc=example,dc=org"; + + ldapRootUser = "admin"; + ldapRootPassword = "foobar"; + + testUser = "alice"; + in + { + name = "sssd-ldap"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bbigras ]; + }; + + machine = { pkgs, ... }: { + services.openldap = { + enable = true; + rootdn = "cn=${ldapRootUser},${dbSuffix}"; + rootpw = ldapRootPassword; + suffix = dbSuffix; + declarativeContents = '' + dn: ${dbSuffix} + objectClass: top + objectClass: dcObject + objectClass: organization + o: ${dbDomain} + + dn: ou=posix,${dbSuffix} + objectClass: top + objectClass: organizationalUnit + + dn: ou=accounts,ou=posix,${dbSuffix} + objectClass: top + objectClass: organizationalUnit + + dn: uid=${testUser},ou=accounts,ou=posix,${dbSuffix} + objectClass: person + objectClass: posixAccount + # userPassword: somePasswordHash + homeDirectory: /home/${testUser} + uidNumber: 1234 + gidNumber: 1234 + cn: "" + sn: "" + ''; + }; + + services.sssd = { + enable = true; + config = '' + [sssd] + config_file_version = 2 + services = nss, pam, sudo + domains = ${dbDomain} + + [domain/${dbDomain}] + auth_provider = ldap + id_provider = ldap + ldap_uri = ldap://127.0.0.1:389 + ldap_search_base = ${dbSuffix} + ldap_default_bind_dn = cn=${ldapRootUser},${dbSuffix} + ldap_default_authtok_type = password + ldap_default_authtok = ${ldapRootPassword} + ''; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("openldap.service") + machine.wait_for_unit("sssd.service") + machine.succeed("getent passwd ${testUser}") + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/sssd.nix b/third_party/nixpkgs/nixos/tests/sssd.nix new file mode 100644 index 0000000000..4c6ca86c74 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/sssd.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "sssd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bbigras ]; + }; + machine = { pkgs, ... }: { + services.sssd.enable = true; + }; + + testScript = '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("sssd.service") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 99cd341eec..99395fe302 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -31,7 +31,7 @@ import ./make-test-python.nix ({pkgs, ...}: { firewall.enable = false; interfaces.eth1.ipv4.addresses = lib.mkForce []; # no need for legacy IP interfaces.eth1.ipv6.addresses = lib.mkForce [ - { address = "2001:DB8::"; prefixLength = 64; } + { address = "2001:DB8::1"; prefixLength = 64; } ]; }; @@ -260,7 +260,7 @@ import ./make-test-python.nix ({pkgs, ...}: { client.wait_until_succeeds("ping -6 -c 1 FD42::1") # the global IP of the ISP router should still not be a reachable - router.fail("ping -6 -c 1 2001:DB8::") + router.fail("ping -6 -c 1 2001:DB8::1") # Once we have internal connectivity boot up the ISP isp.start() @@ -273,11 +273,11 @@ import ./make-test-python.nix ({pkgs, ...}: { # wait until the uplink interface has a good status router.wait_for_unit("network-online.target") - router.wait_until_succeeds("ping -6 -c1 2001:DB8::") + router.wait_until_succeeds("ping -6 -c1 2001:DB8::1") # shortly after that the client should have received it's global IPv6 # address and thus be able to ping the ISP - client.wait_until_succeeds("ping -6 -c1 2001:DB8::") + client.wait_until_succeeds("ping -6 -c1 2001:DB8::1") # verify that we got a globally scoped address in eth1 from the # documentation prefix diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd.nix index 319e5e94ec..d5fb2431db 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-networkd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-networkd.nix @@ -7,18 +7,19 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ wireguard-tools ]; boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ]; - systemd.tmpfiles.rules = [ - "f /run/wg_priv 0640 root systemd-network - ${privk}" - ]; systemd.network = { enable = true; netdevs = { "90-wg0" = { netdevConfig = { Kind = "wireguard"; Name = "wg0"; }; wireguardConfig = { - PrivateKeyFile = "/run/wg_priv"; + # NOTE: we're storing the wireguard private key in the + # store for this test. Do not do this in the real + # world. Keep in mind the nix store is + # world-readable. + PrivateKeyFile = pkgs.writeText "wg0-priv" privk; ListenPort = 51820; - FwMark = 42; + FirewallMark = 42; }; wireguardPeers = [ {wireguardPeerConfig={ Endpoint = "192.168.1.${peerId}:51820"; diff --git a/third_party/nixpkgs/nixos/tests/systemd.nix b/third_party/nixpkgs/nixos/tests/systemd.nix index a653932fb3..dfa16eecfa 100644 --- a/third_party/nixpkgs/nixos/tests/systemd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd.nix @@ -4,7 +4,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine = { lib, ... }: { imports = [ common/user-account.nix common/x11.nix ]; - virtualisation.emptyDiskImages = [ 512 ]; + virtualisation.emptyDiskImages = [ 512 512 ]; + virtualisation.memorySize = 1024; + + environment.systemPackages = [ pkgs.cryptsetup ]; fileSystems = lib.mkVMOverride { "/test-x-initrd-mount" = { @@ -141,8 +144,29 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) output = machine.succeed("systemctl show | grep Watchdog") - assert "RuntimeWatchdogUSec=30s" in output - assert "RebootWatchdogUSec=10m" in output - assert "KExecWatchdogUSec=5m" in output + # assert "RuntimeWatchdogUSec=30s" in output + # for some reason RuntimeWatchdogUSec, doesn't seem to be updated in here. + assert "RebootWatchdogUSec=10min" in output + assert "KExecWatchdogUSec=5min" in output + + # Test systemd cryptsetup support + with subtest("systemd successfully reads /etc/crypttab and unlocks volumes"): + # create a luks volume and put a filesystem on it + machine.succeed( + "echo -n supersecret | cryptsetup luksFormat -q /dev/vdc -", + "echo -n supersecret | cryptsetup luksOpen --key-file - /dev/vdc foo", + "mkfs.ext3 /dev/mapper/foo", + ) + + # create a keyfile and /etc/crypttab + machine.succeed("echo -n supersecret > /var/lib/luks-keyfile") + machine.succeed("chmod 600 /var/lib/luks-keyfile") + machine.succeed("echo 'luks1 /dev/vdc /var/lib/luks-keyfile luks' > /etc/crypttab") + + # after a reboot, systemd should unlock the volume and we should be able to mount it + machine.shutdown() + machine.succeed("systemctl status systemd-cryptsetup@luks1.service") + machine.succeed("mkdir -p /tmp/luks1") + machine.succeed("mount /dev/mapper/luks1 /tmp/luks1") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/transmission.nix b/third_party/nixpkgs/nixos/tests/transmission.nix index f4f2186be1..37c0352dcf 100644 --- a/third_party/nixpkgs/nixos/tests/transmission.nix +++ b/third_party/nixpkgs/nixos/tests/transmission.nix @@ -9,6 +9,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { networking.firewall.allowedTCPPorts = [ 9091 ]; + security.apparmor.enable = true; + services.transmission.enable = true; }; diff --git a/third_party/nixpkgs/nixos/tests/v2ray.nix b/third_party/nixpkgs/nixos/tests/v2ray.nix new file mode 100644 index 0000000000..f1b2570cc8 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/v2ray.nix @@ -0,0 +1,83 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: let + + v2rayUser = { + # A random UUID. + id = "a6a46834-2150-45f8-8364-0f6f6ab32384"; + alterId = 4; + }; + + # 1080 [http proxy] -> 1081 [vmess] -> direct + v2rayConfig = { + inbounds = [ + { + tag = "http_in"; + port = 1080; + listen = "127.0.0.1"; + protocol = "http"; + } + { + tag = "vmess_in"; + port = 1081; + listen = "127.0.0.1"; + protocol = "vmess"; + settings.clients = [v2rayUser]; + } + ]; + outbounds = [ + { + tag = "vmess_out"; + protocol = "vmess"; + settings.vnext = [{ + address = "127.0.0.1"; + port = 1081; + users = [v2rayUser]; + }]; + } + { + tag = "direct"; + protocol = "freedom"; + } + ]; + routing.rules = [ + { + type = "field"; + inboundTag = "http_in"; + outboundTag = "vmess_out"; + } + { + type = "field"; + inboundTag = "vmess_in"; + outboundTag = "direct"; + } + ]; + }; + +in { + name = "v2ray"; + meta = with lib.maintainers; { + maintainers = [ servalcatty ]; + }; + machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.v2ray = { + enable = true; + config = v2rayConfig; + }; + services.httpd = { + enable = true; + adminAddr = "foo@example.org"; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("httpd.service") + machine.wait_for_unit("v2ray.service") + machine.wait_for_open_port(80) + machine.wait_for_open_port(1080) + machine.succeed( + "curl --fail --max-time 10 --proxy http://localhost:1080 http://localhost" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/virtualbox.nix b/third_party/nixpkgs/nixos/tests/virtualbox.nix index af76e6f984..0d9eafa4a2 100644 --- a/third_party/nixpkgs/nixos/tests/virtualbox.nix +++ b/third_party/nixpkgs/nixos/tests/virtualbox.nix @@ -15,7 +15,7 @@ assert use64bitGuest -> useKvmNestedVirt; -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let @@ -91,13 +91,15 @@ let (isYes "SERIAL_8250_CONSOLE") (isYes "SERIAL_8250") ]; + + networking.usePredictableInterfaceNames = false; }; mkLog = logfile: tag: let rotated = map (i: "${logfile}.${toString i}") (range 1 9); all = concatMapStringsSep " " (f: "\"${f}\"") ([logfile] ++ rotated); logcmd = "tail -F ${all} 2> /dev/null | logger -t \"${tag}\""; - in optionalString debug "$machine->execute(ru '${logcmd} & disown');"; + in if debug then "machine.execute(ru('${logcmd} & disown'))" else "pass"; testVM = vmName: vmScript: let cfg = (import ../lib/eval-config.nix { @@ -204,96 +206,105 @@ let }; testSubs = '' - my ${"$" + name}_sharepath = '${sharePath}'; - sub checkRunning_${name} { - my $cmd = 'VBoxManage list runningvms | grep -q "^\"${name}\""'; - my ($status, $out) = $machine->execute(ru $cmd); - return $status == 0; - } - sub cleanup_${name} { - $machine->execute(ru "VBoxManage controlvm ${name} poweroff") - if checkRunning_${name}; - $machine->succeed("rm -rf ${sharePath}"); - $machine->succeed("mkdir -p ${sharePath}"); - $machine->succeed("chown alice.users ${sharePath}"); - } + ${name}_sharepath = "${sharePath}" - sub createVM_${name} { - vbm("createvm --name ${name} ${createFlags}"); - vbm("modifyvm ${name} ${vmFlags}"); - vbm("setextradata ${name} VBoxInternal/PDM/HaltOnReset 1"); - vbm("storagectl ${name} ${controllerFlags}"); - vbm("storageattach ${name} ${diskFlags}"); - vbm("sharedfolder add ${name} ${sharedFlags}"); - vbm("sharedfolder add ${name} ${nixstoreFlags}"); - cleanup_${name}; - ${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"} - } + def check_running_${name}(): + cmd = "VBoxManage list runningvms | grep -q '^\"${name}\"'" + (status, _) = machine.execute(ru(cmd)) + return status == 0 - sub destroyVM_${name} { - cleanup_${name}; - vbm("unregistervm ${name} --delete"); - } - sub waitForVMBoot_${name} { - $machine->execute(ru( - 'set -e; i=0; '. - 'while ! test -e ${sharePath}/boot-done; do '. - 'sleep 10; i=$(($i + 10)); [ $i -le 3600 ]; '. - 'VBoxManage list runningvms | grep -q "^\"${name}\""; '. - 'done' - )); - } + def cleanup_${name}(): + if check_running_${name}(): + machine.execute(ru("VBoxManage controlvm ${name} poweroff")) + machine.succeed("rm -rf ${sharePath}") + machine.succeed("mkdir -p ${sharePath}") + machine.succeed("chown alice.users ${sharePath}") - sub waitForIP_${name} ($) { - my $property = "/VirtualBox/GuestInfo/Net/$_[0]/V4/IP"; - my $getip = "VBoxManage guestproperty get ${name} $property | ". - "sed -n -e 's/^Value: //p'"; - my $ip = $machine->succeed(ru( - 'for i in $(seq 1000); do '. - 'if ipaddr="$('.$getip.')" && [ -n "$ipaddr" ]; then '. - 'echo "$ipaddr"; exit 0; '. - 'fi; '. - 'sleep 1; '. - 'done; '. - 'echo "Could not get IPv4 address for ${name}!" >&2; '. - 'exit 1' - )); - chomp $ip; - return $ip; - } - sub waitForStartup_${name} { - for (my $i = 0; $i <= 120; $i += 10) { - $machine->sleep(10); - return if checkRunning_${name}; - eval { $_[0]->() } if defined $_[0]; - } - die "VirtualBox VM didn't start up within 2 minutes"; - } + def create_vm_${name}(): + # fmt: off + vbm(f"createvm --name ${name} ${createFlags}") + vbm(f"modifyvm ${name} ${vmFlags}") + vbm(f"setextradata ${name} VBoxInternal/PDM/HaltOnReset 1") + vbm(f"storagectl ${name} ${controllerFlags}") + vbm(f"storageattach ${name} ${diskFlags}") + vbm(f"sharedfolder add ${name} ${sharedFlags}") + vbm(f"sharedfolder add ${name} ${nixstoreFlags}") + cleanup_${name}() - sub waitForShutdown_${name} { - for (my $i = 0; $i <= 120; $i += 10) { - $machine->sleep(10); - return unless checkRunning_${name}; - } - die "VirtualBox VM didn't shut down within 2 minutes"; - } + ${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"} + # fmt: on - sub shutdownVM_${name} { - $machine->succeed(ru "touch ${sharePath}/shutdown"); - $machine->execute( - 'set -e; i=0; '. - 'while test -e ${sharePath}/shutdown '. - ' -o -e ${sharePath}/boot-done; do '. - 'sleep 1; i=$(($i + 1)); [ $i -le 3600 ]; '. - 'done' - ); - waitForShutdown_${name}; - } + + def destroy_vm_${name}(): + cleanup_${name}() + vbm("unregistervm ${name} --delete") + + + def wait_for_vm_boot_${name}(): + machine.execute( + ru( + "set -e; i=0; " + "while ! test -e ${sharePath}/boot-done; do " + "sleep 10; i=$(($i + 10)); [ $i -le 3600 ]; " + "VBoxManage list runningvms | grep -q '^\"${name}\"'; " + "done" + ) + ) + + + def wait_for_ip_${name}(interface): + property = f"/VirtualBox/GuestInfo/Net/{interface}/V4/IP" + # fmt: off + getip = f"VBoxManage guestproperty get ${name} {property} | sed -n -e 's/^Value: //p'" + # fmt: on + + ip = machine.succeed( + ru( + "for i in $(seq 1000); do " + f'if ipaddr="$({getip})" && [ -n "$ipaddr" ]; then ' + 'echo "$ipaddr"; exit 0; ' + "fi; " + "sleep 1; " + "done; " + "echo 'Could not get IPv4 address for ${name}!' >&2; " + "exit 1" + ) + ).strip() + return ip + + + def wait_for_startup_${name}(nudge=lambda: None): + for _ in range(0, 130, 10): + machine.sleep(10) + if check_running_${name}(): + return + nudge() + raise Exception("VirtualBox VM didn't start up within 2 minutes") + + + def wait_for_shutdown_${name}(): + for _ in range(0, 130, 10): + machine.sleep(10) + if not check_running_${name}(): + return + raise Exception("VirtualBox VM didn't shut down within 2 minutes") + + + def shutdown_vm_${name}(): + machine.succeed(ru("touch ${sharePath}/shutdown")) + machine.execute( + "set -e; i=0; " + "while test -e ${sharePath}/shutdown " + " -o -e ${sharePath}/boot-done; do " + "sleep 1; i=$(($i + 1)); [ $i -le 3600 ]; " + "done" + ) + wait_for_shutdown_${name}() ''; }; @@ -364,26 +375,31 @@ let }; testScript = '' - sub ru ($) { - my $esc = $_[0] =~ s/'/'\\${"'"}'/gr; - return "su - alice -c '$esc'"; - } - - sub vbm { - $machine->succeed(ru("VBoxManage ".$_[0])); - }; - - sub removeUUIDs { - return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n"; - } - + from shlex import quote ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vms)} - $machine->waitForX; + def ru(cmd: str) -> str: + return f"su - alice -c {quote(cmd)}" + + def vbm(cmd: str) -> str: + return machine.succeed(ru(f"VBoxManage {cmd}")) + + + def remove_uuids(output: str) -> str: + return "\n".join( + [line for line in (output or "").splitlines() if not line.startswith("UUID:")] + ) + + + machine.wait_for_x() + + # fmt: off ${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"} + # fmt: on ${testScript} + # (keep black happy) ''; meta = with pkgs.stdenv.lib.maintainers; { @@ -393,133 +409,129 @@ let unfreeTests = mapAttrs (mkVBoxTest true vboxVMsWithExtpack) { enable-extension-pack = '' - createVM_testExtensionPack; - vbm("startvm testExtensionPack"); - waitForStartup_testExtensionPack; - $machine->screenshot("cli_started"); - waitForVMBoot_testExtensionPack; - $machine->screenshot("cli_booted"); + create_vm_testExtensionPack() + vbm("startvm testExtensionPack") + wait_for_startup_testExtensionPack() + machine.screenshot("cli_started") + wait_for_vm_boot_testExtensionPack() + machine.screenshot("cli_booted") - $machine->nest("Checking for privilege escalation", sub { - $machine->fail("test -e '/root/VirtualBox VMs'"); - $machine->fail("test -e '/root/.config/VirtualBox'"); - $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); - }); + with machine.nested("Checking for privilege escalation"): + machine.fail("test -e '/root/VirtualBox VMs'") + machine.fail("test -e '/root/.config/VirtualBox'") + machine.succeed("test -e '/home/alice/VirtualBox VMs'") - shutdownVM_testExtensionPack; - destroyVM_testExtensionPack; + shutdown_vm_testExtensionPack() + destroy_vm_testExtensionPack() ''; }; in mapAttrs (mkVBoxTest false vboxVMs) { simple-gui = '' - createVM_simple; - $machine->succeed(ru "VirtualBox &"); - $machine->waitUntilSucceeds( - ru "xprop -name 'Oracle VM VirtualBox Manager'" - ); - $machine->sleep(5); - $machine->screenshot("gui_manager_started"); # Home to select Tools, down to move to the VM, enter to start it. - $machine->sendKeys("home"); - $machine->sendKeys("down"); - $machine->sendKeys("ret"); - $machine->screenshot("gui_manager_sent_startup"); - waitForStartup_simple (sub { - $machine->sendKeys("home"); - $machine->sendKeys("down"); - $machine->sendKeys("ret"); - }); - $machine->screenshot("gui_started"); - waitForVMBoot_simple; - $machine->screenshot("gui_booted"); - shutdownVM_simple; - $machine->sleep(5); - $machine->screenshot("gui_stopped"); - $machine->sendKeys("ctrl-q"); - $machine->sleep(5); - $machine->screenshot("gui_manager_stopped"); - destroyVM_simple; + def send_vm_startup(): + machine.send_key("home") + machine.send_key("down") + machine.send_key("ret") + + + create_vm_simple() + machine.succeed(ru("VirtualBox &")) + machine.wait_until_succeeds(ru("xprop -name 'Oracle VM VirtualBox Manager'")) + machine.sleep(5) + machine.screenshot("gui_manager_started") + send_vm_startup() + machine.screenshot("gui_manager_sent_startup") + wait_for_startup_simple(send_vm_startup) + machine.screenshot("gui_started") + wait_for_vm_boot_simple() + machine.screenshot("gui_booted") + shutdown_vm_simple() + machine.sleep(5) + machine.screenshot("gui_stopped") + machine.send_key("ctrl-q") + machine.sleep(5) + machine.screenshot("gui_manager_stopped") + destroy_vm_simple() ''; simple-cli = '' - createVM_simple; - vbm("startvm simple"); - waitForStartup_simple; - $machine->screenshot("cli_started"); - waitForVMBoot_simple; - $machine->screenshot("cli_booted"); + create_vm_simple() + vbm("startvm simple") + wait_for_startup_simple() + machine.screenshot("cli_started") + wait_for_vm_boot_simple() + machine.screenshot("cli_booted") - $machine->nest("Checking for privilege escalation", sub { - $machine->fail("test -e '/root/VirtualBox VMs'"); - $machine->fail("test -e '/root/.config/VirtualBox'"); - $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); - }); + with machine.nested("Checking for privilege escalation"): + machine.fail("test -e '/root/VirtualBox VMs'") + machine.fail("test -e '/root/.config/VirtualBox'") + machine.succeed("test -e '/home/alice/VirtualBox VMs'") - shutdownVM_simple; - destroyVM_simple; + shutdown_vm_simple() + destroy_vm_simple() ''; headless = '' - createVM_headless; - $machine->succeed(ru("VBoxHeadless --startvm headless & disown %1")); - waitForStartup_headless; - waitForVMBoot_headless; - shutdownVM_headless; - destroyVM_headless; + create_vm_headless() + machine.succeed(ru("VBoxHeadless --startvm headless & disown %1")) + wait_for_startup_headless() + wait_for_vm_boot_headless() + shutdown_vm_headless() + destroy_vm_headless() ''; host-usb-permissions = '' - my $userUSB = removeUUIDs vbm("list usbhost"); - print STDERR $userUSB; - my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost"); - print STDERR $rootUSB; + user_usb = remove_uuids(vbm("list usbhost")) + print(user_usb, file=sys.stderr) + root_usb = remove_uuids(machine.succeed("VBoxManage list usbhost")) + print(root_usb, file=sys.stderr) - die "USB host devices differ for root and normal user" - if $userUSB ne $rootUSB; - die "No USB host devices found" if $userUSB =~ //; + if user_usb != root_usb: + raise Exception("USB host devices differ for root and normal user") + if "" in user_usb: + raise Exception("No USB host devices found") ''; systemd-detect-virt = '' - createVM_detectvirt; - vbm("startvm detectvirt"); - waitForStartup_detectvirt; - waitForVMBoot_detectvirt; - shutdownVM_detectvirt; - my $result = $machine->succeed("cat '$detectvirt_sharepath/result'"); - chomp $result; - destroyVM_detectvirt; - die "systemd-detect-virt returned \"$result\" instead of \"oracle\"" - if $result ne "oracle"; + create_vm_detectvirt() + vbm("startvm detectvirt") + wait_for_startup_detectvirt() + wait_for_vm_boot_detectvirt() + shutdown_vm_detectvirt() + result = machine.succeed(f"cat '{detectvirt_sharepath}/result'").strip() + destroy_vm_detectvirt() + if result != "oracle": + raise Exception(f'systemd-detect-virt returned "{result}" instead of "oracle"') ''; net-hostonlyif = '' - createVM_test1; - createVM_test2; + create_vm_test1() + create_vm_test2() - vbm("startvm test1"); - waitForStartup_test1; - waitForVMBoot_test1; + vbm("startvm test1") + wait_for_startup_test1() + wait_for_vm_boot_test1() - vbm("startvm test2"); - waitForStartup_test2; - waitForVMBoot_test2; + vbm("startvm test2") + wait_for_startup_test2() + wait_for_vm_boot_test2() - $machine->screenshot("net_booted"); + machine.screenshot("net_booted") - my $test1IP = waitForIP_test1 1; - my $test2IP = waitForIP_test2 1; + test1_ip = wait_for_ip_test1(1) + test2_ip = wait_for_ip_test2(1) - $machine->succeed("echo '$test2IP' | nc -N '$test1IP' 1234"); - $machine->succeed("echo '$test1IP' | nc -N '$test2IP' 1234"); + machine.succeed(f"echo '{test2_ip}' | nc -N '{test1_ip}' 1234") + machine.succeed(f"echo '{test1_ip}' | nc -N '{test2_ip}' 1234") - $machine->waitUntilSucceeds("nc -N '$test1IP' 5678 < /dev/null >&2"); - $machine->waitUntilSucceeds("nc -N '$test2IP' 5678 < /dev/null >&2"); + machine.wait_until_succeeds(f"nc -N '{test1_ip}' 5678 < /dev/null >&2") + machine.wait_until_succeeds(f"nc -N '{test2_ip}' 5678 < /dev/null >&2") - shutdownVM_test1; - shutdownVM_test2; + shutdown_vm_test1() + shutdown_vm_test2() - destroyVM_test1; - destroyVM_test2; + destroy_vm_test1() + destroy_vm_test2() ''; } // (if enableUnfree then unfreeTests else {}) diff --git a/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix b/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix index 1518aaacc8..2b09f99f5f 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix @@ -5,6 +5,10 @@ import ../make-test-python.nix ({ pkgs, ... }: { }; nodes = { client = { nodes, pkgs, ... }: { + networking.extraHosts = '' + ${nodes.server.config.networking.primaryIPAddress} example.com + ''; + environment.systemPackages = [ (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) ]; @@ -46,6 +50,11 @@ import ../make-test-python.nix ({ pkgs, ... }: { module: ejabberd_service access: local shaper: fast + - + port: 5444 + module: ejabberd_http + request_handlers: + "/upload": mod_http_upload ## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text ## password storage (see auth_password_format option). @@ -180,6 +189,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { mod_client_state: {} mod_configure: {} # requires mod_adhoc ## mod_delegation: {} # for xep0356 + mod_disco: {} #mod_irc: # host: "irc.@HOST@" # default_encoding: "utf-8" @@ -187,9 +197,9 @@ import ../make-test-python.nix ({ pkgs, ... }: { ## mod_http_fileserver: ## docroot: "/var/www" ## accesslog: "/var/log/ejabberd/access.log" - #mod_http_upload: - # thumbnail: false # otherwise needs the identify command from ImageMagick installed - # put_url: "https://@HOST@:5444" + mod_http_upload: + thumbnail: false # otherwise needs the identify command from ImageMagick installed + put_url: "http://@HOST@:5444/upload" ## # docroot: "@HOME@/upload" #mod_http_upload_quota: # max_days: 14 diff --git a/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix b/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix index 349b9c6f38..30945e6830 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -36,7 +36,11 @@ class CthonTest(ClientXMPP): def timeout_callback(arg): log.error("ERROR: Cannot upload file. XEP_0363 seems broken") sys.exit(1) - url = await self['xep_0363'].upload_file("${dummyFile}",timeout=10, timeout_callback=timeout_callback) + try: + url = await self['xep_0363'].upload_file("${dummyFile}",timeout=10, timeout_callback=timeout_callback) + except: + log.error("ERROR: Cannot run upload command. XEP_0363 seems broken") + sys.exit(1) log.info('Upload success!') # Test MUC self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98', wait=True) diff --git a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix new file mode 100644 index 0000000000..6bb21b5eda --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "ashuffle"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "joshkunz"; + repo = "ashuffle"; + rev = "v${version}"; + sha256 = "09q6lwgc1dc8bg1mb9js9qz3xcsxph3548nxzvyb4v8111gixrp7"; + fetchSubmodules = true; + }; + + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake pkg-config meson ninja ]; + buildInputs = [ mpd_clientlib ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/joshkunz/ashuffle"; + description = "Automatic library-wide shuffle for mpd"; + maintainers = [ maintainers.tcbravo ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index 18f2b4f67c..20526c8c6c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound editor with graphical UI"; - homepage = "http://audacityteam.org/"; + homepage = "https://www.audacityteam.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lheckemann ]; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM diff --git a/third_party/nixpkgs/pkgs/applications/audio/axoloti/libusb1.nix b/third_party/nixpkgs/pkgs/applications/audio/axoloti/libusb1.nix index 49b788f665..255cf3f5e3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/axoloti/libusb1.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/axoloti/libusb1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: +{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: stdenv.mkDerivation rec { name = "libusb-1.0.19"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; preFixup = stdenv.lib.optionalString stdenv.isLinux '' - sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la + sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index c74c0ca4ef..a26431a82e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -1,8 +1,6 @@ { mkDerivation , stdenv , fetchFromGitHub -, fetchpatch -, installShellFiles , qmake , qtbase , qtmultimedia @@ -21,26 +19,18 @@ let in mkDerivation rec { pname = "bambootracker"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rerrahkr"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0gq40qmsdavsyl2d6a71rwp4mjlwvp1c8bry32srn4hliwfnvqa6"; + sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc"; }; - # Fix macOS build until new release - patches = [ - (fetchpatch { - url = "https://github.com/rerrahkr/BambooTracker/commit/45346ed99559d44c2e32a5c6138a0835b212e875.patch"; - sha256 = "1xkiqira1kpcqkacycy0y7qm1brhf89amliv42byijl4palmykh2"; - }) - ]; + sourceRoot = "source/BambooTracker"; - preConfigure = "cd BambooTracker"; - - nativeBuildInputs = [ qmake qttools installShellFiles ]; + nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase qtmultimedia ] ++ optional alsaSupport alsaLib @@ -51,17 +41,6 @@ mkDerivation rec { ++ optional pulseSupport "CONFIG+=use_pulse" ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ]; - postInstall = '' - install -Dm644 ../BambooTracker.desktop $out/share/applications/BambooTracker.desktop - installManPage ../BambooTracker*.1 - - cp -r ../{demos,licenses,skins,LICENSE} $out/share/BambooTracker/ - - for size in 16x16 256x256; do - install -Dm644 res/icon/icon_$size.png $out/share/icons/hicolor/$size/apps/BambooTracker.png - done - ''; - meta = with stdenv.lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; homepage = "https://github.com/rerrahkr/BambooTracker"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix index 1b642e1ed6..7d4d53408d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.6.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "16b0sg7q2b8l4y4bp5s3yzsj9j6jayjy2mlvqkby6l7hcgjcj493"; + sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index ee060602c8..7e5099f3c3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -2,11 +2,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "00hrbgnjns3s8lbjbabwwqvbwz4dlrg33cs3d1qlpzgi3y72h3nn"; + sha256 = "1mj9kii4bnk5w2p18hypwy8swkpzkaqw98q5fsjq362x4qm0b3py"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bjumblr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bjumblr/default.nix index 458fe20937..e1a5bee64b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bjumblr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bjumblr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BJumblr"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0"; + sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix index 47de14ecb2..76a7893561 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ffmpeg_3, sox }: +{ stdenv, fetchurl, ffmpeg, sox }: stdenv.mkDerivation rec { pname = "bs1770gain"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"; }; - buildInputs = [ ffmpeg_3 sox ]; + buildInputs = [ ffmpeg sox ]; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix index de8e55a954..c0d11e1fe5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "0.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1pcch7j1wgsb77mjy58hl3z43p83dv0vcmyh129m9k216b09gy29"; + sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix index e5d62b15f4..95b7dd1842 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtsvg, qttools +, qtbase, qtsvg, qttools, perl # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -38,6 +38,8 @@ let withUdisks = (withTaglib && withDevices); + perl' = perl.withPackages (ppkgs: [ ppkgs.URI ]); + in mkDerivation { name = "${pname}-${version}"; @@ -48,7 +50,18 @@ in mkDerivation { sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c"; }; - buildInputs = [ qtbase qtsvg ] + patches = [ + # Cantata wants to check if perl is in the PATH at runtime, but we + # patchShebangs the playlists scripts, making that unnecessary (perl will + # always be available because it's a dependency) + ./dont-check-for-perl-in-PATH.diff + ]; + + postPatch = '' + patchShebangs playlists + ''; + + buildInputs = [ qtbase qtsvg perl' ] ++ lib.optionals withTaglib [ taglib taglib_extras ] ++ lib.optionals withReplaygain [ ffmpeg_3 speex mpg123 ] ++ lib.optional withHttpStream qtmultimedia diff --git a/third_party/nixpkgs/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff b/third_party/nixpkgs/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff new file mode 100644 index 0000000000..effb0f3b50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff @@ -0,0 +1,17 @@ +diff --git a/playlists/dynamicplaylists.cpp b/playlists/dynamicplaylists.cpp +index 07b6dce3..6a3f97c9 100644 +--- a/playlists/dynamicplaylists.cpp ++++ b/playlists/dynamicplaylists.cpp +@@ -211,11 +211,6 @@ void DynamicPlaylists::start(const QString &name) + return; + } + +- if (Utils::findExe("perl").isEmpty()) { +- emit error(tr("You need to install \"perl\" on your system in order for Cantata's dynamic mode to function.")); +- return; +- } +- + QString fName(Utils::dataDir(rulesDir, false)+name+constExtension); + + if (!QFile::exists(fName)) { + diff --git a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix index 4b426609fe..d91e550334 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. - version = "6.13.0"; + version = "6.15.0"; enableParallelBuilding = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh"; + sha256 = "1vld6v55jxvv3ddr21kh41s4cdkhnm5wpffvd097zqrqh1aq08r0"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix b/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix index b42929ff20..e5cbcd4a2e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p"; + sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/drumkv1/default.nix b/third_party/nixpkgs/pkgs/applications/audio/drumkv1/default.nix index 8c956c53fb..7a6acb25e8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/drumkv1/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.15"; + version = "0.9.16"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "108jk8p1sbm99plipf98ssij6dxaip1lmznibg8y2c4x0v2la6ab"; + sha256 = "1r55575w9r0ifysw9mgxjvv0fszvx8ykjgim3zczf3mb5s9ngavv"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix index de90bd038b..515f8a6f9a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -5,8 +5,7 @@ , pkgconfig , cmake , llvm -# TODO: put back when it builds again -# , emscripten +, emscripten , openssl , libsndfile , libmicrohttpd @@ -21,13 +20,13 @@ with stdenv.lib.strings; let - version = "unstable-2020-08-03"; + version = "unstable-2020-08-27"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "b6045f4592384076d3b383d116e602a95a000eb3"; - sha256 = "1wcpilwnkc7rrbv9gbkj5hb7kamkh8nrc3r4hbcvbz5ar2pfc6d5"; + rev = "c10f316fa90f338e248787ebf55e3795c3a0d70e"; + sha256 = "068pm04ddafbsj2r8akdpqyzb0m8mp9ql0rgi83hcqs4ndr8v7sb"; fetchSubmodules = true; }; @@ -47,7 +46,7 @@ let inherit src; nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; - buildInputs = [ llvm /*emscripten*/ openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; + buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix index 370c25ecd7..0f70370496 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix @@ -4,6 +4,7 @@ , alsaLib , opencv2 , libsndfile +, which }: faust.wrapWithBuildEnv { @@ -21,6 +22,7 @@ faust.wrapWithBuildEnv { alsaLib opencv2 libsndfile + which ]; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix index a2f1c2139a..753208c54c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix @@ -3,6 +3,7 @@ , opencv2 , qt4 , libsndfile +, alsaLib , which }: @@ -20,6 +21,7 @@ faust.wrapWithBuildEnv { opencv2 qt4 libsndfile + alsaLib which ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix index 55c0d7c597..8969f3a47b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "nu774"; repo = pname; - rev = version; - sha256 = "16iwqmwagnb929byz8kj79pmmr0anbyv26drbavhppmxhk7rrpgh"; + rev = "v${version}"; + sha256 = "02mzx4bird2q5chzpavfc9pg259hwfvq6px85xarm59vmj9nryb6"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/fmit/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fmit/default.nix index 114cf5e192..f173d2fe02 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fmit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fmit/default.nix @@ -11,13 +11,13 @@ with stdenv.lib; mkDerivation rec { pname = "fmit"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "gillesdegottex"; repo = "fmit"; rev = "v${version}"; - sha256 = "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6"; + sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx"; }; nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix b/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix index eae4b65168..b93ad14f55 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix @@ -4,30 +4,32 @@ let py = python3Packages; in py.buildPythonApplication rec { pname = "friture"; - version = "0.37"; + version = "unstable-2020-02-16"; src = fetchFromGitHub { owner = "tlecomte"; repo = pname; - rev = "v${version}"; - sha256 = "1ivy5qfd90w1s1icsphvvdnnqz563v3fhg5pws2zn4483cgnzc2y"; + rev = "4460b4e72a9c55310d6438f294424b5be74fc0aa"; + sha256 = "1pmxzq78ibifby3gbir1ah30mgsqv0y7zladf5qf3sl5r1as0yym"; }; - # module imports scipy.misc.factorial, but it has been removed since scipy - # 1.3.0; use scipy.special.factorial instead - patches = [ ./factorial.patch ]; - nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ [ wrapQtAppsHook ]; propagatedBuildInputs = with py; [ sounddevice pyopengl + pyopengl-accelerate docutils numpy pyqt5 appdirs pyrr + rtmixer + ]; + + patches = [ + ./unlock_constraints.patch ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch b/third_party/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch new file mode 100644 index 0000000000..ab53f948a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch @@ -0,0 +1,34 @@ +diff --git a/setup.py b/setup.py +index f31eeec..ac0927b 100644 +--- a/setup.py ++++ b/setup.py +@@ -50,19 +50,19 @@ ext_modules = [LateIncludeExtension("friture_extensions.exp_smoothing_conv", + # these will be installed when calling 'pip install friture' + # they are also retrieved by 'requirements.txt' + install_requires = [ +- "sounddevice==0.3.14", +- "rtmixer==0.1.0", +- "PyOpenGL==3.1.4", +- "PyOpenGL-accelerate==3.1.4", +- "docutils==0.15.2", +- "numpy==1.17.4", +- "PyQt5==5.13.2", +- "appdirs==1.4.3", +- "pyrr==0.10.3", ++ "sounddevice>=0.3.14", ++ "rtmixer>=0.1.0", ++ "PyOpenGL>=3.1.4", ++ "PyOpenGL-accelerate>=3.1.4", ++ "docutils>=0.15.2", ++ "numpy>=1.17.4", ++ "PyQt5>=5.13.2", ++ "appdirs>=1.4.3", ++ "pyrr>=0.10.3", + ] + + # Cython and numpy are needed when running setup.py, to build extensions +-setup_requires=["numpy==1.17.4", "Cython==0.29.14"] ++setup_requires=["numpy>=1.17.4", "Cython>=0.29.14"] + + with open(join(dirname(__file__), 'README.rst')) as f: + long_description = f.read() diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 60040119d6..aa4f122689 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.26"; + version = "1.31"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv"; + sha256 = "02j876d4xmbdmqairrs5190dzdm3k4s5hi3g9wvx62cxnnw7igha"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix b/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix index c2dc39fe61..dcfb542603 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix @@ -2,20 +2,21 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.3.3"; + version = "2.3.7"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "0h1abb6q2bmi01a3v37adkc4zc03j47jpvffz8p2lpp33xhljghs"; + sha256 = "1wdcbwiyy6i5agq5lffkyilyc8mv1cc4mp9h0nybn240vb2flqc2"; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ]; - cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" ]; + # https://github.com/iurie-sw/geonkick/issues/120 + cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = { homepage = "https://gitlab.com/iurie-sw/geonkick"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix index f51eb338d2..920c06038f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gSpeech"; - version = "0.9.2"; + version = "0.10.1"; src = fetchFromGitHub { owner = "mothsart"; repo = pname; rev = version; - sha256 = "11pvdpb9jjssp8nmlj21gs7ncgfm89kw26mfc8c2x8w2q4h92ja3"; + sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc"; }; nativeBuildInputs = [ @@ -56,8 +56,8 @@ python3.pkgs.buildPythonApplication rec { ]; postFixup = '' - wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts ]} - wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts ]} + wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts sox ]} + wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts sox ]} ''; strictDeps = false; diff --git a/third_party/nixpkgs/pkgs/applications/audio/helm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helm/default.nix index 8459967a36..145ba68b08 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/helm/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 -, lv2, pkgconfig, libGLU, libGL }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, xorg +, freetype +, alsaLib +, curl +, libjack2 +, lv2 +, pkgconfig +, libGLU +, libGL +}: stdenv.mkDerivation { version = "0.9.0"; @@ -20,7 +31,15 @@ CXXFLAGS = "-DHAVE_LROUND"; - patchPhase = '' + patches = [ + # gcc9 compatibility https://github.com/mtytel/helm/pull/233 + (fetchpatch { + url = "https://github.com/mtytel/helm/commit/cb611a80bd5a36d31bfc31212ebbf79aa86c6f08.patch"; + sha256 = "1i2289srcfz17c3zzab6f51aznzdj62kk53l4afr32bkjh9s4ixk"; + }) + ]; + + prePatch = '' sed -i 's|usr/||g' Makefile ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/hydrogen/0.nix b/third_party/nixpkgs/pkgs/applications/audio/hydrogen/0.nix new file mode 100644 index 0000000000..b3aff4e4c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/hydrogen/0.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, cmake +, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 +}: + +stdenv.mkDerivation rec { + version = "0.9.7"; + pname = "hydrogen"; + + src = fetchurl { + url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"; + sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ + alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 + ]; + + meta = with stdenv.lib; { + description = "Advanced drum machine"; + homepage = "http://www.hydrogen-music.org"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/hydrogen/default.nix b/third_party/nixpkgs/pkgs/applications/audio/hydrogen/default.nix index b3aff4e4c5..c6d307e2c1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/hydrogen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/hydrogen/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, cmake -, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 +{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf +, qtbase, qttools, qtxmlpatterns }: stdenv.mkDerivation rec { - version = "0.9.7"; pname = "hydrogen"; + version = "1.0.1"; - src = fetchurl { - url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"; - sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; + src = fetchFromGitHub { + owner = "hydrogen-music"; + repo = pname; + rev = version; + sha256 = "0snljpvbcgikhz610c325dgvayi0k512p3bglck9vvi90wsqx7l1"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ - alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 + alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf + qtbase qttools qtxmlpatterns + ]; + + cmakeFlags = [ + "-DWANT_DEBUG=OFF" ]; meta = with stdenv.lib; { @@ -21,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://www.hydrogen-music.org"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu orivej ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/hydrogen/unstable.nix b/third_party/nixpkgs/pkgs/applications/audio/hydrogen/unstable.nix deleted file mode 100644 index 2f220f8d31..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/hydrogen/unstable.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook -, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf -, qtbase, qttools, qtxmlpatterns -}: - -stdenv.mkDerivation rec { - pname = "hydrogen"; - version = "1.0.0-beta2"; - - src = fetchFromGitHub { - owner = "hydrogen-music"; - repo = pname; - rev = version; - sha256 = "1s3jrdyjpm92flw9mkkxchnj0wz8nn1y1kifii8ws252iiqjya4a"; - }; - - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; - buildInputs = [ - alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf - qtbase qttools qtxmlpatterns - ]; - - cmakeFlags = [ - "-DWANT_DEBUG=OFF" - ]; - - meta = with stdenv.lib; { - description = "Advanced drum machine"; - homepage = "http://www.hydrogen-music.org"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu orivej ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/jackmix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jackmix/default.nix index ad01a3ff76..405217675a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jackmix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2 }: +{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2, alsaLib }: stdenv.mkDerivation { name = "jackmix-0.5.2"; @@ -14,6 +14,7 @@ stdenv.mkDerivation { qt4 lash jack + alsaLib ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix index b8763f07b4..7a5887d4f9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.5.9"; + version = "3.5.10"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0h2m1sahi8cg15k6wa9m2d38va2cs3nvi0q8rpr9vak8g8d3p460"; + sha256 = "0bw2v40csjmlkvkhr3dh0g1a7mfqrs1xkqjsii61yfzy2ckbsi82"; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix index 256f5766c4..f229e15871 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix @@ -5,8 +5,10 @@ , gtk3 , wrapGAppsHook , alsaLib +, libjack2 , libpulseaudio , fftw +, jackSupport ? true }: stdenv.mkDerivation rec { @@ -29,11 +31,9 @@ stdenv.mkDerivation rec { alsaLib libpulseaudio fftw - ]; + ] ++ stdenv.lib.optional jackSupport libjack2; - configureFlags = [ - "--disable-jack" - ]; + configureFlags = stdenv.lib.optional (!jackSupport) "--disable-jack"; meta = { description = "Not a Guitar-Only tuner"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch new file mode 100644 index 0000000000..3cabd2a2c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch @@ -0,0 +1,52 @@ +From 2e1e9b3ffce9d1069fca0b27b8011f85c7547c3b Mon Sep 17 00:00:00 2001 +From: Francesco Gazzetta +Date: Wed, 19 Aug 2020 15:06:19 +0200 +Subject: [PATCH 1/2] Remove coherency checks >:) + +As far as I can see, they are just to make sure that the types can fit +in the word length, but this check was written when 64 bits weren't a +possibility and didn't take that into account, +so although the types do fit, the checks fail. +Indeed, the program seems to work well on 64 bits. +More info here: +https://github.com/Mdashdotdashn/LittleGPTracker/issues/4 +--- + sources/Externals/Soundfont/DATATYPE.H | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/sources/Externals/Soundfont/DATATYPE.H b/sources/Externals/Soundfont/DATATYPE.H +index 762a724..f6b031f 100644 +--- a/sources/Externals/Soundfont/DATATYPE.H ++++ b/sources/Externals/Soundfont/DATATYPE.H +@@ -123,28 +123,6 @@ typedef short SHORT; /* 16 bit signed value was: INT */ + ********************************************************************/ + typedef unsigned short EMUSTAT; + +-/******************************************************************** +-* Compare values with SoundFont Enabler limits. Fail compile +-* if discrepency. If compile fails due to one of these errors, then +-* the SoundFont enabler will not work with your system or the state of your +-* development environment. +-********************************************************************/ +-#if (SCHAR_MAX != CHAR_MAXVAL) || (UCHAR_MAX != BYTE_MAXVAL) +- #error : char is out of range! +-#endif +- +-#if (SHRT_MAX != SHRT_MAXVAL) +- #error : short is out of range! +-#endif +- +-#if (LONG_MAX != LONG_MAXVAL) +- #error : long is out of range! +-#endif +- +-#if (ULONG_MAX != DWORD_MAXVAL) +- #error : unsigned long is out of range! +-#endif +- + #ifdef __BYTE_COHERENT + + /******************************************************************** +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch new file mode 100644 index 0000000000..3e1c822be2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch @@ -0,0 +1,27 @@ +From c3865405ca707e3284a81709577d85ce2b3db72c Mon Sep 17 00:00:00 2001 +From: Francesco Gazzetta +Date: Wed, 19 Aug 2020 15:06:58 +0200 +Subject: [PATCH 2/2] Set the initial directory to the current directory + +otherwise the user has to navigate from the nix store, which makes the program +crash due to its size +--- + sources/Adapters/DEB/System/DEBSystem.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sources/Adapters/DEB/System/DEBSystem.cpp b/sources/Adapters/DEB/System/DEBSystem.cpp +index 6e86693..65d2cdd 100644 +--- a/sources/Adapters/DEB/System/DEBSystem.cpp ++++ b/sources/Adapters/DEB/System/DEBSystem.cpp +@@ -54,7 +54,7 @@ void DEBSystem::Boot(int argc,char **argv) { + } + Path::SetAlias("bin",dirname(buff)) ; + +- Path::SetAlias("root","bin:..") ; ++ Path::SetAlias("root",".") ; + + #ifdef _DEBUG + Trace::GetInstance()->SetLogger(*(new StdOutLogger())); +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix new file mode 100644 index 0000000000..91d7096879 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix @@ -0,0 +1,72 @@ +{ stdenv +, fetchFromGitHub +, SDL +, jack2 +, Foundation +}: + +stdenv.mkDerivation rec { + pname = "littlegptracker"; + version = "unstable-2019-04-14"; + + src = fetchFromGitHub { + owner = "Mdashdotdashn"; + repo = "littlegptracker"; + rev = "0ed729b46739e3df5e111c6fa4d548fde2d3b891"; + sha256 = "1pc6lg2qp6xh7ahs5d5pb63ms4h2dz7ryp3c7mci4g37gbwbsj5b"; + }; + + buildInputs = [ + SDL + ] + ++ stdenv.lib.optional stdenv.isDarwin Foundation + ++ stdenv.lib.optional stdenv.isLinux jack2; + + patches = [ + # Remove outdated (pre-64bit) checks that would fail on modern platforms + # (see description in patch file) + ./0001-Remove-coherency-checks.patch + # Set starting directory to cwd, default is in /nix/store and causes a crash + # (see description in patch file) + ./0002-Set-the-initial-directory-to-the-current-directory.patch + ]; + + preBuild = "cd projects"; + + makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ] + ++ stdenv.lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; + + NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++ + stdenv.lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + + NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "-framework Foundation"; + + installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; + in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; + + meta = with stdenv.lib; { + description = "A music tracker similar to lsdj optimised to run on portable game consoles"; + longDescription = '' + LittleGPTracker (a.k.a 'The piggy', 'lgpt') is a music tracker optimised + to run on portable game consoles. It is currently running on Game Park's + GP2x & Caanoo, PSP, Dingoo, Windows, Mac OSX (intel/ppc) & Linux (Debian). + + It implements the user interface of littlesounddj, a very famous tracker + for the Gameboy platform that has been tried and tested by many users over + the years, leading to a little complex but yet extremely efficent way of + working. + + Piggy currently supports 8 monophonic 16Bit/44.1Khz stereo sample playback + channels. Additionally, the program can drive MIDI instruments (with the + gp32 and gp2x a custom MIDI interface is required). + ''; + homepage = "http://www.littlegptracker.com/"; + downloadPage = "http://www.littlegptracker.com/download.php"; + license = licenses.bsd3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821 + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/lv2-cpp-tools/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lv2-cpp-tools/default.nix new file mode 100644 index 0000000000..d98135fb01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/lv2-cpp-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }: + +stdenv.mkDerivation rec { + pname = "lv2-cpp-tools"; + version = "1.0.5"; + + src = fetchzip { + url = "http://deb.debian.org/debian/pool/main/l/lv2-c++-tools/lv2-c++-tools_${version}.orig.tar.bz2"; + sha256 = "039bq7d7s2bhfcnlsfq0mqxr9a9iqwg5bwcpxfi24c6yl6krydsi"; + }; + + preConfigure = '' + sed -r 's,/bin/bash,${stdenv.shell},g' -i ./configure + sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template + ''; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 gtkmm2 boost ]; + + meta = with stdenv.lib; { + homepage = "http://ll-plugins.nongnu.org/hacking.html"; + description = "Tools and libraries that may come in handy when writing LV2 plugins in C++"; + license = licenses.gpl3; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix index a3e33471ce..6229cb3a80 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix @@ -1,7 +1,8 @@ { stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , cairo +, fluidsynth , libX11 , libjack2 , liblo @@ -11,20 +12,18 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.3"; + version = "1.5"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "1wa3f9c4l239mpxa7nxx8hajy4icn40vpvaxq5l1qzskl74w072d"; + sha256 = "1l74ckqqrccgsdy430pfsbv4fbzny7zivx399bi2jk1lv06p4h9a"; fetchSubmodules = true; }; - patches = [ ./fix-build.patch ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo libX11 libjack2 liblo libsigcxx libsmf ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo fluidsynth libX11 libjack2 liblo libsigcxx libsmf ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mamba/fix-build.patch b/third_party/nixpkgs/pkgs/applications/audio/mamba/fix-build.patch deleted file mode 100644 index ed36696367..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/mamba/fix-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libxputty/Build/Makefile -+++ b/libxputty/Build/Makefile -@@ -20,1 +20,1 @@ -- LDFLAGS += -fPIC `pkg-config --static --cflags --libs cairo x11` -lm -+ LDFLAGS += -fPIC `pkg-config --cflags --libs cairo x11` -lm ---- a/src/Makefile -+++ b/src/Makefile -@@ -84,1 +83,1 @@ ifneq ("$(wildcard ./$(BUILD_DIR))","") -- update-desktop-database -+ update-desktop-database || true diff --git a/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix new file mode 100644 index 0000000000..c66771be1c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, glfw, makeWrapper, + libXrandr, libXinerama, libXcursor, gtk3, ffmpeg-full, ...}: + +stdenv.mkDerivation rec { + pname = "MIDIVisualizer"; + version = "5.1"; + + src = fetchFromGitHub { + owner = "kosua20"; + repo = pname; + rev = "v${version}"; + sha256 = "1fjlfa0qjpnjxl3bx5cq3dkswv9wihxmgfpkjijqp7kvf3q127rq"; + }; + + nativeBuildInputs = [ cmake pkg-config makeWrapper]; + + buildInputs = [ + libX11 + glfw + libXrandr + libXinerama + libXcursor + gtk3 + ffmpeg-full + ]; + + installPhase = '' + mkdir -p $out/bin + cp MIDIVisualizer $out/bin + + wrapProgram $out/bin/MIDIVisualizer \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + ''; + + meta = with stdenv.lib; { + description = "A small MIDI visualizer tool, using OpenGL"; + homepage = "https://github.com/kosua20/MIDIVisualizer"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.ericdallo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mooSpace/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mooSpace/default.nix new file mode 100644 index 0000000000..f6958c5e97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mooSpace/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + pname = "mooSpace"; + version = "unstable-2020-06-10"; + + src = fetchFromGitHub { + owner = "modularev"; + repo = pname; + rev = "e5440407ea6ef9f7fcca838383b2b9a388c22874"; + sha256 = "10vsbddf6d7i06040850v8xkmqh3bqawczs29kfgakair809wqxl"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + patchPhase = "mv ${pname}_faust.dsp ${pname}.dsp"; + + buildPhase = '' + faust2jaqt -time -vec -t 0 ${pname}.dsp + faust2lv2 -time -vec -t 0 -gui ${pname}.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp ${pname} $out/bin/ + mkdir -p $out/lib/lv2 + cp -r ${pname}.lv2 $out/lib/lv2 + ''; + + meta = { + description = "Variable reverb audio effect, jack and lv2"; + homepage = "https://github.com/modularev/mooSpace"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 796812a9bd..467ba6fe3f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ configobj requests - tornado_4 + tornado ]); # no tests implemented diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix index ae65d9b2f6..28216020b7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado_4 requests setuptools + gst-python pygobject3 pykka tornado requests setuptools ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix index 5260cb85a2..f3203566a1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix @@ -1,21 +1,43 @@ { stdenv -, fetchurl, alsaLib +, fetchurl +, makeWrapper + +, alsaLib +, perl }: stdenv.mkDerivation rec { - name = "mpg123-1.26.2"; + name = "mpg123-1.26.3"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "1wrgds46wj6xsnqa6bi8kkh3wd29i2nxclbps34w5kjglrzbzxq0"; + sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h"; }; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + outputs = [ "out" "conplay" ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; configureFlags = stdenv.lib.optional (stdenv.hostPlatform ? mpg123) "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}"; + postInstall = '' + mkdir -p $conplay/bin + mv scripts/conplay $conplay/bin/ + ''; + + preFixup = '' + patchShebangs $conplay/bin/conplay + ''; + + postFixup = '' + wrapProgram $conplay/bin/conplay \ + --prefix PATH : $out/bin + ''; + meta = { description = "Fast console MPEG Audio Player and decoder library"; homepage = "http://mpg123.org"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix index b1e8822cdc..7ef2b400b7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }: +{ stdenv, fetchFromGitHub, cmake, eigen, libav }: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ]; + buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ]; fixupPhase = if stdenv.isDarwin then '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index aea50d71d7..ca61aa0cd6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.38"; + version = "0.39"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1kidpd1xrfax3v31q93r9g9b7jd841476q47wgd94h1a86b70gs9"; + sha256 = "08xrcinfm1a7hjycf8la7gnsxbp3six70ks987dr7j42kd42irfq"; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index 90dc4e6db3..2fcbf82107 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "1yx0fc24bgh1x6fdwznc1hqvjq0j7i0zvws3bsyijzs7q48jm0z7"; + sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2"; }; - cargoSha256 = "0bh2shg80xbs2cw10dabrdxkvhf2csk5h9wmmk5z87q6w25paz1f"; + cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix deleted file mode 100644 index c4cc291d02..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, lib, fontconfig, zlib, libGL, glib, pango -, gdk-pixbuf, freetype, atk, cairo, libsForQt5, xorg -, sqlite, taglib, nss, nspr, cups, dbus, alsaLib -, libpulseaudio, deepin, qt5, harfbuzz, p11-kit -, libgpgerror, libudev0-shim, makeWrapper, dpkg, fetchurl }: -let - rpath = lib.makeLibraryPath [ - fontconfig.lib - zlib - stdenv.cc.cc.lib - libGL - glib - pango - gdk-pixbuf - freetype - atk - cairo - libsForQt5.vlc - sqlite - taglib - nss - nspr - cups.lib - dbus.lib - alsaLib - libpulseaudio - xorg.libX11 - xorg.libXext - xorg.libXtst - xorg.libXdamage - xorg.libXScrnSaver - xorg.libxcb - xorg.libXi - deepin.qcef - qt5.qtwebchannel - qt5.qtbase - qt5.qtx11extras - qt5.qtdeclarative - harfbuzz - p11-kit - libgpgerror - ]; - - runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; - -in stdenv.mkDerivation rec { - pname = "netease-cloud-music"; - version = "1.2.0"; - src = fetchurl { - url = "http://d1.music.126.net/dmusic/netease-cloud-music_1.2.0_amd64_deepin_stable_20190424.deb"; - sha256 = "0hg8jqim77vd0fmk8gfbz2fmlj99byxcm9jn70xf7vk1sy7wp6h1"; - curlOpts = "-A 'Mozilla/5.0'"; - }; - unpackCmd = "${dpkg}/bin/dpkg -x $src ."; - sourceRoot = "."; - - nativeBuildInputs = [ qt5.wrapQtAppsHook makeWrapper ]; - - installPhase = '' - mkdir -p $out - cp -r usr/* $out - ''; - - preFixup = '' - local exefile="$out/bin/netease-cloud-music" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exefile" - patchelf --set-rpath "$out/libs:$(patchelf --print-rpath "$exefile"):${rpath}" "$exefile" - - wrapProgram $out/bin/netease-cloud-music \ - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QCEF_INSTALL_PATH "${deepin.qcef}/lib/qcef" - ''; - - meta = { - description = "Client for Netease Cloud Music service"; - homepage = "https://music.163.com"; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.mlatus ]; - license = stdenv.lib.licenses.unfreeRedistributable; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix index 15d38a1eea..0646407582 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.1"; + version = "0.5.2"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1vpalfsrkbx4vyrh1qy564lr91jwdxlbjivv5gzf8zcywxasf0xa"; + sha256 = "1cwpc4j90dpxa2siia68rg9qwwm2xk6bhxnslfjj364507jy6s4l"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/parlatype/default.nix b/third_party/nixpkgs/pkgs/applications/audio/parlatype/default.nix index e4728b9b9c..b9babddb80 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/parlatype/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/parlatype/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "026i19vkdq35rldbjp1wglamr22a1330iv736mmgbd8fs7vz22nx"; + sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix index 276fe75dd9..9274044090 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.4.1"; + version = "2.4.4"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0s4jmcg1n6ayxf7x0amq67rgn6y127h98s2k4fcna6n9477krrwf"; + sha256 = "0iw2v37j70881v0a2rjp2miq97nscq04x1ysk1dqmi1b9hi0y17q"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix new file mode 100644 index 0000000000..1dc9c70af8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsaLib, libjack2 }: + +stdenv.mkDerivation rec { + pname = "picoloop"; + version = "0.77e"; + + src = fetchFromGitHub { + repo = pname; + owner = "yoyz"; + rev = "${pname}-${version}"; + sha256 = "0i8j8rgyha3ara6d4iis3wcimszf2csxdwrm5yq0wyhg74g7cvjd"; + }; + + buildInputs = [ + libpulseaudio + SDL2 + SDL2.dev + SDL2_image + SDL2_ttf + alsaLib + libjack2 + ]; + + sourceRoot = "source/picoloop"; + + makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; + + NIX_CFLAGS_COMPILE = [ "-I${SDL2.dev}/include/SDL2" ]; + + hardeningDisable = [ "format" ]; + + patchPhase = '' + substituteInPlace SDL_GUI.cpp \ + --replace "\"font.ttf\"" "\"$out/share/font.ttf\"" \ + --replace "\"font.bmp\"" "\"$out/share/font.bmp\"" + ''; + + installPhase = '' + mkdir -p $out/{bin,share} + cp PatternPlayer_debian_RtAudio_sdl20 $out/bin/picoloop + cp {font.*,LICENSE} $out/share + ''; + + meta = with stdenv.lib; { + description = "Picoloop is a synth and a stepsequencer (a clone of the famous nanoloop)."; + homepage = "https://github.com/yoyz/picoloop"; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index caa703f59c..36462aa28b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.1.1"; + version = "3.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - sha256 = "11hgcysa1x9yqvha6ri4vl1zk8gf8vhcpnh3j38wg9ncd7nz5k2v"; + sha256 = "R1BhobnwoU7oJ7bNes8kH2neXqHlMPbRCNjcHyzUPqo="; name="${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/puddletag/default.nix b/third_party/nixpkgs/pkgs/applications/audio/puddletag/default.nix index a0813fa0c8..47ea078c4b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/puddletag/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/puddletag/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchFromGitHub, python2Packages, chromaprint }: +{ stdenv, fetchFromGitHub, python3Packages, chromaprint }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "puddletag"; - version = "1.2.0"; + version = "2.0.1"; src = fetchFromGitHub { - owner = "keithgg"; - repo = "puddletag"; - rev = "v${version}"; - sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; + owner = "keithgg"; + repo = "puddletag"; + rev = version; + sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ="; }; - setSourceRoot = '' - sourceRoot=$(echo */source) - ''; + sourceRoot = "source/source"; - disabled = python2Packages.isPy3k; # work to support python 3 has not begun - - propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [ + propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ configobj mutagen pyparsing - pyqt4 + pyqt5 ]); doCheck = false; # there are no tests + dontStrip = true; # we are not generating any binaries meta = with stdenv.lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; - homepage = "https://docs.puddletag.net"; - license = licenses.gpl3; + homepage = "https://docs.puddletag.net"; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix index 75990d593d..c0986880c0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -4,7 +4,7 @@ , faacSupport ? false, faac ? null , flacSupport ? true, flac ? null , soxSupport ? true, sox ? null -, vorbisSupport ? true, vorbisTools ? null +, vorbisSupport ? true, vorbis-tools ? null }: assert mp3Support -> lame != null; @@ -12,7 +12,7 @@ assert opusSupport -> opusTools != null; assert faacSupport -> faac != null; assert flacSupport -> flac != null; assert soxSupport -> sox != null; -assert vorbisSupport -> vorbisTools != null; +assert vorbisSupport -> vorbis-tools != null; let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; @@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication { ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional flacSupport flac ++ stdenv.lib.optional soxSupport sox - ++ stdenv.lib.optional vorbisSupport vorbisTools; + ++ stdenv.lib.optional vorbisSupport vorbis-tools; # upstream has no tests checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index a3ee0e23ec..a7b97e9daa 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -44,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "9dQNYWBx8iAifRTZr2FRlYv4keZt5Cfahwi/w01duFg="; + sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix index 87666940c1..8cb28dcfd5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: mkDerivation rec { - version = "0.6.2"; + version = "0.6.3"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; - sha256 = "1rjhdyp0wzhlqr4cn80rh1qhby998cpqv81j1bbb9hfsiq77viqy"; + sha256 = "0zbb4jlx56qvcqyhx34mbagkqf3wbxgj84hk0ppf5cmcrxv67d4x"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 5da8f4cd46..af59bb56eb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "qsynth"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - sha256 = "0cp6vrqrj37rv3a7qfvqrg64j7zwpfj60y5b83mlkzvmg1sgjnlv"; + sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv"; }; nativeBuildInputs = [ autoconf pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix index f2ee5eac70..2975e6464e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1gh268gdpj7nw19xfh7k2l3aban4yrs1lmx33qswrnngs2izj1fk"; + sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index 9de70d83ee..e15addd78b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.10"; + version = "6.12c"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p"; + sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix index 1cbd5b3afa..0ae65cb8c3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.2.1"; + version = "3.2.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" ]; - sha256 = "0dhcidgnjzd4abw0xw1waj9mazp03nbvjcr2xx09l8gnfrkvny46"; + sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl"; } else releasePath diff --git a/third_party/nixpkgs/pkgs/applications/audio/seq66/default.nix b/third_party/nixpkgs/pkgs/applications/audio/seq66/default.nix new file mode 100644 index 0000000000..6b3a3939b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/seq66/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which +, alsaLib, libjack2, liblo, qtbase +}: + +stdenv.mkDerivation rec { + pname = "seq66"; + version = "0.90.5"; + + src = fetchFromGitHub { + owner = "ahlstromcj"; + repo = pname; + rev = version; + sha256 = "1jvra1wzlycfpvffnqidk264zw6fyl4fsghkw5256ldk22aalmq9"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config qttools which ]; + + buildInputs = [ alsaLib libjack2 liblo qtbase ]; + + postPatch = '' + for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do + substituteInPlace "$d/Makefile.am" --replace '$(git_info)' '${version}' + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/ahlstromcj/seq66"; + description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix index 9bc8fcb669..76ea4efeac 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-20.2"; + name = "snd-20.3"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0ip4sfyxqlbghlggipmvvqjqs1a7qas0zcmzw8d1nwg6krjkfj0r"; + sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix index 68eefadf41..cf3f173a09 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook -, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }: +{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext +, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -16,26 +16,38 @@ in buildPythonApplication rec { disabled = !isPy3k; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + ]; + buildInputs = [ - intltool wrapGAppsHook + glib gnome3.adwaita-icon-theme gsettings-desktop-schemas + gtk3 + gdk-pixbuf ]; + # The optional tagpy dependency (for editing metadata) is not yet + # included because it's difficult to build. + pythonPath = [ + dbus-python + mpd2 + pygobject3 + setuptools + ]; + + # Otherwise the setup hook for gobject-introspection is not run: + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + postPatch = '' # Remove "Local MPD" tab which is not suitable for NixOS. sed -i '/localmpd/d' sonata/consts.py ''; - propagatedBuildInputs = [ - gobject-introspection gtk3 pygobject3 setuptools - ]; - - # The optional tagpy dependency (for editing metadata) is not yet - # included because it's difficult to build. - pythonPath = [ dbus-python pygobject3 mpd2 ]; - meta = { description = "An elegant client for the Music Player Daemon"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix index b837eb07cf..526dd24569 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sonic-lineup"; - version = "1.0.1"; + version = "1.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2610/${pname}-${version}.tar.gz"; - sha256 = "0w4v5zr81d8fh97y820r0vj1rrbl0kwgvhfkdnyl4hiabs97b1i7"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2765/${pname}-${version}.tar.gz"; + sha256 = "0k45k9fawcm4s5yy05x00pgww7j8m7k2cxcc7g0fn9vqy7vcbq9h"; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix index e8b6a4d431..2593bf38d1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,8 +1,8 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo -, libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland +, libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate +, libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland , rubberband, serd, sord, vamp-plugin-sdk, fftwFloat , capnproto, liboggz, libfishsound, libid3tag, opusfile , wrapQtAppsHook @@ -10,13 +10,14 @@ stdenv.mkDerivation rec { pname = "sonic-visualiser"; - version = "4.0.1"; + version = "4.2"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz"; - sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2755/${pname}-${version}.tar.gz"; + sha256 = "1wsvranhvdl21ksbinbgb55qvs3g2d4i57ssj1vx2aln6m01ms9q"; }; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland @@ -27,7 +28,6 @@ stdenv.mkDerivation rec { # portaudio libpulseaudio libmad - libogg # ? libfishsound liblo libX11 @@ -37,15 +37,13 @@ stdenv.mkDerivation rec { opusfile ]; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; - - enableParallelBuilding = true; - # comment out the tests preConfigure = '' sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "View and analyse contents of music audio files"; homepage = "https://www.sonicvisualiser.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix index df5806b50b..3e133a0caa 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix @@ -1,6 +1,6 @@ # currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery { - mkDerivation, fetchFromGitHub, lib, makeWrapper, + mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper, cmake, extra-cmake-modules, pkgconfig, libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, qtbase, phonon, @@ -53,6 +53,15 @@ mkDerivation rec { rev = "v" + version; sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l"; }; + patches = [ + # already merged into master, so it can go during the next release + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch"; + sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w="; + name = "soundkonverter_taglib.patch"; + stripLen = 1; + }) + ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix index 245d96dee0..13edd8ea38 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix @@ -64,7 +64,7 @@ let in stdenv.mkDerivation { - pname = "spotify"; + pname = "spotify-unwrapped"; inherit version; # fetch from snapcraft instead of the debian repository most repos fetch from. diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/wrapper.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/wrapper.nix new file mode 100644 index 0000000000..418ef3cbc0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/wrapper.nix @@ -0,0 +1,31 @@ +{ symlinkJoin +, lib +, spotify-unwrapped +, makeWrapper + + # High-DPI support: Spotify's --force-device-scale-factor argument; not added + # if `null`, otherwise, should be a number. +, deviceScaleFactor ? null +}: + +symlinkJoin { + name = "spotify-${spotify-unwrapped.version}"; + + paths = [ spotify-unwrapped.out ]; + + nativeBuildInputs = [ makeWrapper ]; + preferLocalBuild = true; + passthru.unwrapped = spotify-unwrapped; + postBuild = '' + wrapProgram $out/bin/spotify \ + ${lib.optionalString (deviceScaleFactor != null) '' + --add-flags ${lib.escapeShellArg "--force-device-scale-factor=${ + builtins.toString deviceScaleFactor + }"} + ''} + ''; + + meta = spotify-unwrapped.meta // { + priority = (spotify-unwrapped.meta.priority or 0) - 1; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index 515a653d6b..7e3c1b9164 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -9,11 +9,11 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.0"; + version = "0.11.7"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1rnjc8pjfaq67mq10gy939g77azc80lxf77s9nsaxds4q5j1yrl2"; + sha256 = "1x6b02gw46gp6qcgv67j7k3gr1dpfczbyma6dxanag8pnpqrj8qi"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix index 48ad9bc971..2cd48806f7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sunvox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "15pyc3dk4dqlivgzki8sv7xpwg3bbn5xv9338g16a0dbn7s3kich"; + sha256 = "04f7psm0lvc09nw7d2wp0sncf37bym2v7hhxp4v8c8gdgayj7k8m"; }; buildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix b/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix new file mode 100644 index 0000000000..1614bbfae6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, cmake, git, pkg-config, python3 +, cairo, libsndfile, libxcb, libxkbcommon, xcbutil, xcbutilcursor, xcbutilkeysyms, zenity +}: + +stdenv.mkDerivation rec { + pname = "surge"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = pname; + rev = "release_${version}"; + sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s"; + leaveDotGit = true; # for SURGE_VERSION + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake git pkg-config python3 ]; + buildInputs = [ cairo libsndfile libxcb libxkbcommon xcbutil xcbutilcursor xcbutilkeysyms zenity ]; + + postPatch = '' + substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge" + substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace '"zenity' '"${zenity}/bin/zenity' + substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity' + substituteInPlace vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp --replace /usr/bin/zenity ${zenity}/bin/zenity + ''; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/share/surge + cp -r surge_products/Surge.lv2 $out/lib/lv2/ + cp -r surge_products/Surge.vst3 $out/lib/vst3/ + cp -r ../resources/data/* $out/share/surge/ + ''; + + doInstallCheck = true; + installCheckPhase = '' + cd .. + build/surge-headless + ''; + + meta = with stdenv.lib; { + description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; + homepage = "https://surge-synthesizer.github.io"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon orivej ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/synthv1/default.nix b/third_party/nixpkgs/pkgs/applications/audio/synthv1/default.nix index c7e936d28e..74f68283fd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/synthv1/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "synthv1"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40"; + sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix"; }; buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/talentedhack/default.nix b/third_party/nixpkgs/pkgs/applications/audio/talentedhack/default.nix new file mode 100644 index 0000000000..b30cf59f7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/talentedhack/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "talentedhack"; + version = "1.86"; + + src = fetchFromGitHub { + owner = "jeremysalwen"; + repo = "talentedhack"; + rev = "v${version}"; + sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 fftwFloat ]; + + # To avoid name clashes, plugins should be compiled with symbols hidden, except for `lv2_descriptor`: + preConfigure = '' + sed -r 's/^CFLAGS.*$/\0 -fvisibility=hidden/' -i Makefile + ''; + + installPhase = '' + d=$out/lib/lv2/talentedhack.lv2 + mkdir -p $d + cp *.so *.ttl $d + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jeremysalwen/TalentedHack"; + description = "LV2 port of Autotalent pitch correction plugin"; + license = licenses.gpl3; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix deleted file mode 100644 index d9469fa4b7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf -, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }: - -stdenv.mkDerivation rec { - pname = "transcribe"; - version = "8.72"; - - src = if stdenv.hostPlatform.system == "i686-linux" then - fetchzip { - url = "https://www.seventhstring.com/xscribe/downlinux32/xscsetup.tar.gz"; - sha256 = "1h5l7ry9c9awpxfnd29b0wm973ifrhj17xl5d2fdsclw2swsickb"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchzip { - url = "https://www.seventhstring.com/xscribe/downlinux64/xsc64setup.tar.gz"; - sha256 = "1rpd3ppnx5i5yrnfbjrx7h7dk48kwl99i9lnpa75ap7nxvbiznm0"; - } - else throw "Platform not supported"; - - nativeBuildInputs = [ wrapGAppsHook ]; - - buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly ]; - - dontPatchELF = true; - - libPath = with gst_all_1; stdenv.lib.makeLibraryPath [ - stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib - libX11 libSM libpng12 gstreamer gst-plugins-base zlib - ]; - - installPhase = '' - mkdir -p $out/bin $out/libexec $out/share/doc - cp transcribe $out/libexec - cp xschelp.htb readme_gtk.html $out/share/doc - cp -r gtkicons $out/share/icons - - ln -s $out/share/doc/xschelp.htb $out/libexec - - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - $out/libexec/transcribe - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" - --prefix LD_LIBRARY_PATH : "${libPath}" - ) - ''; - - postFixup = '' - ln -s $out/libexec/transcribe $out/bin/ - ''; - - meta = with stdenv.lib; { - description = "Software to help transcribe recorded music"; - longDescription = '' - The Transcribe! application is an assistant for people who want - to work out a piece of music from a recording, in order to write - it out, or play it themselves, or both. It doesn't do the - transcribing for you, but it is essentially a specialised player - program which is optimised for the purpose of transcription. It - has many transcription-specific features not found on - conventional music players. - ''; - homepage = "https://www.seventhstring.com/xscribe/"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ michalrus ]; - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/tunefish/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tunefish/default.nix new file mode 100644 index 0000000000..72802c4f87 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/tunefish/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pkg-config, python3 +, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk +}: + +stdenv.mkDerivation { + pname = "tunefish"; + version = "unstable-2020-08-13"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = "tunefish"; + rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed"; + fetchSubmodules = true; + sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh"; + }; + + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; + + postPatch = '' + patchShebangs src/tunefish4/generate-lv2-ttl.py + ''; + + makeFlags = [ + "-C" "src/tunefish4/Builds/LinuxMakefile" + "CONFIG=Release" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 + cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2 + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://tunefish-synth.com/"; + description = "Virtual analog synthesizer LV2 plugin"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix index 2aa09ec0be..18d8f7415b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix @@ -10,7 +10,7 @@ let pfft-source = fetchFromBitbucket { owner = "jpommier"; repo = "pffft"; - rev = "29e4f76ac53bef048938754f32231d7836401f79"; + rev = "74d7261be17cf659d5930d4830609406bd7553e3"; sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1"; }; nanovg-source = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix b/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix new file mode 100644 index 0000000000..24e112aff2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchzip +, libX11 +, libXi +, libGL +, alsaLib +, SDL2 +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "virtual-ans"; + version = "3.0.2c"; + + src = fetchzip { + url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip"; + sha256 = "03r1v3l7rd59dakr7ndvgsqchv00ppkvi6sslgf1ng07r3rsvb1n"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + libX11 + libXi + libGL + alsaLib + SDL2 + ]; + + installPhase = '' + mkdir -p $out + cp -R ./* $out/ + + # Remove all executables except for current architecture + ls -1d $out/START* | grep -v ${startScript} | xargs rm -rf + ls -1d $out/bin/pixilang_linux* | grep -v ${linuxExecutable} | xargs rm -rf + + # Start script performs relative search for resources, so it cannot be moved + # to bin directory + ln -s $out/${startScript} $out/bin/virtual-ans + ''; + + startScript = if stdenv.isx86_32 then "START_LINUX_X86" + else if stdenv.isx86_64 then "START_LINUX_X86_64" + #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin + else abort "Unsupported platform: ${stdenv.platform.kernelArch}."; + + linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86" + else if stdenv.isx86_64 then "pixilang_linux_x86_64" + else ""; + + meta = with stdenv.lib; { + description = "Photoelectronic microtonal/spectral musical instrument"; + longDescription = '' + Virtual ANS is a software simulator of the unique Russian synthesizer ANS + - photoelectronic musical instrument created by Evgeny Murzin from 1938 to + 1958. The ANS made it possible to draw music in the form of a spectrogram + (sonogram), without live instruments and performers. It was used by + Stanislav Kreichi, Alfred Schnittke, Edward Artemiev and other Soviet + composers in their experimental works. You can also hear the sound of the + ANS in Andrei Tarkovsky's movies Solaris, The Mirror, Stalker. + + The simulator extends the capabilities of the original instrument. Now + it's a full-featured graphics editor where you can convert sound into an + image, load and play pictures, draw microtonal/spectral music and create + some unusual deep atmospheric sounds. This app is for everyone who loves + experiments and is looking for something new. + + Key features: + + + unlimited number of pure tone generators; + + powerful sonogram editor - you can draw the spectrum and play it at the same time; + + any sound (from a WAV file or a Microphone/Line-in) can be converted to image (sonogram) and vice versa; + + support for MIDI devices; + + polyphonic synth mode with MIDI mapping; + + supported file formats: WAV, AIFF, PNG, JPEG, GIF; + + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA. + ''; + homepage = "https://warmplace.ru/soft/ans/"; + license = licenses.free; + # I cannot test the Darwin version, so I'll leave it disabled + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ jacg ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/vocproc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vocproc/default.nix new file mode 100644 index 0000000000..ddaa5b790e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/vocproc/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: + +stdenv.mkDerivation rec { + pname = "vocproc"; + version = "0.2.1"; + + src = fetchzip { + url = "https://hyperglitch.com/files/vocproc/${pname}-${version}.default.tar.gz"; + sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ]; + + makeFlags = [ + "INSTALL_DIR=$(out)/lib/lv2" + ]; + + meta = with stdenv.lib; { + homepage = "https://hyperglitch.com/dev/VocProc"; + description = "An LV2 plugin for pitch shifting (with or without formant correction), vocoding, automatic pitch correction and harmonizing of singing voice (harmonizer)"; + license = licenses.gpl2; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix index d283dc7107..ad4fc9728b 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix @@ -3,44 +3,32 @@ , substituteAll , meson , ninja -, pkgconfig +, pkg-config , vala , gettext -, gnome3 -, libnotify , itstool , glib , gtk3 -, libxml2 -, gnome-online-accounts , coreutils , libsoup , libsecret -, pcre -, libxkbcommon +, libhandy , wrapGAppsHook -, libpthreadstubs -, libXdmcp -, epoxy -, at-spi2-core -, dbus , libgpgerror , json-glib -, appstream-glib -, desktop-file-utils , duplicity }: stdenv.mkDerivation rec { pname = "deja-dup"; - version = "40.6"; + version = "42.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "1d4g34g660wv42a4k2511bxrh90z0vdl3v7ahg0m45phijg9n2n1"; + sha256 = "c4E6mHYVb8TWVTVlmHidcLa9ebHJ27iStsNNLJhY8vY="; }; patches = [ @@ -48,54 +36,31 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit coreutils; }) - - # Hardcode GSettings path for Nautilus extension to avoid crashes from missing schemas - ./hardcode-gsettings.patch ]; - postPatch = '' - # substitute variable from hardcode-gsettings.patch - substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH "${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" - ''; - nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gettext itstool - appstream-glib - desktop-file-utils - libxml2 wrapGAppsHook ]; buildInputs = [ - libnotify libsoup glib gtk3 libsecret - pcre - libxkbcommon - libpthreadstubs - libXdmcp - epoxy - gnome3.nautilus - at-spi2-core - dbus - gnome-online-accounts # GOA not used any more, only for transferring legacy keys + libhandy libgpgerror json-glib ]; - # TODO: hard code the path - # https://gitlab.gnome.org/World/deja-dup/merge_requests/32 - propagatedUserEnvPkgs = [ duplicity ]; - - # install nautilus plug-in to correct path - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + mesonFlags = [ + "-Dduplicity_command=${duplicity}/bin/duplicity" + ]; meta = with stdenv.lib; { description = "A simple backup tool"; @@ -106,7 +71,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://wiki.gnome.org/Apps/DejaDup"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar joncojonathan ]; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch deleted file mode 100644 index f74dbf7354..0000000000 --- a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/deja-dup/nautilus/NautilusExtension.c -+++ b/deja-dup/nautilus/NautilusExtension.c -@@ -313,7 +313,12 @@ - bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - -- settings = g_settings_new(APPLICATION_ID); -+ g_autoptr (GSettingsSchemaSource) schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default (), TRUE, NULL); -+ -+ g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, APPLICATION_ID, 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", diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix index f1c0b056c8..3c6a9587a6 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "vorta"; - version = "0.6.26"; + version = "0.7.1"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "189kzwdmissg9142cd7wvxa1rvc2y7lysgr7if99zc7ks59mv6dq"; + sha256 = "069fq5gv324l2ap3g6m6i12lhq1iqm27dsmaagyc3sva945j0gxw"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix index 420e267aa8..1596ed2d35 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.12"; + version = "0.21.13"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1mad3aqfwrxi06135nf8hv13d67nilmxpx4dw5vjcy1zi3lljj1j"; + sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix index f755efaa0e..fe39b955a2 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.7.0.0"; + version = "1.8.0.0"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; - rev = "bucash${version}"; - sha256 = "0lil6rivrj4cnr8a7n8zn9rp9f4h2nk88jjxc29m6dwqn5gk6f1i"; + rev = "BCHunlimited${version}"; + sha256 = "01qi15li5x9fvhsmvx7ai5fz6yzqqd3r9yv7081h75jn0nxai49q"; }; nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix index 65feac9565..09dc59a051 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { homepage = "https://bitcoin.org/"; downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; changelog = "https://bitcoincore.org/en/releases/${version}/"; - maintainers = with maintainers; [ roconnor AndersonTorres ]; + maintainers = with maintainers; [ roconnor ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix new file mode 100644 index 0000000000..eec39e691a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, + dotnetPackages, dotnetCorePackages, writeScript, bash +}: + +let + deps = import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }; + dotnetSdk = dotnetCorePackages.sdk_3_1; +in + +stdenv.mkDerivation rec { + pname = "btcpayserver"; + version = "1.0.5.5"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "11h1nrmb7f44msbhhiz9ddqh5ss2kz6d8ysnvd070x3xj5krgnxz"; + }; + + nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget ]; + + # Due to a bug in btcpayserver, we can't just `dotnet publish` to create a binary. + # Build with `dotnet build` instead and add a custom `dotnet run` script. + buildPhase = '' + export HOME=$TMP/home + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + nuget sources Add -Name tmpsrc -Source $TMP/nuget + nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget + + dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj + dotnet build -c Release BTCPayServer/BTCPayServer.csproj + ''; + + runScript = '' + #!${bash}/bin/bash + DOTNET_CLI_TELEMETRY_OPTOUT=1 exec ${dotnetSdk}/bin/dotnet run --no-launch-profile --no-build \ + -c Release -p @@SHARE@@/BTCPayServer/BTCPayServer.csproj -- "$@" + ''; + + installPhase = '' + cd .. + share=$out/share/$pname + mkdir -p $share + mv -T source $share + install -D -m500 <(echo "$runScript" | sed "s|@@SHARE@@|$share|") $out/bin/$pname + ''; + + dontStrip = true; + + meta = with lib; { + description = "Self-hosted, open-source cryptocurrency payment processor"; + homepage = "https://btcpayserver.org"; + maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix new file mode 100644 index 0000000000..cb0641b8c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -0,0 +1,1937 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "AngleSharp"; + version = "0.9.11"; + sha256 = "17vf1bizskkxr8pf547lk2b48m12wv3si83gxk145i73bf9gi64a"; + }) + (fetchNuGet { + name = "AWSSDK.Core"; + version = "3.3.104.14"; + sha256 = "157694kb63z1szbsv861515fvjv7amrjrfmgbm3idpyw31afk650"; + }) + (fetchNuGet { + name = "AWSSDK.S3"; + version = "3.3.110.10"; + sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; + }) + (fetchNuGet { + name = "BTCPayServer.Hwi"; + version = "1.1.3"; + sha256 = "1c8hfnrjh2ad8qh75d63gsl170q8czf3j1hk8sv8fnbgnxdnkm7a"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.All"; + version = "1.2.3"; + sha256 = "1vx47rb505904pz30n5jzc9x42pcfln695l31q4dv5p4fbf10g4q"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Charge"; + version = "1.2.1"; + sha256 = "0iv9frbr6xfxif3pnfd7c87y8mv31nqkdrnhvnaswrx43nv6s272"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.CLightning"; + version = "1.2.0"; + sha256 = "0a47fz20ngcz90h2y01isi2h940jljcmnfy6wyknj029sii7i1zs"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Common"; + version = "1.2.0"; + sha256 = "17di8ndkw8z0ci0zk15mcrqpmganwkz9ys2snr2rqpw5mrlhpwa0"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Eclair"; + version = "1.2.0"; + sha256 = "0w7nwsr0n2hrqak023xa294palsk3r96wlgw2ks8d3p5kxm8kskp"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.LND"; + version = "1.2.1"; + sha256 = "0ql4qyvz0rms6ls46pi3bgak3r6hj2c5ivnzahiq6cb84pbl61cr"; + }) + (fetchNuGet { + name = "BTCPayServer.Lightning.Ptarmigan"; + version = "1.2.0"; + sha256 = "1yd6nhlssb9k08p5491knlwwjij9324ildir99sa9cp24rlq5nis"; + }) + (fetchNuGet { + name = "BuildBundlerMinifier"; + version = "3.2.435"; + sha256 = "0y1p226dbvs7q2ngm9w4mpkhfrhw2y122plv1yff7lx5m84ia02l"; + }) + (fetchNuGet { + name = "BundlerMinifier.Core"; + version = "3.2.435"; + sha256 = "17338x8ycr7hjzq16kr0ri30k19802hsn1sy259k3v694mxk59vd"; + }) + (fetchNuGet { + name = "BundlerMinifier.TagHelpers"; + version = "3.2.435"; + sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; + }) + (fetchNuGet { + name = "CsvHelper"; + version = "15.0.5"; + sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; + }) + (fetchNuGet { + name = "DBriize"; + version = "1.0.1.3"; + sha256 = "0rsm68hwq2ky8i6mv3ckdjkj4vjygnkgk3disva0skl3apk833dc"; + }) + (fetchNuGet { + name = "DigitalRuby.ExchangeSharp"; + version = "0.6.3"; + sha256 = "1vb7ahafcd3lcbiiz552aisilwm1yq3j600gkf1wik8vhvsk02fs"; + }) + (fetchNuGet { + name = "Google.Api.Gax.Rest"; + version = "2.5.0"; + sha256 = "1zkjl5zh6qwdz4qmnxnk5877pas638i2qi25znilhqqf3mrkp0rp"; + }) + (fetchNuGet { + name = "Google.Api.Gax"; + version = "2.5.0"; + sha256 = "0q6pi53px998i3gdndla8v0zqdpyi9gnsy9mdcfpkrg09vfbdsl9"; + }) + (fetchNuGet { + name = "Google.Apis.Auth"; + version = "1.35.1"; + sha256 = "1qdnd1nq9bfgyljmiww91pfi0iz1n29rz2dlizhxcijqya2ldha3"; + }) + (fetchNuGet { + name = "Google.Apis.Auth"; + version = "1.38.0"; + sha256 = "0x3bdwiyqjxw5df99bfasmsv09kb47wzisag938631cijl0g277y"; + }) + (fetchNuGet { + name = "Google.Apis.Core"; + version = "1.35.1"; + sha256 = "01dfw2kxknlc5pm7x1q88lv9j979509lkkgvlffjry5bawsxsja4"; + }) + (fetchNuGet { + name = "Google.Apis.Core"; + version = "1.38.0"; + sha256 = "012gslhnx65vqfyzjnqx4bqk9kb8bwbx966q2f9fdgrfcn26gj9j"; + }) + (fetchNuGet { + name = "Google.Apis.Storage.v1"; + version = "1.38.0.1470"; + sha256 = "0mfrz7fmpfbjvp4zfpjasmnfbgxgxrrjkf8xgp9p6h9g8qh2f2h2"; + }) + (fetchNuGet { + name = "Google.Apis"; + version = "1.35.1"; + sha256 = "1022l8m7v9f3rkjc9l11mkzwsbmqx9sk5f4aym035vn9hdr16d49"; + }) + (fetchNuGet { + name = "Google.Apis"; + version = "1.38.0"; + sha256 = "01j3d1lv106cqw9n0lwgclrxghy852fsibv6av4xr03ivrkm8g40"; + }) + (fetchNuGet { + name = "Google.Cloud.Storage.V1"; + version = "2.3.0"; + sha256 = "01jhrd6m6md8m28chzg2dkdfd4yris79j1xi7r1ydm1cfjhmlj64"; + }) + (fetchNuGet { + name = "HtmlSanitizer"; + version = "4.0.217"; + sha256 = "0szay9mf5mmrp1hx0yc175aaalv76qg0j515lfs133j1d95lj26d"; + }) + (fetchNuGet { + name = "Microsoft.AspNet.SignalR.Client"; + version = "2.3.0"; + sha256 = "1xyj8b88bc6sc7fxgqyalzfmlfgbagfk7adyk29if9hr8ki9bic4"; + }) + (fetchNuGet { + name = "Microsoft.AspNet.WebApi.Client"; + version = "5.2.7"; + sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Cryptography.Internal"; + version = "3.1.4"; + sha256 = "0d4djj073bl9kps5jkcpydh92lcp6kpa7njhypjw3myaa987dcsh"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; + version = "3.1.4"; + sha256 = "1rya2775prm8ss0rz6izsqqcz96gcf1rh0bpcvnfy1mwi04rx8bl"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Hosting.Abstractions"; + version = "2.0.0"; + sha256 = "0x6vw7kiy9z7cdmgbqav0d9wq66032wg39l2c9cv6xvxxvdpbkz7"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; + version = "2.0.0"; + sha256 = "1k4dr6l32swi8zasfvzxixnjvgbrra7v6lgpri0929vb3r5lagjb"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Abstractions"; + version = "2.0.0"; + sha256 = "1hgmnd5mj35g8cqq3mdhjf9cmi3wm5lqiyrj5mgfscnig6i686xr"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Features"; + version = "2.0.0"; + sha256 = "1zk5ad3laa7ma83md8r80kijqzps6dcrvv0k1015nddfk1qd74s6"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; + version = "3.1.4"; + sha256 = "0smcpaqm7d95flr0k7i2psrsfvs48lv28kzqgnllv5229hhb670d"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.JsonPatch"; + version = "3.1.1"; + sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; + version = "3.1.1"; + sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; + version = "3.1.1"; + sha256 = "1iydcr7rfzg3kqky0x70853g6lbzsl9ja9cv8ph6iwpqxnswgdkh"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; + version = "3.1.1"; + sha256 = "1q1bblcj9l2dnz46frygsfq7w4v08l96clgryh78wyws83xjm43y"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Razor.Language"; + version = "3.1.1"; + sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.0"; + sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.1.1"; + sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; + }) + (fetchNuGet { + name = "Microsoft.Bcl.HashCode"; + version = "1.1.0"; + sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Analyzers"; + version = "2.9.3"; + sha256 = "1kskwc9gyd2sx3zwx52qwfsl7s0xhaclmlnxvjsb4jgvpydv3xii"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.0.0"; + sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Common"; + version = "3.3.0"; + sha256 = "1vwhsp3pjgcfnpapkps9a3z9n2ryiv5bbhzycfljngj5grj63rg2"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Common"; + version = "3.6.0"; + sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.CSharp"; + version = "3.3.0"; + sha256 = "09nmd5h1r2q0dwp1dfpn4anvs8sfi3rwcgpcv28lrhky8vc51424"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.CSharp"; + version = "3.6.0"; + sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn"; + }) + (fetchNuGet { + name = "Microsoft.CodeAnalysis.Razor"; + version = "3.1.1"; + sha256 = "03n5rli6v1kvghha82zar3dvvkbc2vb9g8zp5fjrzhvp4l74ingn"; + }) + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "16.6.1"; + sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.5.0"; + sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + }) + (fetchNuGet { + name = "Microsoft.Data.Sqlite.Core"; + version = "3.1.4"; + sha256 = "1pahyqjs4l9g1wg9hvxf68kgzzf72ny2i7n7ai97a389p2c86xvh"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "2.0.4"; + sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "3.1.4"; + sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "3.1.0"; + sha256 = "1bd6hilnwp47z3l14qspdxi5f5nhv6rivarc6w8wil425bq0h3pd"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "3.1.4"; + sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Analyzers"; + version = "3.1.0"; + sha256 = "1pjn4wwhxgsiap7byld114kx6m0nm6696r8drspqic7lskm4y305"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Analyzers"; + version = "3.1.4"; + sha256 = "1zaqn9z7ns6p6jgnffzkgpziqr2wqs68g2sa0c11kaclhlhgvvbv"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Design"; + version = "3.1.4"; + sha256 = "10mxnbiw23ia4sln86sd3gn84yhmrb6r2kipzid4h1g15paal9gi"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Relational"; + version = "3.1.0"; + sha256 = "0javqw6c27ppcysigjvcjcw3mk0gg1pv2pmwfpvvryr1pb4a9n55"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Relational"; + version = "3.1.4"; + sha256 = "1344rsavawwg69dx8xsl08hcs43lc6h7z4mn461dcx85rirlwd0v"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; + version = "3.1.4"; + sha256 = "080qz0b52i7v5c1sgnqlh9px9881cfr1x06np66hdgmh0ni5c1lw"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite"; + version = "3.1.4"; + sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore"; + version = "3.1.0"; + sha256 = "1l12lsk1xfrv5pjnm0b9w9kncgdh0pcjcbxl4zrsg82s7bs7dhda"; + }) + (fetchNuGet { + name = "Microsoft.EntityFrameworkCore"; + version = "3.1.4"; + sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "3.1.0"; + sha256 = "0j5m2a48rwyzzvbz0hpr2md35iv78b86zyqjnrjq0y4vb7sairc0"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "3.1.4"; + sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Memory"; + version = "3.1.0"; + sha256 = "1hi61647apn25kqjcb37nqafp8fikymdrk43j3kxjbwwwx507jy1"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Memory"; + version = "3.1.4"; + sha256 = "0b8ijxjd8lgq8mgnvh3wl4y4wbjj3v5b763y6gslm75fn43iyad8"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "1.1.2"; + sha256 = "0z83kxfzsgqlshg4x1mhdnhlrprrwsgnnibvwk257drzy9079994"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.0.0"; + sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.1.0"; + sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.0"; + sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.4"; + sha256 = "0r33m68y1vgpmqams4sgciizl0w6y97qkp93m0hyn0nlkxqf72l6"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "2.0.0"; + sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.0"; + sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.4"; + sha256 = "1bnf213zlrh0m3sbhsv601yx21l5xp254jiy2g4hm7zpm8vsz1hz"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; + version = "2.1.0"; + sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.FileExtensions"; + version = "2.1.0"; + sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Ini"; + version = "2.1.0"; + sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.0.0"; + sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.1.0"; + sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.0"; + sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.4"; + sha256 = "0npc18pjl86d06czb0fy6ln3prfpwfb16p6709xx2jrsl96dp9bp"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.0.0"; + sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "2.1.0"; + sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.0"; + sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.4"; + sha256 = "03ys96pqca93zwxvh0vprzms09i9y0lmq32w98m6klbizq01fc06"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "2.0.0"; + sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.0"; + sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.4"; + sha256 = "0rhyjgdpjm56drvrvqd9v1xq1qhyrpwwn2pjsz17g2s462rwliqx"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "2.0.4"; + sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "3.1.1"; + sha256 = "0qa04dspjl4qk7l8d66wqyrvhp5dxcfn2j4r8mmj362xyrp3r8sh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "3.1.4"; + sha256 = "0r0wv4k0ig6mrl6fr184zqbf5f010d6i2an2ws23g2bjvk8jh1bk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.0.0"; + sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.1.0"; + sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.1.0"; + sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.1.0"; + sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Hosting.Abstractions"; + version = "2.0.0"; + sha256 = "056wgjcdzvz1qwb26xv6hgxq4xya56qiimhk30v8an8cgsrjk3mc"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Hosting.Abstractions"; + version = "2.1.0"; + sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Identity.Core"; + version = "3.1.4"; + sha256 = "0kyi03l9d7pnsvrcylc86fcxwnj59mhvmbz4c1d142f8djdrqfid"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Identity.Stores"; + version = "3.1.4"; + sha256 = "0jb3syy0glyn4nnd7lb7aj412xnqyrwhfavh98rbc5adq9v09nbw"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.0.0"; + sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.1.2"; + sha256 = "0j9b4z3pf8a5xphx3ksn6jm01rf4z001vfll5kcbxw995xcidjw1"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.0.0"; + sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.1.0"; + sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.0"; + sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.4"; + sha256 = "1rkl0yqmi5vfivn641866v2mdsgdy8amym546y6lzbab39g24b5n"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Filter"; + version = "1.1.2"; + sha256 = "1pip87q89376xxpi3r5pf9vxhqxx21qrp179fbldbkr2m1577k9m"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "2.0.0"; + sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "3.1.0"; + sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "3.1.4"; + sha256 = "04asfrhfrcl3ijilry2pr28ql5m6pgrwapadikgcg66jjxbx75zq"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options.ConfigurationExtensions"; + version = "2.0.0"; + sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "2.0.0"; + sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.0"; + sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.4"; + sha256 = "0jphncx82l7jm5xi49dfxhbh24wv86sy44022chd7bkizllsypp4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.PlatformAbstractions"; + version = "1.1.0"; + sha256 = "0r4j8v2vvp3kalvb11ny9cvpls3nrvqj0c81rxbkh99ynd2dbscp"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "1.1.1"; + sha256 = "0rcwxz1r89y96s8k3bmg0v6zdqanqfp09khy5l99wnl777y15g7x"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.0.0"; + sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.1.0"; + sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.0"; + sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.4"; + sha256 = "12xvysk024aghrcwzv4525vznnk8lqmknl2vqqxhq4k5hjxpsysp"; + }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.6.1"; + sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; + }) + (fetchNuGet { + name = "Microsoft.NetCore.Analyzers"; + version = "2.9.8"; + sha256 = "1klybsdy9yw49zlpmix4vjdhmfaibg5h9yx03vszdnijzap7vpsx"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.1.2"; + sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.ObjectModel"; + version = "16.6.1"; + sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.TestHost"; + version = "16.6.1"; + sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "MySqlConnector"; + version = "0.61.0"; + sha256 = "0b0mc41dsih4p1ky3kcmibsz4bw14w439nraq5732wjfkq2sqdxg"; + }) + (fetchNuGet { + name = "NBitcoin.Altcoins"; + version = "2.0.16"; + sha256 = "0fsdb96k5lwyq4d7h7yg91qghima08yk0bsw5cvr4h2jsfphk423"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.33"; + sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.4"; + sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.40"; + sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.45"; + sha256 = "102vwxwkg367yxv26hycnc7hjxlv2zvsgr8g6adw8dmzsxck5fwk"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.51"; + sha256 = "0rg014sl7rqscnranwyfk41xfr5ccjqyx7aidfl5mh0znz44db2g"; + }) + (fetchNuGet { + name = "NBitpayClient"; + version = "1.0.0.39"; + sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; + }) + (fetchNuGet { + name = "NBXplorer.Client"; + version = "3.0.17"; + sha256 = "0xx2xshgpci9l9883zpqnmgchpizygy0hcq2wp2ch6yf3hbrj9qq"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.1"; + sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Schema"; + version = "3.0.13"; + sha256 = "04vzjz5fb588rh6ji5a0svfzjsdcfpr1qrz9hxpc64z5zhnh6sf4"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "10.0.3"; + sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.1"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine.Configuration"; + version = "1.0.0.3"; + sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine"; + version = "1.0.0.2"; + sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; + }) + (fetchNuGet { + name = "NicolasDorier.RateLimits"; + version = "1.1.0"; + sha256 = "06cajxi8wnrxfwqfnk98avphwiyvg1fw428bd42lqjgq9k414rk9"; + }) + (fetchNuGet { + name = "NicolasDorier.StandardConfiguration"; + version = "1.0.0.18"; + sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; + }) + (fetchNuGet { + name = "NLog"; + version = "4.5.10"; + sha256 = "0d4yqxrhqn2k36h3v1f5pn6qqlagbzg67v6gvxqhz3s4zyc3b8rg"; + }) + (fetchNuGet { + name = "Npgsql.EntityFrameworkCore.PostgreSQL"; + version = "3.1.4"; + sha256 = "1ng9pbamh93g0fbnjq8ygaf40d6rs0fy4s08bjmxpa69k3s8c7a4"; + }) + (fetchNuGet { + name = "Npgsql"; + version = "4.1.3.1"; + sha256 = "0qk3hb8s521c2gy4k3m1i6fhpr133mnw9w85cwsy9j7ghxyca1nv"; + }) + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "5.0.0"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }) + (fetchNuGet { + name = "NUglify"; + version = "1.5.12"; + sha256 = "0f4gs31z8dwfvd246nrv3m0qkxzav37hxynx2maykza017khynyf"; + }) + (fetchNuGet { + name = "Pomelo.EntityFrameworkCore.MySql"; + version = "3.1.1"; + sha256 = "1jvv2q7pmh5wzsfjim7iby4r1scb30kgj9w6sbm2dp60i6vm32dx"; + }) + (fetchNuGet { + name = "Pomelo.JsonObject"; + version = "2.2.1"; + sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; + }) + (fetchNuGet { + name = "Portable.BouncyCastle"; + version = "1.8.1.3"; + sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; + }) + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Security"; + version = "4.3.0"; + sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "Selenium.WebDriver.ChromeDriver"; + version = "83.0.4103.3900"; + sha256 = "17j9b637209nm5cs5sgr3vflphkhaxpm8bcjizhgj65r52gn17as"; + }) + (fetchNuGet { + name = "Selenium.WebDriver"; + version = "3.141.0"; + sha256 = "09g0zhz6n7yhxmxlrpzjdykfavr3m4z1gb4cmq304dw0gr8s89mq"; + }) + (fetchNuGet { + name = "Serilog.AspNetCore"; + version = "3.2.0"; + sha256 = "14d1lsw1djsshlkxbn5lkmdvj4372hnddb6788m6ix0mv4mhj3bj"; + }) + (fetchNuGet { + name = "Serilog.Extensions.Hosting"; + version = "3.0.0"; + sha256 = "1r01lsy4rp0wj7ffbjcf9dcg3aipdhy7066yjicja45m0z2y42w6"; + }) + (fetchNuGet { + name = "Serilog.Extensions.Logging"; + version = "3.0.1"; + sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; + }) + (fetchNuGet { + name = "Serilog.Formatting.Compact"; + version = "1.0.0"; + sha256 = "0mi1yzzj33v4nkyspyshhc6nn2mx3y07z5dvv26hl7hw6kb6yazw"; + }) + (fetchNuGet { + name = "Serilog.Settings.Configuration"; + version = "3.1.0"; + sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Console"; + version = "3.1.1"; + sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; + }) + (fetchNuGet { + name = "Serilog.Sinks.Debug"; + version = "1.0.1"; + sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; + }) + (fetchNuGet { + name = "Serilog.Sinks.File"; + version = "4.1.0"; + sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; + }) + (fetchNuGet { + name = "Serilog"; + version = "2.9.0"; + sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.bundle_e_sqlite3"; + version = "2.0.2"; + sha256 = "00p7n7ndmmh45fhhd3clb11igpzklm1n7r50sdrgnbi5yifv1lxl"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.core"; + version = "2.0.2"; + sha256 = "11mnbnsiirpgmilskqh1issvgzgg08ndq3p3nkrw73hyqr7kl958"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.lib.e_sqlite3"; + version = "2.0.2"; + sha256 = "0967w6r6n94hj0fma3kidb9fx1m2p3fgrw6gpsy6q6jbb33qw6vj"; + }) + (fetchNuGet { + name = "SQLitePCLRaw.provider.dynamic_cdecl"; + version = "2.0.2"; + sha256 = "1lzs8yfjygrwfm3hjmkhnbnpsjzq53ijwx9whmii2r9kjg2a46if"; + }) + (fetchNuGet { + name = "SSH.NET"; + version = "2016.1.0"; + sha256 = "0q08bf9sdf1rf9763z4bk2mr6z381iybm73823scmq9qcpr2jk4d"; + }) + (fetchNuGet { + name = "SshNet.Security.Cryptography"; + version = "1.2.0"; + sha256 = "1xlj8bjavpjk6lrkypk66cxpf2xa31wv73ymrk34d72f05z0xrg0"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.5.0"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.7.0"; + sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.7.1"; + sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.ComponentModel.Annotations"; + version = "4.7.0"; + sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; + }) + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "System.Configuration.ConfigurationManager"; + version = "4.5.0"; + sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.7.0"; + sha256 = "0cr0v5dz8l5ackxv6b772fjcyj2nimqmrmzanjs4cw2668v568n1"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.7.1"; + sha256 = "1mivaifniyrqwlnvzsfaxzrh2sd981bwzs3cbvs5wi7jjzbcqr4p"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "System.Diagnostics.TraceSource"; + version = "4.0.0"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.Interactive.Async"; + version = "3.1.1"; + sha256 = "03iq20gq0n2b2sdzs5jhxf46nzkfgvzip6q5248vka2rcvn1yanh"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO.Pipelines"; + version = "4.7.2"; + sha256 = "16v4qaypm72cfsfqr8z3k6yrpzn0m3apgkh6aljfwpycdk150sf9"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.3"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.0.0"; + sha256 = "0dj3pvpv069nyia28gkl4a0fb7q33hbxz2dg25qvpah3l7pbl0qh"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + (fetchNuGet { + name = "System.Net.Requests"; + version = "4.0.11"; + sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h"; + }) + (fetchNuGet { + name = "System.Net.Security"; + version = "4.3.0"; + sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.0.1"; + sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.3.0"; + sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.Client"; + version = "4.3.2"; + sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; + }) + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.3.0"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.3.0"; + sha256 = "149xcsa1pphlrc2zfmca9n822g4mxk7s2a44phvf34r0fajm3hk8"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.4.0"; + sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0"; + sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.2"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.7.0"; + sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.5.0"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.0.1"; + sha256 = "03dw0ls49bvsrffgwycyifjgz0qzr9r85skqhdyhfd51fqf398n6"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.ProtectedData"; + version = "4.5.0"; + sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "System.Security.Permissions"; + version = "4.5.0"; + sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.0.0"; + sha256 = "1d3vc8i0zss9z8p4qprls4gbh7q4218l9845kclx7wvw41809k6z"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.0.1"; + sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.5.1"; + sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Text.Encodings.Web"; + version = "4.4.0"; + sha256 = "05qp3yivh6gz0vva0v3wjlj3g1b45d5jmz362f2y8ah6yb3rx088"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "4.7.0"; + sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "4.7.2"; + sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Threading.Channels"; + version = "4.5.0"; + sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.0.10"; + sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Xml.XPath.XmlDocument"; + version = "4.0.1"; + sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; + }) + (fetchNuGet { + name = "System.Xml.XPath"; + version = "4.0.1"; + sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; + }) + (fetchNuGet { + name = "Text.Analyzers"; + version = "2.6.4"; + sha256 = "1fm3gjnbfnjap3wphx5x48awriy14a2g3s9c1nc4m8w85k8mqdsl"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Amazon"; + version = "2.12.1"; + sha256 = "03nrkvhki35w1rqx94s97rwxl0qwqlczyiimhrkc72vjppn5p6ph"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Azure"; + version = "2.12.1"; + sha256 = "10q7gpr8kmgzmxrzj3paqlnw4d8li8scwpxkzs11ildscfp6hvlv"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Google"; + version = "2.12.1"; + sha256 = "0d8s7p9brp03h9dpv3wxnqg0xsm7d9p4k6dpxpb9jak535khxzhp"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage.Local"; + version = "2.12.1"; + sha256 = "1zmjqwd1v3z78ab4vdmaadh94465k1qgpv7ylv8x3sdx4z78yjm8"; + }) + (fetchNuGet { + name = "TwentyTwenty.Storage"; + version = "2.12.1"; + sha256 = "0m41dxzc3hh0f4j1k4q915pvcq6zr0hv1pj6b3sayrn8vjhk64qb"; + }) + (fetchNuGet { + name = "U2F.Core"; + version = "1.0.4"; + sha256 = "0mk32yyihigp9njs54z411fswgzr6x3kw134c7ylwy2d2wmq2n9b"; + }) + (fetchNuGet { + name = "WindowsAzure.Storage"; + version = "9.3.3"; + sha256 = "14b0b0nj85yvyn0h8ghr3kj6di2nkbzjxc2q98f1wcr0151xvdfx"; + }) + (fetchNuGet { + name = "xunit.abstractions"; + version = "2.0.3"; + sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; + }) + (fetchNuGet { + name = "xunit.analyzers"; + version = "0.10.0"; + sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; + }) + (fetchNuGet { + name = "xunit.assert"; + version = "2.4.1"; + sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; + }) + (fetchNuGet { + name = "xunit.core"; + version = "2.4.1"; + sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; + }) + (fetchNuGet { + name = "xunit.extensibility.core"; + version = "2.4.1"; + sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; + }) + (fetchNuGet { + name = "xunit.extensibility.execution"; + version = "2.4.1"; + sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; + }) + (fetchNuGet { + name = "xunit.runner.visualstudio"; + version = "2.4.2"; + sha256 = "0fi85h43nyrhfc5jzg07znh01r7cpb7bpjdc6mzb9z1pm14ppfm6"; + }) + (fetchNuGet { + name = "xunit"; + version = "2.4.1"; + sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; + }) + (fetchNuGet { + name = "YamlDotNet"; + version = "8.0.0"; + sha256 = "09hr1jimmfhcpk97p963y94h2k5p7wzcj4mpwqpdnwzbyrp2flpm"; + }) +] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/update.sh new file mode 100755 index 0000000000..1f7dbedd02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) + +"$scriptDir"/../nbxplorer/util/update-common.sh btcpayserver "$scriptDir"/deps.nix diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix index f289139d8d..2467d30992 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "11ig5bqxvhx82gq9nl7c5iqaf3x8xbwfx7cf2318pyqdimz4r1v6"; + sha256 = "4923e2fa001cfc2403d1bed368710499d5def322e6384b8eea2bd39d3351a417"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dashpay.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dashpay.nix index b88aa3af19..7bdf93b2da 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dashpay.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dashpay.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { private as you make transactions without waits, similar to cash. ''; homepage = "https://www.dash.org"; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrd.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dcrd.nix index 5943642ad6..e959eca48a 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dcrd.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dcrd.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dcrd"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "decred"; repo = "dcrd"; rev = "refs/tags/release-v${version}"; - sha256 = "1ggw289y1f4dqvj3w60q9bahq8bblbfjymn5xy04ldylr3qlxm9x"; + sha256 = "14pxajc8si90hnddilfm09kmljwxq6i6p53fk0g09jp000cbklkl"; }; vendorSha256 = "03aw6mcvp1vr01ppxy673jf5hdryd5032cxndlkaiwg005mxp1dy"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin.nix index b1ebebdd21..27a1f6132f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.dogecoin.com/"; license = licenses.mit; - maintainers = with maintainers; [ edwtjo offline AndersonTorres ]; + maintainers = with maintainers; [ edwtjo offline ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index cfd72db7f4..83a6cfaf05 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1lja4ba6bm1jk0lh2ra5v8i5g3f1gy7mk2b3yrx1w7x02ll9gr06"; + sha256 = "1qr1vfb6mhm2hxl2ksydkhadm7phadn93lwm3f9zni01plk56bb5"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index 758673229a..af49bb9121 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.1.30"; + version = "20.8.28"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "0jns5zqjm0gqn18ypghbgk6gb713mh7p44ax1r8y4vcwijlp5nql"; + sha256 = "fde9165f71f0d641f6892ddce3ec26d200e8095a383f2b4c8f924de4041d65ef"; }; sourceRoot = "."; @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { description = "Top-rated cryptocurrency wallet with Trezor integration and built-in Exchange"; license = licenses.unfree; platforms = platforms.linux; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut rople380 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index f69489c7ff..6952d469ad 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.19"; + version = "1.9.21"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "08wf7qklk31dky2z0l2j9vbyr8721gkvy4dsc60afwrwihwd8lrp"; + sha256 = "0mr5pw08jka11lzgl28555nb90cqxx9vlqd1plfmyic6rb5z11df"; }; runVend = true; - vendorSha256 = "1744df059bjksvih4653nnvb4kb1xvzdhypd0nnz36m1wrihqssv"; + vendorSha256 = "155hmny3543h02ryn1nnlpmvs0qvhd0lb66vmkhw5351m6gkbx7x"; doCheck = false; @@ -31,7 +31,6 @@ buildGoModule rec { "cmd/puppeth" "cmd/rlpdump" "cmd/utils" - "cmd/wnode" ]; # Fix for usb-related segmentation faults on darwin @@ -42,6 +41,6 @@ buildGoModule rec { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3 gpl3 ]; - maintainers = with maintainers; [ adisbladis lionello xrelkd ]; + maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/litecoin.nix b/third_party/nixpkgs/pkgs/applications/blockchains/litecoin.nix index 22cfa3dbb9..fa352652db 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/litecoin.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/litecoin.nix @@ -50,6 +50,6 @@ mkDerivation rec { platforms = platforms.unix; license = licenses.mit; broken = stdenv.isDarwin; - maintainers = with maintainers; [ offline AndersonTorres ]; + maintainers = with maintainers; [ offline ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix index b6c7879c3b..831195f06f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.10.3-beta"; + version = "0.11.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "129vi8z2sk4hagk7axa675nba6sbj9km88zlq8a1g8di7v2k9z6a"; + sha256 = "1r1hwz8ka5mnmrvj9zcd78kn68g8fg3d4bdx9i0xy4sc2hh1dcpj"; }; - vendorSha256 = "0a4bk2qry0isnrvl0adwikqn6imxwzlaq5j3nglb5rmwwq2cdz0r"; + vendorSha256 = "090b9sxvdwh787w0rhrcbky9pbx64qgqx1pvk9ysk3886nxdhf7k"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix index 569a9b1704..f118656411 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix @@ -10,13 +10,13 @@ assert stdenv.isDarwin -> IOKit != null; stdenv.mkDerivation rec { pname = "monero"; - version = "0.16.0.1"; + version = "0.16.0.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0n2cviqm8radpynx70fc0819k1xknjc58cvb4whlc49ilyvh8ky6"; + sha256 = "1r9x3712vhb24dxxirfiwj5f9x0h4m7x0ngiiavf5983dfdlgz33"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin.nix b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin.nix index 548213a52f..936eaa2505 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ doublec AndersonTorres infinisil ]; + maintainers = with maintainers; [ doublec infinisil ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix new file mode 100644 index 0000000000..76ca21ef9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, + dotnetPackages, dotnetCorePackages +}: + +let + deps = import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }; + dotnetSdk = dotnetCorePackages.sdk_3_1; +in + +stdenv.mkDerivation rec { + pname = "nbxplorer"; + version = "2.1.42"; + + src = fetchFromGitHub { + owner = "dgarage"; + repo = "NBXplorer"; + rev = "v${version}"; + sha256 = "01q6n7095rrha00xs3l7igzfb9rd743z8crxa2dcz4q5srapfzpi"; + }; + + nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; + + buildPhase = '' + export HOME=$TMP/home + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + nuget sources Add -Name tmpsrc -Source $TMP/nuget + nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget + + dotnet restore --source $TMP/nuget NBXplorer/NBXplorer.csproj + dotnet publish --no-restore --output $out/share/$pname -c Release NBXplorer/NBXplorer.csproj + ''; + + installPhase = '' + makeWrapper $out/share/$pname/NBXplorer $out/bin/$pname \ + --set DOTNET_ROOT "${dotnetSdk}" + ''; + + dontStrip = true; + + meta = with lib; { + description = "Minimalist UTXO tracker for HD Cryptocurrency Wallets"; + maintainers = with maintainers; [ kcalvinalvin earvstedt ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix new file mode 100644 index 0000000000..65afa6b72c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -0,0 +1,1072 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "DBTrie"; + version = "1.0.38"; + sha256 = "09n9f2j0pha2np9cpbgjfs19jwvfmrglws89izarq71gl8jia6d9"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.JsonPatch"; + version = "3.1.5"; + sha256 = "0agcp9c8zf59bliybjfg5whby7k1i1xc4sccyyyj3qcx1snf6lfx"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; + version = "3.1.5"; + sha256 = "1n76xr3jn4bcxm9f3lk8k76zn39mhyqcj5b0dqhi2xykyvvrqjgc"; + }) + (fetchNuGet { + name = "Microsoft.Azure.Amqp"; + version = "2.4.2"; + sha256 = "0pfgl6fnw3apwasfg1dp5pvi5h0z0vmznhn2bfsgwndn1xlfw1g9"; + }) + (fetchNuGet { + name = "Microsoft.Azure.ServiceBus"; + version = "4.1.3"; + sha256 = "1mj21nal3hv8b5678rah808521c5rkb0yh6hrlqirsdgxwnl6z6g"; + }) + (fetchNuGet { + name = "Microsoft.Azure.Services.AppAuthentication"; + version = "1.0.3"; + sha256 = "0as64agcsilwgbvwx7iw3abdxyp9cbfpczbagjz49mqmmgnqp899"; + }) + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "16.6.1"; + sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "2.1.0"; + sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; + version = "2.1.0"; + sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.FileExtensions"; + version = "2.1.0"; + sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Ini"; + version = "2.1.0"; + sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "2.1.0"; + sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.1.0"; + sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.1.0"; + sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.1.0"; + sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.0.0"; + sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "2.1.0"; + sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.1.0"; + sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Clients.ActiveDirectory"; + version = "3.14.2"; + sha256 = "0g9a2z1qjxd71lqqghp0a542xk9jkvz951bbnnnw43is4hlnqncq"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.JsonWebTokens"; + version = "5.4.0"; + sha256 = "0a5fn0p10dmkwa7vvbq28xw78aq33xm7c82l7vhla95n0lr178n8"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Logging"; + version = "5.4.0"; + sha256 = "1idlpyg3q3syam6aflfbnsa7iql685mjralr1cnfpryf00lm59v0"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Tokens"; + version = "5.4.0"; + sha256 = "0gpdh5rs0p97zm41pphha8n3ccd50b1iszikj3917f111khpw8l0"; + }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.6.1"; + sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.2"; + sha256 = "17rrj0awknxx6rpdxr7yijdxqdmbbpdlcf2nsadjbd4d2gw7dck0"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.ObjectModel"; + version = "16.6.1"; + sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.TestHost"; + version = "16.6.1"; + sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.3.0"; + sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; + }) + (fetchNuGet { + name = "NBitcoin.Altcoins"; + version = "2.0.19"; + sha256 = "12a3bf1pi6sq78z6h3clyczvycx7cjry8fby4fyi748wjwljjizz"; + }) + (fetchNuGet { + name = "NBitcoin.TestFramework"; + version = "2.0.11"; + sha256 = "09jrbq9p5k67kdic2038s7q299y2nc8ij6m55m3m8hys7jdrrv05"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.54"; + sha256 = "0mx2gr8j8bc4mf1vi1fvqj3672qalxvzvincc61if79p46cik24b"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "10.0.3"; + sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.1"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine.Configuration"; + version = "1.0.0.3"; + sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; + }) + (fetchNuGet { + name = "NicolasDorier.CommandLine"; + version = "1.0.0.2"; + sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; + }) + (fetchNuGet { + name = "NicolasDorier.StandardConfiguration"; + version = "1.0.0.18"; + sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; + }) + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "5.0.0"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }) + (fetchNuGet { + name = "RabbitMQ.Client"; + version = "5.1.2"; + sha256 = "195nxmnva1z2p0ahvn0kswv4d39f5bdy2sl3cxcvfziamc21xrmd"; + }) + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Security"; + version = "4.3.0"; + sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.4.0"; + sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.5.0"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.5.1"; + sha256 = "1j8dgilsgd0n7y87wq1cdlnwck96wijhbyhdp4d01l1gzm3074c1"; + }) + (fetchNuGet { + name = "System.Diagnostics.Process"; + version = "4.3.0"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.IdentityModel.Tokens.Jwt"; + version = "5.4.0"; + sha256 = "05f91fjn054bwphmbbg7c38ipl4i81v73j232jgcq6y16dx6ifyc"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + (fetchNuGet { + name = "System.Net.Security"; + version = "4.3.0"; + sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.0.1"; + sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; + }) + (fetchNuGet { + name = "System.Net.WebHeaderCollection"; + version = "4.3.0"; + sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.Client"; + version = "4.0.2"; + sha256 = "0p8m9h94h9za8281hngpi6awka6v26s1gkk0npmxzqq4ilas6b4s"; + }) + (fetchNuGet { + name = "System.Net.WebSockets.Client"; + version = "4.3.2"; + sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; + }) + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.0.0"; + sha256 = "04jdhq9dp43x1m6hddn06sq74skc50i1yk6hip0224pj6fwxa4k2"; + }) + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.3.0"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }) + (fetchNuGet { + name = "System.Numerics.Vectors"; + version = "4.4.0"; + sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "System.Private.DataContractSerialization"; + version = "4.1.1"; + sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; + }) + (fetchNuGet { + name = "System.Private.DataContractSerialization"; + version = "4.3.0"; + sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.0"; + sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Json"; + version = "4.0.2"; + sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Xml"; + version = "4.3.0"; + sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Threading.Channels"; + version = "4.7.1"; + sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.3.0"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Xml.XmlSerializer"; + version = "4.0.11"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + }) + (fetchNuGet { + name = "System.Xml.XmlSerializer"; + version = "4.3.0"; + sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; + }) + (fetchNuGet { + name = "xunit.abstractions"; + version = "2.0.3"; + sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; + }) + (fetchNuGet { + name = "xunit.analyzers"; + version = "0.10.0"; + sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; + }) + (fetchNuGet { + name = "xunit.assert"; + version = "2.4.1"; + sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; + }) + (fetchNuGet { + name = "xunit.core"; + version = "2.4.1"; + sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; + }) + (fetchNuGet { + name = "xunit.extensibility.core"; + version = "2.4.1"; + sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; + }) + (fetchNuGet { + name = "xunit.extensibility.execution"; + version = "2.4.1"; + sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; + }) + (fetchNuGet { + name = "xunit.runner.visualstudio"; + version = "2.4.2"; + sha256 = "0fi85h43nyrhfc5jzg07znh01r7cpb7bpjdc6mzb9z1pm14ppfm6"; + }) + (fetchNuGet { + name = "xunit"; + version = "2.4.1"; + sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; + }) +] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/update.sh new file mode 100755 index 0000000000..5db2723ef8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) + +getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh new file mode 100755 index 0000000000..1402d1cd1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p dotnet-sdk_3 +set -euo pipefail + +# Writes deps for dotnet package in $pkgSrc to $depsFile. +# Expects $pkgSrc to contain a single .sln file. + +pkgSrc=$1 +depsFile=$2 + +sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) +[[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } + +tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX) +echo "Using tmp dir: $tmpdir" +cp -rT "$pkgSrc" "$tmpdir" +chmod -R +w "$tmpdir" + +pushd "$tmpdir" > /dev/null +mkdir home +echo "Running dotnet restore for $sln" +HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ + dotnet restore -v normal --no-cache "$sln" > restore_log + +echo "{ fetchNuGet }: [" > "$depsFile" +while read pkgSpec; do + { read name; read version; } < <( + # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2 + sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkgSpec" + ) + sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg) + cat >> "$depsFile" <> "$depsFile" + +echo "Created $depsFile" + +popd > /dev/null +rm -r $tmpdir diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh new file mode 100755 index 0000000000..c69168ccbb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 +set -euo pipefail + +# This script uses the following env vars: +# getVersionFromTags +# onlyCreateDeps + +pkgName=$1 +depsFile=$2 + +: ${getVersionFromTags:=} +: ${onlyCreateDeps:=} + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +nixpkgs=$(realpath "$scriptDir"/../../../../..) + +evalNixpkgs() { + nix eval --raw "(with import \"$nixpkgs\" {}; $1)" +} + +getRepo() { + url=$(evalNixpkgs $pkgName.src.meta.homepage) + echo $(basename $(dirname $url))/$(basename $url) +} + +getLatestVersionTag() { + "$nixpkgs"/pkgs/common-updater/scripts/list-git-tags https://github.com/$(getRepo) 2>/dev/null \ + | sort -V | tail -1 | sed 's|^v||' +} + +if [[ ! $onlyCreateDeps ]]; then + oldVersion=$(evalNixpkgs "$pkgName.version") + if [[ $getVersionFromTags ]]; then + newVersion=$(getLatestVersionTag) + else + newVersion=$(curl -s "https://api.github.com/repos/$(getRepo)/releases" | jq -r '.[0].name') + fi + + if [[ $newVersion == $oldVersion ]]; then + echo "nixpkgs already has the latest version $newVersion" + echo "Run this script with env var onlyCreateDeps=1 to recreate "$(basename "$depsFile") + exit 0 + else + echo "Updating $pkgName: $oldVersion -> $newVersion" + (cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion") + fi +fi + +storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" +. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix index 0324f02442..6b5358c9cf 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix @@ -35,7 +35,7 @@ let }; pname = "WasabiBackend"; - version = "1.1.11.1"; + version = "1.1.12"; projectName = "WalletWasabi.Backend"; projectConfiguration = "Release"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { owner = "zkSNACKs"; repo = "WalletWasabi"; rev = "v${version}"; - sha256 = "0kxww8ywhld00b0qsv5jh5s19jqpahnb9mvshmjnp3cb840j12a7"; + sha256 = "001k43z2jxvs03csyzndlzlk034aclzc4n8ddrqxykgrq508xk1d"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix index ff5184ba86..4d4489efa3 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -13,6 +13,21 @@ in [ version = "4.0.11"; sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.0.1"; @@ -23,11 +38,6 @@ in [ version = "4.0.1"; sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; - }) (fetchNuGet { name = "System.Private.DataContractSerialization"; version = "4.1.1"; @@ -38,50 +48,30 @@ in [ version = "4.0.0"; sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.0.1"; - sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; - }) (fetchNuGet { name = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; + name = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; @@ -89,35 +79,65 @@ in [ sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.1.0"; - sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Physical"; - version = "2.0.0"; - sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3"; - }) - (fetchNuGet { - name = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts"; - version = "2.0.2"; - sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App"; - version = "2.0.5"; - sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) (fetchNuGet { name = "Microsoft.VisualStudio.Web.CodeGeneration.Tools"; version = "2.0.2"; sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6"; }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts"; + version = "2.0.2"; + sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.0.0"; + sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App"; + version = "2.0.5"; + sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) (fetchNuGet { name = "NuGet.Frameworks"; version = "4.0.0"; sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq"; }) + (fetchNuGet { + name = "Microsoft.Build.Runtime"; + version = "15.3.409"; + sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q"; + }) (fetchNuGet { name = "runtime.native.System"; version = "4.0.0"; @@ -128,125 +148,15 @@ in [ version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) - (fetchNuGet { - name = "Microsoft.Build.Runtime"; - version = "15.3.409"; - sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "10.0.1"; - sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileSystemGlobbing"; - version = "2.0.0"; - sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography"; - version = "4.0.0"; - sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.0.0"; - sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; - }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.0.1"; - sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.DotNetHostPolicy"; - version = "2.0.5"; - sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "2.0.1"; - sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.3.0"; - sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Formatters"; - version = "4.3.0"; - sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; - }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.3.0"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + name = "Newtonsoft.Json"; + version = "10.0.1"; + sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) (fetchNuGet { name = "Microsoft.NETCore.DotNetAppHost"; @@ -259,74 +169,74 @@ in [ sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) (fetchNuGet { - name = "System.Threading"; + name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { - name = "Microsoft.CSharp"; + name = "System.IO.FileSystem"; version = "4.3.0"; - sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { - name = "System.IO.Pipes"; - version = "4.0.0"; - sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za"; + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.0.0"; + sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4"; }) (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.0.0"; + sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; }) (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + name = "Microsoft.NETCore.Platforms"; + version = "2.0.1"; + sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np"; }) (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + name = "Microsoft.NETCore.DotNetHostPolicy"; + version = "2.0.5"; + sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; }) (fetchNuGet { - name = "System.Xml.XDocument"; + name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; - sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + name = "NETStandard.Library"; + version = "2.0.1"; + sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; }) (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; + name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; - sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { - name = "System.Runtime.Extensions"; + name = "System.Collections.Specialized"; version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { - name = "System.Dynamic.Runtime"; + name = "System.ComponentModel"; version = "4.3.0"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { - name = "System.Xml.ReaderWriter"; + name = "System.Collections.NonGeneric"; version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) (fetchNuGet { - name = "System.Linq.Expressions"; + name = "System.ComponentModel.Primitives"; version = "4.3.0"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) (fetchNuGet { - name = "System.Runtime"; + name = "System.Runtime.InteropServices"; version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -343,26 +253,246 @@ in [ version = "15.3.409"; sha256 = "135swyygp7cz2civwsz6a7dj7h8bzp7yrybmgxjanxwrw66hm933"; }) - (fetchNuGet { - name = "Microsoft.Build.Utilities.Core"; - version = "15.3.409"; - sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; - }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; }) + (fetchNuGet { + name = "Microsoft.Build.Utilities.Core"; + version = "15.3.409"; + sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; + }) (fetchNuGet { name = "Microsoft.Build"; version = "15.3.409"; sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; }) + (fetchNuGet { + name = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) (fetchNuGet { name = "System.Threading.Tasks.Dataflow"; version = "4.6.0"; sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1"; }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "System.IO.Pipes"; + version = "4.0.0"; + sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za"; + }) + (fetchNuGet { + name = "System.Diagnostics.FileVersionInfo"; + version = "4.0.0"; + sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Diagnostics.Contracts"; + version = "4.0.1"; + sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "System.Runtime.Loader"; + version = "4.0.0"; + sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.0.10"; + sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Xml"; + version = "4.1.1"; + sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.2.0"; + sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.3.0"; + sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Linq.Parallel"; + version = "4.0.1"; + sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Diagnostics.Process"; + version = "4.1.0"; + sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.0.0"; @@ -374,124 +504,9 @@ in [ sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw"; }) (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; - }) - (fetchNuGet { - name = "System.ComponentModel.Primitives"; - version = "4.3.0"; - sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; - }) - (fetchNuGet { - name = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.3.0"; - sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; - }) - (fetchNuGet { - name = "System.Collections.Specialized"; - version = "4.3.0"; - sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }) - (fetchNuGet { - name = "System.AppContext"; - version = "4.1.0"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }) - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.1.0"; - sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; - }) - (fetchNuGet { - name = "System.Threading.Timer"; - version = "4.0.1"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -499,39 +514,9 @@ in [ sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.0.0"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; - }) - (fetchNuGet { - name = "System.Console"; - version = "4.0.0"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.0.0"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + name = "System.AppContext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { name = "System.Diagnostics.Debug"; @@ -539,29 +524,9 @@ in [ sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.0.1"; - sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; - }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + name = "System.Diagnostics.TraceSource"; + version = "4.0.0"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) (fetchNuGet { name = "System.Resources.ResourceManager"; @@ -569,189 +534,274 @@ in [ sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.2.0"; - sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.1.0"; - sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.1.0"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.0.11"; - sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Threading.Thread"; - version = "4.0.0"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; - }) - (fetchNuGet { - name = "System.Diagnostics.TraceSource"; - version = "4.0.0"; - sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; + name = "System.Globalization.Calendars"; version = "4.0.1"; - sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.0.1"; - sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; - }) - (fetchNuGet { - name = "System.Resources.Reader"; - version = "4.0.0"; - sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; - }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; - version = "4.0.1"; - sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.7.0"; - sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) (fetchNuGet { name = "System.Xml.XPath"; version = "4.0.1"; sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Resources.Writer"; + version = "4.0.0"; + sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.0.1"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + }) + (fetchNuGet { + name = "System.Xml.XPath.XmlDocument"; + version = "4.0.1"; + sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Resources.Reader"; + version = "4.0.0"; + sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "11.0.1"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.7.0"; - sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; - }) - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.7.0"; - sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + name = "Newtonsoft.Json.Bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; @@ -764,85 +814,40 @@ in [ sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) (fetchNuGet { - name = "System.Resources.Writer"; - version = "4.0.0"; - sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; + name = "System.Security.Principal.Windows"; + version = "4.7.0"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "1.3.0"; - sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; + name = "System.Security.AccessControl"; + version = "4.7.0"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.2.0"; - sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; - }) - (fetchNuGet { - name = "System.Linq.Parallel"; - version = "4.0.1"; - sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; - }) - (fetchNuGet { - name = "System.Diagnostics.Process"; - version = "4.1.0"; - sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Xml"; - version = "4.1.1"; - sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; - }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.0.10"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; - }) - (fetchNuGet { - name = "System.Runtime.Loader"; - version = "4.0.0"; - sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; - }) - (fetchNuGet { - name = "System.Diagnostics.Contracts"; - version = "4.0.1"; - sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j"; - }) - (fetchNuGet { - name = "System.Diagnostics.FileVersionInfo"; - version = "4.0.0"; - sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3"; - }) - (fetchNuGet { - name = "NBitcoin.Secp256k1"; - version = "1.0.1"; - sha256 = "0j3a8iamqh06b7am6k8gh6d41zvrnmsif3525bw742jw5byjypdl"; + name = "NBitcoin"; + version = "5.0.47"; + sha256 = "1plri6q83jn80m95np0zxdg3nk2f36z8v42j4sg5wjv8qppp866d"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "3.1.1"; sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; }) - (fetchNuGet { - name = "Newtonsoft.Json.Bson"; - version = "1.0.2"; - sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; - }) (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) + (fetchNuGet { + name = "NBitcoin.Secp256k1"; + version = "1.0.3"; + sha256 = "08d4db64j1qz8ax9fg8zi6n7g1n53clnkajbbvv2hgaqyfrsnqxj"; + }) (fetchNuGet { name = "Microsoft.OpenApi"; version = "1.1.4"; sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3"; }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.29"; - sha256 = "0a6jvdvnf5h9j6c3ii3pdnkq79shmcm1hf6anaqcwvi3gq19chak"; - }) (fetchNuGet { name = "Swashbuckle.AspNetCore.SwaggerUI"; version = "5.0.0"; @@ -878,26 +883,11 @@ in [ version = "4.0.11"; sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; }) - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; - }) (fetchNuGet { name = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; - }) - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.1.0"; - sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; - }) (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.0.1"; @@ -908,44 +898,59 @@ in [ version = "4.0.1"; sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; }) + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.1.0"; + sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; + }) (fetchNuGet { name = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; + name = "runtime.any.System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; }) (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.0.11"; - sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; - }) - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.0.11"; - sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; - }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; }) (fetchNuGet { name = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; + }) (fetchNuGet { name = "runtime.any.System.Reflection"; version = "4.1.0"; sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; }) (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; + name = "runtime.any.System.Collections"; + version = "4.0.11"; + sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) -] \ No newline at end of file + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.0.11"; + sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; + }) + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; + }) + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; + }) +] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index a098f14668..3b4ec1c49c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.11.1"; + version = "1.1.12"; src = fetchurl { - url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; - sha256 = "04v8f2h67aqvcb5a8vmzbp2sqnq7g4m0v1ng52ccb4ii668ya8hy"; + url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; + sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix index f1e680f60e..605d810b3d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -200,7 +200,7 @@ in runCommand platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { stable = [ meutraa ]; - beta = [ galagora ]; + beta = [ meutraa ]; canary = [ meutraa ]; dev = canary; }."${channel}"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index c622a1fcea..f35e695d1b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -14,14 +14,14 @@ let sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; }; betaVersion = { - version = "4.1.0.14"; # "Android Studio 4.1 Beta 4" - build = "201.6667167"; - sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290"; + version = "4.1.0.18"; # "Android Studio 4.1 RC 3" + build = "201.6823847"; + sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev - version = "4.2.0.5"; # "Android Studio 4.2 Canary 5" - build = "201.6682321"; - sha256Hash = "076q6d7kmi0wcsqak7n6ggp1qns4xj1134xcpdzb92qk3dmg3wrh"; + version = "4.2.0.11"; # "Android Studio 4.2 Canary 11" + build = "202.6825553"; + sha256Hash = "sha256-la3J0mgUxJA50l1PLr9FPMKI5QYkoBRriVyu3aVq7io="; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix new file mode 100644 index 0000000000..25caf4b7ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, makeWrapper, jdk }: + +stdenv.mkDerivation rec { + pname = "bluej"; + version = "4.2.2"; + src = fetchurl { + # We use the deb here. First instinct might be to go for the "generic" JAR + # download, but that is actually a graphical installer that is much harder + # to unpack than the deb. + url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb"; + sha256 = "5c2241f2208e98fcf9aad7c7a282bcf16e6fd543faa5fdb0b99b34d1023113c3"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + + installPhase = '' + mkdir -p $out + cp -r usr/* $out + + makeWrapper ${jdk}/bin/java $out/bin/bluej \ + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot" + ''; + + meta = with stdenv.lib; { + description = "A simple integrated development environment for Java"; + homepage = "https://www.bluej.org/"; + license = licenses.gpl2ClasspathPlus; + maintainers = [ maintainers.charvp ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/brackets/default.nix b/third_party/nixpkgs/pkgs/applications/editors/brackets/default.nix index 3e01bcdb0f..9d5978e605 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/brackets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/brackets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf +{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }: with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { rmdir $out/usr ln -sf $out/opt/brackets/brackets $out/bin/brackets - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 substituteInPlace $out/opt/brackets/brackets.desktop \ --replace "Exec=/opt/brackets/brackets" "Exec=brackets" diff --git a/third_party/nixpkgs/pkgs/applications/editors/code-browser/default.nix b/third_party/nixpkgs/pkgs/applications/editors/code-browser/default.nix new file mode 100644 index 0000000000..11476cae70 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/code-browser/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchurl +, copper +, ruby +, python3 +, qtbase +, gtk3 +, pkg-config +, withQt ? false +, withGtk ? false, wrapQtAppsHook ? null +}: +stdenv.mkDerivation rec { + pname = "code-browser"; + version = "7.1.20"; + src = fetchurl { + url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz"; + sha256 = "1svi0v3h42h2lrb8c7pjvqc8019v1p20ibsnl48pfhl8d96mmdnz"; + }; + postPatch = '' + substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L." + substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o" + patchShebangs . + ''; + nativeBuildInputs = [ copper + python3 + ruby + qtbase + gtk3 + pkg-config + ] + ++ stdenv.lib.optionals withQt [ wrapQtAppsHook ]; + buildInputs = stdenv.lib.optionals withQt [ qtbase ] + ++ stdenv.lib.optionals withGtk [ gtk3 ]; + makeFlags = [ + "prefix=$(out)" + "COPPER=${copper}/bin/copper-elf64" + "with-local-libs" + "QINC=${qtbase.dev}/include" + ] + ++ stdenv.lib.optionals withQt [ "UI=qt" ] + ++ stdenv.lib.optionals withGtk [ "UI=gtk" ]; + meta = with stdenv.lib; { + description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code."; + homepage = "https://tibleiz.net/code-browser/"; + license = licenses.gpl2; + platforms = platforms.x86_64; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix new file mode 100644 index 0000000000..a1af859af8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -0,0 +1,113 @@ +{ stdenv +, lib +, fetchFromGitHub +, lazarus +, fpc +, libX11 + +# GTK2/3 +, pango +, cairo +, glib +, atk +, gtk2 +, gtk3 +, gdk-pixbuf +, python3 + +# Qt5 +, libqt5pas +, qt5 + +, widgetset ? "qt5" +# See https://github.com/Alexey-T/CudaText-lexers +, additionalLexers ? [ "Nix" ] +}: + +assert builtins.elem widgetset [ "gtk2" "gtk3" "qt5" ]; + +let + deps = lib.mapAttrs + (name: spec: + fetchFromGitHub { + owner = "Alexey-T"; + repo = name; + inherit (spec) rev sha256; + } + ) + (builtins.fromJSON (builtins.readFile ./deps.json)); +in +stdenv.mkDerivation rec { + pname = "cudatext"; + version = "1.111.0"; + + src = fetchFromGitHub { + owner = "Alexey-T"; + repo = "CudaText"; + rev = version; + sha256 = "1ai0g8fmw4m237dqh5dkr8w9qqricyvp49ijz2ivvmg9dsdfzjfp"; + }; + + patches = [ + # Don't check for update + ./dont-check-update.patch + ]; + + postPatch = '' + substituteInPlace app/proc_globdata.pas \ + --replace "/usr/share/cudatext" "$out/share/cudatext" \ + --replace "libpython3.so" "${python3}/lib/libpython3.so" + ''; + + nativeBuildInputs = [ lazarus fpc ] + ++ lib.optional (widgetset == "qt5") qt5.wrapQtAppsHook; + + buildInputs = [ libX11 ] + ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ pango cairo glib atk gdk-pixbuf ] + ++ lib.optional (widgetset == "gtk2") gtk2 + ++ lib.optional (widgetset == "gtk3") gtk3 + ++ lib.optional (widgetset == "qt5") libqt5pas; + + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + + buildPhase = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: '' + cp -r --no-preserve=mode ${dep} ${name} + '') deps) + '' + lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ + EncConv/encconv/encconv_package.lpk \ + ATBinHex-Lazarus/atbinhex/atbinhex_package.lpk \ + ATFlatControls/atflatcontrols/atflatcontrols_package.lpk \ + ATSynEdit/atsynedit/atsynedit_package.lpk \ + ATSynEdit_Cmp/atsynedit_cmp/atsynedit_cmp_package.lpk \ + EControl/econtrol/econtrol_package.lpk \ + ATSynEdit_Ex/atsynedit_ex/atsynedit_ex_package.lpk \ + Python-for-Lazarus/python4lazarus/python4lazarus_package.lpk \ + Emmet-Pascal/emmet/emmet_package.lpk \ + app/cudatext.lpi + ''; + + installPhase = '' + install -Dm755 app/cudatext $out/bin/cudatext + + install -dm755 $out/share/cudatext + cp -r app/{data,py,settings_default} $out/share/cudatext + + install -Dm644 setup/debfiles/cudatext-512.png -t $out/share/pixmaps + install -Dm644 setup/debfiles/cudatext.desktop -t $out/share/applications + '' + lib.concatMapStringsSep "\n" (lexer: '' + install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib + '') additionalLexers; + + meta = with lib; { + description = "Cross-platform code editor"; + longDescription = '' + Text/code editor with lite UI. Syntax highlighting for 200+ languages. + Config system in JSON files. Multi-carets and multi-selections. + Search and replace with RegEx. Extendable by Python plugins and themes. + ''; + homepage = "http://www.uvviewsoft.com/cudatext/"; + license = licenses.mpl20; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json new file mode 100644 index 0000000000..9c3270bb28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -0,0 +1,42 @@ +{ + "EncConv": { + "rev": "2020.06.15", + "sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3" + }, + "ATBinHex-Lazarus": { + "rev": "2020.09.05", + "sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072" + }, + "ATFlatControls": { + "rev": "2020.08.23", + "sha256": "1axzwiz5h62v11ncynxcg431dfbky9pwyha7cd6kpizjdjagfklw" + }, + "ATSynEdit": { + "rev": "2020.09.05", + "sha256": "0qn0fp7rbi48f3nrysb0knkd7a3a6pl5w72yf95g5iibal4zrib2" + }, + "ATSynEdit_Cmp": { + "rev": "2020.09.05", + "sha256": "1bd25zc97001b7lg0bvi8va9mazkr6jih6d2ddkabcxcnsj0dxnq" + }, + "EControl": { + "rev": "2020.09.05", + "sha256": "1n7s1zkhrr216gqdqvq6wq0n3jq7s78mwpi5s5j8054p0fak1ywi" + }, + "ATSynEdit_Ex": { + "rev": "2020.09.05", + "sha256": "17y2cx5syj3jvrszjgdyf1p6vilp2qgaggz4y8yqnz99cvd0shs7" + }, + "Python-for-Lazarus": { + "rev": "2020.07.31", + "sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j" + }, + "Emmet-Pascal": { + "rev": "2020.09.05", + "sha256": "0qfiirxnk5g3whx8y8hp54ch3h6gkkd01yf79m95bwar5qvdfybg" + }, + "CudaText-lexers": { + "rev": "2020.08.10", + "sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6" + } +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch b/third_party/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch new file mode 100644 index 0000000000..44912160b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch @@ -0,0 +1,12 @@ +diff --git i/app/formmain.pas w/app/formmain.pas +index 8c1131680..6c6c0043f 100644 +--- i/app/formmain.pas ++++ w/app/formmain.pas +@@ -2135,6 +2135,7 @@ begin + false + {$endif}; + *) ++ mnuHelpCheckUpd.Enabled:=false; + + with AppPanels[cPaneSide] do + begin diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix index b1b33dc935..a56cb73fb2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -19,10 +19,10 @@ elpaBuild { pname = "ack"; ename = "ack"; - version = "1.8"; + version = "1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ack-1.8.tar"; - sha256 = "1d4218km7j1bx1fsna29j3gi3k2ak2fzbk1gyki327pnnlma6bav"; + url = "https://elpa.gnu.org/packages/ack-1.10.tar"; + sha256 = "0jz8badhjpzjlrprpzgcm1z6ask1ykc7ab62ixjrj9wcgfjif5qw"; }; packageRequires = []; meta = { @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.1.1"; + version = "7.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.1.1.tar"; - sha256 = "11ch0dn478ddzkcjcyqf2rjim7w0fjb8xfijqxxi07847w4gkklp"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.4.tar"; + sha256 = "13zcs7kn7rca82c80qshbdpmmmgkf5phr88hf7p5nwxqhkazy9cd"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -54,10 +54,10 @@ elpaBuild { pname = "ada-ref-man"; ename = "ada-ref-man"; - version = "2012.5"; + version = "2020.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-ref-man-2012.5.tar"; - sha256 = "0n7izqc44i3l6fxbzkq9gwwlcf04rr9g1whrk8biz84jhbyh23x8"; + url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar"; + sha256 = "1g4brb9g2spd55issyqldfc4azwilbrz8kh8sl0lka2kn42l3qqc"; }; packageRequires = []; meta = { @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "12.2.1"; + version = "12.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-12.2.1.tar"; - sha256 = "14y0kdri2zvz81qwpncsr3ly4ciqab6g8yxl956k3ddn36b3a56s"; + url = "https://elpa.gnu.org/packages/auctex-12.2.4.tar"; + sha256 = "1yz2h692mr35zgqwlxdq8rzv8n0jixhpaqmbiki00hlysm4zh9py"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -557,10 +557,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.12.tar"; - sha256 = "1vcgfccdc06alba3jl6dg7ms20wdzdhaqikh7id5lbawb00hc10j"; + url = "https://elpa.gnu.org/packages/company-0.9.13.tar"; + sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw"; }; packageRequires = [ emacs ]; meta = { @@ -636,6 +636,36 @@ license = lib.licenses.free; }; }) {}; + counsel = callPackage ({ elpaBuild, emacs, fetchurl, lib, swiper }: + elpaBuild { + pname = "counsel"; + ename = "counsel"; + version = "0.13.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/counsel-0.13.1.el"; + sha256 = "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli"; + }; + packageRequires = [ emacs swiper ]; + meta = { + homepage = "https://elpa.gnu.org/packages/counsel.html"; + license = lib.licenses.free; + }; + }) {}; + cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "cpio-mode"; + ename = "cpio-mode"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cpio-mode-0.16.tar"; + sha256 = "06xdifgx45aghfppz5dws3v6w37q84lwgxp1pc51p2jjflqbqy5q"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cpio-mode.html"; + license = lib.licenses.free; + }; + }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; @@ -730,10 +760,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.22"; + version = "0.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.22.tar"; - sha256 = "05ik9qv539b5c1nzxkk3lk23bqj4vqgmfmd8x367abhb7c9gix2z"; + url = "https://elpa.gnu.org/packages/debbugs-0.25.tar"; + sha256 = "0h0pxav170yzfpjf4vb8simiw67x9dkcjx9m4ghdk6wia25y8jni"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -745,10 +775,10 @@ elpaBuild { pname = "delight"; ename = "delight"; - version = "1.5"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/delight-1.5.el"; - sha256 = "0kzlvzwmn6zj0874086q2xw0pclyi7wlkq48zh2lkd2796xm8vw7"; + url = "https://elpa.gnu.org/packages/delight-1.7.el"; + sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -925,10 +955,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.17"; + version = "0.6.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.17.tar"; - sha256 = "07335pcqvvj1apzbwy4dc4i6pc6w21hr7v9fvgkc9c2x7fqlqg24"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.18.tar"; + sha256 = "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -970,10 +1000,10 @@ elpaBuild { pname = "ediprolog"; ename = "ediprolog"; - version = "1.2"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ediprolog-1.2.el"; - sha256 = "039ffvp7c810mjyargmgw1i87g0z8qs8qicq826sd9aiz9hprfaz"; + url = "https://elpa.gnu.org/packages/ediprolog-2.1.el"; + sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md"; }; packageRequires = []; meta = { @@ -1040,10 +1070,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.0.0"; + version = "1.8.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-1.0.0.el"; - sha256 = "0jdqnndvpz929rbfgrm2bgw3z2vp7dvvgk3wnhvlhf63mdiza89m"; + url = "https://elpa.gnu.org/packages/eldoc-1.8.0.el"; + sha256 = "1zxy9x9a0yqwdi572jj04x9lyj3d87mpyfbn3092a5nqwc864k9w"; }; packageRequires = [ emacs ]; meta = { @@ -1085,10 +1115,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.4"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.4.tar"; - sha256 = "18ia04aq4pqa8374x60g3g66jqmm17c6n904naa0jhqphlgam8pb"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.7.tar"; + sha256 = "1ps28bvh87d98k84ygx374a1kbwvnqm4w8jpkgzic01as78hgkiz"; }; packageRequires = []; meta = { @@ -1096,6 +1126,21 @@ license = lib.licenses.free; }; }) {}; + emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "emms"; + ename = "emms"; + version = "5.42"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/emms-5.42.tar"; + sha256 = "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/emms.html"; + license = lib.licenses.free; + }; + }) {}; enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "enwc"; @@ -1187,10 +1232,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.23"; + version = "0.24"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.23.tar"; - sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5"; + url = "https://elpa.gnu.org/packages/exwm-0.24.tar"; + sha256 = "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s"; }; packageRequires = [ xelb ]; meta = { @@ -1243,16 +1288,16 @@ license = lib.licenses.free; }; }) {}; - flymake = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.0.8.el"; - sha256 = "1hqxrqb227v4ncjjqx8im3c4mhg8w5yjbz9hpfcm5x8xnr2yd6bp"; + url = "https://elpa.gnu.org/packages/flymake-1.0.9.el"; + sha256 = "0xm1crhjcs14iqkf481igbf40wj2ib3hjzinw1gn8w1n0462ymp6"; }; - packageRequires = [ emacs ]; + packageRequires = [ eldoc emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/flymake.html"; license = lib.licenses.free; @@ -1292,10 +1337,10 @@ elpaBuild { pname = "frog-menu"; ename = "frog-menu"; - version = "0.2.10"; + version = "0.2.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/frog-menu-0.2.10.el"; - sha256 = "050qikvgh9v7kgvhznjsfrpyhs7iq1x63bryqdkrwlf668yhzi1m"; + url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.el"; + sha256 = "06iw11z61fd0g4w3562k3smcmzaq3nivvvc6gzm8y8k5pcrqzdff"; }; packageRequires = [ avy emacs posframe ]; meta = { @@ -1591,10 +1636,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "7.0.6"; + version = "7.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-7.0.6.tar"; - sha256 = "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab"; + url = "https://elpa.gnu.org/packages/hyperbole-7.1.2.tar"; + sha256 = "1bspmqnbniwr9385wh823dsr5fgch5qnlkf45s4vi0nvg8jdccp1"; }; packageRequires = [ emacs ]; meta = { @@ -1636,10 +1681,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.13.0"; + version = "0.13.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.13.0.tar"; - sha256 = "18r9vb9v7hvdkylchn436sgh7ji9avhry1whjip8zrn0c1bnqmk8"; + url = "https://elpa.gnu.org/packages/ivy-0.13.1.tar"; + sha256 = "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx"; }; packageRequires = [ emacs ]; meta = { @@ -1726,10 +1771,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.11.el"; - sha256 = "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.12.el"; + sha256 = "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad"; }; packageRequires = [ emacs ]; meta = { @@ -1782,6 +1827,21 @@ license = lib.licenses.free; }; }) {}; + leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "leaf"; + ename = "leaf"; + version = "4.2.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/leaf-4.2.5.tar"; + sha256 = "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/leaf.html"; + license = lib.licenses.free; + }; + }) {}; let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "let-alist"; @@ -2026,10 +2086,10 @@ elpaBuild { pname = "mmm-mode"; ename = "mmm-mode"; - version = "0.5.7"; + version = "0.5.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mmm-mode-0.5.7.tar"; - sha256 = "0c4azrkgagyfm9znh7hmw93gkvddpsxlr0dwjp96winymih7mahf"; + url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar"; + sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4"; }; packageRequires = [ cl-lib ]; meta = { @@ -2041,10 +2101,10 @@ elpaBuild { pname = "modus-operandi-theme"; ename = "modus-operandi-theme"; - version = "0.8.1"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.8.1.el"; - sha256 = "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb"; + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.11.0.el"; + sha256 = "11sq105vpp8rmyayfb7h8gz099kfdr7nb8n4pg81iby4fllj1kgd"; }; packageRequires = [ emacs ]; meta = { @@ -2056,10 +2116,10 @@ elpaBuild { pname = "modus-vivendi-theme"; ename = "modus-vivendi-theme"; - version = "0.8.1"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.8.1.el"; - sha256 = "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1"; + url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.11.0.el"; + sha256 = "14ky9cxg9cpvhgg24ra0xla2dapqjlf948470q7v0m402x1r2iif"; }; packageRequires = [ emacs ]; meta = { @@ -2485,10 +2545,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.48"; + version = "0.3.52"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.48.tar"; - sha256 = "1mnbrsgh6lx7kgkfsfq5zk78a97iwh8mxgxzyf1zq4jj6ziwd6bv"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.52.tar"; + sha256 = "11783i4raw6z326bqin9g37ig2szbqsma1r0fsdckyn2q6w7nn92"; }; packageRequires = [ emacs ]; meta = { @@ -2530,10 +2590,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.7.0.el"; - sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9"; + url = "https://elpa.gnu.org/packages/posframe-0.8.0.el"; + sha256 = "1vzaiiw2pxa0zrc2bkaxljpr4035xrh3d8z3l5f0jvp72cnq49kp"; }; packageRequires = [ emacs ]; meta = { @@ -2541,16 +2601,16 @@ license = lib.licenses.free; }; }) {}; - project = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }: elpaBuild { pname = "project"; ename = "project"; - version = "0.1.2"; + version = "0.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.1.2.el"; - sha256 = "0713hwim1chf6lxpg1rb234aa1gj92c153fjlc4jddp6dzzgn50d"; + url = "https://elpa.gnu.org/packages/project-0.5.1.el"; + sha256 = "1i15hlrfipsfrdmgh6xzkr6aszgvik3y8j9363qkj654dl04pmz4"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs xref ]; meta = { homepage = "https://elpa.gnu.org/packages/project.html"; license = lib.licenses.free; @@ -2571,6 +2631,21 @@ license = lib.licenses.free; }; }) {}; + pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "pspp-mode"; + ename = "pspp-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el"; + sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/pspp-mode.html"; + license = lib.licenses.free; + }; + }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; @@ -2620,10 +2695,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el"; - sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.5.el"; + sha256 = "159fps843k5pap9k04a7ll1k3gw6d9c6w08lq4bbc3lqg78aa2l9"; }; packageRequires = []; meta = { @@ -2840,10 +2915,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.17"; + version = "1.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.17.tar"; - sha256 = "1nv13dqdhf72c1jgk1ml4k6jqb8wsyphcx2vhsyhig5198lg4kd7"; + url = "https://elpa.gnu.org/packages/relint-1.18.tar"; + sha256 = "0zfislsksrkn6qs0w26yaff5xr7xqy2x235dcdpz8s2v35b6dhci"; }; packageRequires = [ emacs xr ]; meta = { @@ -2881,6 +2956,21 @@ license = lib.licenses.free; }; }) {}; + rt-liberation = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "rt-liberation"; + ename = "rt-liberation"; + version = "1.31"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rt-liberation-1.31.tar"; + sha256 = "0qqqqwdkb0h8137rqsr08179skl1475cg4hl7a987rmccys0j83c"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/rt-liberation.html"; + license = lib.licenses.free; + }; + }) {}; rudel = callPackage ({ cl-generic , cl-lib ? null , cl-print @@ -3067,6 +3157,21 @@ license = lib.licenses.free; }; }) {}; + so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "so-long"; + ename = "so-long"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/so-long-1.0.el"; + sha256 = "00z9gnxz32rakd0k7lqaj050fwmqzq5vr9d6rb7ji3fn01rjp7kj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/so-long.html"; + license = lib.licenses.free; + }; + }) {}; soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "soap-client"; @@ -3191,10 +3296,10 @@ elpaBuild { pname = "svg-clock"; ename = "svg-clock"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-clock-1.1.el"; - sha256 = "12wf4dd3vgbq1v3363cil4wr2skx60xy546jc69ycyk0jq7plcq3"; + url = "https://elpa.gnu.org/packages/svg-clock-1.2.el"; + sha256 = "15pmj07wnlcpv78av9qpnbfwdjlkf237vib8smpa7nvyikdfszfr"; }; packageRequires = [ emacs svg ]; meta = { @@ -3202,6 +3307,21 @@ license = lib.licenses.free; }; }) {}; + swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: + elpaBuild { + pname = "swiper"; + ename = "swiper"; + version = "0.13.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/swiper-0.13.1.el"; + sha256 = "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/swiper.html"; + license = lib.licenses.free; + }; + }) {}; system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "system-packages"; @@ -3300,10 +3420,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.3.4"; + version = "2.4.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.3.4.tar"; - sha256 = "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f"; + url = "https://elpa.gnu.org/packages/tramp-2.4.4.1.tar"; + sha256 = "0jayd75yscaqvg6y0m6g2mgbjswyj5gqdij2az9g0j18vm5vbqy3"; }; packageRequires = [ emacs ]; meta = { @@ -3491,10 +3611,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2020.2.23.232634261"; + version = "2020.6.27.14326051"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2020.2.23.232634261.el"; - sha256 = "07r2nzyfwmpv1299q1v768ai14rdgq7y4bvz5xsnp4qj3g06p0f6"; + url = "https://elpa.gnu.org/packages/verilog-mode-2020.6.27.14326051.el"; + sha256 = "194gn8cj01jb9xcl0qq3gq6mzxfdyn459ysb35fnib7pcnafm188"; }; packageRequires = []; meta = { @@ -3704,10 +3824,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.1.1.tar"; - sha256 = "0abm9xfyk2izi0w9172sfhdq83abcxgbngngbh2gby54df0ycn0q"; + url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar"; + sha256 = "0cbjcm35lp164wd06mn3clikga07qxfsfnkvadswsapsd0cn2b4k"; }; packageRequires = [ emacs seq ]; meta = { @@ -3724,10 +3844,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.1.0.tar"; - sha256 = "123z9j76cm0p22d9n4kqvn2477fdkgp5jarw564nd71cxrrb52ms"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.2.0.tar"; + sha256 = "0isxmpwys148djjymszdm5nisqjp9xff8kad45l4cpb3c717vsjw"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -3810,16 +3930,16 @@ license = lib.licenses.free; }; }) {}; - xref = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xref"; ename = "xref"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.0.1.el"; - sha256 = "17wlwilm2d1gvin8mkkqnpw2skjx0klxfs1pqpy8rrzdfpsb55li"; + url = "https://elpa.gnu.org/packages/xref-1.0.2.el"; + sha256 = "156rfwdihb3vz31iszbmby16spqswyf69nhl3r2cp6jzkgwzc1d8"; }; - packageRequires = [ emacs project ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/xref.html"; license = lib.licenses.free; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f228d34a65..03e9923f73 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -196,6 +196,26 @@ let ivy-rtags = fix-rtags super.ivy-rtags; + libgit = super.libgit.overrideAttrs(attrs: { + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ]; + buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ]; + dontUseCmakeBuildDir = true; + postPatch = '' + sed -i s/'add_subdirectory(libgit2)'// CMakeLists.txt + ''; + postBuild = '' + pushd working/libgit + make + popd + ''; + postInstall = '' + outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**) + mkdir $outd/build + install -m444 -t $outd/build ./source/src/libegit2.so + rm -r $outd/src $outd/Makefile $outd/CMakeLists.txt + ''; + }); + magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -531,6 +551,12 @@ let (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; })); + orgit-forge = super.orgit-forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { HOME = "/tmp"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix index 4beb575016..b0eccbd888 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20200511"; + version = "20200817"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20200511.tar"; - sha256 = "147k6nmq00milw5knyhw01z481rcdl6s30vk4fkjidw508nkmg9c"; + url = "https://orgmode.org/elpa/org-20200817.tar"; + sha256 = "159hch9zls3apxq11c5rjpmci1avyl7q3cgsrqxwgnzy8c61104d"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20200511"; + version = "20200817"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20200511.tar"; - sha256 = "1hsdp7n985404zdqj6gyfw1bxxbs0p3bf4fyizvgji21zxwnf63f"; + url = "https://orgmode.org/elpa/org-plus-contrib-20200817.tar"; + sha256 = "0n3fhcxjsk2w78p7djna4nlppa7ypjxzpq3r5dmzc8jpl71mipba"; }; packageRequires = []; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index a10df77910..98346d4d82 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,20 +31,20 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20200411, - 1227 + 20200521, + 1352 ], - "commit": "59136313132c08ab5fddaa875f6abeb22916a04b", - "sha256": "0acdh1r28v6xcsh39r13xppzqb6m00jgxgsxl17779isw98w9a3y" + "commit": "16581d94a1e32677091f3721506a48177cc49e68", + "sha256": "08gdycsi5mjz7ak8x71i3zs7xnr23b384bdlf1bspa325k8v2klq" }, "stable": { "version": [ 0, 3, - 0 + 1 ], - "commit": "1d29192a3c28ba088d93410bfcdd4bee0abb6610", - "sha256": "02kmfzkrl35y599w5yal5d7rjb3xi02zhvb8q0m3iw4mbm16sw28" + "commit": "16581d94a1e32677091f3721506a48177cc49e68", + "sha256": "08gdycsi5mjz7ak8x71i3zs7xnr23b384bdlf1bspa325k8v2klq" } }, { @@ -322,14 +322,14 @@ "repo": "zk-phi/ac-c-headers", "unstable": { "version": [ - 20151021, - 834 + 20200816, + 1007 ], "deps": [ "auto-complete" ], - "commit": "de13a1d35b311e6601556d8ef163de102057deea", - "sha256": "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y" + "commit": "67e1e86a48c9bed57bc7ce5ce2553ad203f5752e", + "sha256": "1yk0a4p1pi7jwv48rvzn4i2733kg5ffp0q5vgcq22f98pmzyk77f" } }, { @@ -966,16 +966,16 @@ "stable": { "version": [ 2, - 2, - 2 + 3, + 0 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "4490d168778a61a4ee8623defe760164cd9745b8", - "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" } }, { @@ -1003,8 +1003,8 @@ "stable": { "version": [ 2, - 2, - 2 + 3, + 0 ], "deps": [ "dash", @@ -1014,8 +1014,8 @@ "s", "xcscope" ], - "commit": "4490d168778a61a4ee8623defe760164cd9745b8", - "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" } }, { @@ -1064,8 +1064,8 @@ "auto-complete", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -1360,14 +1360,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20200515, - 1854 + 20200518, + 957 ], "deps": [ "avy" ], - "commit": "b610dcb99510328d07ab1e1ea67b2f87ecb1cc5b", - "sha256": "0r7cyvrkbqq0dsm5963wn2i1wqgq0md5r8b2afjbr3m9b6v5lnq4" + "commit": "298f02f7dd117f9ec01f6aa2a2ddfecae0efb7f4", + "sha256": "1i243wfwrbxn00sh96248lpqfb7cvxqqwlc78nf8kim4ymylpp41" }, "stable": { "version": [ @@ -1449,8 +1449,8 @@ "deps": [ "avy-menu" ], - "commit": "02b22bdb40a5828dbd0a2af290034adb761743f0", - "sha256": "12b6s99d0wzs4q827kn5zr56vrp3x1kf2pxp4cr8z5hikylfswcs" + "commit": "390f0711d2a42675980d8b531fd5dc396b85f24b", + "sha256": "00va4glq9iibrfrnhinv8a7f5q0z7xvfyxnjf1rl4z770drz9j4n" }, "stable": { "version": [ @@ -1473,14 +1473,14 @@ "repo": "abo-abo/ace-window", "unstable": { "version": [ - 20200311, - 1025 + 20200606, + 1259 ], "deps": [ "avy" ], - "commit": "7003c88cd9cad58dc35c7cd13ebc61c355fb5be7", - "sha256": "0f3r40d5yxp2pm2j0nn86s29nqj8py0jxjbj50v4ci3hsd92d8jl" + "commit": "c7cb315c14e36fded5ac4096e158497ae974bec9", + "sha256": "06zkb5v6h0gwrqx7xiz2vlzf13kzf3z79xc5jhv2j73rqcajjy9v" }, "stable": { "version": [ @@ -1531,6 +1531,30 @@ "sha256": "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm" } }, + { + "ename": "acme-theme", + "commit": "0bf14d91ff89556671b175d5f7e71066f27cb73d", + "sha256": "0zsrqvhly3si2qkvc4rhki89r2z185l684wf7j9kx32fgaaqanac", + "fetcher": "github", + "repo": "ianpan870102/acme-emacs-theme", + "unstable": { + "version": [ + 20200724, + 1833 + ], + "commit": "e416ec678be72eb1aed3de3d88a8a9e3ee7315ca", + "sha256": "0y98il3gsnhm586hr1qdmif4r6v1987fzl82wgx75g8kiy5shbrj" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "680b2022445861e3e9030a96d9fe587188d778c8", + "sha256": "1mww6x8gwhkrqcylxxm25xhcvam52nhj7q3f3bvaxhyfdc7jw9yq" + } + }, { "ename": "actionscript-mode", "commit": "2c11e74f2156f109b713380cebf83022d7159d4a", @@ -1847,11 +1871,11 @@ "repo": "vietor/agtags", "unstable": { "version": [ - 20191112, - 142 + 20200730, + 116 ], - "commit": "8813eb055dfd3faf1021c7d02fed0dabd8e518c1", - "sha256": "0xj394fiqsyh32g21mcp64srs8dlf0ixaildyla1gm27v8cgiakb" + "commit": "d80c6f61dee74040c07b7010d48cab1df13a3abf", + "sha256": "05jkkh7m126j24ayh85bk10s4z3lsy1s6n217qb7hlgfl8y5fqdj" } }, { @@ -1865,8 +1889,8 @@ 20191212, 652 ], - "commit": "938c78327aad94d5f8e8d86ffd9808a687f3e953", - "sha256": "1zzhy5ajr6ivmj4jbbmaznxfqgxl4xy21s2r4wip668w8kw02h4m" + "commit": "3ca848bcf1fc4c18b4a5329d1439c5effb7dcb97", + "sha256": "1lgxwhq5359qrn3zv5m9sssz93vbqa6bp49z526pck1bkf80s3vx" } }, { @@ -1940,11 +1964,11 @@ "repo": "skeeto/emacs-aio", "unstable": { "version": [ - 20200410, - 1409 + 20200610, + 1904 ], - "commit": "9367005c44c42c46c8ca1e7d3f780731c7d123dd", - "sha256": "063avjlizpjc53myjzvkqsp64gkxwcc7w7shjdf1xgjb9b58pbc1" + "commit": "da93523e235529fa97d6f251319d9e1d6fc24a41", + "sha256": "0hnxbz5pxlrgxhjr5gnhf06qwg67g5pd87xkp0smmagsh18pnf76" }, "stable": { "version": [ @@ -2006,21 +2030,21 @@ }, { "ename": "alan-mode", - "commit": "6e52314db81dad3517ab400099b032260c3e3e6f", - "sha256": "1528rh26kr9zj43djbrfb7vmq78spfay3k3ps5apc580ipx1a4hg", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1i3vhqdrp8zdmkzgyri5z7vh1j0mykcp7mkjxjc7293ncsj310d8", "fetcher": "github", - "repo": "M-industries/AlanForEmacs", + "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20190407, - 555 + 20200723, + 1405 ], "deps": [ "flycheck", "s" ], - "commit": "a5a705b64230bb14ad1d19bcc0613e3261e8cbe5", - "sha256": "1jhsrb26fpm9yykp974rx77ika76zq3gq7pcjgixw4d4ga737d95" + "commit": "fc1fc0312b3e7f868f95b917a66719afb96f0c9a", + "sha256": "1cadc2v8mdlz5di7cwhc9qqhrkwgl3gxyw5v4il895r44rcdifgq" }, "stable": { "version": [ @@ -2133,11 +2157,11 @@ "repo": "alezost/alect-themes", "unstable": { "version": [ - 20190506, - 1440 + 20200801, + 2041 ], - "commit": "da7305075d292cc1909bf26dc5634bc3cc8d2603", - "sha256": "06nsfmydlcdqi4fp3nn6yz4xys38f3q196pf3bmmdqgg7pbcm259" + "commit": "684249b83d711145865ec31650e66ed9aa6e691b", + "sha256": "1cyd327shiwgdxf7bx542pfw6d6ilsq51n65lz3bfs8fzm5mib8v" }, "stable": { "version": [ @@ -2240,14 +2264,14 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20200508, - 1157 + 20200730, + 1545 ], "deps": [ "memoize" ], - "commit": "d6cb6d4a779eaa3570d8e451fd4d38b2b4554860", - "sha256": "0pnzsnklqjlks6ipaj242vlrk5skmwflpn1sdd00xw9gmb5mxb3m" + "commit": "8c0228053dd6693d926970d89270094be52b0f75", + "sha256": "08p2x6da4dp6imw6dg501kw68m4rhjfdbc6yn5ld29mazvv923zl" }, "stable": { "version": [ @@ -2307,14 +2331,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20200319, - 1625 + 20200612, + 1642 ], "deps": [ "all-the-icons" ], - "commit": "3ee9e32f480329e94e45f86538343b0ddc7ddd4f", - "sha256": "1cs9027q26nfm5k3182mbmmhj8s8y2nv47gsyamwpjqdma0sbl73" + "commit": "8bb1a893e826e39ad4d7abc0add5dd6c33b18f29", + "sha256": "02sbddvjys6bf8pcbg3pv5fc1f8b48vmx0bnfyqw1x04dyb8cdm7" }, "stable": { "version": [ @@ -2369,28 +2393,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20200324, - 550 + 20200811, + 838 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "a9a4389c1930a5a071857b4d450eaecb21f4d6b9", - "sha256": "133vl3awl3qxxd2ka8zdr33v6s8hrjpsv4bv2db5j8jz35m0hx9d" + "commit": "e918b23d55313a7464d8cb5d45eb917249638e32", + "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4" }, "stable": { "version": [ 1, - 2, - 0 + 4, + 1 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "3e02da9a166df7ebea25aae476efd7b8d74d63e0", - "sha256": "0p91yvpqy7xjkz2mcpq6c8kjfxqfw9byxprqg2qqnzg421c5yv6x" + "commit": "e918b23d55313a7464d8cb5d45eb917249638e32", + "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4" } }, { @@ -2440,20 +2464,20 @@ "repo": "jcs-elpa/alt-codes", "unstable": { "version": [ - 20190701, - 1246 + 20200723, + 1037 ], - "commit": "ded8cbff05f4f2fc4d023c5ee08ebe8b1bdb9ca9", - "sha256": "1v8sir3c0akv5sb8yg01zh0n6qqd4hp95sahbx01z1200g0phcaw" + "commit": "b36c2b2bccc628da1579016381d5c3195c9e12b2", + "sha256": "19nqpg91in65gj59zndhncx6c1005k0wh05rprv1z6465j5gd40g" }, "stable": { "version": [ 0, 0, - 4 + 5 ], - "commit": "7dcd9cdcc41cfb991801ea1e2f5b3c925a5309ee", - "sha256": "19xg4ng3p49zvn1y7vagrfiiwvc2fynwibr6cmj7qam1y64lw90c" + "commit": "b36c2b2bccc628da1579016381d5c3195c9e12b2", + "sha256": "19nqpg91in65gj59zndhncx6c1005k0wh05rprv1z6465j5gd40g" } }, { @@ -2593,14 +2617,14 @@ "repo": "stardiviner/amread-mode", "unstable": { "version": [ - 20200404, - 1143 + 20200623, + 1544 ], "deps": [ "cl-lib" ], - "commit": "a595828fcc2257f765139b576beb6c33b4fc3bce", - "sha256": "1mwlj48hjp59mcafia612qqzmqxh30k0jshzrnzsnwlfbbsdxjwj" + "commit": "7b1ed6c8aea409e2dce4a3b59f304d716a8efab7", + "sha256": "12hcgkznf1l4db8y0q33v735b5iin8iycc5s0di46ichxcjr0b7x" } }, { @@ -2611,14 +2635,14 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20200417, - 1513 + 20200701, + 2108 ], "deps": [ "s" ], - "commit": "7fb7b874291e0cdeb1f0acb18564a686ec86788d", - "sha256": "0yc2b814zcl3c6lgamrr63cl4r3ayzlyfqql8875fzflc541nnnc" + "commit": "ccfc92c600df681df5e8b5fecec328c462ceb71e", + "sha256": "0pdgicknrph4lfyjxwdqh7xwcfsnqnrx1l4xpd972ivy1n8s7783" }, "stable": { "version": [ @@ -2640,8 +2664,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20200129, - 1718 + 20200806, + 436 ], "deps": [ "dash", @@ -2649,8 +2673,8 @@ "pythonic", "s" ], - "commit": "10299bd9ff38c4f0da1d892905d02ef828e7fdce", - "sha256": "0s5pxfjcsmyrqc5pa2lqx6mxzwy3g8mc3iaxbj313sn1nly26vjw" + "commit": "73266a48fa964d44268c3f3478597e553b9843f1", + "sha256": "0b4zzkr73hmjg92vr348294xymrynw4j0x89jzklh2plizp0alcr" }, "stable": { "version": [ @@ -2730,11 +2754,11 @@ "repo": "fernando-jascovich/android-env.el", "unstable": { "version": [ - 20190720, - 1927 + 20200722, + 1403 ], - "commit": "dcb0bff0e77257266201cf1ccf17e7ca94e67fb1", - "sha256": "132fshzb4f0miqn3ijvwfdigldrvx7dsx06dczr9z9v9xw61ar8j" + "commit": "5c6a6d9449f300eec4f374a5410edc1cbab02e40", + "sha256": "182b3fd85q3x5ynnfnjb01phhq1glf1wxj5rz8zx43ddnzz9ahmn" } }, { @@ -2778,21 +2802,17 @@ }, { "ename": "angular-mode", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0pq4lyhppzi806n1k07n0gdhr8z8z71ri12my0pl81rl5j2z69l2", + "commit": "54d86ad963ca7357ccb62a2e4aa124ed44bc0ebf", + "sha256": "04c07flrfnfr6jsqm76xdl5gw79rh18ys4cmqjmgv55rrs0w4rws", "fetcher": "github", - "repo": "rudolfolah/angularjs-mode", + "repo": "emacsattic/angular-mode", "unstable": { "version": [ 20200510, 1729 ], "commit": "b24020768217f16b1b86aa236e9729b3d40e17b3", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/rudolfolah/angularjs-mode/archive/b24020768217f16b1b86aa236e9729b3d40e17b3.tar.gz': HTTP error 404\n" - ] + "sha256": "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377" }, "stable": { "version": [ @@ -2877,8 +2897,8 @@ "repo": "davidshepherd7/anki-mode", "unstable": { "version": [ - 20200413, - 1019 + 20200703, + 736 ], "deps": [ "dash", @@ -2886,8 +2906,8 @@ "request", "s" ], - "commit": "fcbcfa7cd7fb5c282e1138322e61242942729e3d", - "sha256": "06ab3zdaz5wf30zbci7cav3dvvnknnbzq18zfzzfi4xjcsi0zkvr" + "commit": "3918e4f7b2f14e485cc3acc927abe6563695963f", + "sha256": "16fx2w1nz6jxsrc9naykah3valab46xnwsmjz5lm9zl38g4ypyna" }, "stable": { "version": [ @@ -2962,20 +2982,20 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20200330, - 1640 + 20200812, + 1439 ], - "commit": "f0a71bb14806c79f09cb6aacb5ef98a852ef66e2", - "sha256": "1v2rbrhqg4kipk4l901xzfdc4wm5fkvvx4j3l8mfp7nvc2x8gcbw" + "commit": "2bf7a7c1acb6768a590954c9bfef5f72ae8cc452", + "sha256": "05zwfflsx69904jxlayalh3n3n9msl92zw2rk5kk17p9psjpv9yw" }, "stable": { "version": [ 0, - 4, - 7 + 7, + 0 ], - "commit": "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87", - "sha256": "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1" + "commit": "99c45f553e7caef693506498d11e4b664b6f2946", + "sha256": "154655p54xxsbr06lbbdpzzx4hif6542a4cf767qnichsz9cj75j" } }, { @@ -3028,15 +3048,16 @@ "repo": "rejeep/ansi.el", "unstable": { "version": [ - 20150703, - 826 + 20200611, + 944 ], "deps": [ + "cl-lib", "dash", "s" ], - "commit": "12b4c5d91b3da1902838f421e5af6d40e2cd57dd", - "sha256": "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85" + "commit": "a41d5cc719297515d85bb5256980cd1204a71b88", + "sha256": "051v8dmji90chwbsyqsqry7h35mksal2j6rgw1kpmjsni86d79y1" }, "stable": { "version": [ @@ -3060,28 +3081,28 @@ "repo": "k1LoW/emacs-ansible", "unstable": { "version": [ - 20191003, - 1430 + 20200704, + 1354 ], "deps": [ "f", "s" ], - "commit": "c6532e52161a381ed3dddfeaa7c92ae636d3f052", - "sha256": "16i0r019lj9fdkxcga2jb8ha0r2lf1mz7jywg44hnj7r3lzdcmwp" + "commit": "b5ef59406604bc5027f4d816d90e633feef0149c", + "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "f", "s" ], - "commit": "c6532e52161a381ed3dddfeaa7c92ae636d3f052", - "sha256": "16i0r019lj9fdkxcga2jb8ha0r2lf1mz7jywg44hnj7r3lzdcmwp" + "commit": "b5ef59406604bc5027f4d816d90e633feef0149c", + "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3" } }, { @@ -3576,6 +3597,21 @@ "sha256": "11ssqaax4jl7r3z5agzmc74sjsfvl0m3xvp015ncqzpzysla47g3" } }, + { + "ename": "arduino-cli-mode", + "commit": "613b2f82b1fd035e725e574c750da408e8386cde", + "sha256": "1h49bfn4gn1h2xdb6axhbg6wm74h4fmiylcm55lwg9ri57rcdqkl", + "fetcher": "github", + "repo": "motform/arduino-cli-mode", + "unstable": { + "version": [ + 20200812, + 935 + ], + "commit": "80c5aa6a29a192f9a9d3ba3d7fb7446b1281051a", + "sha256": "1bj4vlvryk2k3920zc9pg9jca9385hji76nrx7avhd6jsjjm79mf" + } + }, { "ename": "arduino-mode", "commit": "2db785f52c2facc55459e945ccb4d4b088506747", @@ -3584,15 +3620,15 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20180509, - 36 + 20200819, + 103 ], "deps": [ "cl-lib", "spinner" ], - "commit": "23ae47c9f28f559e70b790b471f20310e163a39b", - "sha256": "08vnbz9gpah1l93fzfd87aawrhcnh2v1kyfxgsn88pdwg8awz8rx" + "commit": "16955f579c5caca223c0ba825075e3573dcf2288", + "sha256": "1vf3ahvs81i0fa3rbwz3i67ahf3x169pv879p5igxk93xf6whqnp" } }, { @@ -3826,11 +3862,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20200113, - 1745 + 20200809, + 501 ], - "commit": "86aef2c38e7d35e8509b7feeee3e989d825eba91", - "sha256": "1slxlpxjggyg5q8xppn9csh54j93b2hc4v8lcn85ymw2hp3rsib9" + "commit": "36a10151e70e956e2f766ed9e65f4a9cfc8479b2", + "sha256": "08glbksm13kgxvy17x0kg01x9cgnkz01yqqnlwzfaan0zbf6brdl" }, "stable": { "version": [ @@ -3905,6 +3941,30 @@ "sha256": "1pvnwzp0i1s19cyyzrkcannhx1jizvylxsr7qcipfiy2kmf8sbhz" } }, + { + "ename": "atl-markup", + "commit": "42025212ccfe998023f7eb563588be76282d53de", + "sha256": "1123lbnc6hlycm6bg5f7292z7cdnp2iv0wb8mg0n0ydma524s6bm", + "fetcher": "github", + "repo": "jcs-elpa/atl-markup", + "unstable": { + "version": [ + 20200810, + 845 + ], + "commit": "79adac0149bb6083ad3a327c6bbdf56537282ee9", + "sha256": "1kd9fk1f3aaw0ikkbf9n6w5b2sy7v0xzsch688h8ac9rp6s2yws8" + }, + "stable": { + "version": [ + 0, + 1, + 5 + ], + "commit": "876d8a31d5e233d5234231f1428f8edb013e30eb", + "sha256": "1czqi0l1jzhlb47n0grlrnx421wi9mdqb41abcfd33k4mjavv0iz" + } + }, { "ename": "atom-dark-theme", "commit": "d1f565871559d6ea4ca4bb2fbaebce58f2f383eb", @@ -4019,14 +4079,14 @@ "repo": "tsuu32/auctex-cluttex", "unstable": { "version": [ - 20200311, - 1453 + 20200531, + 402 ], "deps": [ "auctex" ], - "commit": "76fba4a1a918ce8a276fa0e22f026ad9a45a47dc", - "sha256": "1rd92s2c08z3l2r2wxcs46bbri4rj0d0aym36v89pwq0fcqqx2ry" + "commit": "7e36dcb88c0021e48e7a095257e63e2913f75789", + "sha256": "1wfsd7kcjm8inbhacsilngjqcwfn5alr02m4bcpv5w8gjyc0qwgx" }, "stable": { "version": [ @@ -4192,11 +4252,11 @@ "repo": "ccrusius/auth-source-xoauth2", "unstable": { "version": [ - 20200509, - 2304 + 20200817, + 1604 ], - "commit": "5e646a32c9ba31a015a09fce1ad711b85717119a", - "sha256": "0nl859csl8xcd6ybpjj15ph8l8fxwkwf45kbylss68alkyf1rl3v" + "commit": "b0386d4a12a88c5635b26eaa4c9e355fc84fb3f6", + "sha256": "11i184s36ddxs06d8gq15nd0q59im8vfqnww3mvy35q12y6r8gpq" }, "stable": { "version": [ @@ -4286,8 +4346,8 @@ "cl-lib", "popup" ], - "commit": "2f11a4e6ff7f5d4939c3e1724158411a7efed057", - "sha256": "067ymm5swi9yq3sndzghqxlyyywzk434ip68nf6fxbj51raxzzq8" + "commit": "c0836fa0662095071e3c40237db611063e3c3ceb", + "sha256": "1269k2q1hv1yixn7w32ani7g0zspiiwfmbywxi8lvh9hj0asbrsc" }, "stable": { "version": [ @@ -4532,10 +4592,10 @@ }, { "ename": "auto-complete-sage", - "commit": "f1cd78dcd58d559c47873f8fcfcab089a8493dd6", - "sha256": "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0ic60b9jnzgidpwxriwamicimyqa8y4hqfbkxmwcrp0snk4nf4hn", "fetcher": "github", - "repo": "stakemori/auto-complete-sage", + "repo": "sagemath/auto-complete-sage", "unstable": { "version": [ 20160514, @@ -4593,11 +4653,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20200516, - 1608 + 20200801, + 2029 ], - "commit": "f712de72d4618ce6c5d55ba20c848c83a87c5f32", - "sha256": "17dsdfs9l3g4jnna5b2pzifvxv13rr5rja76frl5wwp2brfmq8qv" + "commit": "cad370fb6c9fc7186c2af221932e097af5900a2d", + "sha256": "0hjxadi8245zwwsp0kdz0c6i1j25drbky5cvksdnc8xw2l91kpbs" } }, { @@ -4729,14 +4789,14 @@ "repo": "zonuexe/auto-read-only.el", "unstable": { "version": [ - 20170306, - 443 + 20200726, + 1356 ], "deps": [ "cl-lib" ], - "commit": "79654f8fc024f383ae7af05487c1345738236500", - "sha256": "123822s9xkzw25swn1h1szxmmajnn9rq85vasygvy5cn2l6lar3l" + "commit": "a6c493c5279d484c00ce7fe75dfd2e60101b97db", + "sha256": "0wg6pl69k1hy69hgsqry5zahycr1n13avjfrw7g3sva71rqzkzrn" } }, { @@ -4747,20 +4807,20 @@ "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ - 20190525, - 628 + 20200717, + 814 ], - "commit": "27ca700cb2f61a1040013600c5744d68a27cbd8d", - "sha256": "1hydigzi82zana6ivcj4nxqvdnh3973594ag6zlgw9nijilih64r" + "commit": "7227c93e58a2c1837aa35ca35b6325c6f734d0f9", + "sha256": "1q029xy4ssb6lvd199yl1p63ir142q9waw31v2zagxlyn9rs9qx9" }, "stable": { "version": [ 0, - 0, - 2 + 2, + 9 ], - "commit": "4bd41b3107d3971c9533f9d0c8718c299669cb78", - "sha256": "1g6kllnl625h6vmnps15a7ivpxq3k6s4vdxj50dj2i76g19wi2cn" + "commit": "7227c93e58a2c1837aa35ca35b6325c6f734d0f9", + "sha256": "1q029xy4ssb6lvd199yl1p63ir142q9waw31v2zagxlyn9rs9qx9" } }, { @@ -4778,24 +4838,6 @@ "sha256": "0ckjijjpqpbv9yrqfnl3x9hcdwwdgvm5r2vyx1a9nk4d3i0hd9i5" } }, - { - "ename": "auto-scroll-mode", - "commit": "195041c70d2807184d4d8c711bcd3f54b8dfc73a", - "sha256": "1hvnhszn1cqzw42wn7w0hrq7wn161alg2w6xpd53ydg61g31i68n", - "fetcher": "github", - "repo": "stardiviner/auto-scroll-mode", - "unstable": { - "version": [ - 20200316, - 134 - ], - "deps": [ - "cl-lib" - ], - "commit": "a23669a8747e71ca5b1003b923f7a3d3834740e3", - "sha256": "033msm39fdhm6iqd7khjsqvxrv4314h8klsq3g06zsrgpmjki1xr" - } - }, { "ename": "auto-shell-command", "commit": "ea710bfa77fee7c2688eea8258ca9d2105d1896e", @@ -4866,16 +4908,16 @@ "repo": "marcwebbie/auto-virtualenv", "unstable": { "version": [ - 20170125, - 1917 + 20200729, + 2204 ], "deps": [ "cl-lib", "pyvenv", "s" ], - "commit": "3826db66b417788e2b2eb138717255b1f52a55c3", - "sha256": "12691m4z0zr3prmdhmjlpcx0ajj1ddrbj9gy827xmgr0vaqbr7b2" + "commit": "214604ebd3366078d03814a344c3249268d1f15a", + "sha256": "14waa4v6nr0ybyncgfjg96r43ma4lw57iyma0chvpqifmbs6ski0" } }, { @@ -4955,14 +4997,14 @@ "repo": "erjoalgo/autobuild", "unstable": { "version": [ - 20200209, - 2005 + 20200713, + 227 ], "deps": [ "cl-lib" ], - "commit": "9e7a101e1563eaf6f5d671e5877d652079cea78b", - "sha256": "0khhmhh5fv004xhs3v8v8y3m8i1ibi19w74sv4shpy0ixd5zq1bj" + "commit": "6c10b13c285cc4180dc64c1f89ead264e6786f53", + "sha256": "02zjfv5365misiivjgjwwrp6bly7z81vnndkyrn6xzv88d2l2byv" } }, { @@ -5026,21 +5068,6 @@ "sha256": "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85" } }, - { - "ename": "automargin", - "commit": "0937e63ec686cc3e183bddb029a514c64934fc81", - "sha256": "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8", - "fetcher": "github", - "repo": "zk-phi/automargin", - "unstable": { - "version": [ - 20131112, - 814 - ], - "commit": "4901d969ad69f5244e6300baab4ba04efed800c3", - "sha256": "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962" - } - }, { "ename": "autopair", "commit": "4150455d424326667390f72f6edd22b274d9fa01", @@ -5082,8 +5109,8 @@ 20190331, 2230 ], - "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", - "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" + "commit": "fc9ec563430e3beaefc00b26da179f4b4ca9855b", + "sha256": "1m4v56yy73gvycsvpc36h7yh6yhn3fgp90rk5m248hz89gjf9kxv" } }, { @@ -5189,14 +5216,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20200422, - 1153 + 20200624, + 1148 ], "deps": [ "cl-lib" ], - "commit": "509471bad0e8094b8639729ec39ca141fae7d4bd", - "sha256": "0kj4nbp8g22xyvjdy8vh54v6zgd4f3z6srrw5pd55gbczm5csnbj" + "commit": "bbf1e7339eba06784dfe86643bb0fbddf5bb0342", + "sha256": "0jmjjckrmivfy2r527vynq9x0mzwcgcyclydar9fa2xb1wn669pd" }, "stable": { "version": [ @@ -5245,8 +5272,8 @@ "deps": [ "avy" ], - "commit": "aee6878a8c2f18c3ac3bd34d608783b52cd708e0", - "sha256": "1526a6cqaa16x5gi2fsdi9brqa54n3m0dvrnkd85w6sgaz33cpiz" + "commit": "970204989bcd4a4f8223c2fe980a08dc58441045", + "sha256": "196pwh83p0yrnagpiig8h2mq9xxm7wk9q8x832ffwizip4yni80b" }, "stable": { "version": [ @@ -5390,6 +5417,21 @@ "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, + { + "ename": "ayu-theme", + "commit": "22bdc35d5c432c5d58d751c0fc3f2e5d0fafe583", + "sha256": "1ygg6dwzg0kjxxd8c6w5j174jcjkc7f4hljgd70vkh4k7817kxj8", + "fetcher": "github", + "repo": "vutran1710/Ayu-Theme-Emacs", + "unstable": { + "version": [ + 20200521, + 1157 + ], + "commit": "ed98a9f41d9f0e08458ee71cc1038f66c50e1979", + "sha256": "1qdw9pq1daydky0b94x248q27sjzaxpfw9d027xk6ygi9hksvcsk" + } + }, { "ename": "babel", "commit": "b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc", @@ -5475,11 +5517,11 @@ "repo": "mschuldt/backlight.el", "unstable": { "version": [ - 20190905, - 519 + 20200813, + 1839 ], - "commit": "3e5b971b4ee89299240a89614db92d2c4034e954", - "sha256": "0hsb1vd1mk4mcgr4l93b81hz2bq7cpd7b3kdhabv9z489mxiy3fa" + "commit": "38fcb9256c3bf7300a41332fa7f9feffc4e2db9a", + "sha256": "0982il82v10yclm87b06ghwv4cglw03ia0zs4m838ag6zg8a08jg" } }, { @@ -5633,20 +5675,20 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20200510, - 1107 + 20200811, + 1008 ], - "commit": "f80c7c394b57057499db6409f386ade9ac32f763", - "sha256": "0mj2kr13gpvy4kpzxvy1jmz0c9cdnikazlsb9j0dx94f9777sy04" + "commit": "e02338331463461a85144c0ce6b9b877bd3a7567", + "sha256": "1rvgmkl950zrakczk9libws29c9l2hklw49m3xb4swa14kz1r639" }, "stable": { "version": [ 1, 0, - 2 + 3 ], - "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db", - "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls" + "commit": "e02338331463461a85144c0ce6b9b877bd3a7567", + "sha256": "1rvgmkl950zrakczk9libws29c9l2hklw49m3xb4swa14kz1r639" } }, { @@ -5674,10 +5716,10 @@ }, { "ename": "bap-mode", - "commit": "05b1b5885a9d5e3bda38bc8a2f987bffd9353cc0", - "sha256": "1n0sv6d6vnv40iks18vws16psbv83v401pdd8w2d2cfhhsmmi4ii", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0w82dzhahp9zc1dhkfwc77irpqbq0fdp14cjfkk3g5cmvyzz5s1a", "fetcher": "github", - "repo": "fkie-cad/bap-mode", + "repo": "BinaryAnalysisPlatform/bap-mode", "unstable": { "version": [ 20200128, @@ -5748,20 +5790,20 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20191126, - 1824 + 20200806, + 1743 ], - "commit": "96ce14af9674f3e605bacca87abc0c23b8f13cd5", - "sha256": "1w3yvpcdjq9a6m2q2lz23dib2ijmfgn4w2z2g5y9wkpdmx48k655" + "commit": "d47edb9d4142a22746009c1f680df93a4fefd107", + "sha256": "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4" }, "stable": { "version": [ - 2, + 3, 1, 0 ], - "commit": "6aedd690006e07199b2fcd319b9b840a527650e5", - "sha256": "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0" + "commit": "d47edb9d4142a22746009c1f680df93a4fefd107", + "sha256": "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4" } }, { @@ -5902,11 +5944,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20200515, - 1408 + 20200627, + 1625 ], - "commit": "39d4649f4a179e22fabbef1166afe1725c8dbea6", - "sha256": "0n5kqjcmwfbr58my3yisgfigh77rhy5b18jr4kh2b327r76ssqwl" + "commit": "2cf143b616df3de4b199538341d674c58386719e", + "sha256": "1p9pxxdx39jmf8sav660ps6mqwbsgcl4v1i9xb8xsd5qdxmwjqli" }, "stable": { "version": [ @@ -6118,21 +6160,6 @@ "sha256": "0q0i1j8ljfd61rk6d5fys7wvdbym9pz5nhwyfvmm0ijmy19d1ppz" } }, - { - "ename": "bdo", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1n2kpaps6992nxl0v1003czcbw1k4xq906an56694wkh05az505j", - "fetcher": "github", - "repo": "chrisdone/bdo", - "unstable": { - "version": [ - 20140126, - 901 - ], - "commit": "c96cb6aa9e97fa3491185c50dee0f77a13241010", - "sha256": "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm" - } - }, { "ename": "beacon", "commit": "d09cfab21be800831644218e9c8c4433087951c0", @@ -6171,14 +6198,14 @@ "repo": "Sodaware/beeminder.el", "unstable": { "version": [ - 20180413, - 1929 + 20200610, + 2311 ], "deps": [ "org" ], - "commit": "3fcee7a7003a37171ddb59171c7f4b5dd4b34349", - "sha256": "0phiyv4n5y052fgxngl3yy74akb378sr6manx21s360gnxzcblwd" + "commit": "8f86ae34ebd17324d98146a2b3a532d56dd1cdd0", + "sha256": "0jw62l1nnnnz4gr7jrk10jlf8ayjngyx9wm97fd339spiygld5pr" }, "stable": { "version": [ @@ -6201,11 +6228,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20200415, - 1752 + 20200526, + 2005 ], - "commit": "bb51f7ee9229ff0b6ec5ba4a730f7360246fb9ea", - "sha256": "0l7lbmn6ljh8yv7ch2fax47mr7kxly5b5ps5vg61ra15nv8v5vfr" + "commit": "9c7a92779d75f6fd985cf707ff5241bc98ccea6c", + "sha256": "1r9033zlx2q2dk3bjz004flxdiw79qiswq0zqdjnlzwassvk0f35" }, "stable": { "version": [ @@ -6257,10 +6284,10 @@ }, { "ename": "benchstat", - "commit": "d9180fbedf95f9b1f5810bbf4929dfee513f89e3", - "sha256": "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1pcwgvln6dhyqk52021hqs5gpgnj1a07ddbb7xs1qclgyyk72y85", "fetcher": "github", - "repo": "Quasilyte/benchstat.el", + "repo": "quasilyte/benchstat.el", "unstable": { "version": [ 20171014, @@ -6364,11 +6391,11 @@ "repo": "technomancy/better-defaults", "unstable": { "version": [ - 20200209, - 1717 + 20200717, + 2012 ], - "commit": "fc9a03138c959f0d24301c6401f800eb6e7d3af9", - "sha256": "1hi1xxc99z0pkbj8w63fx3qsy4sq5b3gdc2ccyk0gnbzw2sfc93j" + "commit": "293237a22a4f24171dd9910d6517a0eccf526fdf", + "sha256": "0f3alik361d81kdwpigcgkj9rxww23prqfhjfdh97fnycp3r1nyb" }, "stable": { "version": [ @@ -6442,14 +6469,14 @@ "repo": "zk-phi/bfbuilder", "unstable": { "version": [ - 20150924, - 1650 + 20200816, + 519 ], "deps": [ "cl-lib" ], - "commit": "49560bdef131fa5672dab660e0c62376dbdcd906", - "sha256": "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17" + "commit": "00cbf1010dc3fee5a0b8e7c0e0b6041bb6251bdf", + "sha256": "1n1aq3kwsjc3hlgas73bs22pvrn69hfba1wcbqs2j28j2j9j00b2" } }, { @@ -6680,20 +6707,20 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20200429, - 1021 + 20200723, + 2222 ], - "commit": "1bd8836171cf8da0be836fc407f2f140f52bdeb1", - "sha256": "0zd8ls2qyxgdzkmhl7mxlh7wbkp627kync8zg95kvrh3qymf5vys" + "commit": "799969a66192b27c6464fc2e0025f4089d70493b", + "sha256": "13179nlhjkdsgpjp2lbx8fqx76ka79hjkhip6im6afv9icr3j3ba" }, "stable": { "version": [ 0, - 3, - 1 + 4, + 2 ], - "commit": "91d9f946690df0a1ed866f2cd1eab1b2e7c7480a", - "sha256": "0pkn99srwyvyibz5zxkh58csbf598x26f31mpizacx3bs4nys0qb" + "commit": "799969a66192b27c6464fc2e0025f4089d70493b", + "sha256": "13179nlhjkdsgpjp2lbx8fqx76ka79hjkhip6im6afv9icr3j3ba" } }, { @@ -6764,8 +6791,8 @@ "bind-key", "key-chord" ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -6788,11 +6815,11 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20191110, - 416 + 20200805, + 1727 ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -6993,11 +7020,11 @@ "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20191123, - 1547 + 20200626, + 2018 ], - "commit": "a09f8e2564739792a1b86bc8a6ce41039db3bbf8", - "sha256": "0cs9nmi30dknrw6p2xvx9np1zmzpsn3bs93lhfiqy2a4ylf96brl" + "commit": "784da60033fe3743336d1da0f33239f1bf514266", + "sha256": "1s7isvih1xl4l6say8xa69r9lf3prq9sd6d9fmn1n8g8p3w09cnq" } }, { @@ -7276,26 +7303,26 @@ "repo": "kyleam/bog", "unstable": { "version": [ - 20180815, - 2213 + 20200720, + 244 ], "deps": [ "cl-lib" ], - "commit": "6c8fa1b4961e279ae63130902996c5f71a2e64e4", - "sha256": "0kph9898s2m086p8gj97bbzr7mba9y7hmyxh1z4mgpv5808zvd05" + "commit": "14241d308d15410bfaafcf607a8a4a7ff3d7254c", + "sha256": "1k9ww9in54v0bmw8l6azx67wbb18r2q6fdwl1j931gaz9pngk3k0" }, "stable": { "version": [ 1, 3, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "6ed4d3edbe771e586d873b826330f3ef23aa1611", - "sha256": "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j" + "commit": "14241d308d15410bfaafcf607a8a4a7ff3d7254c", + "sha256": "1k9ww9in54v0bmw8l6azx67wbb18r2q6fdwl1j931gaz9pngk3k0" } }, { @@ -7444,15 +7471,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20200513, - 1954 + 20200805, + 1131 ], "deps": [ "epkg", "magit" ], - "commit": "f6a2e0cb8c3db5840c717114caba93793f2e9661", - "sha256": "1sa0wk7xj3qsk9fr4z2av80gp8n0804zylx3d27pdwm8bjyfzf7b" + "commit": "1fe1d2b7a574dd560740a55d87d9a5fb3a989dbc", + "sha256": "19rxqh6qagznsm5hqal65cv03k9gg1cfvb0j5saaqfc4nxkhkv7v" }, "stable": { "version": [ @@ -7507,25 +7534,25 @@ "repo": "davep/boxquote.el", "unstable": { "version": [ - 20170802, - 1117 + 20200727, + 1203 ], "deps": [ "cl-lib" ], - "commit": "7e47e0e2853bc1215739b2e28f260e9eed93b2c5", - "sha256": "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3" + "commit": "bdc6c84b9274b228dbc383a14abf9694157e869c", + "sha256": "0wwjawgylaaifdsszqxcfsyhfzgxbjkzqhzrnxnr9b16wghb7xf7" }, "stable": { "version": [ 2, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883", - "sha256": "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm" + "commit": "bdc6c84b9274b228dbc383a14abf9694157e869c", + "sha256": "0wwjawgylaaifdsszqxcfsyhfzgxbjkzqhzrnxnr9b16wghb7xf7" } }, { @@ -7638,14 +7665,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20200329, - 1531 + 20200811, + 1622 ], "deps": [ "fringe-helper" ], - "commit": "f1ae0c5eb74f62af109ebaf18e8663d6f51270cb", - "sha256": "1pzxz5irx6ysa8nhl9x50v8l5r2cvd6pafj71q4i5lrxv9a1dkl1" + "commit": "4e12ec16d6b896402f8bcdc1cd468d4064a2df6f", + "sha256": "1pdrpvff6hvhjv512z1vkivd848ar5li4p63jnbvl90hp7kpy7c3" + }, + "stable": { + "version": [ + 1, + 19 + ], + "deps": [ + "fringe-helper" + ], + "commit": "0024b1a276c43fde0d85011b51b5aaf1f201da64", + "sha256": "1nnhb0vyx5f3f7h2fsg2p7656kcsk7ahrndxrhs7a77svnr426lb" } }, { @@ -8098,20 +8136,20 @@ "repo": "jcs-elpa/buffer-wrap", "unstable": { "version": [ - 20200223, - 605 + 20200724, + 906 ], - "commit": "460f90bc024b6c287ed8afac3ff1bed2a147c777", - "sha256": "07r50iiiyhbqbia9c8c3kz1hvqjs6dkb8rkqpq4yyv3vd1kc9qnb" + "commit": "ef0fcb38b23246cfea1721570acc266764cef0a4", + "sha256": "029vq5hfknp5l8b9lmxw4hskq9bmv56kqysdfka0636hp7bvc63p" }, "stable": { "version": [ 0, 1, - 1 + 3 ], - "commit": "813a3dab3007a34fa27cf0a1ae687dc0eae98240", - "sha256": "0m2ryic16083ab0x6qwfrxrpsgq84s518vn0cbfcxycblpdh89al" + "commit": "c24eb1f251baecfb0bbfa750904e6b15cc977a6c", + "sha256": "1bzr5bf4rm1wm0xdhhdprlv7z60ijwrp1lq9h572iw6giyl0hgc3" } }, { @@ -8452,19 +8490,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200509, - 2224 + 20200817, + 2001 ], - "commit": "e71a40f1ffef4847df28c9d4ad7edc1e360ee52a", - "sha256": "0avmxbxxsazd14h5avsrqh2yyfnp8jan64sbp5ih2c9hm7xv5p1k" + "commit": "0e5eae0766a33b5c8997e1477e3914d5c8ba3d29", + "sha256": "0qn3i26g119h14jv9q0vha55s4g154djp3f68d2g7i0f46wm54hz" }, "stable": { "version": [ 1, - 21 + 23 ], - "commit": "0dbd474460e4c314bf8bc6e4d3dec647081538c9", - "sha256": "1ra5r56k539q6l98msxdn4vfd7k6jm00g8cdhs6hpwvb1blj8di2" + "commit": "a9647cbb566eb488b7bbde44c4cdaf51b7915851", + "sha256": "0ym1hajy47n5f1rxic8qfxrwd8zc1r7csz1v4hrwhwm4qld4krfr" } }, { @@ -8909,6 +8947,42 @@ "sha256": "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa" } }, + { + "ename": "calibredb", + "commit": "774ebbd69372ffba6fd16107762957b8ea3713a5", + "sha256": "1bdkxzs18c8krw28vfnzirx0pq13yf8pgkmjy8ks5j8zbih4dhqm", + "fetcher": "github", + "repo": "chenyanming/calibredb.el", + "unstable": { + "version": [ + 20200809, + 1128 + ], + "deps": [ + "dash", + "org", + "s", + "transient" + ], + "commit": "a53d3c3d87fb7cd756f73fcd813aca0480ada5f7", + "sha256": "11m9d015fnjf89qg6wpy0vs1vhvak5q753m4dzqrdw3jgm9zsnmv" + }, + "stable": { + "version": [ + 2, + 5, + 0 + ], + "deps": [ + "dash", + "org", + "s", + "transient" + ], + "commit": "a53d3c3d87fb7cd756f73fcd813aca0480ada5f7", + "sha256": "11m9d015fnjf89qg6wpy0vs1vhvak5q753m4dzqrdw3jgm9zsnmv" + } + }, { "ename": "call-graph", "commit": "a6acf099e2510c82b4b03e2f35051afc3d28af45", @@ -9013,11 +9087,7 @@ 1 ], "commit": "9803cf37ac52bbfa5130fde0f228dc51c4590c2d", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404\n" - ] + "sha256": "13gz0s7bnjsnab7wn8mk0zva7756hf68izqp9agd8vqnm0c75nlp" } }, { @@ -9028,16 +9098,16 @@ "repo": "kisaragi-hiu/cangjie.el", "unstable": { "version": [ - 20190929, - 1221 + 20200808, + 828 ], "deps": [ "dash", "f", "s" ], - "commit": "0a703f4d1162259d77bfb3f862d13c1b1f11a711", - "sha256": "19f7xzc1204zdv8bbd5vfzxqrinhk8m9mw911dc77jab2in22348" + "commit": "0cbf706890df06b9e0d541692c579ed213da8252", + "sha256": "0a3mwgbza09rfiswmk4kh699mqc5746k16jc6rgy9q24jbjgradf" }, "stable": { "version": [ @@ -9149,8 +9219,8 @@ "dash", "s" ], - "commit": "92a31f6a7cae0b4e2af106cd6f2b0abe6c2d8921", - "sha256": "1cp9i69npvyn72fqv0w8q1hlkcawkhbah4jblc341ycxwxb48mkl" + "commit": "75ddb9c64eeb78b46d9e1db99bef8d0fb1e46b99", + "sha256": "06briiapv2pfll8zc0wl55sad8cjgxkb8j8d4bvc8w5li3d52xa9" }, "stable": { "version": [ @@ -9175,8 +9245,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20191004, - 1155 + 20200814, + 913 ], "deps": [ "ansi", @@ -9188,8 +9258,8 @@ "s", "shut-up" ], - "commit": "a4715f7c6c9797639c3636399cb21c2b0332b354", - "sha256": "1zjz3mp8hgnsfyapq7qdfysj31g9f6syvrik2w057r3w3bxp8vkf" + "commit": "c69822a1a3168d43caebb7afaa13249429419ae0", + "sha256": "0w7q16y2r54rann07lk4gwi7jkqnb5xc8cbjnx2avgpsk7kawi8w" }, "stable": { "version": [ @@ -9368,11 +9438,11 @@ "repo": "xuchunyang/cc-cedict.el", "unstable": { "version": [ - 20181217, - 1112 + 20200705, + 443 ], - "commit": "0dd9bcd5337c8f16fc9c8d27daba4a9362695c99", - "sha256": "16qp0r413lqrym2xh2vpx0hg295g8mr428fg6q07w1hnzz10dpc2" + "commit": "6bb9481e48b889503626b4e3cb7cfec8d14cbf4b", + "sha256": "0nxq8p7hafpl1xq9daf5lcyk8ragdgnwsfxxd2d0rnzmyflgw5wi" } }, { @@ -9386,8 +9456,8 @@ 20200314, 1557 ], - "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", - "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" + "commit": "275a831be77573470309a78967734d2b6d10f218", + "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal" } }, { @@ -9398,16 +9468,15 @@ "repo": "MaskRay/emacs-ccls", "unstable": { "version": [ - 20200327, - 1915 + 20200819, + 106 ], "deps": [ "dash", - "lsp-mode", - "projectile" + "lsp-mode" ], - "commit": "17ec7bb4cf362b7268c24e070e841f0dfac1c919", - "sha256": "08pndwbw6wcpysnvhkqfvrw91ac0np31swiq0yv3dr2x0sq70cp5" + "commit": "44f1fb38786cb6159e03e930876239a215d3feee", + "sha256": "0adw1gfp8a6cfyh7s1bchdpak7z32jlnliq35ynhakwwx3ixzmfv" } }, { @@ -9433,11 +9502,11 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200314, - 1557 + 20200803, + 2138 ], - "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", - "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" + "commit": "275a831be77573470309a78967734d2b6d10f218", + "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal" } }, { @@ -9507,11 +9576,11 @@ "repo": "zk-phi/cedit", "unstable": { "version": [ - 20141231, - 1614 + 20200816, + 526 ], - "commit": "0878d851b6307c162bfbddd2bb02789e5e27bc2c", - "sha256": "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v" + "commit": "cb38316903e6cfa8b8c978defa7e1dafcd4e0c12", + "sha256": "1m5n0rwh97g3vl4x0akclgc8flh9vpdavp82q3i1yraigvzqzfc9" } }, { @@ -9571,15 +9640,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20200511, - 1242 + 20200722, + 27 ], "deps": [ "cl-lib", "powerline" ], - "commit": "57afd81c7fd6449239af7adcda4cd2192976dbb8", - "sha256": "1sa4anfqvhidn7kxqnchk0d8kc2v0l3cxbf0bnwwx7nk04gjvshg" + "commit": "7e0332b138f836b9d0b6d2134310f53369598cfd", + "sha256": "1fjs1l79wsyiyi4nrdkxg2hhfkngm7g0zpdq5ca3c1zi4fsv084i" }, "stable": { "version": [ @@ -9706,17 +9775,17 @@ 20171115, 2108 ], - "commit": "dc0e180cbaf73e86d22f1d2996c7582dd0eb07b5", - "sha256": "0n9f87syrj30dn5k4vq1l7i02hzwfnadanfjbwv4a9wfjl77xy53" + "commit": "ec47889f4bef53c6c5a15add60d34c44c6ef1634", + "sha256": "16lndmhm0ad23g0pa4rl7dyrwmdv22xmscnpqnd49sg88356fyd2" }, "stable": { "version": [ 3, - 15, - 1 + 16, + 0 ], - "commit": "e766ee2484f9a7609688ac1832ff2ca7528624c5", - "sha256": "18iv6s2g7gz2dmqhipn6ln6g4qngywcj7fm4gqwrph04bx5dfqac" + "commit": "ee2c1fd898a8219e81fea4f753648070e50ebc2e", + "sha256": "1jcvh67kxx5isqb78zjbca51px21cyjcwy1cbfkx47y1rmgsqzaw" } }, { @@ -9866,17 +9935,20 @@ }, { "ename": "chapel-mode", - "commit": "ff32db72ad55a7191b5105192480e17535c7edde", - "sha256": "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz", + "commit": "f84c693e9e90069b028be6149dd730f2ba5f4aff", + "sha256": "0yi1xjm1myxywjdb3n1505mz7vnylrvpd067aibjc4vgq0gqvq6f", "fetcher": "github", - "repo": "russel/Emacs-Chapel-Mode", + "repo": "damon-kwok/chapel-mode", "unstable": { "version": [ - 20160504, - 808 + 20200814, + 759 ], - "commit": "6e095edd7639f5f0a81e14d6412410b49466697e", - "sha256": "0r3yja2ak3z62lav2s8vimmjyi4rd5s82fbs8r6p2k0shm6lj7hz" + "deps": [ + "hydra" + ], + "commit": "0855d6ea5e74da7b02e7307066da912c242084c8", + "sha256": "08bgjwkm6bhm5s73pdx62bjm58z18q21fhj02zdp0q8dds5babf9" }, "stable": { "version": [ @@ -9902,8 +9974,8 @@ "deps": [ "avy-menu" ], - "commit": "22d0e061f170d59d7cf6bcd948c11fa0266b7771", - "sha256": "1m29vg4cispsd8nl8lpmv5fify1208nrf8h7nkl17pplrk7hqhwb" + "commit": "a1ccf5ed786af6e2441037964668d817b9c7362f", + "sha256": "19yl7gmzalhrhr3spi8vs6wpxpv6m3m1d9564naznswxx19sjcjy" }, "stable": { "version": [ @@ -9926,11 +9998,11 @@ "repo": "lateau/charmap", "unstable": { "version": [ - 20160309, - 946 + 20200616, + 1418 ], - "commit": "bd4b3e466d7a9433cf35167e3a68ec74fe631bb2", - "sha256": "0vqsfk83lg3gvcv62jsgxxwz7icpkpswgg30hmcq0qfg0dfwwcl9" + "commit": "feac50b87d2a596c5e5b7b82b79ddd65b6dedd8c", + "sha256": "1pms4s1qnf60d3amhx1lfa255ln5wypq0q6w918whhzi4l7mdyz4" }, "stable": { "version": [ @@ -10291,36 +10363,71 @@ }, { "ename": "chronometrist", - "commit": "35d03fe9c066e7388d5ff4adad1afa1e30145995", - "sha256": "09dil46qjn7y55y7qax92l7mcw8g1bsb1mjqc92zgln96asi25kj", - "fetcher": "git", - "url": "https://framagit.org/contrapunctus/chronometrist/", + "commit": "9031f880b8646bf9a4be61f3057dc6a3c50393e8", + "sha256": "1xjxq257iwjd3zzwqicjqs3mdrkg9x299sm7wfx53dac14d7sa9g", + "fetcher": "github", + "repo": "contrapunctus-1/chronometrist", "unstable": { "version": [ - 20200503, - 633 + 20200816, + 1947 ], "deps": [ + "anaphora", "dash", "s", - "seq" + "seq", + "ts" ], - "commit": "16f2ca86540001b40725c4099d04154aab0a6ba5", - "sha256": "19z8wmhsqbm12h0vvzfgjmzj7g3mcpa9qgcz3cnmrr4hgkx4b9a5" + "commit": "c886dbb1ec8d1e22f7e9891ce9794d373b3b4e9b", + "sha256": "0f94w039ibqyysldgs0rdzjczhpgd1dq6ll85gdb4av7vw6mp3hy" }, "stable": { "version": [ 0, - 4, + 5, 3 ], "deps": [ "dash", "s", - "seq" + "seq", + "ts" ], - "commit": "282c338c21d01932049392f271f66e1725562efd", - "sha256": "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr" + "commit": "0445b5187293a927f505633e851ca871bb89d8df", + "sha256": "0jz35972m372kx9x8mgf42zhzdw2w9wv2ri52chfb2fin4bh1biy" + } + }, + { + "ename": "chronometrist-goal", + "commit": "61031b9ab0c0dedf88e6947ae2ad8d4ad0351210", + "sha256": "0hcww5qy167fiwwkj33pj8fdc89b61mb767gz85ya5r6d5nd4si3", + "fetcher": "github", + "repo": "contrapunctus-1/chronometrist-goal", + "unstable": { + "version": [ + 20200706, + 1306 + ], + "deps": [ + "alert", + "chronometrist" + ], + "commit": "a9c4410f25f875c55b9237ef6544e82f4a805af6", + "sha256": "0wydrc4x19rp6nn1hyhaa5zxr4br51aamrv0ky5yppr17rnyygsy" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "deps": [ + "alert", + "chronometrist" + ], + "commit": "e651821d0f64830235232082a8295e86a173574b", + "sha256": "02q9bksjs24hxl1lz93f16rvqyn6ah10acjg2yw7kx0nj3qxff8v" } }, { @@ -10379,8 +10486,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200511, - 1025 + 20200814, + 1540 ], "deps": [ "clojure-mode", @@ -10391,14 +10498,14 @@ "sesman", "spinner" ], - "commit": "25fb15d915117310069254016391c9d76abcebcc", - "sha256": "1hz2l2ryllwyv1zk0la376klg7yndz9q32pd1vypwymwnac93c0y" + "commit": "a89b694cc3cec0294d84bf9dbe1163ad2373e8db", + "sha256": "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d" }, "stable": { "version": [ 0, - 24, - 0 + 26, + 1 ], "deps": [ "clojure-mode", @@ -10409,8 +10516,8 @@ "sesman", "spinner" ], - "commit": "bfcf9157a970c9423fe27c5021f445b509e71280", - "sha256": "1y7fngd47c5dz6sdf4b5w5lxdw5jmm4wa98l4h48badl8cn6m1vl" + "commit": "a89b694cc3cec0294d84bf9dbe1163ad2373e8db", + "sha256": "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d" } }, { @@ -10583,14 +10690,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20200125, - 2110 + 20200815, + 1410 ], "deps": [ "cl-lib" ], - "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4", - "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw" + "commit": "89aac22259e5d09ae1183e0df163338fe491e9e7", + "sha256": "16hfahyhl1vv3r0amyvc514sw6x9x56b319lkp7bwcy8mxicc3cy" }, "stable": { "version": [ @@ -10643,8 +10750,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20200305, - 2126 + 20200705, + 1155 ], "deps": [ "dash", @@ -10654,24 +10761,63 @@ "s", "string-inflection" ], - "commit": "1884b5c88ad4eb35450a7acf053594369ccb1b22", - "sha256": "0dr4fx14kmahg533ij92ycn1a8kagbadfml9iyziisllxypmjrzf" + "commit": "0ad1f975a095156d02dd7f9adc0fecbc57b1e751", + "sha256": "1xhkicffmdiy4c22m9qilm09nq9zqfsi9gawq3gflla79avblh4r" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "dash", "f", + "org", "queue", "s", "string-inflection" ], - "commit": "6d68f52ebd150e035b33dcaa59d9e2aceab69b84", - "sha256": "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k" + "commit": "80b395b8a0c7fc92290f0d1bfd1b5520ffd415fd", + "sha256": "1b918gjzds9jzs0ywfr41wd069l234pshpa9rn8srkzlpj5lac4d" + } + }, + { + "ename": "citeproc-org", + "commit": "2055da5d0628ca3c35b111b5ded56c0f635ca690", + "sha256": "06kr5qg0l2389n72vyxmh86sc376hjg4npzkrh42cgb1c2m4psj8", + "fetcher": "github", + "repo": "andras-simonyi/citeproc-org", + "unstable": { + "version": [ + 20200615, + 947 + ], + "deps": [ + "citeproc", + "dash", + "f", + "org", + "org-ref" + ], + "commit": "342f6531b08f5d789a1ae222f9707f636b1f5e2f", + "sha256": "1dc5qkwmfi2jm12297yy14fqbc335qjsdfi2mfgiz8wvs84hyci8" + }, + "stable": { + "version": [ + 0, + 2, + 4 + ], + "deps": [ + "citeproc", + "dash", + "f", + "org", + "org-ref" + ], + "commit": "a35655c55bbdc3f8c0571c8a8f14a33f9eac330b", + "sha256": "1n9k25qsxjv50nkk0v7cfqwdb0y89bid8lprfzzn8zi9b7gyly6x" } }, { @@ -10750,6 +10896,30 @@ "sha256": "1xp0zajp4rsnxkfzrmz0m5bihk0n1hgwc1cm9q163b2azsvixxmw" } }, + { + "ename": "clang-capf", + "commit": "c47e1fd9d5a4b85f08676742a9b36b74a2ac8fb6", + "sha256": "11qfh8c2kjcy715yyp0sywla74z92qn5j1z9wp4fv5p45w6b6112", + "fetcher": "git", + "url": "https://git.sr.ht/~zge/clang-capf", + "unstable": { + "version": [ + 20200813, + 2056 + ], + "commit": "630ab057ed614d142ac08bb3a44a869a81cb591a", + "sha256": "0xrxk4b903ayymrngf2swk8d7ic8np1dy8zp9hg3wjlibsmagak0" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "commit": "630ab057ed614d142ac08bb3a44a869a81cb591a", + "sha256": "0xrxk4b903ayymrngf2swk8d7ic8np1dy8zp9hg3wjlibsmagak0" + } + }, { "ename": "clang-format", "commit": "be27e728327016b819535ef8cae10020e5a07c2e", @@ -11004,8 +11174,8 @@ "seq", "yasnippet" ], - "commit": "8259791e054382457b87d1f78061b5e3ce948907", - "sha256": "0vn32b8vhlp75vj4schy8blmiddc6dn92jl4f935yd4sg7pm04cj" + "commit": "97095682580bbc5bfebcbc5349f03f5bd7121c96", + "sha256": "1dgksqzdln8cv0hyq273ikfk2bmk16rwvkiyscqsxzi8jdv8cdck" }, "stable": { "version": [ @@ -11061,6 +11231,26 @@ "sha256": "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj" } }, + { + "ename": "cljr-ivy", + "commit": "c34d8d2edc5e5d213aef33255a9214ff87ece1bf", + "sha256": "03afriiwswaw0canv4wphqr4kfrrpkclcczcx5ab0w3pm4bax1zl", + "fetcher": "github", + "repo": "wandersoncferreira/cljr-ivy", + "unstable": { + "version": [ + 20200602, + 1607 + ], + "deps": [ + "cl-lib", + "clj-refactor", + "ivy" + ], + "commit": "921ba65d0db7cda4edcd690c708946125b874a70", + "sha256": "12g74sfjw6siix8hvfbb0a7y8cxzxi1mb22sw8wih56bcv1987wl" + } + }, { "ename": "cljsbuild-mode", "commit": "d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba", @@ -11160,6 +11350,70 @@ "sha256": "0qkkdlifii6wkfxaj95zphiw3psmf9qnds3whmp6jq2lq9wpd74f" } }, + { + "ename": "clojure-essential-ref", + "commit": "8ecff309816256bdc09163aee6ca06b4292d98b7", + "sha256": "0vl4lz9wmymkai7yhv0gqiky5czmzd7yz9g9czfp7lhfh1hpgbkg", + "fetcher": "github", + "repo": "p3r7/clojure-essential-ref", + "unstable": { + "version": [ + 20200619, + 1653 + ], + "deps": [ + "cider" + ], + "commit": "3787300a2f6100d1a20b1259b488256f3a840fa6", + "sha256": "08r5whs39r2fscicjzvmdfj7s7f49afhiz4i2i05ps1f1545569d" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "cider" + ], + "commit": "e05d61b96f6469a93f52015b7ad5deadf616139e", + "sha256": "118zkdx118p1mzgq1szschl40qmb2cb5vw9jb9fhpimqdrlq53md" + } + }, + { + "ename": "clojure-essential-ref-nov", + "commit": "11341af9478acdaec9d5e0b5011269ac7c0ada86", + "sha256": "1740mmv8qh8gsnzvvvfdxsp676ss8b6filidbxq6b6qz2jyb7fzw", + "fetcher": "github", + "repo": "p3r7/clojure-essential-ref", + "unstable": { + "version": [ + 20200719, + 608 + ], + "deps": [ + "clojure-essential-ref", + "dash", + "nov" + ], + "commit": "3787300a2f6100d1a20b1259b488256f3a840fa6", + "sha256": "08r5whs39r2fscicjzvmdfj7s7f49afhiz4i2i05ps1f1545569d" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "clojure-essential-ref", + "dash", + "nov" + ], + "commit": "e05d61b96f6469a93f52015b7ad5deadf616139e", + "sha256": "118zkdx118p1mzgq1szschl40qmb2cb5vw9jb9fhpimqdrlq53md" + } + }, { "ename": "clojure-mode", "commit": "5e3cd2e6ee52692dc7b2a04245137130a9f521c7", @@ -11168,20 +11422,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20200419, - 559 + 20200813, + 639 ], - "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", - "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" + "commit": "84ed16c5ddb6561620886485e20669d0c81f88a1", + "sha256": "1kdm9dfj3qifwylj9j2x12xwxzrkmyp4pvph7bvwfrv65jp4r58j" }, "stable": { "version": [ 5, - 11, + 12, 0 ], - "commit": "721287c7a756678d5fe8fa0dcb2d8dc846d239a2", - "sha256": "1x1yszp6waa778ki6sw66w1pzcz389wd01gkcldfxxnd7z89ad5d" + "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e", + "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3" } }, { @@ -11198,20 +11452,20 @@ "deps": [ "clojure-mode" ], - "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", - "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" + "commit": "84ed16c5ddb6561620886485e20669d0c81f88a1", + "sha256": "1kdm9dfj3qifwylj9j2x12xwxzrkmyp4pvph7bvwfrv65jp4r58j" }, "stable": { "version": [ 5, - 11, + 12, 0 ], "deps": [ "clojure-mode" ], - "commit": "721287c7a756678d5fe8fa0dcb2d8dc846d239a2", - "sha256": "1x1yszp6waa778ki6sw66w1pzcz389wd01gkcldfxxnd7z89ad5d" + "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e", + "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3" } }, { @@ -11284,30 +11538,30 @@ "repo": "clojure-emacs/clomacs", "unstable": { "version": [ - 20191201, - 200 + 20200808, + 2347 ], "deps": [ "cider", "s", "simple-httpd" ], - "commit": "88b8fc6d1b7105adae009578ef24fedaf157f341", - "sha256": "13rhnncqj8666g2v7493i8xh79mczjrmg24p12knzhkslxdnv9hp" + "commit": "ada167954911bf1631ea73537b4b496f35f99a73", + "sha256": "0gc4c97s6y7al1777zmzvq1n30i532b4v8k2p7i71bzzijr97fml" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ "cider", "s", "simple-httpd" ], - "commit": "292c8f5370a2c74094da46ede990b5e7cc8b55b8", - "sha256": "1rv57wqr09vl0caz4wjr0kqvhgvl5y1x6818v8m55rm2z8rim11i" + "commit": "ada167954911bf1631ea73537b4b496f35f99a73", + "sha256": "0gc4c97s6y7al1777zmzvq1n30i532b4v8k2p7i71bzzijr97fml" } }, { @@ -11318,26 +11572,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20191229, - 1814 + 20200704, + 2124 ], "deps": [ "emacsql-sqlite" ], - "commit": "1e78f96dc976badb59067c986f7766cce89405cc", - "sha256": "03nknirj5jd3yf842amb274269fyiinr325g1x2snf1zgqfm3csn" + "commit": "c864c1fadfea4a05fff29cb60891b7a32ac88c78", + "sha256": "06j0sc6dx8f34wc8i7dzkp8jwvwnrpnl8i93vpc1qw0ih0jwa2zh" }, "stable": { "version": [ 1, 0, - 1 + 4 ], "deps": [ "emacsql-sqlite" ], - "commit": "92f8f2dba684b7c9cc60821aa5668d336544ab99", - "sha256": "0q8val0v4hryr0miliqjf38y4aybrihzncr0p1mwba861jlpy86n" + "commit": "c864c1fadfea4a05fff29cb60891b7a32ac88c78", + "sha256": "06j0sc6dx8f34wc8i7dzkp8jwvwnrpnl8i93vpc1qw0ih0jwa2zh" } }, { @@ -11501,17 +11755,17 @@ 20190710, 1319 ], - "commit": "135b5835a42d6e3c7efb85f80f3fe0885d45d644", - "sha256": "18mgkn5cy14f5l4qajhdphxvw66hhhw2yf12qfvpd2n5bx3b8dcs" + "commit": "92d724903192b98e42cc1048ca587207aa20043f", + "sha256": "1ig5wjiq31rgf57gkf37d2rzx4qkkif997w1dfllwc4w3svwykp0" }, "stable": { "version": [ 3, - 17, - 2 + 18, + 1 ], - "commit": "615129f3ebd308abeaaee7f5f0689e7fc4616c28", - "sha256": "1akclhrc9gx0asvmwcsbvw90wgazlyqd044wql7qj6vibv47cdjd" + "commit": "63a65baf4c343c73b2142078ef0045d3711dea1d", + "sha256": "1a3r119qca4sg83zchnsnmmq9k7ad8pljl5s24k00xbyyfs1wm7k" } }, { @@ -11525,8 +11779,8 @@ 20171121, 1115 ], - "commit": "d3f408f226eff3f77f7e00dd519f4efc78fd292d", - "sha256": "1r8a3arpkkn91k619z4b6ywnq15glc4n1ji33l0q2m59f5sfk8mp" + "commit": "a7cf9e4c01c4683e14b6942cc5cc5e8cddc98721", + "sha256": "0zff8705vllkmm112qm58q1af0x1rcra5yw4fi8m5q97kh0n77vn" }, "stable": { "version": [ @@ -11579,11 +11833,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20200327, - 101 + 20200819, + 543 ], - "commit": "d741332ad4bcd9a136d5dc4974a050da8ca28888", - "sha256": "1f2nrklzvm0b09d1s5rxvzahc32rs5qdqx910a45fj95hlw2w2wc" + "commit": "d4d303b0045b682b9e699e63fa3af4dd00daf878", + "sha256": "06gcm7wc1ayz0z2fqz3bqyfxqlgbx31z95gwbwjd9x2mqgkp02mh" }, "stable": { "version": [ @@ -11868,14 +12122,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20200129, - 144 + 20200705, + 2145 ], "deps": [ "dash" ], - "commit": "923ed4789c5ab66369ac4dda7eedb910951684a6", - "sha256": "1d502n6bpdscgpqfanax1h0iirgpq8x56vh6bbpzg9i042i3z7ls" + "commit": "dfca97595094fc192a04172d86cb4ba68cab984f", + "sha256": "1w9biijvqr7ig7l3j6axbnmdn44xvyj3m8yinx0d6qqyys98hgyj" }, "stable": { "version": [ @@ -11961,11 +12215,11 @@ "repo": "emacs-jp/replace-colorthemes", "unstable": { "version": [ - 20200315, - 929 + 20200729, + 921 ], - "commit": "40464198e7bf2121694a7e6d87588342140a84ff", - "sha256": "0fhr0rvfrb9fmbh9zgzxx2c2zl28v16hxmn9jx6k73nsfwpy498j" + "commit": "a996eca37f4df726eec95406deb76b538320771a", + "sha256": "1fgcd6vdqknqb1s1hwqqspk84a8xnxmrcnlic1j0x558i2yj4l2x" }, "stable": { "version": [ @@ -11985,14 +12239,14 @@ "repo": "purcell/color-theme-sanityinc-solarized", "unstable": { "version": [ - 20200304, - 2156 + 20200805, + 603 ], "deps": [ "cl-lib" ], - "commit": "c688337aaae9f47128a841479e4191858ac147f6", - "sha256": "0a16fn7h0yljlgg1scy82w5r6awd7gk6xf1qd83cx8kj2cg7k7vb" + "commit": "7ef39ac9d99bfb699903cfc3623521c0ceec7b86", + "sha256": "18x1hhq5v9agv2gvragwvxgzxfixfqy8pcbqhi63yqxmx30zlqj1" }, "stable": { "version": [ @@ -12011,11 +12265,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20200507, - 608 + 20200813, + 333 ], - "commit": "e4e577c24db6ad7f6940a13e1d58418d42ff0c81", - "sha256": "0363fi2q4wprnkrdlvvbsib42czsf4fwhy61c6b9bbj8fvmflzj8" + "commit": "b7e33d1ccb10a93d6a0393c43400435b70a48689", + "sha256": "1qg5wz04d7kq63zsjbhdcxn96j6x84hsbj7vbx6d051yql6l3m8s" }, "stable": { "version": [ @@ -12052,11 +12306,11 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20200325, - 1307 + 20200812, + 656 ], - "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37", - "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn" + "commit": "736f7a105535901b4783d19534e7855920e25115", + "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73" }, "stable": { "version": [ @@ -12099,11 +12353,11 @@ "repo": "jordonbiondo/column-enforce-mode", "unstable": { "version": [ - 20171030, - 1900 + 20200605, + 1933 ], - "commit": "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944", - "sha256": "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs" + "commit": "14a7622f2268890e33536ccd29510024d51ee96f", + "sha256": "1vxra5vk78yns2sw89m41bggczqg1akq6xvzfs9kylhkg5yz3g7g" } }, { @@ -12114,28 +12368,26 @@ "repo": "jcs-elpa/com-css-sort", "unstable": { "version": [ - 20190723, - 1714 + 20200717, + 338 ], "deps": [ - "cl-lib", "s" ], - "commit": "b0491d5340c5f5c516b44aa7bfef6f6cf2998484", - "sha256": "0d6pxwi5mbb98zzx3j55w221541674d69pxmf55yji6hly8yqavv" + "commit": "e12f77ad3a17a0d599ca802497086cd9155d451b", + "sha256": "1i0pg3hzw87drvfivr1355h3rfp409ak57bff9la8qlx1llynv5y" }, "stable": { "version": [ 0, 0, - 5 + 6 ], "deps": [ - "cl-lib", "s" ], - "commit": "e3c6a3a88c8f7e3ce7a5c6756b47a7aba7ffe149", - "sha256": "0c3pcgr95nhf2yx66hxiwwl6k2fqz8cpmr0y0fxzahkmvc4c9zi6" + "commit": "e12f77ad3a17a0d599ca802497086cd9155d451b", + "sha256": "1i0pg3hzw87drvfivr1355h3rfp409ak57bff9la8qlx1llynv5y" } }, { @@ -12162,6 +12414,21 @@ "sha256": "1hh1lkan1ch5xyzrpfgzibf8dxmvaa1jfwlxyyhpnfs5h69h3245" } }, + { + "ename": "comby", + "commit": "1173462e86ec0518cd6bab241fea3fe0342c4b41", + "sha256": "0wipqvdsmjhg4kvqcgarix955m9v8fs1lccs002f03rz4ckfdpxf", + "fetcher": "github", + "repo": "s-kostyaev/comby.el", + "unstable": { + "version": [ + 20200629, + 140 + ], + "commit": "928b8b8959a2556aba5526f2a25801341eb59dc3", + "sha256": "1f0155fyvh1m20ahl6wqask4qx6jp3lfwxj894cda9j4y8gnr5iq" + } + }, { "ename": "comint-hyperlink", "commit": "3c3bc7c897bfc5fafcda33d9837e6f3ff4da3692", @@ -12248,8 +12515,8 @@ "f", "s" ], - "commit": "c93985dc318fe89e5a29abc21d19fb41e2fd14d2", - "sha256": "0mlabiraagqwl17payils5589fr2mivvkzrfic6ndsipryab6rfc" + "commit": "9ba1456b0a389a2f7b42b6f42a4208ddd87ce609", + "sha256": "1kj7w8akrybr1y30lbhax8dnk5m4fg365ifxlyw766v69g5x7zd2" }, "stable": { "version": [ @@ -12394,14 +12661,14 @@ "repo": "ddoherty03/commify", "unstable": { "version": [ - 20161106, - 2334 + 20200812, + 1241 ], "deps": [ "s" ], - "commit": "78732c2fa6c1a10288b7436d7c561ec9ebdd41be", - "sha256": "1kb3cbjp69niq8ravh273dma0mnkf1v2ja372ahxfsq1janrkkm6" + "commit": "92514f071c667653f146629c0aec0ab4d3b78226", + "sha256": "1n6jpkhq0kncsszkkpfi923zq75h3d032vwmlz7pp8szs93w2308" } }, { @@ -12442,20 +12709,20 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20200510, - 1614 + 20200818, + 1753 ], - "commit": "1c7a87283146f429c5076e8ea0a559556a4d4272", - "sha256": "0dvvdyg8fc6jzcl1hgrh0cr3nz4vyw5i9xz5w3mc3mn7fixbdcr3" + "commit": "54f60ef523878c4d332f29df380f36cf2f165935", + "sha256": "08lbjvm97fh1bm5201ncbnr5b1456y9mwf6yhrrhg1rjqvcca74q" }, "stable": { "version": [ 0, 9, - 12 + 13 ], - "commit": "490d3e4e7ef3fbc90fb3e8747f902bf839a924cc", - "sha256": "0c31amc6gyfkmb1ii6mm56c75za1yxkj2iyhrjc45nn2mrh7yj7a" + "commit": "656ad10670512e135a0a5881f127bb7a789ef8ca", + "sha256": "1j5f8kqv36r18pg09a6139q7a0a39xdnc5nf6sv3c0pw3yfw1szn" } }, { @@ -12557,16 +12824,16 @@ "repo": "alexeyr/company-auctex", "unstable": { "version": [ - 20180725, - 1912 + 20200529, + 1835 ], "deps": [ "auctex", "company", "yasnippet" ], - "commit": "48c42c58ce2f0e693301b0cb2d085055410c1b25", - "sha256": "10qn7frn5wcmrlci3v6iliqzj7r9dls87h9zp3xkgrgn4bqprfp8" + "commit": "9400a2ec7459dde8cbf1a5d50dfee4e300ed7e18", + "sha256": "0x8qc63zn126hspcblwlihxfzs8kvcjb6cpj28ahsb0117j2i789" } }, { @@ -12616,16 +12883,16 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20200511, - 401 + 20200818, + 738 ], "deps": [ "company", "dash", "dash-functional" ], - "commit": "452f083f6c11793a3723224bce42898a2bedc0e1", - "sha256": "07il7z52ywvkqy5zpkvzsaxsjqx8dqgd91cpba05vywpsl3lis30" + "commit": "20384f0e382c063173b9d863344b1b23bc1e4954", + "sha256": "0l66ajzh1x0gazmv9nzgcsy72kyja3yq4gmzgzpkgin5dxms33k0" } }, { @@ -12686,8 +12953,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20200130, - 2058 + 20200729, + 401 ], "deps": [ "cl-lib", @@ -12696,8 +12963,8 @@ "dash", "yasnippet" ], - "commit": "f9dba9ddff7da99a93d8a6e26d9b1d813bc96b2f", - "sha256": "1hl8gr8afx2i5bia7vq3vn4shbaz8fps3h30ldvq141kfvmcp8jm" + "commit": "b096cb528de1e0bb31cc1059d0bd698b98a6cc6a", + "sha256": "0m70w4f0kpvk97nnnp1bfk191dhipv418fmcfqjw90sajknyhq6m" }, "stable": { "version": [ @@ -12724,26 +12991,26 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20200407, - 803 + 20200603, + 438 ], "deps": [ "company" ], - "commit": "b159e45b38226e046cf6fb7d08a0cf864ebbf772", - "sha256": "0h0k06c9fabyz6akka1bpwkz69wzl7ajcm0p108xdf5lymc75v5h" + "commit": "ba4d2577fbbe5ad7bb978838e3e3177f8a56e8f8", + "sha256": "0cy48my9d02v7wa40dw5x6djyjjacddj9p0pgdvr1rg70lqxii45" }, "stable": { "version": [ 0, 0, - 3 + 4 ], "deps": [ "company" ], - "commit": "3d21eaa511b5f0ca55205f203d28fd10ea1d3b39", - "sha256": "0lj5gkj2dl0c7sva8bi3bng2gm90sjq15g7w8r9nz70666szdr1i" + "commit": "ba4d2577fbbe5ad7bb978838e3e3177f8a56e8f8", + "sha256": "0cy48my9d02v7wa40dw5x6djyjjacddj9p0pgdvr1rg70lqxii45" } }, { @@ -12860,15 +13127,15 @@ "repo": "dunn/company-emoji", "unstable": { "version": [ - 20191226, - 1915 + 20200612, + 1902 ], "deps": [ "cl-lib", "company" ], - "commit": "fc45b56f3e2081d794f243bce705e77d4e29fc06", - "sha256": "0r9zcbm3nb3zw5cwrkl098v5b49jbga5404bj7j55g6k4rwkjar2" + "commit": "5f2d10623c1e9f547d852cb13c7a391afbda09fb", + "sha256": "0b7hfcgmrkmbi138hjfc9jsgh84slw4fcizxss55b9j60xrzsc75" }, "stable": { "version": [ @@ -12962,28 +13229,28 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20190812, - 204 + 20200712, + 49 ], "deps": [ "company", "s" ], - "commit": "2af24f053465ab370566a49c231d541ca9509850", - "sha256": "0ki049jpd4xymagaxd4zvnj3bm7d7d797xa1bm8lfi701m2jjlgg" + "commit": "af017d00f4576fddee1d386f41c9ccebd7038d9a", + "sha256": "1a3317wzilp7z01j34rqg5khr77hqz9nxm930d16225gki98g9q3" }, "stable": { "version": [ 0, - 5, - 3 + 6, + 0 ], "deps": [ "company", "s" ], - "commit": "a97f55b60f427e536e637898d12792154d134aab", - "sha256": "1iw1vk1pgdacvfh17n45kk98rxml3f6kxnijmpp7fzz4q07yiv7w" + "commit": "af017d00f4576fddee1d386f41c9ccebd7038d9a", + "sha256": "1a3317wzilp7z01j34rqg5khr77hqz9nxm930d16225gki98g9q3" } }, { @@ -13226,8 +13493,26 @@ "lean-mode", "s" ], - "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c", - "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n" + "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd", + "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws" + } + }, + { + "ename": "company-ledger", + "commit": "546bc62530136a7fdf3886731e4316c6c8081ead", + "sha256": "0y54wbky6jq9r3h4ghpkjywj78hw8k83ri6szph6s8w5m6dkji82", + "fetcher": "github", + "repo": "debanjum/company-ledger", + "unstable": { + "version": [ + 20200726, + 1825 + ], + "deps": [ + "company" + ], + "commit": "9fe9e3b809d6d2bc13c601953f696f43b09ea296", + "sha256": "08cs8vd2vzpzk71wzcrghn48mzvbk6w2fzlb3if63klhfcfpngc8" } }, { @@ -13287,6 +13572,25 @@ "sha256": "0ny2dcc7c585p7v3j6q0rpkbj1qmf2ismy8a5020jpr585xvz0hh" } }, + { + "ename": "company-manually", + "commit": "a7cdcad45efa0ecb807645c597b6fc3be22899d3", + "sha256": "1ws4kgvjz8ff600rw4grgjq7s34233s9616jnyykjfdh18skssmi", + "fetcher": "github", + "repo": "yanghaoxie/company-manually", + "unstable": { + "version": [ + 20200709, + 913 + ], + "deps": [ + "company", + "ivy" + ], + "commit": "b922318da821fc3cf1d3155f21d543ea8470c881", + "sha256": "1s2bv040gg22qzjca39r32cz3qhairnvppk9wdp1hl52i6by57v9" + } + }, { "ename": "company-math", "commit": "fadff01600d57f5b9ea9c0c47ed109e058114998", @@ -13353,8 +13657,8 @@ "company", "native-complete" ], - "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41", - "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5" + "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52", + "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd" } }, { @@ -13446,16 +13750,16 @@ "repo": "org-roam/company-org-roam", "unstable": { "version": [ - 20200511, - 743 + 20200711, + 355 ], "deps": [ "company", "dash", "org-roam" ], - "commit": "674c2bd493f571c5323d69279557a6c18ccbd14e", - "sha256": "1x88kvxawbpg4sagi0kh4y7inyhy05dxcg8hl0ih4x40cwxyxrs5" + "commit": "1132663bd68022aa7ea005ff53c7c7571890769d", + "sha256": "1xk53lyf5sn16cs2gv874sajs5jlsxbxpksbjx9nk8glzrq7r6r3" }, "stable": { "version": [ @@ -13492,16 +13796,16 @@ "stable": { "version": [ 2, - 2, - 2 + 3, + 0 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "4490d168778a61a4ee8623defe760164cd9745b8", - "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" } }, { @@ -13519,8 +13823,8 @@ "company", "phpactor" ], - "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", - "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" + "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24", + "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc" }, "stable": { "version": [ @@ -13536,6 +13840,42 @@ "sha256": "0dsa1mygb96nlz5gppf0sny3lxaacvmvnkg84c0cs6x223s6zfx8" } }, + { + "ename": "company-plisp", + "commit": "bdd486fdb97b4954a881b6099704704829eb0058", + "sha256": "071h99nv6q3lrc6navii0dhzak28j3fqx4mwajyapzlcrrsdpp4i", + "fetcher": "gitlab", + "repo": "sasanidas/company-plisp", + "unstable": { + "version": [ + 20200531, + 1927 + ], + "deps": [ + "cl-lib", + "company", + "dash", + "s" + ], + "commit": "fc0b56d2a711340ca3e63119bfe692bb3e8620fb", + "sha256": "0xw475spfwq32nn5qz3gk22cggj1f5y245da9030vzi2jfb9vvid" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "cl-lib", + "company", + "dash", + "s" + ], + "commit": "0e6941e1832faafb2176238339667edd482acd95", + "sha256": "1ri022shrwiw10gdydm66c2xya1qxl449r5f8qadals7m4crczp2" + } + }, { "ename": "company-plsense", "commit": "9cf9d671d81e07c704676c557a9f0d686067ce5c", @@ -13584,15 +13924,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200514, - 2116 + 20200812, + 410 ], "deps": [ "company", "posframe" ], - "commit": "4e506d661ed9cd2e4cf16281f3a11009210e9c30", - "sha256": "1h6pls6vg593cbmvq2kh5z67jvcyljvwbdxypqqsls5d22hvvbh5" + "commit": "4bfb8bccef4b64479f4147de6bf6fbd05df2a67e", + "sha256": "0k19gkh8xbap4j1jjqw6lnkp1v2q76fz3ryrns7kvbzmca3y5599" }, "stable": { "version": [ @@ -13616,27 +13956,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200404, - 1550 + 20200716, + 1414 ], "deps": [ "company", "prescient" ], - "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", - "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" + "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530", + "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p" }, "stable": { "version": [ - 4, - 1 + 5, + 0 ], "deps": [ "company", "prescient" ], - "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", - "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", + "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" } }, { @@ -13666,15 +14006,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20180525, - 1003 + 20200714, + 1611 ], "deps": [ "company", "pos-tip" ], - "commit": "479676cade80a9f03802ca3d956591820ed5c537", - "sha256": "0hbqpnaf4hnin3nmdzmfj3v22kk9a97b6zssqs96ns36d9h52xcp" + "commit": "5a86731de461142db3b7ca26b4681756edb4b773", + "sha256": "0n0pdcgql8hcipwacc60hk4ymp8ry6z9lm4p4wn8gmnb7km023qb" }, "stable": { "version": [ @@ -13698,36 +14038,36 @@ "repo": "jcs-elpa/company-quickhelp-terminal", "unstable": { "version": [ - 20200309, - 245 + 20200627, + 908 ], "deps": [ "company-quickhelp", "popup" ], - "commit": "0a7c86258b3069adbeb0889e21c6977390d00f4f", - "sha256": "0zbzbm4hchp1a8m0bdcp9d97i0yx3kkhp5vbs0m5pr2h13xdc7vj" + "commit": "e18b4cf309e2bbc63995ebc3c1230c8c865dd00e", + "sha256": "1ixl54wgynq0zzqr7cxphblwmxx5a9gs28rfyq5c2l499ja4r1k7" }, "stable": { "version": [ 0, - 0, - 2 + 1, + 0 ], "deps": [ "company-quickhelp", "popup" ], - "commit": "344e30202fb38e1947b8b17f403bb7b2208936fe", - "sha256": "1gzmx8zz93261m9kks2hdgdhfs9vz8gsdxx5xkldbnz4g1wbmh2a" + "commit": "e18b4cf309e2bbc63995ebc3c1230c8c865dd00e", + "sha256": "1ixl54wgynq0zzqr7cxphblwmxx5a9gs28rfyq5c2l499ja4r1k7" } }, { "ename": "company-racer", - "commit": "c4671a674dbc1620a41e0ff99508892a25eec2ad", - "sha256": "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4", + "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d", + "sha256": "180851z4ngpfvib2rhr9dvc1kbqjn4flsibc9r382na8wnmmcx5j", "fetcher": "github", - "repo": "emacs-pe/company-racer", + "repo": "emacsattic/company-racer", "unstable": { "version": [ 20171205, @@ -13812,8 +14152,8 @@ "company", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -13878,8 +14218,8 @@ "company", "solidity-mode" ], - "commit": "022b3159832384a7dcdc2168809e698600826047", - "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" + "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e", + "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq" }, "stable": { "version": [ @@ -13947,8 +14287,8 @@ "company", "stan-mode" ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -14002,14 +14342,14 @@ "repo": "juergenhoetzel/company-suggest", "unstable": { "version": [ - 20180527, - 1631 + 20200804, + 1127 ], "deps": [ "company" ], - "commit": "e1fa663b48639c76d91d1f5ac3b23215aa3dabc3", - "sha256": "0jn7rx4m3121lx6hhabvnfq73vd0rj2364hbvza2myylw4f4qav9" + "commit": "7f4efb0e2577b7b34928db3dc71758ab6852f66b", + "sha256": "0hlvg11p4xkafqys322ablbld2v7fks924cpc3bs3wcipjjxl3cf" } }, { @@ -14246,11 +14586,11 @@ "repo": "paldepind/composable.el", "unstable": { "version": [ - 20190904, - 701 + 20200604, + 1156 ], - "commit": "46f82d86c285ceba3e0e46adf993a98cd8816390", - "sha256": "14n5sckdaxx291wmj7mnsn06sprpdxf6s44hgxdksv0pvln2m0wx" + "commit": "f6262e6d7380ce9d4eacd7127fe0d968325f347d", + "sha256": "0a2xfnd54pclh3qm1hwv867dpkhk6wck94092yyzapj7zxnfnr15" }, "stable": { "version": [ @@ -14270,35 +14610,32 @@ "repo": "emacs-php/composer.el", "unstable": { "version": [ - 20200214, - 1119 + 20200616, + 1717 ], "deps": [ - "cl-lib", "f", "php-runtime", - "request", "s", "seq" ], - "commit": "8b4867e30efcdf10c6d9a74822aa281404377818", - "sha256": "1605fk7nkzjshn6faxw0ycn45a1wbivpmlmyaxcqzjhmawavky6b" + "commit": "7c7f89df226cac69664d7eca5e913b544dc475c5", + "sha256": "0iyajdlp95mii462xqy6fqbv5q7vai3ya4jip8433zwwr2pkdbsr" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "f", "php-runtime", - "request", "s", "seq" ], - "commit": "d88741009cf7cae0a75e3cc7a19dd9143fcc92f9", - "sha256": "0iqm8997pl3pni7a49igj8q6sp37bjdshjwl6d95bqrjkjf9ll08" + "commit": "db65d874d762f70558449a01bdac5361bf067c15", + "sha256": "1krfdc8xrkxl7mhldxhbf2lddyskvvrykrspkzvvwivc29dl0vmm" } }, { @@ -14357,8 +14694,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20200509, - 1836 + 20200818, + 1614 ], "deps": [ "dash", @@ -14366,14 +14703,14 @@ "pythonic", "s" ], - "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9", - "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v" + "commit": "9f7eea16e9ad3eb34fe3d1cbd9d6162b8046c2f8", + "sha256": "1151bk1fx8y8yql1sg9qqagxcbq57rz85gwnx0z2acfpljb2i7r7" }, "stable": { "version": [ 0, 0, - 10 + 11 ], "deps": [ "dash", @@ -14381,8 +14718,8 @@ "pythonic", "s" ], - "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9", - "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v" + "commit": "78e1aad076f6cefc6aa7cc77d08e174b13050994", + "sha256": "02l9m5wx0z865w3cdwbw7c22fmdjbsw4svivqg72nbl7yrq7rv5v" } }, { @@ -14658,16 +14995,16 @@ "repo": "emacs-php/emacs-auto-deployment", "unstable": { "version": [ - 20180604, - 1419 + 20200616, + 518 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "5af6d5fcc35ddf9050eada96fd5f334bf0661b62", - "sha256": "1q9liby1dmwwmg2jz13gx2ld47bpcqb9c7vx4qgky75wb5c2q1xz" + "commit": "811c8fe638c5616b6471525421e61a4470be3b52", + "sha256": "0j205ky9djlzhgrgjw4562lz2gnpi48las66w7ll8z20zkk4ylnm" }, "stable": { "version": [ @@ -14798,20 +15135,27 @@ "repo": "conao3/cort.el", "unstable": { "version": [ - 20200330, - 1641 + 20200812, + 910 ], - "commit": "eb94d2a5b3a048a495fb0218b2df9021f8c864f4", - "sha256": "0rc1jfqkc05ml41cp8dc8akrxx3ifziyjy1w4vvgpbb5z49m83ky" + "deps": [ + "ansi", + "cl-lib" + ], + "commit": "28c8422e84fd545f7a166f1904277b6b3f98398c", + "sha256": "06fcwadrn32i19qp30xw65976wplsw3xh2jm0zzsp9g0pir1snxb" }, "stable": { "version": [ - 3, - 0, - 5 + 7, + 1, + 0 ], - "commit": "1df178e296feaf4465967567b1cfdce1dda5a09b", - "sha256": "0y23w34dcifk6cxw2kcgwydqdc8hn0mj5129z560fm6iwxd6cgkx" + "deps": [ + "ansi" + ], + "commit": "a2d5ac5639e43dd73b5dbfa5bd011b7760b126fd", + "sha256": "03c223nczpbdkjmq69panhbsq2a0zj20w329jgj4c0zsj8m1a32a" } }, { @@ -14837,14 +15181,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200512, - 1130 + 20200818, + 1428 ], "deps": [ "swiper" ], - "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", - "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" }, "stable": { "version": [ @@ -14943,10 +15287,10 @@ }, { "ename": "counsel-dash", - "commit": "0f8af4d854f972bfed3d2122b4c089f72d8b5f2a", - "sha256": "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1ya7mnxlgb1rwr8xlg17mqh25dbkr0v04wccg9l8hwl63m7bfzpv", "fetcher": "github", - "repo": "nathankot/counsel-dash", + "repo": "dash-docs-el/counsel-dash", "unstable": { "version": [ 20200103, @@ -14984,26 +15328,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200514, - 1224 + 20200814, + 716 ], "deps": [ "counsel" ], - "commit": "362fc857a271e509d05fa190212629dc6b0778f2", - "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" + "commit": "5ec1e422b47163e17d0d5c1cf732068f93ffc39c", + "sha256": "0zwyff7lamlpqd52ifspf6bb78cpanlsy5gccp7ms7mnj82zhfxm" }, "stable": { "version": [ 1, 9, - 8 + 12 ], "deps": [ "counsel" ], - "commit": "362fc857a271e509d05fa190212629dc6b0778f2", - "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" + "commit": "9436bdbddc0deba88d97b5f31d62a2c95a52c400", + "sha256": "08glszh5y8y078vjrnmasxdfmxiics88hkva4nqq6spl0a0hrn9f" } }, { @@ -15132,14 +15476,14 @@ "repo": "akirak/counsel-org-capture-string", "unstable": { "version": [ - 20180816, - 724 + 20200810, + 1114 ], "deps": [ "ivy" ], - "commit": "0fd5d72397a9268a89dd26de2a6c355f127453ac", - "sha256": "19ijjiidxxysvkz9vnsgiymxd7w7zcs5bazn7dmahp5yaprlsjld" + "commit": "dbb7d95f99d7910d76ffc2d024580088a34ec444", + "sha256": "1pymgwvjiagsx9dh9678x3i8ds1s7l4s182dr2p9rpjiwya48l6x" } }, { @@ -15150,15 +15494,15 @@ "repo": "akirak/counsel-org-clock", "unstable": { "version": [ - 20190407, - 348 + 20200810, + 1109 ], "deps": [ "dash", "ivy" ], - "commit": "ddf6b89652e4dbc0be5e8719213e7673c83959f1", - "sha256": "1fd8ll7jcfmy2dhhhsqh1l6wqfklma54bqpb4jnxmdn2w9p3ndmn" + "commit": "c5f781f241f8b16b7c3b6fb3e56e2938ba1dd87a", + "sha256": "10img15z5lfn8ml8d6v5mjf1nr73i8mjn9xy23ydp16n2idshh3d" } }, { @@ -15187,15 +15531,15 @@ "repo": "ericdanan/counsel-projectile", "unstable": { "version": [ - 20200430, - 2133 + 20200522, + 1131 ], "deps": [ "counsel", "projectile" ], - "commit": "126e825bbab872b3befd9ef88660571391ebfdc3", - "sha256": "0shmndgr1plx8kzppn990ybb2144h8p49v4vd37099y5pj6w3zri" + "commit": "77392cbbc42e98fc137b43f1db1b111ba6e2dd75", + "sha256": "131pww7lf88az5bsnaza8i60p7xcic271wpdr870zan8z1jh69k3" }, "stable": { "version": [ @@ -15237,14 +15581,14 @@ "repo": "Lautaro-Garcia/counsel-spotify", "unstable": { "version": [ - 20200326, - 156 + 20200818, + 2055 ], "deps": [ "ivy" ], - "commit": "5d23a898483de19cb60773492c9846facb8ae281", - "sha256": "0k9m8xi9p5w2qnpz0zmdf52ip6viws06qq5rssgvb0cr888iqib2" + "commit": "2743ad52a9def53534fd505397fbe1ac49e53015", + "sha256": "1xrh06w3pszp4gygwsyjz7b5w2ffqmnh6rh891ydbhysp586hk0v" } }, { @@ -15360,16 +15704,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20191004, - 36 + 20200630, + 1942 ], "deps": [ "elquery", "f", "s" ], - "commit": "9e6f4af7a07e281913f9f50f20dbbf6f26807563", - "sha256": "1w27hi64wcd86pw4ds2w4yldfm0wsk15f9mpcinyb68sj1p7sn9y" + "commit": "8b9c7d7f4e53ab3a66cc4d9c88ac07fa57c7a5fe", + "sha256": "17msfsl7q78cs065a28z95hgcqvhbddlg9qwgldc1v62lgpqfd7a" } }, { @@ -15393,14 +15737,14 @@ "stable": { "version": [ 0, - 3 + 5 ], "deps": [ "cl-lib", "ov" ], - "commit": "c73d984168955ca0f47f44b0464aa45282df42b6", - "sha256": "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl" + "commit": "6e3c6f2dcb759a76086adeeb1fdfe83e4f082482", + "sha256": "1l2vpyv22f77r2nd1bxf4mggmarb621dl7fnskp5hizhc5sfxi4f" } }, { @@ -15493,30 +15837,6 @@ "sha256": "0yspf51h5b7wbqvi9lbd22chyw799n5d05xdzl5axg0i33lzk7bq" } }, - { - "ename": "cpp-capf", - "commit": "7a456977e00708d2a0b764553048f3be11d96ebc", - "sha256": "0gc5grf9viiqsjwydyv3q3qgjwkla4n54d48dc7m6mq6fl8f3p23", - "fetcher": "git", - "url": "https://git.sr.ht/~zge/cpp-capf", - "unstable": { - "version": [ - 20200405, - 8 - ], - "commit": "0a4fd531e9e47369ff29d9f8583efd0bacd6bc50", - "sha256": "0q6kgh2mdx3pr8ywr3fhn96chvrf6zx6xxs2lyfviwmfq2c3pyph" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "bee4a7d5e9a52d955325396121a901a7679295b2", - "sha256": "0lk6q8jy53iqn9gzh7nd1qpfn5lmsc1h1qn8b6br82v0i1wd96gb" - } - }, { "ename": "cpputils-cmake", "commit": "9b84a159e97f7161d0705da5dd5e8c34ae5cb848", @@ -15789,14 +16109,14 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20181108, - 827 + 20200817, + 1534 ], "deps": [ "seq" ], - "commit": "903db7b1a2052f4959d934cae26ec40a3f323ed4", - "sha256": "15wq0z9mnx60mi9xfkvgfgsfxdbiigwxr0wqabv3n2091dbzfas4" + "commit": "139eb6f1504b6885c86c658fd33c6d59bfac0a8c", + "sha256": "1889cn6pb8j55mi606nm1r6yywg64xa89s0hfbiksl4gx03yk2ip" }, "stable": { "version": [ @@ -15846,8 +16166,8 @@ 20191121, 1447 ], - "commit": "2428b016243e78a0312cf6b3ba6939e7169a1405", - "sha256": "0al65ldsbmm15h4y79i8avk63qq1y7fqzzad8p327z6d42zfm1qj" + "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472", + "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102" }, "stable": { "version": [ @@ -15900,11 +16220,11 @@ "repo": "josteink/csharp-mode", "unstable": { "version": [ - 20200402, - 919 + 20200728, + 1113 ], - "commit": "31124dba6833a4de144ca508edb90d5adfeec209", - "sha256": "0jrj2ayna8bzhi441hhszhch3na08iciqnd7fsqrm8xbwlrq7l2x" + "commit": "48851778e0f01a2b0395e054e418a1d8a1687a06", + "sha256": "0nikm2sn59ichbd3ikyhdn696fqj5ikzh79iniylza8gzmhxgddi" }, "stable": { "version": [ @@ -15924,8 +16244,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20200402, - 1509 + 20200518, + 1546 ], "deps": [ "dash", @@ -15933,8 +16253,8 @@ "multi", "shut-up" ], - "commit": "81bec1a71934a56f677f442e2c22fb6336b366c4", - "sha256": "1cxg2c8sz76b3ml8blb4f268xl6ql959p2hi5i4llil4fggw6df2" + "commit": "b6e8167c927c400c291daaa46a8aea132834b07c", + "sha256": "12k3z7azwbg11gs8sc8j6h0rb3zy3kw19z6l9ynxys4vzm9ln7dm" }, "stable": { "version": [ @@ -15959,11 +16279,11 @@ "repo": "omajid/csproj-mode", "unstable": { "version": [ - 20191012, - 49 + 20200801, + 1732 ], - "commit": "95e797af7cc30d4675247b64496c39b77b82e18e", - "sha256": "08cxkvq7k14lixavv7nwi5kmmxqvkgmqr4i46ihsgv7jcmxyy8gx" + "commit": "a7f0f4610c976a28c41b9b8299892f88b5d0336c", + "sha256": "0j8m7rhkf98zqkg6zydcks6qs4msw6vz51nbqya23hka2wpz7f81" } }, { @@ -16119,19 +16439,19 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20200417, - 1549 + 20200802, + 1422 ], - "commit": "0bf26a5688b7f34695310100dc8c28381bfafe34", - "sha256": "1rknqa4qj3gfhlxfb8fqhdcy936sr0a2vi89rcqh5izl76zynisr" + "commit": "5a13161bb2ef2908dd5a00b3b6aa7b8dacfecd8a", + "sha256": "09gd2zi3wvg9vhaxz6y1zii0n8nxhffp9qyjsgswyzaa1j7dzv2i" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "41eecedf44f2235ce13e021906c4ce92deddefdc", - "sha256": "10gnhafas54zj3z9173h1g7b519ac4i26afclmw3w1pk6qyyb03z" + "commit": "b91f88a24c05408757ae9c9b5ce74d46d6ce20d8", + "sha256": "1ffcjf0ff0748gqipkklz6jmcj4f3blgzdcax93ql9ws8bmvlsdc" } }, { @@ -16301,6 +16621,21 @@ "sha256": "1yk5j8sb1li2zh1w5awwn83rhcwr1g492an4ajxkyikj3b7ljyfv" } }, + { + "ename": "currency-convert", + "commit": "cc9d610a29376bb1c24f77669ee6a05bcf60023d", + "sha256": "1i7hs3c7lwfnp7d9ql6bl5l0s9byfnc3n68gkk57zl5imsfhbgg1", + "fetcher": "github", + "repo": "lassik/emacs-currency-convert", + "unstable": { + "version": [ + 20200611, + 815 + ], + "commit": "a8bd12654c34380b87ac6ffece32f43b723b6f0f", + "sha256": "1np43lwrwfwnnff98230ahaqdifiq2nzd361ypsg8cp8qja4zwwi" + } + }, { "ename": "cursor-test", "commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e", @@ -16369,19 +16704,19 @@ "repo": "n3mo/cyberpunk-theme.el", "unstable": { "version": [ - 20200115, - 1720 + 20200601, + 1632 ], - "commit": "07edefdec3956fba9076fe98cdc33df7bf617afc", - "sha256": "0swjbc61ii88j4myxfl5inn2j46jpf7giqd1kf0rjdyrc8zmj08h" + "commit": "cbd0d7193e69ff9e98262eb06aee3d27667ff5f5", + "sha256": "16nd57rwld78brcwx6vjib2v3l9xsiv7bxhbn2kilg1p75m3ngpx" }, "stable": { "version": [ 1, - 21 + 22 ], - "commit": "17f68f8ac70b712d2870ecb6adb3841b992074fa", - "sha256": "05mfgr9aj7knn7niadv9p6z3qrfpq2lbbi2wxxx62xywim9maw2y" + "commit": "81004fc774d373777d426926fc11abcf1e7ab334", + "sha256": "06nff38pcy5rgz13svkajsg0jjk73qy4a8m7p9f76yxcywxlgxlc" } }, { @@ -16443,8 +16778,8 @@ 20190713, 1339 ], - "commit": "78e3705cca65e1456ce26221690dca74c71735c1", - "sha256": "1mr0q76p7yw9wv48qwp66nw95c1k3x2yly1vfvdq3phbb8xr6g4q" + "commit": "763531d077d02a4a45c58332b8a8b8300c090678", + "sha256": "0q0wjybmasrv04r09linnb3n1m7g7qylaynzmmsdrk59fwzda3c2" }, "stable": { "version": [ @@ -16482,25 +16817,25 @@ 20190111, 2150 ], - "commit": "d6e6de9237bde72e7878f7b1fe0e58fdccd36dd2", - "sha256": "0lac5lqina90w8mdjkqa9qk4b52lmh6kibcph1xcjghqlw7agjfn" + "commit": "fcfd16c7467c31f255287a73f36cf66b32bc096c", + "sha256": "1yscd5q1qqw8xx4ds2pifpiyzhdnx0la5n50mxqjb3hlky7p48wh" }, "stable": { "version": [ 0, 29, - 17 + 21 ], - "commit": "b648b65ac39291aa546b58e44c8576869c351b66", - "sha256": "1kc172hh7nj8vlf781rr8jal4f7nl7dbh6csxj0qz4h4cyxrsl6z" + "commit": "976f5483c6df8570f34076ef25af7e7512dd9347", + "sha256": "1951kwfnngy2k7m3adqi17rb7f17yrr5n9zpvvmw7vxpfmca66ka" } }, { "ename": "czech-holidays", - "commit": "7224fd77b3d8a37fac2fe0cf832e3487513afd8c", - "sha256": "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0yp04d7czypxd22mvd84n4mgm6f4mfwmbzyfjiiqc7va60bbsis0", "fetcher": "github", - "repo": "hydandata/czech-holidays", + "repo": "chkhd/czech-holidays", "unstable": { "version": [ 20160113, @@ -16634,11 +16969,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20200507, - 2144 + 20200724, + 1525 ], - "commit": "06bcd1c00397a528cf8863b08e93e9a4b1032a57", - "sha256": "1y3xnya33qszxnn2kyzgk339gfxxq485b2fydhc32ayfav6hjfn7" + "commit": "5b458ce976acf948aa101a05994b68baf9b01846", + "sha256": "16496dr846whv056xq2y994csr55zjd8906brkav2zjhj7qy0w1r" } }, { @@ -16661,8 +16996,8 @@ "lcr", "s" ], - "commit": "7411904bfbde25cdb986e001ec682593dcb7c5e3", - "sha256": "0dhkp9g1cc1vlfk1fjncl3x3s7zd9a633ya85pjyxl70kky2qhnz" + "commit": "c516bc9e8f09e0f928de9a93e82acfb382636f5c", + "sha256": "16msp36vflq10w0h1hh6fy7z9gmqzhr61w0xali2jkb203v1pi6d" }, "stable": { "version": [ @@ -16690,8 +17025,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200514, - 1655 + 20200814, + 1819 ], "deps": [ "bui", @@ -16700,15 +17035,16 @@ "f", "lsp-mode", "lsp-treemacs", + "posframe", "s" ], - "commit": "86fc65d525e30c0249e7ec6acac5e4e55cd7c3e2", - "sha256": "1jfrjrbjscjsa52wjvvmhcl4cqrw43wz4f34z8yzsxmsalgpf0nw" + "commit": "0c11dd205152f3b8712362e4bc8919def7f312a4", + "sha256": "1j7vxf42icl4nsnza91lp8l3lgrhn6y11xi9ql5lji5vfgj94mk6" }, "stable": { "version": [ 0, - 4 + 6 ], "deps": [ "bui", @@ -16717,10 +17053,11 @@ "f", "lsp-mode", "lsp-treemacs", + "posframe", "s" ], - "commit": "6cbf83784788dc2bba85a2baa1492b276252680c", - "sha256": "0w0a9x8lp1z05jv50biidj7vh4yfwkzfkmzwv04il028cy509yh0" + "commit": "35db94e81c592246675f300aaca4a70966b8a5fc", + "sha256": "1d4hdydfk86d4slibigyhwng8wx3vzyap8hp5iv0h7wr6868m4iv" } }, { @@ -16844,11 +17181,11 @@ "repo": "sjrmanning/darkokai", "unstable": { "version": [ - 20190603, - 1919 + 20200614, + 1452 ], - "commit": "a53815fbfb06604d7f51519c62cc11e507204a70", - "sha256": "01jd3y3kr4fplvdv32smbaxqa2dafs8vvp967jma7xm7r1frnbdw" + "commit": "5820aeddfc8c869ba840cc534eba776936656a66", + "sha256": "1bj7l5sh6nzxcw575kjcscjpjqmwlxhvi30qviqg4d6aymzkgr53" } }, { @@ -16955,11 +17292,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20200426, - 2244 + 20200803, + 1520 ], - "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b", - "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8" + "commit": "b92ab5a39b987e4fe69317b9d9fda452300baf20", + "sha256": "0qxjl10883l5xq56d474visrp0m3hapj4qqvrpqnanppx22499mh" }, "stable": { "version": [ @@ -17003,21 +17340,21 @@ }, { "ename": "dash-docs", - "commit": "2f597ec52f4bf55a748231751b6e51328e8f6f59", - "sha256": "0vms4yr67l95rybvavd34a9gm57j7524swlf1c0rj8fff1wrmhn0", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0y5mq4cy9swp0xb51n3h57ra0ln3k0i6q2j7sslmwvaxi9a12zkg", "fetcher": "github", - "repo": "gilbertw1/dash-docs", + "repo": "dash-docs-el/dash-docs", "unstable": { "version": [ - 20190516, - 1702 + 20200516, + 1943 ], "deps": [ "async", "cl-lib" ], - "commit": "111fd9b97001f1ad887b45e5308a14ddd68ce70a", - "sha256": "0sckb7z0ylflva212bns7iq9mfnffgjghi0qspsbfwra35zb9xng" + "commit": "dafc8fc9f1ddb2e4e39e0b8d066c42d5d7ce8d06", + "sha256": "0n6d3mm43gj16v8kjjradcfik93wb89dsqnfcbskb28bvcamafid" } }, { @@ -17028,14 +17365,14 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20191109, - 1327 + 20200617, + 702 ], "deps": [ "dash" ], - "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b", - "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8" + "commit": "b92ab5a39b987e4fe69317b9d9fda452300baf20", + "sha256": "0qxjl10883l5xq56d474visrp0m3hapj4qqvrpqnanppx22499mh" }, "stable": { "version": [ @@ -17245,26 +17582,26 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20200208, - 1629 + 20200621, + 2103 ], "deps": [ "extmap" ], - "commit": "0ae7addb2c46133393f59011b2aecc08de49b8d1", - "sha256": "1df6c5wsn6nwqvfx11d7x3wkjazri3946fwy0m9i6mx18yac38h0" + "commit": "c51eeb6df180f6c7d1676d1c0af78255bb0fdf95", + "sha256": "11w32jnkc596ybbhqih5d4rbvqk50cc6yyc9759acnzlqfd188xs" }, "stable": { "version": [ 0, 6, - 5 + 6 ], "deps": [ "extmap" ], - "commit": "4a480b66179f016100a582af170a76cda19c980a", - "sha256": "0j7k6157fvzl1395ybnrgcz697h6cjk9v445nnfi7q0l8vylbfvm" + "commit": "55297bf409f35dbc4bcd26b458b83e349ed11452", + "sha256": "0a3q667pybpmsjkbgf6287jwgpnx8brp5314wb8zbczw6ncygnbi" } }, { @@ -17367,15 +17704,15 @@ "repo": "matsievskiysv/display-buffer-control", "unstable": { "version": [ - 20200331, - 1826 + 20200527, + 1040 ], "deps": [ "cl-lib", "ht" ], - "commit": "17c6640a409424ec32fdb6bfd6065562e726bf1f", - "sha256": "18mamp8j3lmmcpcyfrwrqppxvyx7zirn30rwp4wndczpyapkwv4n" + "commit": "8aa8982e6afbe3820f60c3defbb3c8037e04eebe", + "sha256": "1zwxn76zh0ba5pa821g2aaqa1niz2l0g3wvnngspw04fla2scjb4" }, "stable": { "version": [ @@ -17398,15 +17735,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200403, - 1308 + 20200816, + 1809 ], "deps": [ "ccc", "cdb" ], - "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", - "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" + "commit": "275a831be77573470309a78967734d2b6d10f218", + "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal" } }, { @@ -17417,15 +17754,15 @@ "repo": "conao3/ddskk-posframe.el", "unstable": { "version": [ - 20191123, - 1632 + 20200812, + 917 ], "deps": [ "ddskk", "posframe" ], - "commit": "8a37953b37d397ba406bc308eb908bd966d34af6", - "sha256": "0qm2hb2m3gqzqblgy3d5krxkjbwyhiivzbjfiq9yygh5v729d3as" + "commit": "299493dd951e5a0b43b8213321e3dc0bac10f762", + "sha256": "1rsy0wjncxzjhis8jrxpxjh9l9pw0bngg1sb4dj5qvhsgszhawpn" }, "stable": { "version": [ @@ -17448,29 +17785,29 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20200411, - 652 + 20200803, + 606 ], "deps": [ "dash", "s", "spinner" ], - "commit": "bdcdf138cd71b0a5a80ca64b3bd68b7355084757", - "sha256": "1f0gbl2s6h945h1d4pg6cms3w2jwppqiddy3ja9b02ckcld1c227" + "commit": "9cd79e0d5dd6b77abca3e84e17d3e4e2e9aa5695", + "sha256": "1xq06af3lib8i2l0619ggzkzf00pb39pk0pd97i6dv7593y82c94" }, "stable": { "version": [ 0, - 8 + 9 ], "deps": [ "dash", "s", "spinner" ], - "commit": "094ad453e8bc0451a2c062d06db3079f003566d2", - "sha256": "18prsg8kyngz8f0l9kjhaz23al9fna2naazy324bjj0sn9yiqgd4" + "commit": "411a6973580b3503535ba58e405035bde2392903", + "sha256": "05xsf2axlxdsv8aivd7qyb0ipf9cp95y9f0sf0kaqpc1rn6i79ps" } }, { @@ -17812,25 +18149,26 @@ "repo": "liblit/demangle-mode", "unstable": { "version": [ - 20190528, - 306 + 20200621, + 2344 ], "deps": [ "cl-lib" ], - "commit": "06903d731dfde110e10b979dcc7624ef6dbb5ac8", - "sha256": "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4" + "commit": "697c1dbde93f164eac7ea0dc530d7e8b799272d6", + "sha256": "1ycbggyljbm5iawhk6i1cm21a3gzz1javab99c3abprkgmldmd5l" }, "stable": { "version": [ 1, - 3 + 3, + 2 ], "deps": [ "cl-lib" ], - "commit": "06903d731dfde110e10b979dcc7624ef6dbb5ac8", - "sha256": "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4" + "commit": "697c1dbde93f164eac7ea0dc530d7e8b799272d6", + "sha256": "1ycbggyljbm5iawhk6i1cm21a3gzz1javab99c3abprkgmldmd5l" } }, { @@ -17848,6 +18186,54 @@ "sha256": "1fcmrhm6h0j7jjw6kijrcacv628fy80ssxn6h5bilwmw0r4c7wm6" } }, + { + "ename": "deno-fmt", + "commit": "d6c3171a30886ecc4427938d847924023d1171ae", + "sha256": "15490s5xx58jc0irras3yaczx9s0v93fp7dnd6pba7zq149nqpy7", + "fetcher": "github", + "repo": "rclarey/deno-emacs", + "unstable": { + "version": [ + 20200520, + 1838 + ], + "commit": "3b193eef576e2c14fdcf350495955e6e8546dddd", + "sha256": "19fl389rgi6k8w84ggin54p9lpngwah96fxa6qf86y4rf9r2s9sh" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "ccae334361b9f83b687f040bcdfdc2a58c78059f", + "sha256": "1fm2ym36gv4p4i27hln706dnwr6rvrkkfgggbcz9rqfbphrsfqyx" + } + }, + { + "ename": "describe-hash", + "commit": "8c6c5cd96acd3deeb86503341dd9cd729e20185e", + "sha256": "0a26d46p46fypq3snh52grnjcgp6isb5k4qv2fm2m6ha2n7jdi5a", + "fetcher": "github", + "repo": "Junker/describe-hash", + "unstable": { + "version": [ + 20200718, + 1556 + ], + "commit": "18e69a932d5495c8439571ba8f2d2ee123d434b1", + "sha256": "1z2msiqwq7lqvyz6b2szyx1kpb6rv6irvwdcv36519mda0smhjlv" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "20dbbbea630055b2401f13a55fbb21216960dc46", + "sha256": "1mz5951yr27jnncz3c080jri7h3pb1k07i6w7wx5aj54kwpsg1d8" + } + }, { "ename": "describe-number", "commit": "d5ed9063f7e9f540bc90c1df4e3604d4af9bcfe5", @@ -18010,14 +18396,14 @@ "repo": "psibi/dhall-mode", "unstable": { "version": [ - 20191006, - 2324 + 20200716, + 2147 ], "deps": [ "reformatter" ], - "commit": "ef4d33debe224c6ba37e51a29b9dc8b74f20f1c2", - "sha256": "1232y2k4l3bsz90pgis78zxmrw7jv09dfaip21yc1w4vpxfyr384" + "commit": "484bcf8f78f1183ef45c3b04a362bb73690c6b9b", + "sha256": "1wggg8jlzg9rph4jhxp6yiri178rnasbv38838i973kjgqjxrl76" } }, { @@ -18197,14 +18583,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20200510, - 1540 + 20200701, + 2141 ], "deps": [ "cl-lib" ], - "commit": "ab2f4f0db9b0c3484db837252ce2dc75f4696b1d", - "sha256": "1pb1hp79b3r0nn7dclk3x0d0yrvx6nasgzwi1f918k9n7kzz7n4g" + "commit": "2281a89a3ddc6616073da6f190dda08d23b18ba6", + "sha256": "0lyx0hnc45k2f154p81dyjxrv5r53bwb6nfyhmy5avmp9cqdjd4d" }, "stable": { "version": [ @@ -18299,20 +18685,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20200322, - 2109 + 20200819, + 1316 ], - "commit": "567fff3933f80f00f53610e7b08f75bb636b12c0", - "sha256": "0252lhkv2r8gy4512frhdh381xrf64nspvfm2hp7bkhz47dlrs7y" + "commit": "7f89372f27eff9e4db55bcf39f9cce3693d95bb2", + "sha256": "0s9q9f9bqr4w9ll0im65h95hxki3svanlikwxgq6m7p493s1q5j0" }, "stable": { "version": [ 0, - 6, - 1 + 9, + 0 ], - "commit": "8b350b7a143219b3f927cb3a1aeb16a299363f05", - "sha256": "1sxfzirl8kgzmq8l9l868yl92mz1r8yk58fnxf7p6z4y0pdlcqfg" + "commit": "343de0e0fe408f422a32e1bda22cafc2cc9900bb", + "sha256": "1cg38x7zd1n9zqsyg47famss91nqs7giqpgsi5qy10zp8y3i3l2c" } }, { @@ -18448,20 +18834,20 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20190921, - 1647 + 20200712, + 1355 ], - "commit": "0b1262f947b3ce03dca17879caec808a7d091bf4", - "sha256": "0yrzp7jdw04hj3ag3379l6kb9vpd1vcvqqf4z5yb3i28b5d7s136" + "commit": "2ef1e03458b9528a737814546aaee66067db649e", + "sha256": "0xlbgxl44iyffpg5r7md3a3l1b7gdj1vsfajww8g3rsna7d7n2wp" }, "stable": { "version": [ 0, 0, - 3 + 7 ], - "commit": "e137baa5e258a7938c713253fc9cc63f8674f841", - "sha256": "03068nyfb3cz0lz8z3qcwjlsvqaw9dfg3g8w13gmpwsmxaxlbv3i" + "commit": "cef452767c16c564dabc819b234fd3236fa97a51", + "sha256": "1hz3b44pbsy6ybicjs6i1fm2lai1ccxk46dk6fyd5bcb66s2lxzy" } }, { @@ -18554,8 +18940,8 @@ 20181228, 1422 ], - "commit": "09dbb769fe02f546da470369a12468ab4a0cceb2", - "sha256": "0j2dz4vy4i22185hhlwg2kprpis97xb12qvfdhvdcnz2vwy61sxa" + "commit": "52ce4ac88fa39a0ebdf732435fd831ea9a8d0764", + "sha256": "00br8f8rw0rrzmi3nvacwn14d122jw243z1izlsm8h8q95hh8f6l" }, "stable": { "version": [ @@ -18741,8 +19127,8 @@ "repo": "conao3/dired-git.el", "unstable": { "version": [ - 20200130, - 743 + 20200527, + 732 ], "deps": [ "all-the-icons", @@ -18750,8 +19136,8 @@ "async-await", "ppp" ], - "commit": "11938721f7202aa784cc493027e3a0ec2c0d39b5", - "sha256": "1b5vc9hc26cs1dq7lmvm5gly4h6ahpp0dnlbxi8p4mza12yhnrwi" + "commit": "82c93bdb2fe392b122f79d2e425c632f1c69ede3", + "sha256": "134f97zk7q2fvqphfgbjdbwlgrrnq51v0zrv6aw8c8n7fln5ap93" } }, { @@ -18880,6 +19266,30 @@ "sha256": "0rz8d9lj2zbipz6cwrlw2a3z9y4rybbmz73h73l1i7fjg9q1kqm4" } }, + { + "ename": "dired-lsi", + "commit": "b38502c7c37658b369ae004e1ce8a21c16d9e6de", + "sha256": "1q84krip2814b726ni4q2c8mhqqhr39wgvi6881mg96h624v9bxm", + "fetcher": "github", + "repo": "conao3/dired-lsi.el", + "unstable": { + "version": [ + 20200812, + 929 + ], + "commit": "0f4038c8b47f6cfc70f82062800700c14c9912c2", + "sha256": "1bb46cla9pa4697njyqlycjjxf63i0nsxppg9sb0762xsashyz9s" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "8170d7711254af18cbf1397d681fd331363a17d8", + "sha256": "1wgvd229cirfgn2vkjqwam4gnhs7jnp05c73vh8sckrzs3z51zc9" + } + }, { "ename": "dired-narrow", "commit": "8994330f90a925df17ae425ccdc87865df8e19cd", @@ -18918,6 +19328,36 @@ "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, + { + "ename": "dired-posframe", + "commit": "33ce7b7ad21c774ce7f1222af5a7d87219072fc1", + "sha256": "0jzbkafv0hv107412szs777ni3zxpn8fwlr5xm8pb89q3q5v7bcx", + "fetcher": "github", + "repo": "conao3/dired-posframe.el", + "unstable": { + "version": [ + 20200817, + 420 + ], + "deps": [ + "posframe" + ], + "commit": "1a21eb9ad956a0371dd3c9e1bec53407d685f705", + "sha256": "0k633fz5gccza5l3dydn55yg4r1a50bgcmxwxn89qc7cd8dck75v" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "posframe" + ], + "commit": "1a21eb9ad956a0371dd3c9e1bec53407d685f705", + "sha256": "0k633fz5gccza5l3dydn55yg4r1a50bgcmxwxn89qc7cd8dck75v" + } + }, { "ename": "dired-quick-sort", "commit": "4d278178128deb03a7b1d2e586dc38da2c7af857", @@ -18993,11 +19433,11 @@ "repo": "Vifon/dired-recent.el", "unstable": { "version": [ - 20191004, - 1500 + 20200712, + 716 ], - "commit": "5c799f96da08a0a3200cb5f609baf6c184f558ea", - "sha256": "0kc97v80rh10ksfw49pp551ay0b1apwi6ba66rwbyix50d7drimw" + "commit": "860e70b15983ac7164648de8148a529bdcdb8833", + "sha256": "1558cdinig8kx2hx2hkl3zxk001ijx53n5rjdm3367wllp0icyzf" } }, { @@ -19077,14 +19517,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20200409, - 801 + 20200711, + 2031 ], "deps": [ "dired-subtree" ], - "commit": "6e569c851418890c21fd37d03a62f85343aa0900", - "sha256": "0jxljpmzncbh9xb22y4xr9bzcxwijy68pn8chqsvqmivss5py7n9" + "commit": "da77919081d9a4e73c2df63542353319381e4f89", + "sha256": "05h56wdl2xvc8davnx83ypg20fl7wlks97cafa4r2yf141xjc05h" }, "stable": { "version": [ @@ -19200,8 +19640,8 @@ 20191227, 2028 ], - "commit": "83567d00affce66a4e501563eddd0bd436ac48d0", - "sha256": "11xkvywcfv27gr0dpgprmmnjqfxmxdmcpa2kq0vqnxrblg6ijwbr" + "commit": "cd052dfef602fe79d8dfbcf9f06e6da74412218b", + "sha256": "1zhnr4wkb0gifhf1gfssipanifaiixvz6wqlmscxyp7hdm8xjvad" }, "stable": { "version": [ @@ -19243,14 +19683,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20200319, - 2357 + 20200529, + 1305 ], "deps": [ "dash" ], - "commit": "1daf479b9b7600ce9681f2a980deae7fcb2f3d59", - "sha256": "08hwjd1xmq6hxab537zm11kwqhwnc1dfznfqzy66c4agl9z9a7vx" + "commit": "f5484b0fc33d4e5116612626294efb362ff9ecd4", + "sha256": "0772z4v2jjinqlqhrdcsvk912gdi0dkxag7q5nm0rnkx2pyk7ynw" }, "stable": { "version": [ @@ -19922,6 +20362,24 @@ "sha256": "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49" } }, + { + "ename": "dmacro", + "commit": "26d2f0ed0013dc0c03db5bae3119ae3522181ed2", + "sha256": "1n2gsml4ypasakxvq9q3h54kj5pl87m796si73700n5m4pgpp4hq", + "fetcher": "github", + "repo": "emacs-jp/dmacro", + "unstable": { + "version": [ + 20200803, + 633 + ], + "deps": [ + "cl-lib" + ], + "commit": "3480b97aaad9e65fa03c6a9d1a0a8111be1179f8", + "sha256": "1vb2jz4z4z9bhw76b1l08jf8gd3kq6c8zsxxvmlan87nwkj211wz" + } + }, { "ename": "dmenu", "commit": "98bcdd71a160b9c04f83cc5b939031c9e7b5eb59", @@ -19975,10 +20433,10 @@ }, { "ename": "docean", - "commit": "d4827fa337d7d25f2aaf67aca3081fbdaeacbcbf", - "sha256": "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9", + "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d", + "sha256": "0y45gk3jvjqpzk51098qbnrvhbvg0rzsdhd3fnw7pblsgzzqn9w6", "fetcher": "github", - "repo": "emacs-pe/docean.el", + "repo": "emacsorphanage/docean", "unstable": { "version": [ 20180605, @@ -20000,8 +20458,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20200508, - 1956 + 20200610, + 715 ], "deps": [ "dash", @@ -20011,8 +20469,8 @@ "tablist", "transient" ], - "commit": "01a04d0a295f3396833d0b6fa60cf24d52e1a89f", - "sha256": "0gh0h64dwn8v67q5569gifdjhzz5g4hfnsiqmg1nyq0nhvpp2b1c" + "commit": "3773112eea3fc99704b5ca50c1e9a3db2cb8e4f3", + "sha256": "0gi86ggjyfmfas7pswj7wirn5n7zs6rvb5b95nchnf4xf0nzwia1" }, "stable": { "version": [ @@ -20084,15 +20542,15 @@ "repo": "meqif/docker-compose-mode", "unstable": { "version": [ - 20180324, - 1752 + 20200730, + 1258 ], "deps": [ "dash", "yaml-mode" ], - "commit": "c9f131d2c90d652435d407fd36c40feebfed1dad", - "sha256": "0d5d46i6hplmy7q2ihbvcrnk9jrwa2mswgbf8yca3m4k44wgk6la" + "commit": "4c0c897fb0572e6b026b2a5ab9f2c76174be7a14", + "sha256": "01fj856511qjn5zw370axyz4imdnq3j5sqvbm8nkd71z1mz3dyv1" }, "stable": { "version": [ @@ -20171,11 +20629,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200514, - 2215 + 20200815, + 2139 ], - "commit": "1bcec209e12200c9b93b0d95f61b964b5de4439c", - "sha256": "03lbsww77vq1wrpj94jdx62zmjjhir9i50g85l8yadlp9696zh3s" + "commit": "89eb2e6f1c2630c980bdf4c0430ba54722c9ee00", + "sha256": "0210jwk19b59hx7gi2ddy5ja9jndvmwmip8bh16g35qiscn2jwml" } }, { @@ -20290,16 +20748,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200513, - 1103 + 20200819, + 117 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "2b308857677e983ca4eaedc36438ed94aadf9e65", - "sha256": "1c7mk26drz9yldy3kvcxxnabg8ph900pj1g029xhd1407x417vqc" + "commit": "ffbaaee832f1c97ff608bc4959b408997d959b7d", + "sha256": "0gvdlwa4w7s1igy8hqapng2s1k9ca6f76g68m5wzrfnx1z0zf7xl" }, "stable": { "version": [ @@ -20324,14 +20782,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200514, - 2115 + 20200816, + 2044 ], "deps": [ "cl-lib" ], - "commit": "95463eac68fe88535d9342c7b4c2cbaae3c80950", - "sha256": "0ccq6gzahpsxsgmmd9dl16mfnz1n9sgn0ns62n03s3xgmf4ay3ap" + "commit": "24023de3c80c9f3afc3d012762d1ef0f8dbd326e", + "sha256": "0dwwpdwi0722xyap3xnm7034syb2fssfm4c6k5868k0344rvdkr8" }, "stable": { "version": [ @@ -20394,11 +20852,11 @@ "repo": "julienXX/dotnet.el", "unstable": { "version": [ - 20190415, - 1237 + 20200803, + 1032 ], - "commit": "932d776ed739d20d57dbd6ba49f61d1b450571fc", - "sha256": "1h7y9vz64bv4slz9mpd7cjyyaxgqk92jn11y5ycfyncq70wyd3j4" + "commit": "83ba1305d7895b03f3dffb2d3458b7ec75e6909f", + "sha256": "0x3kaq06wbrhqanfzj0m6yb5x1mvcjz3xg52kk7a7d4mr1h9xlip" } }, { @@ -20433,14 +20891,14 @@ "repo": "zk-phi/download-region", "unstable": { "version": [ - 20180124, - 133 + 20200816, + 1009 ], "deps": [ "cl-lib" ], - "commit": "bbba3ecd80818d5d940d41fe89a6e2ec5dd2c53c", - "sha256": "1cwlbdmdils5rzhjpc3fqjmd3dhalk6i7bxskpahbrr9xxfq0iw4" + "commit": "0dca3b224649bba80a7e9ecbf1d1b6f6be962455", + "sha256": "1yka864dzz8nxskcllqyxk04313hlyfc9a4p0apmk56q19fcpwgn" } }, { @@ -20466,6 +20924,21 @@ "sha256": "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb" } }, + { + "ename": "doxy-graph-mode", + "commit": "4727d492a4867fc58bfdb8f57fff9313710bada8", + "sha256": "170r39cq25qkbng4i1rlpj3y7cvdqc0wxxr1rcxy15szjf7qw2dl", + "fetcher": "github", + "repo": "gustavopuche/doxy-graph-mode", + "unstable": { + "version": [ + 20200807, + 646 + ], + "commit": "2685c28e7a725614c23345195c3b85e505be2a1b", + "sha256": "0a4kil5v88wkki3r4jjc9ackv2z7ik0qgn4bdv75baskig8f8qjy" + } + }, { "ename": "dpaste", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -20560,11 +21033,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200514, - 1527 + 20200814, + 1717 ], - "commit": "c162aff5025a7e9f55785d7177d59f4a3aa60183", - "sha256": "11wlrvrz3q054nqkdbd4525kh50cspszrgmqd74plah6jc95wpa3" + "commit": "3b7c2905d249f47bc9c09d304c16f72f217df2e0", + "sha256": "031c2md9zxk8bhb8v6s6i5s3qmlfxf5ks0nl7n6kyw1w31h6pww9" }, "stable": { "version": [ @@ -20772,8 +21245,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20200315, - 1931 + 20200816, + 2055 ], "deps": [ "cl-lib", @@ -20781,8 +21254,8 @@ "s", "seq" ], - "commit": "d21a5b7958da058bb53d36fe9234089409f62c5e", - "sha256": "0w46yr5d108z2pipvh449p15qnm6mnix21pbnq3alczilzxzf9lw" + "commit": "a0e789919f71ff4ab752432fe9e295f9f44c7b12", + "sha256": "029xsdasbrvkg8w2ykgy6iq618cdjkr4gkp4l094na35jpv96yca" } }, { @@ -20890,16 +21363,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20200513, - 2014 + 20200815, + 1537 ], "deps": [ "dash", "popup", "s" ], - "commit": "194bfdbe305e21d8e6d29893d449686c85273207", - "sha256": "0lz5kajhkqh18xyg07bshvl0v5j5g5xj4q8p6min1mapm8shnv2i" + "commit": "0d74b2f2aa834b602e91d99e9cb23197a389f042", + "sha256": "01jwyridywbihspan8zrrfpxl4gl275z8l23swhczg0bcjq1x8g8" }, "stable": { "version": [ @@ -20943,17 +21416,17 @@ 20191016, 1241 ], - "commit": "e5bec1a57fd4ebeedc848e76e0cf991db7e22fd0", - "sha256": "091z6p93sv3aqf7bcw41nwh4kvvpsfncjny2fwcv3vv7zlyj2px2" + "commit": "26078df94ea16e2fc9221a84c5d42f2fe024074b", + "sha256": "1pvqrijx5bmnbvwk4pz6j1ldir5zi95ixbfrqki284qcgq28krd1" }, "stable": { "version": [ 2, - 5, - 1 + 7, + 0 ], - "commit": "4d1ef91df8c732d516ddea4a953f5956e99692b2", - "sha256": "1ljhwsyl277lvmii4v439dafyc0y2l2jf2ds5zivpbrh168851di" + "commit": "85b4e16bd6c310811fcc206d3d0cbb391eb8b81c", + "sha256": "19fn7ywx13j1hc600pccyghz2izjy26bzwaqjynn7swlbkc96ymz" } }, { @@ -20994,14 +21467,14 @@ "repo": "harsman/dyalog-mode", "unstable": { "version": [ - 20200301, - 1149 + 20200817, + 737 ], "deps": [ "cl-lib" ], - "commit": "5dceeefaed6fbedb680bb6cc9aba14fb5f890310", - "sha256": "137kgixsdkw2rqj1402gc31gd6hdbna7bx5j1xxhyiig2x2b3aqx" + "commit": "5d703d91f90ddebdfb4cae1b45c476aec5976313", + "sha256": "1vf88vywb4cjfndc4jd185fdqjydd7ckbf1n2qsi9w3k8940q2pq" } }, { @@ -21012,11 +21485,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20200425, - 1347 + 20200607, + 1911 ], - "commit": "64f3aed546315c766331c69be3c7e78c7da6c333", - "sha256": "1r63gxy1hlij1ck570agvj39rynby6kna5kcfhrr0imi7hl98mzz" + "commit": "bdccb252dffa99a3a55dce446cc4a7ff4a8dc089", + "sha256": "09dgjwdsni936chj2b8r607bqa2vcav66mb49j5vi2lxiw60sg8m" } }, { @@ -21053,6 +21526,21 @@ "sha256": "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f" } }, + { + "ename": "dynamic-graphs", + "commit": "8c0101a98dcddd7135478a218f4b0a5fd6d4fe0c", + "sha256": "188w7srdrfzri1l7y68b6vhrwn0yxx8578v6p234p8bsgmlwzan9", + "fetcher": "github", + "repo": "zellerin/dynamic-graphs", + "unstable": { + "version": [ + 20200818, + 442 + ], + "commit": "10dffcbc4011647c16e8d65d05856e043de1865d", + "sha256": "08f3f4bwryyhvj8yp2y2v3fppl6drd4rq3wyx48mxwkiw6z1db4r" + } + }, { "ename": "dynamic-ruler", "commit": "926c43867120db429807ff5aaacc8af65a1738c8", @@ -21196,28 +21684,28 @@ "repo": "aki2o/e2wm-direx", "unstable": { "version": [ - 20170509, - 1301 + 20200805, + 1414 ], "deps": [ "direx", "e2wm" ], - "commit": "b47f19d15436cc28233a812a1150689f61d11046", - "sha256": "0lihc02b0792kk61vcmhi0jwb7c4w2hi19g6a0q1598b3rci82nf" + "commit": "5672bc44d8e5cea6bc3b84c3b58e522050ffae0e", + "sha256": "18fj8qn4b6f13vb3n6j5cwcgdh2ypnvaqyjszmh321zmwxq08nd5" }, "stable": { "version": [ 0, 0, - 5 + 7 ], "deps": [ "direx", "e2wm" ], - "commit": "f319625b56c44e601af7c17fc6dbb88e5d70ebae", - "sha256": "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia" + "commit": "5672bc44d8e5cea6bc3b84c3b58e522050ffae0e", + "sha256": "18fj8qn4b6f13vb3n6j5cwcgdh2ypnvaqyjszmh321zmwxq08nd5" } }, { @@ -21279,26 +21767,26 @@ "repo": "aki2o/e2wm-sww", "unstable": { "version": [ - 20140524, - 858 + 20200805, + 1339 ], "deps": [ "e2wm" ], - "commit": "1063f9854bd34db5ac771cd1036cecc89834729d", - "sha256": "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g" + "commit": "8926d0c70be05c7b4ef821e22e411e8813973687", + "sha256": "0941mfz6a398jq5cb8kgr5cikzkzrpjnfbbx2f9c1yy9wj1awklk" }, "stable": { "version": [ 0, 0, - 2 + 3 ], "deps": [ "e2wm" ], - "commit": "1063f9854bd34db5ac771cd1036cecc89834729d", - "sha256": "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g" + "commit": "8926d0c70be05c7b4ef821e22e411e8813973687", + "sha256": "0941mfz6a398jq5cb8kgr5cikzkzrpjnfbbx2f9c1yy9wj1awklk" } }, { @@ -21343,26 +21831,26 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20200407, - 756 + 20200612, + 736 ], "deps": [ "ivy" ], - "commit": "47b839f305e63e119b6a554497cd4b99512e8e00", - "sha256": "1gdppgjdapjx25ns5ja1lnnypq26m8w9s5vbnfg7p0j64kd2mdwh" + "commit": "0517e60d8d36838df1a90498f2d75ded814d75e4", + "sha256": "0vri0dmq6w58crjwhpi9r1r2i6nqr2q69arqagbwvs4hrxm79z1k" }, "stable": { "version": [ 2, 0, - 2 + 3 ], "deps": [ "ivy" ], - "commit": "e074682aa18bed4fd68068a48ccaa970ae6d4e33", - "sha256": "1kb14p8004kaqxq765nv5rn8xniw53g4zafcy9wkv9b88bixb7q9" + "commit": "0517e60d8d36838df1a90498f2d75ded814d75e4", + "sha256": "0vri0dmq6w58crjwhpi9r1r2i6nqr2q69arqagbwvs4hrxm79z1k" } }, { @@ -21403,28 +21891,28 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20200427, - 1901 + 20200811, + 842 ], "deps": [ "popup", "request" ], - "commit": "2dfdcdbcd8eb81c3fd631372d7dceb4f432d5f1e", - "sha256": "19j7r14qxh2cl4zi4vssbbqjhp6r53gjavnwyihk52llxcgrxrr7" + "commit": "cc4ba71c07dd8b3a66c996e7b31fa7e3e9870ce2", + "sha256": "1haias0k1gia0jfjiviy222jmbv4zf1ddsv00z9h476g8h303w7b" }, "stable": { "version": [ 3, 9, - 46 + 47 ], "deps": [ "popup", "request" ], - "commit": "9e923e32f21134bb89196a169f5a3f2aecfe45cb", - "sha256": "1r8s83dc3ibp687fywfsgs2kc95j2s153ncrgxldqvsp24k1wm8x" + "commit": "cc4ba71c07dd8b3a66c996e7b31fa7e3e9870ce2", + "sha256": "1haias0k1gia0jfjiviy222jmbv4zf1ddsv00z9h476g8h303w7b" } }, { @@ -21435,26 +21923,26 @@ "repo": "masasam/emacs-easy-jekyll", "unstable": { "version": [ - 20200506, - 117 + 20200811, + 859 ], "deps": [ "request" ], - "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0", - "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp" + "commit": "8ecdb70a4f957fbd0b81dc0c5726edc136513b34", + "sha256": "15ps0b8ik3bsxv96jb0cbbgiwx0z601m56cj83yp7r5zyphbm2n5" }, "stable": { "version": [ 2, 4, - 26 + 27 ], "deps": [ "request" ], - "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0", - "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp" + "commit": "8ecdb70a4f957fbd0b81dc0c5726edc136513b34", + "sha256": "15ps0b8ik3bsxv96jb0cbbgiwx0z601m56cj83yp7r5zyphbm2n5" } }, { @@ -21540,36 +22028,6 @@ "sha256": "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq" } }, - { - "ename": "ebal", - "commit": "629aa451162a0085488caad4052a56366b7ce392", - "sha256": "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg", - "fetcher": "github", - "repo": "mrkkrp/ebal", - "unstable": { - "version": [ - 20180101, - 616 - ], - "deps": [ - "f" - ], - "commit": "1740118125ae7aa6ba82d36e1fe0e69065a6fcaa", - "sha256": "1i5r8m34zf7ya1kzgm8hsx707phq5smf2x6y2a1ykbnfkk39gmbf" - }, - "stable": { - "version": [ - 0, - 3, - 1 - ], - "deps": [ - "f" - ], - "commit": "4d19565516785348894c4911e757e33a270b3efd", - "sha256": "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7" - } - }, { "ename": "ebf", "commit": "22e2f6383f2a7a01778c0524af19a68af57796ae", @@ -21612,26 +22070,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200513, - 2326 + 20200628, + 2157 ], "deps": [ "parsebib" ], - "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", - "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" + "commit": "805c2e30e30f9f211f4aa443263d1c3971935295", + "sha256": "0kgw049wph40kk0kin7zxj44ghd1s1pr8zpl1gli4zic02vzcaga" }, "stable": { "version": [ 2, - 23, + 25, 1 ], "deps": [ "parsebib" ], - "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", - "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" + "commit": "bd258c1f364a8c96b0026fdc3de75117ca4e324a", + "sha256": "1mvsa2a761va74ybxprdvmhkzhjl6axn1ngjfhrrljqgsvqgyjwk" } }, { @@ -21979,20 +22437,20 @@ "repo": "Fanael/edit-indirect", "unstable": { "version": [ - 20191103, - 1013 + 20200805, + 1840 ], - "commit": "935ded353b9ed3da67bc61abf245c21b58d88864", - "sha256": "0yghm0l4wickhqc29ykjjg98xb91djr1f6n6ihc7ymsv0yhw5wc4" + "commit": "bdc8f542fe8430ba55f9a24a7910639d4c434422", + "sha256": "189nvmlkki1jfszm9i0crbb1p4nzgmbly0wpvpg0i8vmw7vrpl40" }, "stable": { "version": [ 0, 1, - 5 + 6 ], - "commit": "032ac0ec690d4999d564fd882588c7a197efe8dd", - "sha256": "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r" + "commit": "bdc8f542fe8430ba55f9a24a7910639d4c434422", + "sha256": "189nvmlkki1jfszm9i0crbb1p4nzgmbly0wpvpg0i8vmw7vrpl40" } }, { @@ -22048,8 +22506,8 @@ 20181016, 1125 ], - "commit": "43f180809fcbc7e104f96f95608a97c4c2a2c8b3", - "sha256": "0v9nn85pw7lll516p8bb9y6dk44rj2h88ky4zz9wgkrppjs7qdb0" + "commit": "5f6352f98f9795ea0423cb46e9b01dc54e523ab1", + "sha256": "0khf51sbjkqij36l00lby004ca9nb67xvksjnbafzp2bvwcs356j" }, "stable": { "version": [ @@ -22086,14 +22544,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20200212, - 739 + 20200730, + 1329 ], "deps": [ "cl-lib" ], - "commit": "19de0ec1bac67c5a76a4dd3d8ffe6c5411ace1af", - "sha256": "187vcflpbv4zpbzdsxw5i6c9j6dva7v3d3skh3b6wybjzh6ib4jf" + "commit": "9bc1343ce8bd2cc84bf04b58a053b7ec700244c0", + "sha256": "10zaxq356fq6y4h1g9gxj8sja4k4g5z9g2xggw0yy4dbx1mmw7n1" }, "stable": { "version": [ @@ -22232,8 +22690,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20200413, - 1929 + 20200710, + 1424 ], "deps": [ "auto-complete", @@ -22244,8 +22702,8 @@ "popup", "s" ], - "commit": "e797eb57ede8332205b3abd7d7adeccbb319ad29", - "sha256": "1101yx1dg82msw0bbji9hpnzq029ghh9ca4a6588fik8sn3v786j" + "commit": "eda93f89c198db6aa3590d8e812ed797c9b3e305", + "sha256": "0vpvil86j6ahfq9f123ampba93h7pgnlvg14y9a9fpwig1hvqm60" }, "stable": { "version": [ @@ -22408,17 +22866,17 @@ 20200107, 2333 ], - "commit": "1809fd4c001a4ae2fa5e2b721b67c1059fb8e9b8", - "sha256": "0ssh0chavas524jwj3r9bywkd8rgnbjz4xcgxhbnjfcl786pmyw7" + "commit": "54b0f51a103e4c12515cd814e3bc6be67c3da966", + "sha256": "1yvf4qns69smcg6vbb6l25g8dnai5da827qpd8f6pg3qp8w1q5wc" }, "stable": { "version": [ 4, 0, - 0 + 3 ], - "commit": "400465de0ece5b03607895bd1c83b1cfae34079a", - "sha256": "196jn2cmyjvjai3nbij5kk64djz908ch4kddi4qdpkighwslkh2i" + "commit": "64665dba315f5b70b3ce2045a42f6059d7b858de", + "sha256": "0z41p0aqz4bqvx885vy7hqny8ni8q2nrk7bhwazwymnhnzq52bjp" } }, { @@ -22429,18 +22887,18 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200516, - 1013 + 20200816, + 1810 ], "deps": [ "eldoc", "flymake", "jsonrpc", - "package", + "project", "xref" ], - "commit": "bf75312b8e7ea5136905d7a55a6d705b51b2b6c9", - "sha256": "1xbisdraj04jns0vcpcvnqqiwib3b8jpbian1nnmllvscfdz6c7l" + "commit": "5f873d288e1c5434c1640bef03555ed056cb0d35", + "sha256": "1rdfrw6qcbkl7bnjsfrzz6ndbr6lk0s4ldyqwv48k1nvlk9jc796" }, "stable": { "version": [ @@ -22463,28 +22921,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200514, - 2034 + 20200726, + 741 ], "deps": [ "eglot", "julia-mode" ], - "commit": "844f12d881a3305d319e959b032e01501be1e8ae", - "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" + "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9", + "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4" }, "stable": { "version": [ 2, - 0, + 1, 0 ], "deps": [ "eglot", "julia-mode" ], - "commit": "844f12d881a3305d319e959b032e01501be1e8ae", - "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" + "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9", + "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4" } }, { @@ -22495,19 +22953,18 @@ "repo": "emacs-china/EGO", "unstable": { "version": [ - 20180301, - 104 + 20200803, + 1101 ], "deps": [ "dash", "ht", "htmlize", "mustache", - "org", - "simple-httpd" + "org" ], - "commit": "719809679c1a60887735db41abae53b61f08ef59", - "sha256": "10f179kl53la4dyikzl1xysccx4gk04skzwaw3w1pgr8f5fjppxc" + "commit": "211c4cb2af2582849d9df984fb2346deecaf79be", + "sha256": "0sk3mn1gxb826x69s6hlkrzgj8irs9sh3anfazryibw7i61p9cbj" } }, { @@ -22518,11 +22975,11 @@ "url": "https://forge.tedomum.net/eide/eide.git", "unstable": { "version": [ - 20200507, - 2238 + 20200702, + 2009 ], - "commit": "f5f858e238c279a134d34a4ff334428dd811ca07", - "sha256": "1y87cbzngn29svx94mqvsk74j7vk912fx29b4fi26hj6myvki1nx" + "commit": "b1dfdaf06b00409250135cb1000beac60c7f659b", + "sha256": "17wzffhqnd65c94qcxlwmb4qyw44kq39hvkqlwpxx8g4wj0lql3j" }, "stable": { "version": [ @@ -22557,8 +23014,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200514, - 2040 + 20200812, + 230 ], "deps": [ "anaphora", @@ -22567,10 +23024,11 @@ "exec-path-from-shell", "polymode", "request", - "websocket" + "websocket", + "with-editor" ], - "commit": "ec3aa36bf37a78e99723563e38f81ee24b855524", - "sha256": "0pr14dv4bbxgpki8kd1z9i07x1khb0v2wr82483qf3hhqafv6lrm" + "commit": "99a4718f50538a439a2a3f2011d1aa97246e259b", + "sha256": "0qi012pbyj1zdj7h0y3r26ijf80046827ln079v1q9hgkz9ipaam" }, "stable": { "version": [ @@ -22644,34 +23102,32 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200516, - 1604 + 20200809, + 1221 ], "deps": [ - "auto-complete", "clomacs", "dash", "direx", "spinner" ], - "commit": "b02e0bbc6df08a4ae44d16ac57886e56cfb8095d", - "sha256": "0vs4kcdval7klzbs21jq2rcxs013r7rskpxgjc7lrq1qrsgyyq9d" + "commit": "c99825ce67c142b38a8d3edec444593e29d48b44", + "sha256": "0fwkaz5cacfmgchl0xyb82bqc20fbvl1kk14m5mvydhjqaam7r45" }, "stable": { "version": [ 0, - 3, - 3 + 4, + 1 ], "deps": [ - "auto-complete", "clomacs", "dash", "direx", "spinner" ], - "commit": "ad6473ba40bcc0b300baa83eda13523b9cd2cd2c", - "sha256": "18ik1r18yc904048l1yalqm9m7ll4vln73q483yqqywda9hm8saq" + "commit": "ddbae7be2aed9c273d9d570c542936f1faa3088f", + "sha256": "1gvbw4iqnsbs6fj713gjd9s0l1xxqmvq98ixsh59p0wh68a1nhhl" } }, { @@ -22738,8 +23194,8 @@ 20181006, 225 ], - "commit": "3f746410a9024af60a1368d02c2c0d9edd93ab66", - "sha256": "03zvxdbqjzkr6js8g21dzdiqsbmbhphij8jz98ian7gvzi8ady23" + "commit": "3b5e48ba4a4dca5c91610e2eb607a8bbb725a6ab", + "sha256": "1kx0c3wgij66hhryb9ggf8c975406vb9a9m6z4yrsrrisyc2ljgk" }, "stable": { "version": [ @@ -22765,8 +23221,8 @@ "anaphora", "cl-lib" ], - "commit": "65c48ec47fea84d16ff2d1ef7015b4d220fcf5ff", - "sha256": "0awx7ry9xnzw7n9aqiy7i2lfj453jkj15wfy38nlgw9qxv9bri9j" + "commit": "747acd434aa6f50a599efe5f6e96dea2dfed79d6", + "sha256": "0nyllimsrghwd1vkmal1c58g1nx4djyvjfmylhqidx4h79gkryxm" }, "stable": { "version": [ @@ -22800,8 +23256,8 @@ "dash", "el-init" ], - "commit": "8a2ab457586962bde0da2a1c56a37ce6363ae690", - "sha256": "08ni8hmszryf75h1c13q3yrrxgh41as6r8r4vq4gih0jbiz0wx8w" + "commit": "7c0169d356d6c007317e253e5776e1e48a60d6ad", + "sha256": "0w2mxppkx6306kyxaw00fzv8q745iklcm41iswmflr2585h2adnq" }, "stable": { "version": [ @@ -22852,37 +23308,20 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20200404, - 1548 + 20200716, + 1428 ], - "commit": "46d22e7dfc7f9d8e9cbf5042d365f60b1fc7da0f", - "sha256": "1xjnzy7gp4sqd0mj3zkw741bj7kbpbdgcqxs6ppvlmr5i0adx2hh" + "commit": "ff1951d776f80d2fd4a0cd9a0c930182fbb57b3c", + "sha256": "1f783xapqa6zigg0gqayxsf8lfkldng8r4ns9x04rqg9vmhkxmk0" }, "stable": { "version": [ 2, - 3 + 3, + 1 ], - "commit": "278a27477a4d7032fe06bb56ab01701cb10df808", - "sha256": "15bwjl6377ngg3qwn1g8wc2wi61pcm6xlhjzj28ap5vz7y7zxps2" - } - }, - { - "ename": "el-pocket", - "commit": "ef362a76a3881c7596dcc2639df588227b3713c0", - "sha256": "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw", - "fetcher": "github", - "repo": "pterygota/el-pocket", - "unstable": { - "version": [ - 20170922, - 1249 - ], - "deps": [ - "web" - ], - "commit": "a80abfb67efe68ada1d7d0a73aecee57e763baaa", - "sha256": "0q4nsgqpjmmxml5pcb6im1askk6q7c3ykzv6fgf1w8jgkvdifa6f" + "commit": "ff1951d776f80d2fd4a0cd9a0c930182fbb57b3c", + "sha256": "1f783xapqa6zigg0gqayxsf8lfkldng8r4ns9x04rqg9vmhkxmk0" } }, { @@ -23080,11 +23519,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20200322, - 2027 + 20200611, + 2314 ], - "commit": "94b0afb9bac32fa72354517347646166d6bec986", - "sha256": "11gj67d83hx9wfjf4j277jy8jxf97i6bd9r8r057v4i8301qh91p" + "commit": "01b26d1af2f33a7c7c5a1c24d8bfb6d40115a7b0", + "sha256": "1lj87zfcvmzm34rlq5s4y4x2nwckwg5qxlhlgl4qry3bf16bmkcf" } }, { @@ -23128,20 +23567,20 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20200515, - 1905 + 20200815, + 2332 ], - "commit": "a76712621a4851fdb0bc3d76f454898afefedf6e", - "sha256": "1jc6l0pcsyv9wgp58ij9wvjj4x4a3zz4svsna2aq86pf8bbbyng9" + "commit": "ae353301c15b15930b0a83807275ed58a3be82e6", + "sha256": "0l1ac2ll2127wn6nlrpvxzk38xb74rb8bmp6c5sjh79hnjr04zh5" }, "stable": { "version": [ 0, - 3, - 2 + 6, + 1 ], - "commit": "f345065592b4bc9a5173b44e12a74400335d4e49", - "sha256": "0gf7sfdrnyndgbkpm2pz3056y0d06iy6pwhr63sbm7g4x79j9yjd" + "commit": "8440e797f0dcaf7bf6da2a7573a7b07c4ea9da82", + "sha256": "16g68lgd5lp3rdskym4xnkvsm6953xgx48yah8zs5fpk4qny212r" } }, { @@ -23214,15 +23653,15 @@ "repo": "stardiviner/eldoc-overlay", "unstable": { "version": [ - 20200328, - 619 + 20200715, + 1214 ], "deps": [ "inline-docs", "quick-peek" ], - "commit": "ec318acb564ac5679285b51b7d979410d393fac9", - "sha256": "0dx1b9d7zyqcwsnhl18hyrkmrc0zy68zwhp81d43fw84gjb4jcx8" + "commit": "563ca285a510d1cbd5129cc3a8f8a3cdded065de", + "sha256": "1llh93rlvzsl9m2f7gprb5rbbf2ghysyn1balb8clb64hq98gjyb" } }, { @@ -23239,8 +23678,8 @@ "deps": [ "stan-mode" ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -23309,11 +23748,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20200223, - 838 + 20200607, + 1405 ], - "commit": "83568a7f2f0e2f0983e348b6e4adc0fc75b98adf", - "sha256": "03710cr8jvr22c9j3c266460aln26j7y9vqj6qm3mmzhsr3v7q2c" + "commit": "f039011edb922cdc56c1d2bd0e49bb4575c35ab3", + "sha256": "1qfjk928y8bnx2ksciv0f0ackahj78x3qsr84m9qcvsvlg9cql5p" } }, { @@ -23363,11 +23802,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20200209, - 1942 + 20200716, + 1921 ], - "commit": "af31f80552f7d081b985d729143a804ad47c0734", - "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan" + "commit": "8fb09ad75f2ff7d6f7d8b8d1ac65b9be873cc31d", + "sha256": "0rs32xvpwky37y18wr6maqbkncijia7yvmbrsngbhgdpzdvijp7v" }, "stable": { "version": [ @@ -23432,28 +23871,28 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20200503, - 304 + 20200526, + 341 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "2df5237dfa8c51a151bcf9d8fb6746447a8aa3d0", - "sha256": "0n4f621787v3gqfyqg7f37z6nxjqxl0bxxnl5j3gxqrif0ml2725" + "commit": "c5a928d4217060a49444d80d2fd54282d32a12a5", + "sha256": "0zky2iqkpckaq8c1fyhw9drdnmnyapix8jw46p6jvspljb9vwzkb" }, "stable": { "version": [ 0, 7, - 6 + 8 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "fc0beb392386b8ed387e52e7e100354b8549fd7e", - "sha256": "1kh524fkhsq3l9w0dv12b8shdyqfvnkhdr19xzfbhzw10hfdl5js" + "commit": "c5a928d4217060a49444d80d2fd54282d32a12a5", + "sha256": "0zky2iqkpckaq8c1fyhw9drdnmnyapix8jw46p6jvspljb9vwzkb" } }, { @@ -23464,15 +23903,15 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20200328, - 1855 + 20200810, + 1547 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "916c47b3590b2ff3c5075dcc1def4b36a4b14947", - "sha256": "1vhchbyy3c79cgvdz12wnryklr5g1bwh02d604zj2wca3b0199w4" + "commit": "0551993338c5d41386eccd47cc2f1b382a1b29c3", + "sha256": "0hgdsvi4l9k978kcx8gmbqkdi7q3qj70cg697fqky0cmcpykhcbq" }, "stable": { "version": [ @@ -23503,8 +23942,8 @@ "elfeed", "simple-httpd" ], - "commit": "af31f80552f7d081b985d729143a804ad47c0734", - "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan" + "commit": "8fb09ad75f2ff7d6f7d8b8d1ac65b9be873cc31d", + "sha256": "0rs32xvpwky37y18wr6maqbkncijia7yvmbrsngbhgdpzdvijp7v" }, "stable": { "version": [ @@ -23573,16 +24012,16 @@ "repo": "Wilfred/elisp-def", "unstable": { "version": [ - 20180806, - 723 + 20200528, + 633 ], "deps": [ "dash", "f", "s" ], - "commit": "368b04da68783601b52e3169312183381871cf9e", - "sha256": "0l1kj7xd4332xk821z24c14lhkpcmca5gmivpb8shlk10cvjvxjw" + "commit": "da1f76391ac0d277e3c5758203e0150f6bae0beb", + "sha256": "17zpil3zgi2j7a63lv5vas3ad6bvh45d9vnf2nb37z3id62rjdkd" }, "stable": { "version": [ @@ -23606,11 +24045,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20200427, - 151 + 20200606, + 949 ], - "commit": "4cd55a30d5dbd8d36a0e6f87261c4fef17fc6db0", - "sha256": "0g1wnx37pdl3zxmym4fnqvhlw9hj6aw51vpxa18fpsh7fadfjjdp" + "commit": "8c9748134f7c017ae1536dbd0b76434afb52e64d", + "sha256": "15gyhqnlppsswmmcknc3yfm6p7s2y06r2py656vh5vwhah7pcqxj" }, "stable": { "version": [ @@ -23645,14 +24084,14 @@ "repo": "mtekman/elisp-depmap.el", "unstable": { "version": [ - 20200413, - 1215 + 20200714, + 1630 ], "deps": [ "dash" ], - "commit": "e47616c968dd82e30cb10961452e2b46c7900163", - "sha256": "1jpqdi15lvyd48jsbndlallnjc8bkmv0mxwyf51m483vz9v8nn2i" + "commit": "98676e6ffcc4efb70cc991e659c79cb599b01bc7", + "sha256": "0ybqbyv1jnjk25z6ys90d5lddd4qxqspn2xppkzvby21x634s2ry" } }, { @@ -23725,16 +24164,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20200428, - 1707 + 20200815, + 2357 ], "deps": [ "dash", - "loop", "s" ], - "commit": "0e7ea1574717108ddc2eda5e1bc883d44cd28257", - "sha256": "0qkgsac3g02p4w8rkkmwv0p0brmi3rb1yijq45nvyy8kkf331g0g" + "commit": "b3634a4567c655a1cda51b217629849cba0ac6a7", + "sha256": "1zy629gavyrwx5gmpz7l1a86hbrxjrfqik398v3ja8vg8bj9d6nq" }, "stable": { "version": [ @@ -23802,14 +24240,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20200121, - 623 + 20200723, + 1750 ], "deps": [ "pkg-info" ], - "commit": "231291ecadc479295d83fee619049030940bfbe5", - "sha256": "0lzzgdd1fkswij0d9rh6gyyvhf6z5m0az1hhvyighi45al3mj78s" + "commit": "01b332495d3f44addeb236428041c4ffa0c2ca3b", + "sha256": "0qzzrvzpzj8vpdm8fw3sagp7bfps28l615hi67vnwp2car9a7f2y" }, "stable": { "version": [ @@ -23881,8 +24319,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20200406, - 214 + 20200602, + 500 ], "deps": [ "dash", @@ -23890,8 +24328,8 @@ "reformatter", "s" ], - "commit": "7782be0814b52f7c35a09b21a4839c1502a4707f", - "sha256": "0g3mxp80hfjwf3adaslwykk01w5fh5y6nwj4687wbm5dldvhr42i" + "commit": "363da4b47c9de1ff091a8caf95fccc34188d59a3", + "sha256": "0nmhf4vql0nkc4igd9mp9v77cb0rsxfawb160f9mcgkdd6ahn3xj" }, "stable": { "version": [ @@ -23982,14 +24420,14 @@ "repo": "leoc/elmine", "unstable": { "version": [ - 20190212, - 1740 + 20200520, + 1237 ], "deps": [ "s" ], - "commit": "2f020e41940b182deeca39786a3092a2d68b5eb7", - "sha256": "0x2av6zjd4kkyzxm2hcwjx9x8j2fzqg85pka57hqpk2fhfhsmy3s" + "commit": "c78cc8705c2dffbf649b858f02b5028225943482", + "sha256": "05z9v3lcc0mm40k0y08v8mhnlxb4krlgj6zghfavwwz6nhxn61g3" }, "stable": { "version": [ @@ -24180,20 +24618,20 @@ "url": "git://thelambdalab.xyz/elpher.git", "unstable": { "version": [ - 20200516, - 1232 + 20200628, + 2255 ], - "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", - "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" + "commit": "b4450244a5e23605f80b2179ce7d4dbaff56d927", + "sha256": "0fjqdp4xh9q50rdxg20il1y6wwn5l1af7139f4613z4j5ha3zxxg" }, "stable": { "version": [ 2, - 7, - 1 + 10, + 0 ], - "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", - "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" + "commit": "b4450244a5e23605f80b2179ce7d4dbaff56d927", + "sha256": "0fjqdp4xh9q50rdxg20il1y6wwn5l1af7139f4613z4j5ha3zxxg" } }, { @@ -24219,8 +24657,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20200510, - 1559 + 20200805, + 1736 ], "deps": [ "company", @@ -24229,13 +24667,13 @@ "s", "yasnippet" ], - "commit": "6b7db2f23a9f248fd756e0bc537fd8d53d98eb96", - "sha256": "044qm7kgdnsh4yipxklyfvkrvzgw4abn6gjawkkvgniii2pf39hj" + "commit": "c766feb5c34dd17b7afba480ae9e90a08d75012c", + "sha256": "13z21jfvinjxyyi37xvx12gbr28fbr0g43x0nsip270dz797ls0v" }, "stable": { "version": [ 1, - 33, + 34, 0 ], "deps": [ @@ -24245,8 +24683,8 @@ "s", "yasnippet" ], - "commit": "b69ae7652e5efdda2e3dc650cd425b987ddd65ad", - "sha256": "1g9x67dvg5al6i9hnjcyi0zjsz71iv2jbinpzj7gcx77d0dn3cpk" + "commit": "980705c0b23aead72d7d6711008b1fb1706a45c2", + "sha256": "1x1z298axbh4xalssnq9nkf2z1sdgmx839vb01xz18kr9lfavx1x" } }, { @@ -24275,15 +24713,15 @@ "repo": "AdamNiederer/elquery", "unstable": { "version": [ - 20180917, - 2217 + 20200628, + 1756 ], "deps": [ "dash", "s" ], - "commit": "eac429d8550fbf1582c57d5e16fed9f320d6eb30", - "sha256": "1jkbrv5r5vzqjhadb4dcgks47gaj7aavzdkzc5gjn5zv5fmm1in2" + "commit": "cba7629ad886c4e51d66f8b509aad48bdfe100cc", + "sha256": "119g9ca40rg0aam7i2n4jhjzjzm8r7bg6q0yjaw5x1j7ywks5af6" } }, { @@ -24437,14 +24875,14 @@ "repo": "wamei/elscreen-separate-buffer-list", "unstable": { "version": [ - 20161107, - 358 + 20200807, + 1324 ], "deps": [ "elscreen" ], - "commit": "7652d827aa1b8c1b04303c5b4b0bda5e8f85565e", - "sha256": "1cpmpms3r9lywmxgciz4xq7vjw2c1mxmpd89shssqck16563zwxf" + "commit": "88d8850108947949431425a2d938a09d941454e8", + "sha256": "0c18w11wy3bnxhf109dbr01fcv3y9fg4jx5nkjx2gaf0kl0d7nfi" } }, { @@ -24532,20 +24970,20 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20200422, - 1352 + 20200728, + 819 ], - "commit": "d5ebd8ab6439fea3dcae0bcaece6e914f4ee1f6c", - "sha256": "1h1dx6dpwr4cml2a57mz3lq4f746cja007ckrpk3vii9ap413hf8" + "commit": "f9f810ffcd3cce7ed15848c72ce299609ec09414", + "sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha" }, "stable": { "version": [ 1, 3, - 0 + 2 ], - "commit": "4cbdcd79524db4a71abbf761a3945617086f5d09", - "sha256": "1gb2sh2mcx8va8lgyc46pch9fswfm761935806myi9fl1v67ayk6" + "commit": "f9f810ffcd3cce7ed15848c72ce299609ec09414", + "sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha" } }, { @@ -24595,11 +25033,11 @@ "repo": "skeeto/emacsql", "unstable": { "version": [ - 20190625, - 1859 + 20200714, + 28 ], - "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda", - "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0" + "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", + "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" }, "stable": { "version": [ @@ -24625,8 +25063,8 @@ "deps": [ "emacsql" ], - "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda", - "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0" + "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", + "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" }, "stable": { "version": [ @@ -24655,8 +25093,8 @@ "deps": [ "emacsql" ], - "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda", - "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0" + "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", + "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" }, "stable": { "version": [ @@ -24685,8 +25123,8 @@ "deps": [ "emacsql" ], - "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda", - "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0" + "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", + "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" }, "stable": { "version": [ @@ -24709,14 +25147,26 @@ "repo": "cireu/emacsql-sqlite3", "unstable": { "version": [ - 20200117, - 1922 + 20200718, + 614 ], "deps": [ "emacsql" ], - "commit": "82b90d493dba404473b515ffd670e0dd0dba1248", - "sha256": "1azv9mllvyjzqjkjw9n5rmdj79fa8srbpmx61w6vm25bl9f62vpf" + "commit": "e920671872cd8e0ef9c3646e6f0fae331bf8a7df", + "sha256": "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "emacsql" + ], + "commit": "e920671872cd8e0ef9c3646e6f0fae331bf8a7df", + "sha256": "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj" } }, { @@ -24961,20 +25411,20 @@ }, { "ename": "emms", - "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86", - "sha256": "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94", + "commit": "4caa7403144670c07e326ed3a7d982c427d4a254", + "sha256": "0ml66fgzxl4wsk5g7d78mqhr9gqmbld6qh31nfc6z19c8107jrd5", "fetcher": "git", "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20200508, - 1955 + 20200716, + 1815 ], "deps": [ "cl-lib" ], - "commit": "64b9ee9c86067118b2d0055f467e60bc211aa59d", - "sha256": "16h9hb6d621mfi7805p2iaw814n2pm2g659wcjqxpvm5x5hpn55v" + "commit": "36d760e2bd7e5376aff3f03456fa6445833242ad", + "sha256": "0xgshxdd5zmy1c7sxvrmw0wkqwhwaccqf93zwz98gb9gsfabyxd8" }, "stable": { "version": [ @@ -25296,15 +25746,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20200513, - 1627 + 20200812, + 628 ], "deps": [ "ht", "seq" ], - "commit": "dfa3c6d060914c6082d6837da32df0c337330ee4", - "sha256": "0m963cn916m0xa8cb1yslkcla86a34dchwy3ism62a2r9swa7p6s" + "commit": "d886069974d05c8c15654204f9afeaee962f3e7d", + "sha256": "00s6vzziiym4bqh91c1k55qjihpmqs7w6kcxnwms8mx92w40hlw2" }, "stable": { "version": [ @@ -25435,14 +25885,14 @@ "repo": "hrs/engine-mode", "unstable": { "version": [ - 20191105, - 750 + 20200611, + 1825 ], "deps": [ "cl-lib" ], - "commit": "96b3488a6de2f50b8ba3a101e04ebcbe9821a989", - "sha256": "1xka8i4cdvp5r2v2mkli1zz17x1sdsnmszbhqav2rf94v656d91i" + "commit": "e0910f141f2d37c28936c51c3c8bb8a9ca0c01d1", + "sha256": "15zx4a8gvgk077pnj7wr78nfjrzrj2i9ma6cj6jj6i8ikz6wyvjz" }, "stable": { "version": [ @@ -25465,11 +25915,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20191111, - 2243 + 20200729, + 634 ], - "commit": "732331b99a0884dd7fc0149658d4090886857656", - "sha256": "12wip0l6xyqgvxvjvid1rh61yizk1r9y7xl1jz2sjds7kv6aw0kf" + "commit": "f0bffbe4b32bb59680f897731169442cce5a1eec", + "sha256": "0zjx6mz8kql9d09rzqircbqd9rcpfsn1k7nz9vwijp59m6mnjw1h" }, "stable": { "version": [ @@ -25546,6 +25996,35 @@ "sha256": "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5" } }, + { + "ename": "envrc", + "commit": "f66883b0d6a49decde7d438d9d4bdfa107a3554e", + "sha256": "1hkz0a7rs2yqapv3asmqr9pb8r8jk5hlmrpp8ab5l7qsdjm7xn63", + "fetcher": "github", + "repo": "purcell/envrc", + "unstable": { + "version": [ + 20200714, + 201 + ], + "deps": [ + "seq" + ], + "commit": "1dc5aad14d2c27211c7c288d2d9dffeb2e27cb2d", + "sha256": "11ad4i1cyz6cfsckm4jf10w0570sd2fcrji87sf5052csl4ril2h" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "seq" + ], + "commit": "a15003d6b540b1b07847310d5ed4c39046336a7d", + "sha256": "1sspy227b733dxx6czml5lmx9g7nsxwgnazk1b9ip81q0cm0dv55" + } + }, { "ename": "eopengrok", "commit": "2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545", @@ -25640,14 +26119,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20200503, - 1214 + 20200817, + 1145 ], "deps": [ "closql" ], - "commit": "d987af46d9d763946fbf2930cacc9d6906df4382", - "sha256": "1jyb9m6nx91dn4isai36v1yc7shrpgnk76kpkamavrvwqdzvw6nv" + "commit": "ac6e85e11f0e071911279f3f0a4ea7bff35b68cf", + "sha256": "1g5g8rs4zpwlxmkmnml34hy0arbhq8fsmyxqjq0h1l1xxbwscdl4" }, "stable": { "version": [ @@ -25781,15 +26260,45 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20200429, - 209 + 20200805, + 2110 ], "deps": [ "dash", "tco" ], - "commit": "7e8ef8627151748156e7a4a384b6e8c6c344261b", - "sha256": "1ds89jk4d7j89mgfkqqc92lizh6fwwr338imzvby1lb8i17nww40" + "commit": "85fe1033e3aa64986d297bf1fde2d172827309cc", + "sha256": "0w3yp9ixdwcm3fl8104yb3rxp1h8z6i6msd95b48jia52dbajzcj" + } + }, + { + "ename": "eradio", + "commit": "b5c8621acac2bfb7859bf0b830994fc867ecdaa2", + "sha256": "0kan4ia1g9xsb53gkj43c6sn2009a9cm49x2c30ccj2gl999szq2", + "fetcher": "github", + "repo": "olav35/eradio", + "unstable": { + "version": [ + 20200729, + 1817 + ], + "commit": "5e257849113b70b2b42a999994d89ec8abadf253", + "sha256": "1nni4yyvhqg4dscgn1xlbgh073lwjff5mqw8zxwyiahfsdi0z9ca" + } + }, + { + "ename": "erblint", + "commit": "5c65941ad1afd57d633f8586e9034c5e14acfa18", + "sha256": "1m2w8krg59x5pvbmdnnf9iglx2191hhdpxmfd0ww4bgnf1pf0gn4", + "fetcher": "github", + "repo": "leodcs/erblint-emacs", + "unstable": { + "version": [ + 20200622, + 5 + ], + "commit": "89af42f776d8dc656104322edaace2ede7499932", + "sha256": "1s3fcic42wlab3vnwdakvy7268cr19j5rd2ajr18qkr0vibj7xxj" } }, { @@ -25815,14 +26324,14 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20200511, - 2235 + 20200516, + 2054 ], "deps": [ "cl-lib" ], - "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", - "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" + "commit": "be87248435509f83c56a7f08ac9bcbbd3b20d780", + "sha256": "1d8wfa4rgwv41kmw1kpp90r8371n1l7lfx3k79k2psppvrf72xbf" }, "stable": { "version": [ @@ -25928,14 +26437,14 @@ "repo": "drewbarbs/erc-status-sidebar", "unstable": { "version": [ - 20171223, - 2124 + 20200811, + 136 ], "deps": [ "seq" ], - "commit": "ea4189a1dbfe60117359c36e681ad7c389e2968c", - "sha256": "1hwlhzgx03z8891sblz56zdp8zj0izh72kxykgcnz5rrkyc3vfi3" + "commit": "b589b74245591257c9e666bd5cd25812e04b7a34", + "sha256": "08fvr5ba6gb3y52sypbdj236nxr5rl95zgz1b120scz6xal7mysy" } }, { @@ -26182,15 +26691,15 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20200319, - 1250 + 20200526, + 18 ], "deps": [ "cl-lib", "undo-tree" ], - "commit": "4a6ba06d9c618e9380d059fa25ed677b45d134a7", - "sha256": "0wgdzxla6kz1zfc3vfd8wc2j40kq023z7b83m2k435hcqdffark8" + "commit": "6a3214e1a892a45f575604f0bc4bb83175142aa4", + "sha256": "1n0ki4214c53ax3r54gg303kawyqivwcciyhvrgqa1y0kk093982" }, "stable": { "version": [ @@ -26234,19 +26743,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20200313, - 1030 + 20200519, + 530 ], - "commit": "e5d476b5f22927d341caf1774355d9e69e390cfa", - "sha256": "1kcdl56qybvq4m5dp65n3nbg6xijb793xi25yckk5nc17n1nwrzb" + "commit": "d9bc7858e985143a433953ba286422511b466a0c", + "sha256": "0ik1hhmw4xsmny9j5gbz7lr73jsvdd79xb3ygcsi8jkwz7lxi3v1" }, "stable": { "version": [ 23, - 0 + 0, + 3 ], - "commit": "7a8d04dbcb388a5d837a213ad249c1b96e19e998", - "sha256": "0hw0js0man58m5mdrzrig5q1agifp92wxphnbxk1qxxbl6ccs6ls" + "commit": "44b6531bc575bac4eccab7eea2b27167f0d324aa", + "sha256": "133aw1ffkxdf38na3smmvn5qwwlalh4r4a51793h1wkhdzkyl6mv" } }, { @@ -26388,8 +26898,8 @@ "repo": "rejeep/ert-runner.el", "unstable": { "version": [ - 20200321, - 2158 + 20200704, + 1048 ], "deps": [ "ansi", @@ -26399,8 +26909,8 @@ "s", "shut-up" ], - "commit": "1829f05c46b0baaae160d900f89c8881f4fcdbcc", - "sha256": "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98" + "commit": "59a0f07f4f6b7c4757768309e8a47cec983e862a", + "sha256": "198bc526s6sw8qqsbmw4wgz5m97n6kf9002f2bgg9phms7a8if4s" }, "stable": { "version": [ @@ -26467,8 +26977,8 @@ "s", "spark" ], - "commit": "9e5bcb290b38d5bd143e0ee480ed49147cfd3504", - "sha256": "13f7s8hk5d3psxp4qzzsqnwawsjj59cmjhmg1zi2c90qhvna78vn" + "commit": "3aacf72daf6a2b4104914dd40e5f33e78fb084ac", + "sha256": "1ki839cfsn2xr2d8a2j89llbl452d45x3y5jiaiwkcmfhf7xadcb" }, "stable": { "version": [ @@ -26791,14 +27301,14 @@ "repo": "4DA/eshell-toggle", "unstable": { "version": [ - 20200107, - 2230 + 20200528, + 1124 ], "deps": [ "dash" ], - "commit": "ddfbe0a693497c4d4bc5494a19970ba4f6ab9033", - "sha256": "0xqrp8pwbmfxjdqipgpw5nw633mvhjjjm3k3j9sh9xdpmw05hhws" + "commit": "aeb7c121e4518c0edd1d2972851502303a299984", + "sha256": "12w38h438bg2vm8najsqizcdfyr1px5h1gba68x4mzyv2bcll2qx" } }, { @@ -27036,14 +27546,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200516, - 522 + 20200819, + 1030 ], - "deps": [ - "julia-mode" - ], - "commit": "8f04fa92a11cdb4a3777755fdbaaa65e076f04ef", - "sha256": "10cg90aqlr5y3vmp94zhkwj3l178l9f32igpl38bzxm9hmdgikfr" + "commit": "1baf8bf1403fe5956a25475b03be0d8f02b3f3ca", + "sha256": "0asyd67krsq3xx7kk770x1f70j33bga8w0i7l4089a1jqzmpn3kx" }, "stable": { "version": [ @@ -27178,14 +27685,15 @@ "repo": "jschaf/esup", "unstable": { "version": [ - 20200318, - 2256 + 20200814, + 1400 ], "deps": [ - "cl-lib" + "cl-lib", + "s" ], - "commit": "c9c95e245068d15d8e2732098af9a5d2bc8ec931", - "sha256": "0i4cwwvs5zs8g2ajrrkqgrpxzywsa255rc1g7a6bxzvg9hk77f4k" + "commit": "0de8af8233d9ce1b67f05a50f25c481c4f1118d8", + "sha256": "01khb3xyj0ylwib6ryzzvqmkh5wvzxiq2n3l0s3h9zv7wx849bzv" }, "stable": { "version": [ @@ -27243,6 +27751,30 @@ "sha256": "0k0g58qzkkzall715k0864v3b7p5jnfwxqgmkj087x34frcf388k" } }, + { + "ename": "etc-sudoers-mode", + "commit": "e665f3b7fd75544c174ac3da9e0a498ceb694f5a", + "sha256": "01sn1pd6s4blf6dk3vvi70sr1mgcfsigb1qvxk3dsggf1ng2rhsk", + "fetcher": "gitlab", + "repo": "mavit/etc-sudoers-mode", + "unstable": { + "version": [ + 20200608, + 1555 + ], + "commit": "52d5be9214185cfbba56e0b39bc4af474fc95f45", + "sha256": "1ff4dpwr0127mziwafxry5a9iyw8lbm4z8bdlim81p4pyyll7vx6" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "8d3805d8b8e016278204d727f6b97913ea0e5079", + "sha256": "0cg0l8ksqrxy0clzj5x8l891873zcxwwzziv1mvwf8i618w2sjss" + } + }, { "ename": "eterm-256color", "commit": "e556383f7e18c0215111aa720d4653465e91eff6", @@ -27492,16 +28024,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200516, - 1740 + 20200816, + 737 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", - "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" + "commit": "1e7aa5bfbd86feff0ed5982e487070352d326b90", + "sha256": "1vb7np6yzv8iqblxg0yi1ac080k2bn7n8wz6wj8vkm080zmfwfb0" }, "stable": { "version": [ @@ -27645,15 +28177,15 @@ "repo": "wbolster/evil-colemak-basics", "unstable": { "version": [ - 20170425, - 1209 + 20200630, + 1936 ], "deps": [ "evil", "evil-snipe" ], - "commit": "7844079b47f47bb1dc24c885b0ac2e67524fa960", - "sha256": "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2" + "commit": "dcdf5c3e844f6eef2bf9d6a502cf8c81b3edaff2", + "sha256": "1g9li89kg3wgpm39prz9xra12vw7mhrnjl9wqqkvj98fx6dxsdr7" }, "stable": { "version": [ @@ -27695,16 +28227,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200513, - 804 + 20200808, + 850 ], "deps": [ "annalist", - "cl-lib", "evil" ], - "commit": "e998952dfe73d296259905e1bd8f96659bfe2661", - "sha256": "1r896jbshniaxxh15iw87yklnr2hq5as3a8w6xb202gxz5pvc4ym" + "commit": "c136589d9584e5d01a4b3f2e4cf8ac5f5a23be63", + "sha256": "0kbv4p4v5mgjk2hbrg0c5p29yd74s4xaa8z6c8f2h6l5p28dsk4j" }, "stable": { "version": [ @@ -28229,15 +28760,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20200409, - 1909 + 20200604, + 110 ], "deps": [ "evil", "magit" ], - "commit": "253c644807013fe92429acdef418748794b8f254", - "sha256": "08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5" + "commit": "88dc26ce59dbf4acb4e2891c79c4bd329553ba56", + "sha256": "0vh872rpxfwqj7m77l12czknddmz7aijk30vwb1l08yi9309cdsf" }, "stable": { "version": [ @@ -28261,26 +28792,26 @@ "repo": "redguardtoo/evil-mark-replace", "unstable": { "version": [ - 20150424, - 718 + 20200630, + 940 ], "deps": [ "evil" ], - "commit": "56cf191724a3e82239ca47a17b071c20aedb0617", - "sha256": "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv" + "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047", + "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ "evil" ], - "commit": "56cf191724a3e82239ca47a17b071c20aedb0617", - "sha256": "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv" + "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047", + "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z" } }, { @@ -28291,26 +28822,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20200502, - 1140 + 20200812, + 1050 ], "deps": [ "evil" ], - "commit": "943bf5fb2b04e077a797cf192fd7650b41e3c3e4", - "sha256": "0iryzs12nn20pj5zcyhdk4mpgyrlah0pzbjawmj0l91clmhwbvhb" + "commit": "574d3c4e4517d3bb10bf652cacf459376ae401fe", + "sha256": "12c7y8dmkpqlak733cak6274fxzrk1hpywj7ky6nkfspqdvc2xz8" }, "stable": { "version": [ 2, 3, - 4 + 8 ], "deps": [ "evil" ], - "commit": "5e92e374e6b46176d46323b884c25c44063331da", - "sha256": "1nflkmx08n3ya5vaipy1xg19hnqcp6f7ddsx9xjh5gl6ix2iz0az" + "commit": "8fba4f12e1bbfdbf25a8ed2a5308840f104bc7c0", + "sha256": "04s650hz6aa4ld3xqa272a2jsw9j1scnn5qkhpgis0w2d3gpwvpa" } }, { @@ -28426,11 +28957,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20200417, - 59 + 20200630, + 911 ], - "commit": "1bd2de52011c39777a3e8779b14cee2790dc873b", - "sha256": "0h8hzqjh6qq4fj0imrb5ic5m4zn3ig6s3b7b2x9r6ig9m15jpg6n" + "commit": "87734b9c7fcd047f73a072b9d03ec05f786eeb03", + "sha256": "15dahrvary0ahyzg83jxdhf00pd2231rr628nq9fl0dl54laixsd" }, "stable": { "version": [ @@ -28520,14 +29051,14 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20200101, - 2017 + 20200601, + 1855 ], "deps": [ "evil" ], - "commit": "2d70c981587187f4fb7d72b9c5b368e6f7c1460f", - "sha256": "1v20iba2b6dwr01zm69ix23xrlkm1ig8n9zn13nkna9iawafqrq9" + "commit": "4b23116a6ecfa687819050e5a9a419cf08d5ba90", + "sha256": "0r3b6j0ywkz8wggzyfnvqwwrd7ir317njdwldcdncirfwy603337" }, "stable": { "version": [ @@ -28591,6 +29122,25 @@ "sha256": "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p" } }, + { + "ename": "evil-pinyin", + "commit": "640f1cd1b05d7a806404ffbc2c1a95a10ed63a55", + "sha256": "1gd9fdmm0fdscc3cw5c8sc1sg8yhsvrlnj3kyyj6jjbrz6s96xni", + "fetcher": "github", + "repo": "laishulu/evil-pinyin", + "unstable": { + "version": [ + 20200726, + 546 + ], + "deps": [ + "evil", + "names" + ], + "commit": "ee4ea5a297fb8a445e0c886f9d20bbd4e94c00df", + "sha256": "1g1v0513ypq4kax56rmq5dvf8yf9absvfls6zadhniwjzmdh68ii" + } + }, { "ename": "evil-python-movement", "commit": "130e6d17735ff86b962859528d7e50869f683251", @@ -28838,15 +29388,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20200422, - 519 + 20200531, + 1008 ], "deps": [ "cl-lib", "evil" ], - "commit": "2ba6353bb9253dbbc4193f1d35403e7dcc1317b1", - "sha256": "1sqbwg41by88qq7npsw7w9q3zmfk5adzqpqh2m84zk6fd64mc6h2" + "commit": "6dcac7f2516c6137a2de532fc2c052f242559ee3", + "sha256": "1faimkch2s08kbrwh3j77y0n5inrjr7vphy0xdl402bv0d20h8nq" }, "stable": { "version": [ @@ -28907,21 +29457,21 @@ "evil", "string-inflection" ], - "commit": "6913de02a210487c063cd63ecf27b17a24797870", - "sha256": "1wyd903yvp8lxbhavsr4grn79hkxcsz71mcvy3hrvnf7ifhw514a" + "commit": "d22a90ab807afa7f27f3815b5b5ea47d52d05218", + "sha256": "1vwch4kwwh82k1rlc9qsg74zbghn6vkgch5xb1wz0dmbv4id06l5" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "evil", "string-inflection" ], - "commit": "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f", - "sha256": "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5" + "commit": "d22a90ab807afa7f27f3815b5b5ea47d52d05218", + "sha256": "1vwch4kwwh82k1rlc9qsg74zbghn6vkgch5xb1wz0dmbv4id06l5" } }, { @@ -28932,26 +29482,26 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20191217, - 1131 + 20200603, + 2216 ], "deps": [ "evil" ], - "commit": "9b0b17f06cef9bac81ee4800d121265e54718a17", - "sha256": "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn" + "commit": "346d4d85fcf1f9517e9c4991c1efe68b4130f93a", + "sha256": "1gfgmr4909m36gknprcam6q4rkcqfbi6w43ky7x6jnlmgb6mxggg" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "evil" ], - "commit": "9b0b17f06cef9bac81ee4800d121265e54718a17", - "sha256": "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn" + "commit": "346d4d85fcf1f9517e9c4991c1efe68b4130f93a", + "sha256": "1gfgmr4909m36gknprcam6q4rkcqfbi6w43ky7x6jnlmgb6mxggg" } }, { @@ -29023,14 +29573,14 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200304, - 911 + 20200816, + 737 ], "deps": [ "evil" ], - "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", - "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" + "commit": "1e7aa5bfbd86feff0ed5982e487070352d326b90", + "sha256": "1vb7np6yzv8iqblxg0yi1ac080k2bn7n8wz6wj8vkm080zmfwfb0" }, "stable": { "version": [ @@ -29045,6 +29595,38 @@ "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p" } }, + { + "ename": "evil-tex", + "commit": "2b8ead8c7b1b7cdaefd35e9622fbb99307715e08", + "sha256": "1aph898q7mkw5vgwd1c7fh8vrgmarrbbkglgdfnawg8jycxac6sp", + "fetcher": "github", + "repo": "iyefrat/evil-tex", + "unstable": { + "version": [ + 20200818, + 1628 + ], + "deps": [ + "auctex", + "evil" + ], + "commit": "03c014d63373c21c511506f36763a355e566eb01", + "sha256": "096im6yld0bqkdrb3ywxiabv55l8qdvg10887iwq86zprj89igmf" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "auctex", + "evil" + ], + "commit": "bb01576e4cf9cc10c529621ced3ef3a7eb5ab376", + "sha256": "1d4s9f0p8bmch3kv7zh5fcv1y6nxza9kfcrjrdvmflz1nb96sy6g" + } + }, { "ename": "evil-text-object-python", "commit": "0d0893b07bc4a057561a1c1a85b7520c50f31e12", @@ -29569,20 +30151,20 @@ "deps": [ "evil" ], - "commit": "d5daea30176d48e74c9d063ac9bfc240ebeb97d0", - "sha256": "18mb7ik15yygfyjr5y2awbn5lrr3b9z1f31gnfslvrlav2nl1m7d" + "commit": "aee7af7b7a0e7551478f453d1de7d5b9cb2e06c4", + "sha256": "0m98bwj8dy90ifck8rsda6zfgbjrv5z0166pp7qzvwls9rqa695m" }, "stable": { "version": [ + 1, 0, - 0, - 6 + 0 ], "deps": [ "evil" ], - "commit": "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6", - "sha256": "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm" + "commit": "5e7b5721bf48aa49c6cdb5d41b908ef7d513b2a8", + "sha256": "0xia8dvpz294pqc3zdr0knhdlw251dhkdm69v1005674kd15259w" } }, { @@ -29593,11 +30175,11 @@ "repo": "purcell/exec-path-from-shell", "unstable": { "version": [ - 20191229, - 112 + 20200526, + 324 ], - "commit": "2d152d17814c6d551d525d83201da72c4047c1de", - "sha256": "129iccdddpz0hhb25v63a8pk76ayx67jn47rwd3x6wzsnhsg3pp6" + "commit": "e5647b910900972bc59acea7b74e932ba0a94ce2", + "sha256": "18awpmyrvcw6yckms8wfgyh5kfyva1w7vpvclqa655l22brbvpph" }, "stable": { "version": [ @@ -29783,11 +30365,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20200408, - 2253 + 20200518, + 1043 ], - "commit": "09518ae6650d7be33a4633a4c0f31b7130d04c6e", - "sha256": "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp" + "commit": "7d0ca861e6b483be1f4a08e63c5ade9cd07b4799", + "sha256": "0mw041jccyn8s1n3wpas397k2vrp9ryq9lfj16ipk9iqs4la6hlx" } }, { @@ -29821,19 +30403,20 @@ "repo": "doublep/extmap", "unstable": { "version": [ - 20181028, - 1645 + 20200617, + 1905 ], - "commit": "187f621cb2d9413595cb47917641e5692e3b37cd", - "sha256": "1h9d7fgvy9xz9rw6kf5q606j2k54xqmvva028d929h8aibb6pch2" + "commit": "2a6373d4fad1a5ac95272cabb6f5e4af89233d67", + "sha256": "0n0hz93x7mbf95mf8vvc6cam7qbzwj4kskbbws07km2av7jsi166" }, "stable": { "version": [ + 1, 1, 1 ], - "commit": "1139b57d8f4276fe56b8416fdaf4745f2cdfe7c3", - "sha256": "0jgyscjfparnby0whrmbgvsab2a7qkaqhysmh3s3jh635fndm253" + "commit": "341e3e16e217da5a006c0859cb3a59cbc40cfb84", + "sha256": "09kia3mr4si8kn46kyiza9nl669b22vmgc70ng3mqz742lph5siw" } }, { @@ -29863,11 +30446,11 @@ "repo": "agzam/exwm-edit", "unstable": { "version": [ - 20200126, - 27 + 20200728, + 8 ], - "commit": "bc25ba094b383be3c650ca0b7e1534efe2bb154f", - "sha256": "1z1ya9xgknka3dy3b3x8zzfkxdx5jqsi8q5aqkvxjxa6n7mmqdwv" + "commit": "2fd9426922c8394ec8d21c50dcc20b7d03af21e4", + "sha256": "1gwqwj50ch8iib5yqbyvski7vxiwid6s49lj2xcy5kksnx1a2410" } }, { @@ -29916,14 +30499,14 @@ "repo": "ieure/exwm-mff", "unstable": { "version": [ - 20190810, - 1744 + 20200516, + 2335 ], "deps": [ "exwm" ], - "commit": "a6a4b3dda01cbcf411fc2824981eaa9e85199a52", - "sha256": "1f4yr4q5dayxmyvrdxbbviks6l02amqhgfa97k7cz9rwscsavg6c" + "commit": "81fbbea495e32aef2e2d86c097cb586422d8822c", + "sha256": "0c3k2cs57iahm5dc1i3h05kiz4fjh7l2675im8kh91jx7lk27vb5" }, "stable": { "version": [ @@ -30623,11 +31206,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20200428, - 332 + 20200713, + 243 ], - "commit": "001cc95effdd5c4d9974b3f2c40b2ddf1f0e3de2", - "sha256": "1ab03jn1kg4bq97d7dzinpxlyg3wcx4cha0a7ibqdbqrci3znigc" + "commit": "5622041068d5fa2f299dbc8aa91fece0ba260086", + "sha256": "028qm0snna2w8wrgx988nhw3sdid5n3nr01hvavnzyhadha1j6fc" }, "stable": { "version": [ @@ -30656,8 +31239,8 @@ "page-break-lines", "ppp" ], - "commit": "529b7ec69f1694d7dc8aacb5066cf4ddcf24cc58", - "sha256": "0flph6yv5fj5ladksjqfpj9j8p2jcc102kbc833bvx1cnmjx7qk4" + "commit": "3f19293dada8bf368e9f86f783610e7ca0a51ecb", + "sha256": "11ml9n4bkm0150ifyx3igx55hnnrhbg04q8sb15v734xi29swp6z" }, "stable": { "version": [ @@ -30677,11 +31260,11 @@ "repo": "michaelklishin/cucumber.el", "unstable": { "version": [ - 20190801, - 1137 + 20200815, + 1617 ], - "commit": "11ae1671629bfedaa553c7b819676d64eb320992", - "sha256": "0yd4gkxz9xcbgibfgr8apsid3f83nmg5jgqk5nql0linj5gymc28" + "commit": "8e1464113b489b54067294cd988ff6a11a423fdb", + "sha256": "1lmfksx49ig4b7nqg0mmaalz08b280iaqgsc0x9i471m9kvbisp7" }, "stable": { "version": [ @@ -30707,6 +31290,36 @@ "sha256": "0f2nynx9sib29qi3zkfkgxlcfrwz607pgg6qvvk4nnads033p1yn" } }, + { + "ename": "feed-discovery", + "commit": "eaea977d51dd55a0dd2bfdc2f7cff822ed4053d7", + "sha256": "0yd8hsc6dqipmqh7ahbmr16gj5p4lh8a55652x1lic3q4ssah1ql", + "fetcher": "github", + "repo": "HKey/feed-discovery", + "unstable": { + "version": [ + 20200714, + 1118 + ], + "deps": [ + "dash" + ], + "commit": "47692787326a14c06dab6815bb18caced59a5bf0", + "sha256": "1mj86p4zw73c1n6nqv35zhgsqrmcmgvi07q60dahs016bwdzc6jb" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "dash" + ], + "commit": "3812439c845c184eaf164d3ac8935de135259855", + "sha256": "0v0xcy81a0kysycm3p8rl64vrsc9ph3d4yqzxp7kik9rmkgrp89w" + } + }, { "ename": "fennel-mode", "commit": "cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f", @@ -30715,11 +31328,20 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20200405, - 1935 + 20200714, + 237 ], - "commit": "7fadf2580c3afcae3f6ebc54dad0e519b7600f1d", - "sha256": "1qpfpfdm2d8bdqm7h62y3hgbip67yqmblhg66zlmfxfdnsad5ls6" + "commit": "a39543750ba337b9327108ba17ffb0cdb18c7f9b", + "sha256": "0p9n0plb1ry6r8i09if6mzhhk4gs1saxm05msq8sgwdjs6r1ra61" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "ae4634bef12f66a1d4721ab74c5bf8dd29d710d2", + "sha256": "15b5zb66dzszpdiqkwgxqv434kqgpk1l065ic4lbj3y3krm2snbg" } }, { @@ -30745,28 +31367,28 @@ "repo": "jcs-elpa/ffmpeg-player", "unstable": { "version": [ - 20200224, - 554 + 20200720, + 1028 ], "deps": [ "f", "s" ], - "commit": "9a80e1d42a4b01879a7585485384af6431b34651", - "sha256": "129mfslbp15d9z83r38lcqxnfx3n5jldaja5qbdgrmlw14irgx0r" + "commit": "164fb15d70adbc186eb2d987f5c5143aa7336659", + "sha256": "0i6r2mlpahrnszr9vk476iqvc1c8cpp6wn6fhlnz6vw4dybpw5p5" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "f", "s" ], - "commit": "214c08b362daa138d2e17883a6b4d096f22f5ebb", - "sha256": "0w2afgdd3pasrqi9apnmp0qqg4qvd0skizybrnyi9abnc0bp9v7x" + "commit": "164fb15d70adbc186eb2d987f5c5143aa7336659", + "sha256": "0i6r2mlpahrnszr9vk476iqvc1c8cpp6wn6fhlnz6vw4dybpw5p5" } }, { @@ -30850,17 +31472,17 @@ }, { "ename": "fill-column-indicator", - "commit": "4ea0c00a7784621fcca0391a9c8ea85e9dd43852", - "sha256": "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1fd9l7idzn9vwcy3v80fnn2d8g4c9g3rc505sapc5wgkn8in0p6d", "fetcher": "github", - "repo": "alpaker/Fill-Column-Indicator", + "repo": "alpaker/fill-column-indicator", "unstable": { "version": [ - 20191109, - 10 + 20200806, + 2239 ], - "commit": "3d88b8a4a3eeabb8d1c9ef27d3c6f5d98517be77", - "sha256": "1rklnjsqz8krqjll35xd5xwg79xqwh0sldwbcnymkjwywbky8yhh" + "commit": "c35f9de072c241699b57bcb46da84bed5af29cfe", + "sha256": "1q682bn6wgvga8arv4xfmr4nnw8nhw7qkjrlp5crpyv42x9yqr73" }, "stable": { "version": [ @@ -30902,11 +31524,11 @@ "repo": "snarfed/fillcode", "unstable": { "version": [ - 20171029, - 1625 + 20200524, + 2226 ], - "commit": "d0a9e20f5fcc24a786d09ea19bfb9237681ba823", - "sha256": "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za" + "commit": "501468082e46bd0975ef4d8765363fd564338099", + "sha256": "0z18x3gxh004nd648hwqdlb60a6ss61pkkqg30xpdmsrj8darf5q" } }, { @@ -30987,8 +31609,8 @@ "deps": [ "ivy" ], - "commit": "acedab403f69f242fa41012c20078500d46aa9e8", - "sha256": "0p21vm6xz6093nic2wwgly18a85xki3wp0a2vy4hgy0dl7qici86" + "commit": "506f35e91e06463cca7390da6ebffc411b8c220f", + "sha256": "1iwfhymbmlmakbga1jlp7w6jlnj0jbb0zs1yxxg8mmj7k9ss2xjr" }, "stable": { "version": [ @@ -31128,8 +31750,8 @@ 20200415, 2356 ], - "commit": "a61d7fce35eadba39236a6a3e9aa301e161d147b", - "sha256": "1bn81qwkvhznc5pi6bq08kp83208pj09vknfszx152r72sv5fpmz" + "commit": "c6945a005b9a581c81e2f3560eab4bd629967364", + "sha256": "1ylndx5n433zy9y7n79xhl7p0g1f4c0y97ha50d8fqm451jm0569" } }, { @@ -31298,20 +31920,20 @@ "repo": "marcowahl/fit-text-scale", "unstable": { "version": [ - 20200315, - 2120 + 20200701, + 2239 ], - "commit": "387acab18f9f4064c051771cf666b8550718dc27", - "sha256": "0mrl112vjsl6ddjv0j2pg97s6zk8c2qb92wqsq775ahr1cbhvbw7" + "commit": "a87341d4fb2077076eb83af0fb510112900aaebe", + "sha256": "1ayswmb99mimsg6b05nnvm15yg8w2512sv1mjk1nbifz627vgq2x" }, "stable": { "version": [ 1, 1, - 3 + 4 ], - "commit": "75f74aa14bb38ab00f184ae0a51262eaab07a27c", - "sha256": "1nc1p4qbpvnqq2vi7pck3zygahhippvy2xgqmha4lpq5f996lmyx" + "commit": "ba63f0591c3be1644ee7ee972430c74b5d346579", + "sha256": "014vbzxz1jmm83a5mg4zsyxm8nw96n8s2l7h3myhrn880d9xnqgg" } }, { @@ -31325,8 +31947,8 @@ 20190713, 1349 ], - "commit": "d3e17161d137fb75baf1449741ccaadb949e127a", - "sha256": "18yk3vs4v7n8zmxv80ss7bd94zmr14nring0d5bavax65b4wqk59" + "commit": "7aef6fb29840a2f3c7e3c01eeeb7838a0e702050", + "sha256": "0hf4x16fr5z5l2ypp41sw78dz5qpi14pphpbh8zdg4ky5sa8d4fd" }, "stable": { "version": [ @@ -31375,8 +31997,8 @@ "deps": [ "cl-lib" ], - "commit": "8d023f13710a90ae4da644d5485bf2be2646b6a1", - "sha256": "0pb5sd5cpz4173xi9kzgl9jx69169aymk94kdr6xgzhqda7iwy7p" + "commit": "46487e5279a3079730e2d7146ace7c8ad42371ac", + "sha256": "0ij0bjrb446h07lyhflfk06sk802jylgdl11ib00r89zai8sq8r7" }, "stable": { "version": [ @@ -31499,11 +32121,11 @@ "repo": "seblemaguer/flatfluc-theme", "unstable": { "version": [ - 20200419, - 1033 + 20200707, + 630 ], - "commit": "f81bb130be69e9f321e2085b627387074d23a253", - "sha256": "17z5bmcd2c4k26w9xd8npaqwk9wwr2nf0d6vikzj0mxg0pdlbaz2" + "commit": "5a30b1cd344ac0d3c3bf9dab017805ab96897b54", + "sha256": "0vcinly3lrrkbihafgxcv084zn8fhw94wc8qjjq2lwcc1db7lfjc" } }, { @@ -31662,11 +32284,11 @@ "repo": "IvanMalison/flimenu", "unstable": { "version": [ - 20200415, - 2353 + 20200810, + 1510 ], - "commit": "f110bc77415a7594742f3b12551571c4069c9157", - "sha256": "1y832w4n10k9lfi90lhq8l9s56zcg24j9j8jklkzby1vf34vq0ql" + "commit": "4c0ff37cf3bd6c836bd136b5f6c450560a6c92b9", + "sha256": "1z57vm8pgxfhklzz4gpyqy8wwv3dzl76dzgilx5pfkd69m2jrijg" } }, { @@ -31796,11 +32418,11 @@ "repo": "MetroWind/flucui-theme", "unstable": { "version": [ - 20200204, - 1930 + 20200815, + 2103 ], - "commit": "01a3df3530474da7b4303e4eea2ed1fae00d1776", - "sha256": "1bfnpligs32mpizrz9fb1pyp1zxq2rmympcg9pqrgpkdlxvs6xrf" + "commit": "6591b5093e6e8f0e720e3995a16a91835b2e7a48", + "sha256": "1lrpx1y103655xwaqkvn7i2zvkzbsf5bm7zndaj31rpm917xcm3i" } }, { @@ -31811,11 +32433,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20200508, - 1252 + 20200718, + 1434 ], - "commit": "8818bc07727fe748edf4aea629b510b7ada680b3", - "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6" + "commit": "78b3c572584c95220a40934bd67fd5e3fb096f96", + "sha256": "1vmm1d5sviwwvhm6cbr3sirfhqxa04d0s62a8vsiydb1q7868g2s" } }, { @@ -31833,8 +32455,8 @@ "flutter", "flycheck" ], - "commit": "8818bc07727fe748edf4aea629b510b7ada680b3", - "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6" + "commit": "78b3c572584c95220a40934bd67fd5e3fb096f96", + "sha256": "1vmm1d5sviwwvhm6cbr3sirfhqxa04d0s62a8vsiydb1q7868g2s" } }, { @@ -31944,8 +32566,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200516, - 1719 + 20200610, + 1809 ], "deps": [ "dash", @@ -31953,8 +32575,8 @@ "pkg-info", "seq" ], - "commit": "309d37286729994094b931344c9a664dd7c6c08d", - "sha256": "1gsa4lik5f0dzn897lh369nmcn7n61if80ll5jc5qiymm1fx16cr" + "commit": "c02cd773dded0215f9417ec04dfe8dabda63ef43", + "sha256": "15w2b98zylppbfvy653i3a5jrxqvbrz8lqs4pzb39w2mbf8nxibx" }, "stable": { "version": [ @@ -32056,14 +32678,14 @@ "repo": "alexmurray/flycheck-bashate", "unstable": { "version": [ - 20160630, - 440 + 20200625, + 642 ], "deps": [ "flycheck" ], - "commit": "77fa03dbc578c34fe71ca44926bac2aff8f2b021", - "sha256": "1jcay4gncpr0fap6qlm6k4r5b94s18zj8j56w462hvxydaxxiql6" + "commit": "5e673c591d017329d0a07a61dc1223fa98639ee2", + "sha256": "1gaih50mkyby0r4qnmc03dy111ik4and5p6r3lvsflpvd3hcxjn3" } }, { @@ -32313,15 +32935,15 @@ "repo": "flycheck/flycheck-color-mode-line", "unstable": { "version": [ - 20171122, - 707 + 20200528, + 416 ], "deps": [ "dash", "flycheck" ], - "commit": "cc474804d4e8088a627485faaf4217a5781aec7d", - "sha256": "0lk8p0wb7g9lvxjv9rl59hd9f0m0ksw9rgspis8qshpz8pj5785f" + "commit": "575b604cfe21f65fb07c134392c382c163c87739", + "sha256": "04wc61my2p6zbq22nh6yvap5aww9lfr5zgd7mf0l1chbvi9scdn0" }, "stable": { "version": [ @@ -32381,14 +33003,14 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20180627, - 242 + 20200805, + 2344 ], "deps": [ "flycheck" ], - "commit": "2428b016243e78a0312cf6b3ba6939e7169a1405", - "sha256": "0al65ldsbmm15h4y79i8avk63qq1y7fqzzad8p327z6d42zfm1qj" + "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472", + "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102" }, "stable": { "version": [ @@ -32495,24 +33117,6 @@ "sha256": "1ffpxnwl3wx244n44mbw81g00nhnykd0lnid29f4aw1av7w6nw8l" } }, - { - "ename": "flycheck-demjsonlint", - "commit": "9a15a17a5aa78aed72958b2a1bde53f0c0ab5be7", - "sha256": "0bcfkc9fch1h6gva64j71kb9l8fc9rz6wk0s9w1c1chx1z4nlill", - "fetcher": "github", - "repo": "uqix/flycheck-demjsonlint", - "unstable": { - "version": [ - 20161115, - 718 - ], - "deps": [ - "flycheck" - ], - "commit": "a3dfe1df8ecdea76c076c0849901427567356228", - "sha256": "0zra3rl0kn70kn30wx1lqh9218k06mq3j8jadax61nnynw7bzsa5" - } - }, { "ename": "flycheck-dialyxir", "commit": "fa49551b8f726c235e03ea377bb09a8be37b9f32", @@ -32635,6 +33239,37 @@ "sha256": "1qkzir3lzz4lc5kn55qb52cm5y7iy8w1ljq6xxzcjxfbk9980y0y" } }, + { + "ename": "flycheck-eldev", + "commit": "170b59e0f97ea8a27910efc1de3c82ee188a3fe5", + "sha256": "0z83w4gd34g4kgdfc46c5zkhm0awa1hhi9p600k3sd4n8ac2ms4m", + "fetcher": "github", + "repo": "flycheck/flycheck-eldev", + "unstable": { + "version": [ + 20200614, + 1904 + ], + "deps": [ + "dash", + "flycheck" + ], + "commit": "c2e2bea1e69fe5f50a9629dec1d9b468ee92de54", + "sha256": "0rkzjzghfgypplnsx4w4ih9dh8xyysy9wb0jqmbg13zvc3jcb600" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "dash", + "flycheck" + ], + "commit": "1bddbfaa1de22879ea2b900c9f8d6f16940ee9fb", + "sha256": "0ma26gk9a3lw60i172wcwdsyfa19j7fj579b4yb7gf9ibca2hs5m" + } + }, { "ename": "flycheck-elixir", "commit": "da2ab73ab1426f71ea2b2bea2b418941856b3454", @@ -32850,30 +33485,59 @@ "repo": "jcs-elpa/flycheck-grammarly", "unstable": { "version": [ - 20200203, - 446 + 20200720, + 951 ], "deps": [ - "cl-lib", "flycheck", "grammarly" ], - "commit": "72425743364f4fd9516f94546a7432457e1e7df0", - "sha256": "17dl0g9f58gc9rkk87kg1bqy6qqz225ng7ymdg2ikhd8i2pd2zkw" + "commit": "698b82936f6b592591f7ed9cc3e3cdf0099e8d96", + "sha256": "14lp2js3vlwj2wd8l38bkg4q3dgp4n51smfi70isg3rpi8i0csxy" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ - "cl-lib", "flycheck", "grammarly" ], - "commit": "1bcb11c3c7878c1b0d73318399e572e9a15587b1", - "sha256": "1daw5mmif1nzg4yr5zm42bzzfg1n4qxps3pkcisga11mbp9g553r" + "commit": "698b82936f6b592591f7ed9cc3e3cdf0099e8d96", + "sha256": "14lp2js3vlwj2wd8l38bkg4q3dgp4n51smfi70isg3rpi8i0csxy" + } + }, + { + "ename": "flycheck-guile", + "commit": "e94519d09e86af65778a7b81877e21d139c9a529", + "sha256": "1jxdqn3smpd9vf26y24m35yg60xjkqcazlj18q0vrf4ib188d36c", + "fetcher": "github", + "repo": "flatwhatson/flycheck-guile", + "unstable": { + "version": [ + 20200721, + 103 + ], + "deps": [ + "flycheck", + "geiser" + ], + "commit": "2940f1622fa352e7ca95a9e4ad65958c5575da02", + "sha256": "0cs5r0ik6a3bl1k3imjl0r8y1i69kx9x9m9cgxj470qk34brwyj5" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "flycheck", + "geiser" + ], + "commit": "2940f1622fa352e7ca95a9e4ad65958c5575da02", + "sha256": "0cs5r0ik6a3bl1k3imjl0r8y1i69kx9x9m9cgxj470qk34brwyj5" } }, { @@ -32958,8 +33622,8 @@ "flycheck", "indent-lint" ], - "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797", - "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29" + "commit": "c55f4ded11e8e50a96f43675a071354a8fb501c3", + "sha256": "0d7vkgzsx6ka4zliscsg6drqhg2bj16i911ryzmsp4v6hj294jrc" }, "stable": { "version": [ @@ -33042,14 +33706,14 @@ "repo": "flycheck/flycheck-inline", "unstable": { "version": [ - 20190320, - 1611 + 20200808, + 1019 ], "deps": [ "flycheck" ], - "commit": "cf9eceabff8370f3b834b943a5777b9f914583f9", - "sha256": "1sk8r90iqxpzrg0lpq4vd8ywdi08i0bbmgdivmr510jw2bpi3wp4" + "commit": "0662c314bd819f9b46f8b2b13f0c650445b3a8c5", + "sha256": "1wlvwi8y5pb3gy3j061v7krxfb1766yw5iika5ymk4zjg9g057vn" } }, { @@ -33162,6 +33826,25 @@ "sha256": "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576" } }, + { + "ename": "flycheck-keg", + "commit": "bbf222afada736c149ec91d148c25aad5e077c95", + "sha256": "1kyf3fimdi3kbg9simkn0gqmqd8i5la26p7xrhhg34am5n6wm3g6", + "fetcher": "github", + "repo": "conao3/keg.el", + "unstable": { + "version": [ + 20200726, + 218 + ], + "deps": [ + "flycheck", + "keg" + ], + "commit": "fea2f831d84d7642c35820bb63250487e46683e5", + "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga" + } + }, { "ename": "flycheck-kotlin", "commit": "f158727cc8892aadba0a613dd08e65e2fc791b48", @@ -33228,14 +33911,14 @@ "repo": "hinrik/flycheck-lilypond", "unstable": { "version": [ - 20171203, - 1332 + 20200614, + 2104 ], "deps": [ "flycheck" ], - "commit": "cc1b7677a932c42e5dab1661ad7b923d4aae744c", - "sha256": "1yfsg52z4nhbh33fbsig24c9s0mc4xm72ll36h6ibld9fvqsgv6k" + "commit": "17133911b519be76365103dec8c10cb2f3729f1a", + "sha256": "01486ch8vsq7kcfdpggvykbdangv2pvq2v4g9npr9izlja2kwpar" } }, { @@ -33276,38 +33959,6 @@ "sha256": "15pjqglpcwm4wy0cxk1man3ar0n56qi1bjrr1fxfjq2xwsgsfagh" } }, - { - "ename": "flycheck-mix", - "commit": "fd2a4d71b7f4c0082b687a23fd367d55186625a9", - "sha256": "1wp8lp45lc519w3xsws2c91jlbfmc0pc8764kxsifk74akwcizfl", - "fetcher": "github", - "repo": "tomekowal/flycheck-mix", - "unstable": { - "version": [ - 20200211, - 1414 - ], - "deps": [ - "elixir-mode", - "flycheck" - ], - "commit": "d3c075f61ace6695919e90239cee6567cce09638", - "sha256": "19bvnryfxz4idw1dgp90mpjbp3512423m3xqgczskv4csns4hw1q" - }, - "stable": { - "version": [ - 1, - 0, - 0 - ], - "deps": [ - "elixir-mode", - "flycheck" - ], - "commit": "c565ebb12a48fcd49cc65656d79295c3288fcb84", - "sha256": "1yncail979sfljmib7b1m9aw376xd4b76apz4d50hj83lrfy169c" - } - }, { "ename": "flycheck-mmark", "commit": "2fd10423ab80e32245bb494005c8f87a8987fffb", @@ -33322,8 +33973,8 @@ "deps": [ "flycheck" ], - "commit": "f8fdd59ccb9ddc7d81efbf3dde096dc66e3f9fa1", - "sha256": "08rwmvddla2h0wjiljl8qab87chsyc42hzap2mqih2n7finvzj4f" + "commit": "a285d849e6e227b79bef98f575ecfa43a70661da", + "sha256": "1wdv7iv3lmrpxxdas1p3grkpi08c4ipjfg170nfd2fy9nhr8iy38" }, "stable": { "version": [ @@ -33484,8 +34135,8 @@ "flycheck", "package-lint" ], - "commit": "caea75f77dc7668c7aa0ebcd48f677e3522b5d77", - "sha256": "1x63rwpyzcn99jzhyxh91l3hp2j55wspxdv5rhvnpbar5nlqlbz1" + "commit": "64cf27d69051e02a32e3c517cbfea23f9d2d7557", + "sha256": "0m2bmdwrj7ccf6ndv089qbbrz1msbcgls0ckbbhzpxxq39as2rpv" }, "stable": { "version": [ @@ -33552,8 +34203,21 @@ "flycheck", "pest-mode" ], - "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023", - "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "flycheck", + "pest-mode" + ], + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" } }, { @@ -33571,8 +34235,8 @@ "flycheck", "phpstan" ], - "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", - "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" + "commit": "e675cf0881408e10b76f2e70c6158237cb94671e", + "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f" }, "stable": { "version": [ @@ -33728,15 +34392,15 @@ "repo": "alexmurray/flycheck-posframe", "unstable": { "version": [ - 20191214, - 1109 + 20200817, + 412 ], "deps": [ "flycheck", "posframe" ], - "commit": "2b3e94c2e427ec9831c513007460c5ea9e2225a3", - "sha256": "1hmplb61xvz6p2b2pv6pg5bv7q7mirmgr0n1by1hj1w479g8rps3" + "commit": "c928b5b5424fe84a0b346e28bd7d461c80b27482", + "sha256": "1prjqqhzzaznbsysdipgvcinl3zkbgf19rb061h5mrqbgjw1l8f4" } }, { @@ -33757,6 +34421,38 @@ "sha256": "00jlw18y68yq0fyvfzhvw89a4nmv1ah4c8h4d6g79rl5djnb48hk" } }, + { + "ename": "flycheck-psalm", + "commit": "148d9b28e683a6602bb18eecaaf3cbc8dede65b1", + "sha256": "1a8mvf268bbfg6f557xdmhwa8ihi2misy8ps30kkia9asb176smz", + "fetcher": "github", + "repo": "emacs-php/psalm.el", + "unstable": { + "version": [ + 20200510, + 1540 + ], + "deps": [ + "flycheck", + "psalm" + ], + "commit": "b2a1e8a9524b0004e62996c70da5536f86e56182", + "sha256": "0r0qz5bdznzdj7zxq6a6fz7fwn2c978bq57yywj3fcy8f5vh8jcf" + }, + "stable": { + "version": [ + 0, + 6, + 0 + ], + "deps": [ + "flycheck", + "psalm" + ], + "commit": "aaa77b4ceb61d41a520baa0b84b9b236c99c4156", + "sha256": "1fnr8sbx74c4mdz91y6b4m0n6njjb0qa01r4i9975q197vwzni48" + } + }, { "ename": "flycheck-pycheckers", "commit": "af36dca316b318d25d65c9e842f15f736e19ea63", @@ -33765,25 +34461,25 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20200428, - 40 + 20200807, + 610 ], "deps": [ "flycheck" ], - "commit": "dcf5b097b7c1206f6325547f5cf37b867a6a5ffb", - "sha256": "16fwk1prq7gyhs0yk4bmr9j3wxnznjj9ppbxwidnmpbhdis2f0sv" + "commit": "055830b67cd0f0d7196a5b71bd5cce3197a557a7", + "sha256": "1zw6993a8l7yf3j8dbagmj051m1z8cdax2pzm0l2p2dxvkm0h4s2" }, "stable": { "version": [ 0, - 14 + 15 ], "deps": [ "flycheck" ], - "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74", - "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5" + "commit": "44b11b51c97fd334ecdce74169c0e65123ef5991", + "sha256": "08wsr0hrmbh24bzsd2ghc82mp4m31ms3aykv0x68vpspzm06yyi3" } }, { @@ -33831,27 +34527,27 @@ "repo": "purcell/flycheck-relint", "unstable": { "version": [ - 20200320, - 2223 + 20200721, + 2217 ], "deps": [ "flycheck", "relint" ], - "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c", - "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky" + "commit": "86ebb4dac919eda01341b15b9c896742b9d17c30", + "sha256": "1k638y125xyb0bc5i2zrkypwb770jn1ndky6qak31n4ws41xynbd" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "flycheck", "relint" ], - "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c", - "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky" + "commit": "d1e54d4bfdb12d0b60a1b9a8c2b11799426ddc57", + "sha256": "095vxjy6aacvmav86sg8b43svlnad7h8a83nl830v4nynpmx3183" } }, { @@ -33869,8 +34565,8 @@ "flycheck", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -33920,25 +34616,6 @@ "sha256": "1fh6j5w2387nh2fwwjphkhq17cgj5m2q5k0fhidvgc2w65lzbr1r" } }, - { - "ename": "flycheck-stack", - "commit": "b77f55989d11d1efacbad0fd3876dd27006f2679", - "sha256": "1r9zppqmp1i5i06jhkrgvwy1p3yc8kmcvgibricydqsij26lhpmf", - "fetcher": "github", - "repo": "chrisdone/flycheck-stack", - "unstable": { - "version": [ - 20160520, - 944 - ], - "deps": [ - "flycheck", - "haskell-mode" - ], - "commit": "f04235e00998000ee2c305f5a3ee72bb5dbbc926", - "sha256": "139q43ldvymfxns8zv7gxasn3sg0rn4i9yz08wgk50psg5zq5mjr" - } - }, { "ename": "flycheck-stan", "commit": "e1d19cd6b80080aad5eff159c1bc7f7585bcd655", @@ -33954,8 +34631,8 @@ "flycheck", "stan-mode" ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -34089,15 +34766,15 @@ "repo": "nhojb/flycheck-swiftx", "unstable": { "version": [ - 20200504, - 1345 + 20200814, + 845 ], "deps": [ "flycheck", "xcode-project" ], - "commit": "1b9174fb37498dc3a3cf8bbbfbb4f0470e8ef139", - "sha256": "1qiddgrrf2d0sjmikd9yy53v5vxfh13j1m9qq40ap9vz7x4661va" + "commit": "84f42393dea362d3bdfc9253a205a17ec7a12a76", + "sha256": "0v5km3hf58xysal526l4l2jpyibh0l6f367vwmn4zi64cl5hvf3p" } }, { @@ -34813,6 +35490,24 @@ "sha256": "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv" } }, + { + "ename": "flymake-kondor", + "commit": "ca065538aa80cd33b08092d7787c6b4a1754fb31", + "sha256": "1wgd42g3rfdrf93isfk0z5r6naxibripad3ds08iv20qqcdryasd", + "fetcher": "github", + "repo": "turbo-cafe/flymake-kondor", + "unstable": { + "version": [ + 20200714, + 646 + ], + "deps": [ + "flymake-quickdef" + ], + "commit": "530bf3e6c401d17f6b4f784a1f2524d5ba2d3414", + "sha256": "06adysd3q1gh92y0cdsnlmb588gdax85ad7pkmi324bixck5ggqx" + } + }, { "ename": "flymake-ktlint", "commit": "7b2e630e5e16044fb8ffe251f4fa58fb8f3d6bb9", @@ -34917,8 +35612,20 @@ "deps": [ "pest-mode" ], - "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023", - "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "pest-mode" + ], + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" } }, { @@ -34982,8 +35689,8 @@ "deps": [ "phpstan" ], - "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", - "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" + "commit": "e675cf0881408e10b76f2e70c6158237cb94671e", + "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f" }, "stable": { "version": [ @@ -35314,11 +36021,11 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200215, - 1408 + 20200601, + 944 ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35345,8 +36052,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35377,8 +36084,8 @@ "flyspell-correct", "helm" ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35409,8 +36116,8 @@ "flyspell-correct", "ivy" ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35441,8 +36148,8 @@ "flyspell-correct", "popup" ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35714,21 +36421,6 @@ "sha256": "0ghj0nw2zlrppsgl6x2nda9fj4w04rz6647v9823wxhfirrgnd5z" } }, - { - "ename": "font-lock-cl", - "commit": "b7a2635ceb34f49f84f35e11c14521592a9d330f", - "sha256": "1d8r3d558ipk324hpgfm4fv4kxk6mhvkka3aqd4kcv8zv0k79iq3", - "fetcher": "github", - "repo": "font-lock-cl/font-lock-cl", - "unstable": { - "version": [ - 20200321, - 533 - ], - "commit": "9f82d31f9f0fb06bbc2ce18e21e79d1eabbe6c5e", - "sha256": "0b6g36frvp1i92qn8rv3dcm8sxiw5yvbvhl7j58x2xwvawn79nfd" - } - }, { "ename": "font-lock-profiler", "commit": "b372892a29376bc3f0101ea5865efead41e1df26", @@ -35930,8 +36622,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20200425, - 2225 + 20200725, + 1419 ], "deps": [ "closql", @@ -35943,8 +36635,8 @@ "markdown-mode", "transient" ], - "commit": "e2da80660a0550f613400ce3b238025589800417", - "sha256": "0m80w0qh6icj365pcg9d0kb2nvmv48c3874wy15mjcilzb6i97av" + "commit": "feee7e2fce3f87f7aa113c5edcb1896127ee9d12", + "sha256": "1nn73hxhp7rziwdnnvz6avn1gkax531f4l72sk0v4ywdwjhnnlgs" }, "stable": { "version": [ @@ -35975,11 +36667,11 @@ "url": "https://depp.brause.cc/form-feed.git", "unstable": { "version": [ - 20200506, - 1300 + 20200527, + 2152 ], - "commit": "b5dbfd8b90e72de84ae7b6667947264fe655c163", - "sha256": "0n2k0ki6k1pgni907fvz09z3hbfbchnv1q80j42w23qam2hp7a3f" + "commit": "fc06255e185d32b1616bd86b69b55c1daabbe378", + "sha256": "05yqyp20bvfk5n1nqyffv1k8l1zl1bpz8q32kzqarm9fim2wv23n" }, "stable": { "version": [ @@ -35999,15 +36691,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20200513, - 1930 + 20200804, + 1822 ], "deps": [ "cl-lib", "language-id" ], - "commit": "0227e1aadeb18db397f03368d54cbefe4afd6112", - "sha256": "0p04xgswp269a17jpiwpj8qfj3c2zvkmr4vn0wa1dfrw5f5bfj2x" + "commit": "ccfff41a200e16e3644c2531e984959392e3341a", + "sha256": "0wqq86gfilrg9jf9yls9wcxy926j44lvzafj92kdmmyzbas1nm9k" }, "stable": { "version": [ @@ -36144,26 +36836,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20200516, - 624 + 20200811, + 652 ], "deps": [ "seq" ], - "commit": "83d308b6fd26662bc8fb204c4d634616e03dca44", - "sha256": "0a068qfc969bvxyynrk2yakv2l3y31snnvcpdsbxd4m4m6drv3lw" + "commit": "55be196ef20cdc276b3bde1a39444df1cc599f9b", + "sha256": "14baj9ldssdb5vrc3fl7c7nhc2iff6gxa7v2flcjjnazfg87r3b2" }, "stable": { "version": [ 3, - 1, - 0 + 2, + 2 ], "deps": [ "seq" ], - "commit": "9027c6f2b2a2d7d64501e55ff3531cdef26c463d", - "sha256": "08giwg0jwk8zzj2i4cm08322qr6znrnv9a49za7c6j47bykpwj6s" + "commit": "1405217e69d055b869e804d33feca23cb602f759", + "sha256": "0rwdwbw9cq8ljvbmgmz9izank8dqjki79l1bw127lli69fs72gyi" } }, { @@ -36274,15 +36966,15 @@ "repo": "davidshepherd7/frames-only-mode", "unstable": { "version": [ - 20190524, - 1439 + 20200728, + 740 ], "deps": [ "dash", "s" ], - "commit": "ce55b3ad3b3cb4c4253a0172bb8e9461814b2d64", - "sha256": "1sw1s2k4wch32h5r0z6bfyiw4qcwjz93lq36ix17r968r505djc2" + "commit": "3cd98cbf80b04ae2ebca1c67c52ba756116f6784", + "sha256": "0smyic3x3b98ipwhb9pw47nnymccy4w7k3dbng2g2zhgwi5pyc1k" }, "stable": { "version": [ @@ -36366,15 +37058,15 @@ "url": "https://git.launchpad.net/frecentf.el", "unstable": { "version": [ - 20191204, - 312 + 20200624, + 1534 ], "deps": [ "frecency", "persist" ], - "commit": "1d5d641fdd93480db2374276e85ec652af0565c5", - "sha256": "01l92rz4hll2v5k0xppmszcpy0r6lxgm4cql0zxkcj5yhgzjmrln" + "commit": "d9d093365ffe12c46e81d16ee81850abd86a2177", + "sha256": "06w17km8hmlr2mrxi26g51mnfvcvilw91b17y52pmx09jgnqa9ac" } }, { @@ -36454,8 +37146,8 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200510, - 1438 + 20200527, + 830 ], "deps": [ "cl-lib", @@ -36463,14 +37155,14 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "cl-lib", @@ -36478,8 +37170,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" } }, { @@ -36490,28 +37182,28 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200510, - 1438 + 20200527, + 830 ], "deps": [ "cl-lib", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "cl-lib", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" } }, { @@ -36522,30 +37214,30 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200510, - 1438 + 20200527, + 830 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" } }, { @@ -36668,16 +37360,16 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20191130, - 1857 + 20200520, + 1842 ], "deps": [ "dash", "eglot", "s" ], - "commit": "8c86e38b93aac55f57d5baf3a9575b45b54cd16a", - "sha256": "08c8v5wnb7fi4pbi5ivkhi3l4nf8mhn9b9829nkpz1l5q9lmz263" + "commit": "3e41fe1391b64eefa66a8a02fce27a12a04e1e01", + "sha256": "03ln0dmjkg4bnpabnw27vby3jqf40wzvs3znynqqqx7cn53vy5fp" }, "stable": { "version": [ @@ -36701,8 +37393,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20200424, - 2235 + 20200624, + 2201 ], "deps": [ "company", @@ -36712,8 +37404,8 @@ "quick-peek", "yasnippet" ], - "commit": "d8b586518f32d4acde049852d81902670d1ee277", - "sha256": "0av315lf58nwgvix100bj279mq2pm175vwc5dip19gn73bq4d9vi" + "commit": "bd28cb8f25538e26287c76efbbc5ef7378d1fbc6", + "sha256": "1jvvasin29bwxq7cmviv0431jb7p2gq3yh12pyf6f5zinsax97cp" }, "stable": { "version": [ @@ -36743,8 +37435,8 @@ "deps": [ "cl-lib" ], - "commit": "68f6eeb3adbc7d9f71d24761600bf8538775c969", - "sha256": "16iz2wf8bn4mjcgbc5vj50snlgiqqdc495kxbd9mcld5rjhfs45q" + "commit": "3fdb0325ca2a6d80e4111af43b1b166808022020", + "sha256": "0kid3a0qq2qvzndbs1c69z30f2in7q7fzpv6yas84f8y5kkmk220" }, "stable": { "version": [ @@ -36861,10 +37553,10 @@ }, { "ename": "fuo", - "commit": "25fb625becf7f582d2a8d53726d6f01d9ea89ecc", - "sha256": "02mvgz2cxrdn5kp5dw0c57rl5nfavqli5yqbxczmbsih164ljdxf", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1aaqa7lih9gh4rz51jy577l95rgmyhna2h9ci1h4baini19mxi26", "fetcher": "github", - "repo": "cosven/emacs-fuo", + "repo": "feeluown/emacs-fuo", "unstable": { "version": [ 20190812, @@ -36897,14 +37589,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20200415, - 1228 + 20200627, + 732 ], "deps": [ "cl-lib" ], - "commit": "2befd490ce7d78a43d001b4bb0bd4300d086d645", - "sha256": "0p4ii7mbspx1fsmzx9n8z2siq9n8ixpisxs388ndd2ccp7x3k6nm" + "commit": "9db9fb81e08b6ded43a4eede5220644ce354060d", + "sha256": "0hcwqsq65hlznsq2k5bviwzyh82sddfb28v5xna0016yphbdng2h" } }, { @@ -36918,8 +37610,8 @@ 20200104, 524 ], - "commit": "0b6b64cebde5675be3a28520ee16234db48d3b8b", - "sha256": "1bddjr3rpmvkrljq5ipjm42d59m2897cpfhmiah3rcb4c6ra40m1" + "commit": "fee874aa35d2ee6b12b836290b5c8eaa44175a28", + "sha256": "1xswm8my29i4fddy64k21b1vclbr5fjb0pisb4hs8ynkk5w1kw2a" }, "stable": { "version": [ @@ -37069,6 +37761,21 @@ "sha256": "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz" } }, + { + "ename": "gameoflife", + "commit": "bdfc00fe567155ae98fbf1a44d0bb4fa3a8e5786", + "sha256": "0vjlbpf9672442lzcw1p39vldywy4a1yj2mcwmbsqhpjlnzalw4l", + "fetcher": "github", + "repo": "Lindydancer/gameoflife", + "unstable": { + "version": [ + 20200614, + 1814 + ], + "commit": "2483f3d98dbcf7f1633f551cc3691f5659b4b942", + "sha256": "1a57fc8ylrdlqlywp81b71jd93hiwkxy6gxpi8358d6d4czslvq7" + } + }, { "ename": "gams-ac", "commit": "ca2681b39ac5a985c2f70b4b84ee3c10af1a7ca4", @@ -37188,20 +37895,20 @@ "repo": "GDQuest/emacs-gdscript-mode", "unstable": { "version": [ - 20200427, - 1514 + 20200726, + 1721 ], - "commit": "0718ca9b090780bd28d02ef5c79cd0e7c5a84d5e", - "sha256": "0wdsfakx50x60lxb6d46h9rhb1vrisch71fmdl1c8jiwf57q5kpn" + "commit": "7aea87bd7b3cd14b1a767e7d835cee896722cd29", + "sha256": "1cq2k054ngqwanayy7fgkqdb5fq6xcqdglpyxngqmh765lyb7nrb" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "commit": "86577f81dc2640d5388565d0430b4df241bdd38e", - "sha256": "0cpfdbza3gh1s6y5igs51b1m7g7dfa7jszjfawz3v2g49p4a5m2d" + "commit": "36c92dff1587d7c3c7ff2cd02d8e158cbed55215", + "sha256": "02by4bvdayldbjlz6jkp36m5rgcy2h5bwhqx2cj7wma6xf6cw3lf" } }, { @@ -37289,20 +37996,49 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200513, - 1219 + 20200714, + 1210 ], - "commit": "7a39c8eb7ca2a0a4fe0ad307ea55578e11e6dfdd", - "sha256": "09lv9ixgrkb351nb67nas5yfa8vk0rz4ljhc1hxxn4g451hbd14f" + "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2", + "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08" }, "stable": { "version": [ 0, - 11, + 12 + ], + "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2", + "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08" + } + }, + { + "ename": "geiser-gauche", + "commit": "1cb02b836748f31be26013d2e43ada6d68f35c90", + "sha256": "1fbhfaz304bfzq7m75kifpfxb69zx4ymnvanfv7lnmbx6fqqfrqp", + "fetcher": "gitlab", + "repo": "emacs-geiser/gauche", + "unstable": { + "version": [ + 20200802, + 1300 + ], + "deps": [ + "geiser" + ], + "commit": "66e51430bded0f0e2037f474818a7bbaafb2906c", + "sha256": "1gsvl0r6r385lkv0z4gkxirz9as6k0ghmk402zsyz8gvdpl0f3jw" + }, + "stable": { + "version": [ + 0, + 0, 2 ], - "commit": "51252bcb35d6afe006487b73c1e2276210b4ed83", - "sha256": "1khi1bghsjx6cs5acizmlbw9z19s4qycnji9krdbn42cbpv0rysv" + "deps": [ + "geiser" + ], + "commit": "9e7ed54e5629f759660569bc7efc3d75dbabbc5f", + "sha256": "0rxncnzx7qgcpvc8nz0sd8r0hwrplazzraahdwhbpq0q6z8ywqgg" } }, { @@ -37323,6 +38059,21 @@ "sha256": "0j2djjgfd4hd2k60ymgxzpsy52ks6hxpd4rr81z5nh9fdg9axhrs" } }, + { + "ename": "gemini-mode", + "commit": "2cc0e9039171064cd0fb37b3eb5324c91a88ef7a", + "sha256": "1mbhv034jk4bwi58z6jc2r4d828v0ir3jwqpgi2mfjnjxk5x5ga5", + "fetcher": "git", + "url": "http://git.carcosa.net/jmcbray/gemini.el.git", + "unstable": { + "version": [ + 20200813, + 1424 + ], + "commit": "d114bacfb12f9e66821254ff0a1fb85443700b24", + "sha256": "0m7jricw40h4r30kcg60dl2ybgrdbiglnb55lz3n70bc5nsx8dcd" + } + }, { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", @@ -37456,8 +38207,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20200226, - 2137 + 20200727, + 2006 ], "deps": [ "dash", @@ -37465,8 +38216,8 @@ "magit", "s" ], - "commit": "36870fd34ad681f907a57a2d82b2002735878614", - "sha256": "0h9v4ajp50wpg3zz0p7klyi705ynfy2mka0hpzz81kgpq8q8f46z" + "commit": "eb4b182e493a6d5d3e94c9ff5abe0a0206b03c7c", + "sha256": "16v043avd9sm0rq7951x7045zfxhiadq2q056grkjgcpy2id45lw" } }, { @@ -37603,10 +38354,10 @@ }, { "ename": "gh-md", - "commit": "2794e59d5fea812ce5b376d3d9609f50f6bca40e", - "sha256": "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm", + "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d", + "sha256": "11bbicmv15qfh4s5bpgvbnc6v9v1hdh6y0clii5k8jv4p1nxfix4", "fetcher": "github", - "repo": "emacs-pe/gh-md.el", + "repo": "emacsorphanage/gh-md", "unstable": { "version": [ 20151207, @@ -37754,28 +38505,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20200425, - 2233 + 20200801, + 815 ], "deps": [ "let-alist", "treepy" ], - "commit": "206f2b5b2ab622efda8da85feaa3bc2a1e0f3da3", - "sha256": "132y2yi9c91p25cwnvb9w6jj7la6fdc0xlvnxmbnfnxaic4jyhs3" + "commit": "942e7bdabc4b938a0535530c26eb6548504fca24", + "sha256": "07iy4203ppvzkh67sb0v968hnypnvy4dpfy0qpqrp8zmc455dxq5" }, "stable": { "version": [ 3, - 3, - 0 + 4, + 1 ], "deps": [ "let-alist", "treepy" ], - "commit": "eec071aa9e2810c8ce2f2522e6be8d78f579069d", - "sha256": "1229g0d9f4ywwjndx32x4z5jdr0kzyi44hjxmy0sifwfmg9nn251" + "commit": "942e7bdabc4b938a0535530c26eb6548504fca24", + "sha256": "07iy4203ppvzkh67sb0v968hnypnvy4dpfy0qpqrp8zmc455dxq5" } }, { @@ -37984,11 +38735,11 @@ "repo": "ryuslash/git-auto-commit-mode", "unstable": { "version": [ - 20200322, - 2007 + 20200801, + 748 ], - "commit": "dd0c2441de0f5ff8c69c8260d9450d0b607e3e55", - "sha256": "0r7jry1sbqsp7c1vxf7fchc7ivmnccfrflg52379v3gmpvd8s0kn" + "commit": "d4fd94320610100f23de083493d12de3324304b5", + "sha256": "180rzh53hrd374nf96cz8n6brxvi68fgss21ic5r623hkczhi73b" }, "stable": { "version": [ @@ -38038,15 +38789,15 @@ "repo": "walseb/git-backup-ivy", "unstable": { "version": [ - 20200424, - 1049 + 20200709, + 818 ], "deps": [ "git-backup", "ivy" ], - "commit": "d9361c9ad903e0d58f25ccebad99d9a753f1937a", - "sha256": "0jkkajv0scbp91al18fqqyvvcda2z6wkkbz0p1rcwzap5g96b7ag" + "commit": "0a5c52e64d0062f77ffefc9213e75690c6d7b111", + "sha256": "060x20c4q7cr5zrfsa28z2zgr6isfb2y2ys450h46a9yi3w9h60f" } }, { @@ -38105,16 +38856,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200207, - 1819 + 20200701, + 2112 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", - "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" + "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe", + "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n" }, "stable": { "version": [ @@ -38312,16 +39063,16 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20200124, - 1856 + 20200810, + 1106 ], "deps": [ "dash", "f", "hydra" ], - "commit": "8471e6f8ef6c502dc999e513b552d6b23974d40d", - "sha256": "1w4dnrc0dq0brdq0dpk5lj7ji50v5b7q32f1ghkvx50i7a3dslvq" + "commit": "6bf8b2cd72061eac5a4d247ba2fabdd8deafdea7", + "sha256": "1p6if6fvz6m7nnd7fl1j2dxg830ax06ln9wvm5anpsdky0lqwqyr" }, "stable": { "version": [ @@ -38385,20 +39136,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20200331, - 2329 + 20200721, + 2250 ], - "commit": "7142ec898f0cb97aa5d1a68da7957b4710bbfa87", - "sha256": "0xcgzhlxd7ycfxmbgkwm04pdfjysygkka3jis4p45zy6mrackn4c" + "commit": "cbaf7033edad8d4712b6e7dc11cad979c6a002de", + "sha256": "074xqp1apcrmnh2cb9m60gaq78hzybyg5sr09n37ka0sw447rp15" }, "stable": { "version": [ 0, - 7, - 5 + 8, + 0 ], - "commit": "267bd81c228bdab434172dbef896f3f3b82713fa", - "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6" + "commit": "2f61413bec5d94b068140a764ba8c2a732ac8d58", + "sha256": "1cj04nzqxwvi1f97y36n311nayj31y3iy7kysb31nlfn19y2g4wj" } }, { @@ -38496,14 +39247,14 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20190730, - 849 + 20200603, + 701 ], "deps": [ "transient" ], - "commit": "391eb61050de321101e631fcf373fc70ec6e7700", - "sha256": "1pz4l1xnq6s67w5yq9107vm8dg7rqf8n9dmbn90jys97c722g70n" + "commit": "8d675750e921a047707fcdc36d84f8439b19a907", + "sha256": "1ppids836gdk5j8cli8wkzkjb85f4s1s550v5xpxyyq75rj1bnsr" }, "stable": { "version": [ @@ -38753,11 +39504,20 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20190701, - 630 + 20200803, + 1445 ], - "commit": "e3a410dd1113bdff382a745465ea48d9b1fe860b", - "sha256": "1yq9bsy2qry49q1asdxnfyhahsp499b37l2yabwhpbxjlb7mmnp6" + "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8", + "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8", + "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" } }, { @@ -38850,8 +39610,8 @@ "ghub", "s" ], - "commit": "50c6bcc7cf4d7193577b3f74eea4dd72f2b7795b", - "sha256": "0khsxsqzx81y5krj06i8v84qsb3z86b1z17knyr1xizrd2lmraqp" + "commit": "fab440aeae4fbf6a8192fd11795052e9eb5d27d1", + "sha256": "19kk55r0qixmvw1q80x3rnvcssrq64k5b5ixp8wjzpg6h65s9vk9" } }, { @@ -39078,7 +39838,7 @@ "dash", "helm" ], - "commit": "a0ba22ae7098b1a57af626fe5b6e9d663e8e2fc3", + "commit": "782df679e33646db29e07508311bc8e8624b484e", "sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w" }, "stable": { @@ -39198,11 +39958,11 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20200511, - 2146 + 20200520, + 1816 ], - "commit": "5239c1ba873eb907d5665964820b4a7ddbf75b5c", - "sha256": "0yp1hq849drkkbypaaak36i5s1q9ff549w21qswmi60nmiikabsg" + "commit": "f3c93828ab08895bf7eac8a2d3bfd949303a6d1f", + "sha256": "1ar9pgc31mfv2x26qpvsmiv2lnczfjliplnzjxnrmiccqiabp1y8" } }, { @@ -39514,8 +40274,8 @@ "repo": "deusmax/gnus-notes", "unstable": { "version": [ - 20200509, - 1942 + 20200605, + 1421 ], "deps": [ "async", @@ -39526,17 +40286,26 @@ "org", "s" ], - "commit": "c5c057263ecc86f60b62a1e811e63cfb1c394c15", - "sha256": "1rfkc6pp2kkin87hbjz1192hb6hf24ygiyd6zigs3bfaxja313rp" + "commit": "2b587ac2e428fe3805443df5306e67d78bdf8ec2", + "sha256": "0r08dhc6w2zk8is738qd6rkpq03n1fnfr398lsqgn2jaizgsik0l" }, "stable": { "version": [ 0, 3, - 1 + 2 ], - "commit": "8373615b1b5945db485ab18205fdd1077ee0a506", - "sha256": "10ddsw1idyn1w2w92gs6i7a14hq347qib521vk7yqb9s4qyxg1fg" + "deps": [ + "async", + "bbdb", + "helm", + "hydra", + "lv", + "org", + "s" + ], + "commit": "56403ee22242fd479c2aff85f4cf4133e32ca90a", + "sha256": "0g26ygcmbcmxbafvyw04xcqzg2dlava2rqa5m2lv0cxyi6rnvdhj" } }, { @@ -39729,11 +40498,11 @@ "url": "https://git.sr.ht/~zge/go-capf", "unstable": { "version": [ - 20200216, - 936 + 20200814, + 1046 ], - "commit": "9e66ce4ef4307e9f0e73e65f6bb2f287ed2c940b", - "sha256": "1sgsxd511xw1g707c0d58j3xzxfbay7k5b7hyamd2fnh30pw2hb3" + "commit": "acc353135f390245453f0d90f5846f67b0a84952", + "sha256": "1hb8glprzpm94bsyx2mnv9w6b825y451agpqh2ry8ngydbc1llhi" }, "stable": { "version": [ @@ -39803,26 +40572,26 @@ "repo": "benma/go-dlv.el", "unstable": { "version": [ - 20191005, - 829 + 20200713, + 1202 ], "deps": [ "go-mode" ], - "commit": "d3cca689e76b71e0ef0ab827c7e01cd9042d2095", - "sha256": "0qdbfg9ihxwywjyir3lj1azwsaw425f90gp3182q7165j5v43k9w" + "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", + "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "go-mode" ], - "commit": "d3cca689e76b71e0ef0ab827c7e01cd9042d2095", - "sha256": "0qdbfg9ihxwywjyir3lj1azwsaw425f90gp3182q7165j5v43k9w" + "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", + "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" } }, { @@ -39878,6 +40647,21 @@ "sha256": "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3" } }, + { + "ename": "go-expr-completion", + "commit": "8d09efb2e93fefd5158685084691ccf20178fe78", + "sha256": "1fhcwwv377zahg6nh9v9vigb7pqnm6r0fwvfa6fd5j81vffivaww", + "fetcher": "github", + "repo": "fujimisakari/emacs-go-expr-completion", + "unstable": { + "version": [ + 20200817, + 1750 + ], + "commit": "66bba78f52a732b978848e3a4c99fa2afeb6c25f", + "sha256": "0gbxgf36p24gjh9n5swmvyzl4h518lx63zyf0b80xnrvb7d5qi46" + } + }, { "ename": "go-fill-struct", "commit": "0c03d2382efd20e248b27b5505cdeed67d000f73", @@ -40084,28 +40868,27 @@ "repo": "grafov/go-playground", "unstable": { "version": [ - 20190625, - 1855 + 20200818, + 2215 ], "deps": [ "go-mode", "gotest" ], - "commit": "508294fbc22b22b37f587b2dbc8f3a48a16a07a6", - "sha256": "18vsrckkazfzksjpyx1lbwg5hdgd43ndaj3csy3i3hk7p26x98lm" + "commit": "ede417a52c0eea1a69658f4c6c6c12d6165e64a4", + "sha256": "1zzdkp6zqh03gfiirmvwv5c8s9m4511zcaya9cp5sjzmh0g5wjip" }, "stable": { "version": [ 1, - 6, - 1 + 7 ], "deps": [ "go-mode", "gotest" ], - "commit": "508294fbc22b22b37f587b2dbc8f3a48a16a07a6", - "sha256": "18vsrckkazfzksjpyx1lbwg5hdgd43ndaj3csy3i3hk7p26x98lm" + "commit": "ede417a52c0eea1a69658f4c6c6c12d6165e64a4", + "sha256": "1zzdkp6zqh03gfiirmvwv5c8s9m4511zcaya9cp5sjzmh0g5wjip" } }, { @@ -40140,18 +40923,19 @@ "repo": "dougm/go-projectile", "unstable": { "version": [ - 20181023, - 2144 + 20200609, + 131 ], "deps": [ + "dash", "go-eldoc", "go-guru", "go-mode", "go-rename", "projectile" ], - "commit": "7910884b4de560f3fc70b53752f658ef9cdc02cd", - "sha256": "03bh8k95qrc3q1sja05bbv3jszh6rgdv56jpi8g06yxk53457a1n" + "commit": "ad4ca3b5695a0e31e95e3cc4ccab498f87d68303", + "sha256": "1ai34z7n56cczz6qb0vbcrqbjrkmxwv9r928pjbw58812nycj1mh" } }, { @@ -40300,20 +41084,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20200413, - 2144 + 20200708, + 2200 ], - "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", - "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" + "commit": "ad2e6745294843462f78768b5a1cd3b0d3563951", + "sha256": "00v69c76737yfmy3injhf6l1khj67rr0xvpq0yyjxg4hh9dv4j90" }, "stable": { "version": [ 2, - 16, + 17, 2 ], - "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", - "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" + "commit": "2e519312fdef36dea523aa530d134a703d3032a6", + "sha256": "1gnwl81immxdq72hsxgic2631r4jsq9pv5jqh0jzji0q320m9xcl" } }, { @@ -40404,14 +41188,14 @@ "repo": "stardiviner/goldendict.el", "unstable": { "version": [ - 20180121, - 920 + 20200731, + 1119 ], "deps": [ "cl-lib" ], - "commit": "1aac19daaec811deb9afe45eea4929309c09ac8b", - "sha256": "1il432f6ayj2whl4s804n5wykgs51jhbx4xkcbfgqra58cbjrjhi" + "commit": "ad5212f6ade58c193287851a46c3f9378fe2f059", + "sha256": "0lgdrrch9rn23jd90rpcs5zxrv279ds3g9rzq5whl19410dbjamm" } }, { @@ -40488,8 +41272,8 @@ 20180130, 1736 ], - "commit": "7a59e424c8e641605e30eed68197859533ea6aaf", - "sha256": "1w9hf7bcdd5ddjavhj0ggnxipf5f5w3cfj52n9i46jmm6g2x2b5g" + "commit": "25e977d641fc204a38263a2272f92307c545121b", + "sha256": "1dgna85s3gwb0a2504min4ch0xih4ygnv8ia2jvx3wyxgn436z1x" } }, { @@ -40566,20 +41350,20 @@ "repo": "atykhonov/google-translate", "unstable": { "version": [ - 20190620, - 1416 + 20200809, + 1430 ], - "commit": "dc118de511c433750d4c98b9dd67350118c04fd6", - "sha256": "1kbiqisqyk31l94gxsirhnrdkj51ylgcb16fk2wf7zigmf13jqzp" + "commit": "0ab218f9e1a620af7b4b22d9c82b8d83ff5f4606", + "sha256": "1z0jbjgjnb36cj14l6khnxmrcfvbmlw89sc9dbkw6j7a3k51nlc0" }, "stable": { "version": [ 0, - 11, - 18 + 12, + 0 ], - "commit": "dc118de511c433750d4c98b9dd67350118c04fd6", - "sha256": "1kbiqisqyk31l94gxsirhnrdkj51ylgcb16fk2wf7zigmf13jqzp" + "commit": "ba027ff85352b989abac29b0efba1811b870ebec", + "sha256": "0rwpij2bm8d4jq2w5snkp88mfryplw8166dsrjm407n2p6xr48zx" } }, { @@ -40728,20 +41512,20 @@ "repo": "jcs-elpa/goto-char-preview", "unstable": { "version": [ - 20190418, - 829 + 20200717, + 730 ], - "commit": "c0209143fbeafcc9ba93bc2333dd08e72211fa20", - "sha256": "15plzc33vyhmfm7bxhvnfr25yvjj6fdr1zp2dvsj8jryj4gb6gkz" + "commit": "11fb6b8c77c6191f839f86afc8c8ca3341919058", + "sha256": "14wcz9azp1c66jz1wz75v0ijbsk5hjmchcm36k7phbn3hjag99ji" }, "stable": { "version": [ 0, 0, - 1 + 2 ], - "commit": "366cf84c30fc8e675e9cbab1091ead6f3cd0d399", - "sha256": "1y2ay0r0rqayvw8wlbf8advjbhvzz7sa16k272mxszxzp7xmnr71" + "commit": "446e5236227d6b3f180be2eb5ef2209aef947553", + "sha256": "0dd5iq9xkvqavabipg1iz9zk1rnz830grhzw0z1l89b1vvgzpd62" } }, { @@ -40752,14 +41536,14 @@ "repo": "emacs-evil/goto-chg", "unstable": { "version": [ - 20190110, - 2114 + 20200603, + 1911 ], "deps": [ "undo-tree" ], - "commit": "1829a13026c597e358f716d2c7793202458120b5", - "sha256": "1y603maw9xwdj3qiarmf1bp13461f9f5ackzicsbynl0i9la3qki" + "commit": "85fca9f7d8b04be3fbb37cc5d42416f3c4d32830", + "sha256": "0laq44dfwcdhphrkwsklxa0146sl9y841mmjwn5gc0z4d5npz0ql" }, "stable": { "version": [ @@ -40818,20 +41602,20 @@ "repo": "jcs-elpa/goto-line-preview", "unstable": { "version": [ - 20190308, - 736 + 20200717, + 733 ], - "commit": "1f0afb261a4e4a1b0a2fae3959b0ce5d30bce2a1", - "sha256": "03csbs9mh9jjw21sncvnlmm97waazy0c57jp1jynwhzzsbp0k0rs" + "commit": "b1df7fe72b0281704d277a69dfd9e2b8214a328b", + "sha256": "00862y6r5xbq5crb581xh1b18dqigc8k42di9mjc6zvslxq8n6qd" }, "stable": { "version": [ 0, 0, - 5 + 6 ], - "commit": "772fb942777a321b4698add1b94cff157f23a93b", - "sha256": "16zil8kjv7lfmy11g88p1cm24j9db319fgkwzsgf2vzp1m15l0pc" + "commit": "a4173abfffda03ad27e695a316adfe560a97f00e", + "sha256": "0bh70d2isl3kdzxyidjrxhs7sh8rqr8cmdwil7ksp9a28mz3l55p" } }, { @@ -40851,14 +41635,14 @@ "magit-popup", "s" ], - "commit": "0c56c1e833bc9e21b603539a19bdfe4836a197ed", - "sha256": "0iaa34hh0zpy9alf0d6bad7qwk565l9k5k09ig342pwnmigz1scs" + "commit": "609218c5232673cec215d088eb01d043120de385", + "sha256": "0wg2sn5zfcsdnv6ymy0a13px7j6pkgmdd9dpss98l70xf3b6g590" }, "stable": { "version": [ 0, - 22, - 2 + 23, + 1 ], "deps": [ "dash", @@ -40866,8 +41650,8 @@ "magit-popup", "s" ], - "commit": "e7df0c1118c15c0b35fe08f183ca084269ea6542", - "sha256": "0lm1jaw5bpz7z4gibbbhswjr7qdhxkgbawr5bnykprsmp663i3nm" + "commit": "cfbe1d59b449be9b5378251bc6e52c65bc5e1cbd", + "sha256": "05f6i7v8v9g3w3cmz8c952djl652mj6qcwjx9iyl23h6knd1d9b1" } }, { @@ -40917,19 +41701,19 @@ "repo": "xuchunyang/grab-mac-link.el", "unstable": { "version": [ - 20190419, - 1307 + 20200712, + 428 ], - "commit": "b52d29cd78a60cfe874667a8987ed10e8eb0f172", - "sha256": "15qznll0358cgqb9m9hpr2if2rsskr29mpsg7h32xb6njqnn741m" + "commit": "9b47cbe126a0735fa447a3c5e1e8ba80a7ef8d26", + "sha256": "1hx3a6sfc3ah3xgwii0l0jvshgbw0fjwsyrmb4sri0k8cla7fwin" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2", - "sha256": "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k" + "commit": "9b47cbe126a0735fa447a3c5e1e8ba80a7ef8d26", + "sha256": "1hx3a6sfc3ah3xgwii0l0jvshgbw0fjwsyrmb4sri0k8cla7fwin" } }, { @@ -40999,20 +41783,20 @@ "repo": "lifeisfoo/emacs-grails", "unstable": { "version": [ - 20160417, - 636 + 20200519, + 1909 ], - "commit": "fa638abe5c37f3f8af4fcd32f212453185ce50b1", - "sha256": "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b" + "commit": "d47273a619d6731683afe60636259b02e2c78a2e", + "sha256": "1j2sd51bnn6ngz5sd01akmrnh9938g7v1fh6mxq4lbzjwgnzbvgy" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "fa638abe5c37f3f8af4fcd32f212453185ce50b1", - "sha256": "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b" + "commit": "d47273a619d6731683afe60636259b02e2c78a2e", + "sha256": "1j2sd51bnn6ngz5sd01akmrnh9938g7v1fh6mxq4lbzjwgnzbvgy" } }, { @@ -41026,8 +41810,8 @@ 20160504, 911 ], - "commit": "cafdd98e06a3bbff213f3ccb163de2c42d412b66", - "sha256": "07809alyxind4n0rb1h3x19hgq7ihpn128xljlz38d9xvp0r48z3" + "commit": "26da902d1158c0312628d57578109be54eca2415", + "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2" }, "stable": { "version": [ @@ -41078,32 +41862,30 @@ "repo": "jcs-elpa/grammarly", "unstable": { "version": [ - 20200126, - 420 + 20200720, + 948 ], "deps": [ - "cl-lib", "request", "s", "websocket" ], - "commit": "709bf3124b6e130efcede8b38fc2fed38699e19b", - "sha256": "1lz74qqzznv5c6pnsnnp0x0k16q663pkqakvwpg69lavcg68ysxh" + "commit": "d597c5d71bc64f5a91e96c707d7471bceaa84075", + "sha256": "073rv64m14llav59b2y73qcw7z5p0b537aa46chxf2bxq93lb4vf" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ - "cl-lib", "request", "s", "websocket" ], - "commit": "cd2e75f21989a586c9cc71540fc6e3b5df8a5ce0", - "sha256": "1v7lwwx9iyksh5aaav97vd5pm07k93fkv5v4h96s8i3hyrbcgd74" + "commit": "d597c5d71bc64f5a91e96c707d7471bceaa84075", + "sha256": "073rv64m14llav59b2y73qcw7z5p0b537aa46chxf2bxq93lb4vf" } }, { @@ -41358,20 +42140,20 @@ "repo": "fredcamps/green-is-the-new-black-emacs", "unstable": { "version": [ - 20190724, - 1252 + 20200529, + 242 ], - "commit": "34f0372878a07a23bf1d9418aa380c403d272457", - "sha256": "1gfp5n4lknbw2p5wik0kq5i80p90x9gwd1zif7sjz5g3ximmgg04" + "commit": "9b682c0000bc732e4c55e876ac968877eada0402", + "sha256": "0yilp68qw2a4z8b8mmr2yl2lmwkd3ibk6j5ix6x3vlcmfmrfl3bj" }, "stable": { "version": [ + 1, 0, - 5, 0 ], - "commit": "34f0372878a07a23bf1d9418aa380c403d272457", - "sha256": "1gfp5n4lknbw2p5wik0kq5i80p90x9gwd1zif7sjz5g3ximmgg04" + "commit": "9b682c0000bc732e4c55e876ac968877eada0402", + "sha256": "0yilp68qw2a4z8b8mmr2yl2lmwkd3ibk6j5ix6x3vlcmfmrfl3bj" } }, { @@ -41443,38 +42225,6 @@ "sha256": "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw" } }, - { - "ename": "grep-context", - "commit": "41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637", - "sha256": "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g", - "fetcher": "github", - "repo": "mkcms/grep-context", - "unstable": { - "version": [ - 20181002, - 1654 - ], - "deps": [ - "cl-lib", - "dash" - ], - "commit": "58f6edc18510d871e4f5ef63ef60665cbc204e96", - "sha256": "04mk5wi2i4mx58mfzl4zk10lm58yliczsw5vpxqmikz8gbripqqx" - }, - "stable": { - "version": [ - 0, - 1, - 0 - ], - "deps": [ - "cl-lib", - "dash" - ], - "commit": "4c63d0f2654dee1e249c2054d118d674a757bd45", - "sha256": "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4" - } - }, { "ename": "greymatters-theme", "commit": "d13621f3033b180d06852d90bd3ebe03276031f5", @@ -41498,11 +42248,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20200312, - 1136 + 20200725, + 725 ], - "commit": "9615c4774727a719d38313a679d70f2a2c6aca68", - "sha256": "01imyi1l33ng78m6c5g4pma5gy4j7jy7dwmqwsqgwbws08qdbwgr" + "commit": "281ada2c93bac7043c6f665fac065a17d4247bdc", + "sha256": "14gsmxpp8znk2w2yszdpwb8dx0hxbpy2rjr7rshs3bvqjib8rzyp" }, "stable": { "version": [ @@ -41587,8 +42337,8 @@ "dash", "s" ], - "commit": "cafdd98e06a3bbff213f3ccb163de2c42d412b66", - "sha256": "07809alyxind4n0rb1h3x19hgq7ihpn128xljlz38d9xvp0r48z3" + "commit": "26da902d1158c0312628d57578109be54eca2415", + "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2" }, "stable": { "version": [ @@ -41625,6 +42375,30 @@ "sha256": "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd" } }, + { + "ename": "grugru", + "commit": "eb55452f19b8f33605ca1b0cb5d93e00ff4cf3f5", + "sha256": "0zrcx6097hjdrr3b5fagm77h6fl5ys0djk8h70gkzvc2cc4sdim2", + "fetcher": "github", + "repo": "ROCKTAKEY/grugru", + "unstable": { + "version": [ + 20200810, + 1411 + ], + "commit": "2f304daa39df10ebe9e4cb982af5343bca252c6d", + "sha256": "1bry2iqab6shyhlmka7334yqc5k4c9hl1qrigz2p9km9hv45r7hw" + }, + "stable": { + "version": [ + 1, + 10, + 0 + ], + "commit": "d71007802389028a70d0ccbf5c57330241add7cc", + "sha256": "1gr8jdm8g7cxysf1f83mkfwp3la6bcd08r8gw5v9ms4k217nx2is" + } + }, { "ename": "grunt", "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", @@ -41665,14 +42439,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200514, - 740 + 20200807, + 855 ], "deps": [ "autothemer" ], - "commit": "f1dfcd8bd50e4885cab71b174bbc6a620c2b9d7f", - "sha256": "106vkpm75s3s52bkmcnjlw8gx3qlh5hffwvj2bvkmqfcgnxpzgx0" + "commit": "746a5f36cf4ff3959f2d007598d5cb248cfc1879", + "sha256": "1j66ffg1xl37nggckm38fmapxm0v7bycvpggxdx0s8q7hqlikk9f" }, "stable": { "version": [ @@ -41807,14 +42581,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20200326, - 1725 + 20200707, + 1058 ], "deps": [ "cl-lib" ], - "commit": "f4ce91eba3c479d08fedf0a3ced6c1265a7838ca", - "sha256": "0z7agqi5sgjjidhmnrv7615737xk7p1s6pdhr6swjcr117dq44fm" + "commit": "256230072f4f828e07db6ab17b6b7e90891b7308", + "sha256": "0yqvrd7b43ibzszzcw8zg0ifqz7v4ply5wdgq1zclk3xgsn9n3pr" } }, { @@ -41889,8 +42663,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20200510, - 1613 + 20200730, + 930 ], "deps": [ "bui", @@ -41899,8 +42673,8 @@ "geiser", "magit-popup" ], - "commit": "0b8f75124372266bfab32e8d1fa114f33ea24e6f", - "sha256": "17i0rivgixkg18qiqw5a47ahli9vpc9p5yhd9s9j3jmf1jlzq4bf" + "commit": "58a840d0671091e3064e36244790ef8839da87d6", + "sha256": "1qnr5sixmvrhr9rinrhfy7sy20mikjvvwbdixwkbx30qpcdwgwj1" }, "stable": { "version": [ @@ -41942,19 +42716,19 @@ "repo": "bbatsov/guru-mode", "unstable": { "version": [ - 20170730, - 731 + 20200708, + 728 ], - "commit": "c180e05ebc1484764aad245c85b69de779826e4e", - "sha256": "0qb6yr6vbic0rh8ayrpbz5byq7jxmwm1fc9l4alpz7dhyb11z07v" + "commit": "9d0aff6cda6d3d78d5102f07f813b9fca6f0ab7b", + "sha256": "1ja98di2iwjp0l4ndh22pwm7s56753kmz255xlv6vni2ai4rf8sm" }, "stable": { "version": [ - 0, - 2 + 1, + 0 ], - "commit": "62a9a0025249f2f8866b94683c4114c39f48e1fa", - "sha256": "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0" + "commit": "9d0aff6cda6d3d78d5102f07f813b9fca6f0ab7b", + "sha256": "1ja98di2iwjp0l4ndh22pwm7s56753kmz255xlv6vni2ai4rf8sm" } }, { @@ -42066,14 +42840,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20200421, - 157 + 20200526, + 2210 ], "deps": [ "s" ], - "commit": "330df61f7297344cff9cf9e2d802a4d041279de3", - "sha256": "00g9h96kb9d3qg544x9143hx4nc5crw67cq93ip4mrh3d86rkpc1" + "commit": "572c3b41bed91ea543434c04914a7a0c45fec7c7", + "sha256": "12r14846dpgn03h1gn58aff3p8swlp0zlajhzpqpzp2s7kvl0f6f" }, "stable": { "version": [ @@ -42119,23 +42893,20 @@ "repo": "clarete/hackernews.el", "unstable": { "version": [ - 20190529, - 1120 + 20200604, + 1557 ], - "commit": "2362d7b00e59da7caddc8c0adc24dccb42fddef9", - "sha256": "1hcc5b173yzcvvd2ls3jxrmsw2w9bi21m9hcpcirkn0nh93ywadv" + "commit": "019a727b41e2726516841048a2b5b04f2ed2301a", + "sha256": "1b4vlk3l1mm8jz0kkyjbddfnx963vzsq4gprci8aw203fjnxhbdx" }, "stable": { "version": [ 0, - 5, + 6, 0 ], - "deps": [ - "json" - ], - "commit": "916c3da8da45c757f5ec2faeed57fa370513d4ac", - "sha256": "09bxaaczana1cfvxyk9aagjvdszkj0j1yldl5r4xa60b59lxihsg" + "commit": "aec997970f2c2f8e0077c1f6584e4d1996ae3864", + "sha256": "15asarr271p582xbmhvhh9q0lgka25h6k65xh82rqvig4mirhn1l" } }, { @@ -42517,11 +43288,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20200408, - 247 + 20200531, + 2255 ], - "commit": "bbdbc0e9231f49a45ce787ebfb3f2b019615bf61", - "sha256": "0qln2zc4zx8w4ffplp6b17sksg578x61hyvwv1l79pc8bmpgn0ww" + "commit": "41683c0e634bb3f54eac8747919a82132e1714fe", + "sha256": "1fxj11in90xvpbqhxx5c3qynkd8yfainpbf8cvdh3gdgpifrc0gg" }, "stable": { "version": [ @@ -42574,8 +43345,8 @@ 20200513, 1950 ], - "commit": "0482f0de774c58bd7f2e079f5bf01781eed709a3", - "sha256": "05hgxrmsrmg5i50zxs7pa2xnfn2sja09hdk8xjsalnbbjvn4mmxx" + "commit": "3239e814d6999f31ad845cc58df53395ad299059", + "sha256": "0319nr4l56p0d2gpybkc2lkkhwi6qmf2gjpgpajpcz11ms9m8x5z" }, "stable": { "version": [ @@ -42792,8 +43563,8 @@ 20200315, 2129 ], - "commit": "c3d1158ad1a64f06aa8986ab1cdea6b7fbdd4bf7", - "sha256": "0qza5pgpzcabik3592dk25glsv9zcg84pn1jzm43f9b1j9w5iv4i" + "commit": "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd", + "sha256": "05j97g2l4rdx35a435xpdpq1ixgf9j94828fx4yhh4g60fjwwb82" }, "stable": { "version": [ @@ -42851,30 +43622,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200515, - 715 + 20200818, + 742 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", - "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" + "commit": "e9a1e53c57478389343ee23ebb962c8b9b4b4bba", + "sha256": "1vw6qcpz71sb6xhjzlikr4l1q23sfbphlza4x4ma0gc7mfzyqfh0" }, "stable": { "version": [ 3, 6, - 1 + 4 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", - "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" + "commit": "a3343a370975d9c01df4f1ff42875cc32ae89592", + "sha256": "0cl5awhq5py872qx9s30sfgfpfwjivwbsi18mgar8lj6lvs4s8zz" } }, { @@ -42974,25 +43745,25 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200516, - 613 + 20200811, + 1304 ], "deps": [ "helm" ], - "commit": "ae1dbefa151544035272d04e56e0147185a847c5", - "sha256": "03q29x63v500b3h4mj99h619ayifb12rrqiyyihm84i9lmgp5r28" + "commit": "4ee2174c4e27e02c75a487a235de4d80c663aa08", + "sha256": "1sc9ksfb3s5p5kqriz5402r785fklw3ykz8fb107xykl9kdjnzy3" }, "stable": { "version": [ 0, - 59 + 62 ], "deps": [ "helm" ], - "commit": "79373d7f1616d175a5e0730e1e0c3855f04bd945", - "sha256": "0vsz2b5qw4qahlf74059z4p1grinhfz28f0psw4c3qf4jasv3b9j" + "commit": "08aaab53b8876caba619f956945a8152ece47182", + "sha256": "0xgbpp8xqdiyvfs64x0q909g77ml28z3irw2lnasvpsg0dfdm2zy" } }, { @@ -43013,6 +43784,24 @@ "sha256": "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa" } }, + { + "ename": "helm-apt", + "commit": "5d3fec3e22c66091f0f71c2c9916755006b290f4", + "sha256": "11l35c08zs0ds0k8q8mr63446b0943i9yr85g9i6s1kdcsx96swc", + "fetcher": "github", + "repo": "emacs-helm/helm-apt", + "unstable": { + "version": [ + 20200719, + 1131 + ], + "deps": [ + "helm" + ], + "commit": "f6204e2333881291b007e4859d9446994e988653", + "sha256": "08gxfby2i80nmzlbj39p0nnicg95swzjxc222wksvggfxvvln5f7" + } + }, { "ename": "helm-aws", "commit": "421182006b8af17dae8b5ad453cc11e2d990a053", @@ -43368,16 +44157,15 @@ "repo": "emacs-jp/helm-c-yasnippet", "unstable": { "version": [ - 20170128, - 1542 + 20200520, + 1519 ], "deps": [ - "cl-lib", "helm", "yasnippet" ], - "commit": "65ca732b510bfc31636708aebcfe4d2d845b59b0", - "sha256": "1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8" + "commit": "89cc8561e7e57e9d1070ee3641df019c7f49c5dd", + "sha256": "1b6wwz7j9alwmxmk3wvf862ynznkdm1jk5r456dn8ykkvfrs7nlv" }, "stable": { "version": [ @@ -43733,26 +44521,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200514, - 644 + 20200803, + 1032 ], "deps": [ "async" ], - "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", - "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" + "commit": "e9a1e53c57478389343ee23ebb962c8b9b4b4bba", + "sha256": "1vw6qcpz71sb6xhjzlikr4l1q23sfbphlza4x4ma0gc7mfzyqfh0" }, "stable": { "version": [ 3, 6, - 1 + 4 ], "deps": [ "async" ], - "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", - "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" + "commit": "a3343a370975d9c01df4f1ff42875cc32ae89592", + "sha256": "0cl5awhq5py872qx9s30sfgfpfwjivwbsi18mgar8lj6lvs4s8zz" } }, { @@ -43829,10 +44617,10 @@ }, { "ename": "helm-dash", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0vn9b6v6y1l4v475s69930sf2h8cj9g3vdi1rx5janpcq7w42mq7", "fetcher": "github", - "repo": "areina/helm-dash", + "repo": "dash-docs-el/helm-dash", "unstable": { "version": [ 20190527, @@ -43989,10 +44777,10 @@ }, { "ename": "helm-dired-recent-dirs", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "1rm47if91hk6hi4xil9vb6rs415s5kvhwc6zkrmcvay9hiw9vrpw", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "08dyzsfpzzp279jvzbj7m187gn8rmxzfclrn71n4xsss5g1k7gb1", "fetcher": "github", - "repo": "yynozk/helm-dired-recent-dirs", + "repo": "zonkyy/helm-dired-recent-dirs", "unstable": { "version": [ 20131228, @@ -44230,14 +45018,14 @@ "repo": "cute-jumper/helm-ext", "unstable": { "version": [ - 20180526, - 350 + 20200722, + 107 ], "deps": [ "helm" ], - "commit": "90b788aced21ec467a234b6b77b5a6ebae6de75f", - "sha256": "11a27556slh95snzqyvy0rlf6p7f51nx8rxglnv0d34529h72508" + "commit": "c30f7772ec577a5ce1de3215f0507826e0725a69", + "sha256": "1sb3z1c1p9wal5g6fz8b948pvaarg4yhcmjqmpd2y7b85hzapgp1" }, "stable": { "version": [ @@ -44328,8 +45116,20 @@ "deps": [ "helm" ], - "commit": "6ab26c5fb414a0c1232974fd3f888839b6844203", - "sha256": "0lsrcn03f4981762l2rq25ps1f2ka86q125jkh6nq7wzfb7pj71f" + "commit": "d7e0c1814299fc0e345e159f02733cee5277716e", + "sha256": "07767jm0wqnn4qavnvnsf6wzfsvsk5bfba2sm16l5036sj4dyjxn" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "deps": [ + "helm" + ], + "commit": "52dbc68cf7484d66c40593733770c0c61b383ef0", + "sha256": "1xrq5481mri9nfdwkn14zjq1zgl31w6aywca6sr1by5cqggqrqr1" } }, { @@ -44359,15 +45159,15 @@ "repo": "emacs-helm/helm-firefox", "unstable": { "version": [ - 20200306, - 1408 + 20200612, + 800 ], "deps": [ "cl-lib", "helm" ], - "commit": "7065e01188ed17b86a7b4f01b95ace575a15eef1", - "sha256": "0kk7d73hcrxcnsrq803zp5lh1hyk30nahb6wdlalqvkczksgpkml" + "commit": "8ecf5bcb815d1650bf184deffeef10b1277e0e1e", + "sha256": "00is30ijsh2aqvrkk5cxl46mbcj3q2fzc02hb55mj3gq4h6lb1bq" }, "stable": { "version": [ @@ -44390,27 +45190,27 @@ "repo": "emacs-helm/helm-fish-completion", "unstable": { "version": [ - 20200509, - 1056 + 20200622, + 1255 ], "deps": [ "fish-completion", "helm" ], - "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09", - "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq" + "commit": "f055dab2f14462ff130841d4ab421f34baab39d5", + "sha256": "0hpsm39kx8vpz2zmarjrkvy1capkk5lwpsmdg2xnklsck6xsn922" }, "stable": { "version": [ 0, - 3 + 5 ], "deps": [ "fish-completion", "helm" ], - "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09", - "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq" + "commit": "f055dab2f14462ff130841d4ab421f34baab39d5", + "sha256": "0hpsm39kx8vpz2zmarjrkvy1capkk5lwpsmdg2xnklsck6xsn922" } }, { @@ -44524,15 +45324,15 @@ "repo": "rustify-emacs/fuz.el", "unstable": { "version": [ - 20200104, - 524 + 20200812, + 1222 ], "deps": [ "fuz", "helm" ], - "commit": "0b6b64cebde5675be3a28520ee16234db48d3b8b", - "sha256": "1bddjr3rpmvkrljq5ipjm42d59m2897cpfhmiah3rcb4c6ra40m1" + "commit": "fee874aa35d2ee6b12b836290b5c8eaa44175a28", + "sha256": "1xswm8my29i4fddy64k21b1vclbr5fjb0pisb4hs8ynkk5w1kw2a" }, "stable": { "version": [ @@ -44581,6 +45381,19 @@ "flx", "helm" ], + "commit": "152d54bcd7137e4f5df54cf213e578c9d71864bd", + "sha256": "1msnagb1mxxi9c64j54j9r95l98jha2n6qdgs236b953lz8d9wwf" + }, + "stable": { + "version": [ + 0, + 1, + 5 + ], + "deps": [ + "flx", + "helm" + ], "commit": "fc080a0b4be8a68944a64bc4fb5b38cd11a70bc7", "sha256": "01632zrpl69b034srgsfidf62r1kwc8f4z8i48kz95g5n2ax1xk9" } @@ -44895,14 +45708,26 @@ "repo": "kopoli/helm-grepint", "unstable": { "version": [ - 20161001, - 1413 + 20200811, + 1616 ], "deps": [ "helm" ], - "commit": "a62ca27515ff6a366b89b420500eb16d380cc653", - "sha256": "1v87v6a34zv998z1dwwcqx49476pvy9g5zml7w5vzfkms0l8l28w" + "commit": "9aec98428823b749eb14d2c8512b46b59ca9f8ca", + "sha256": "1fmpk9ynish20daajnx4c2s8bnlngb8sv3nwspxkk8fvv0c3p39i" + }, + "stable": { + "version": [ + 1, + 6, + 1 + ], + "deps": [ + "helm" + ], + "commit": "9aec98428823b749eb14d2c8512b46b59ca9f8ca", + "sha256": "1fmpk9ynish20daajnx4c2s8bnlngb8sv3nwspxkk8fvv0c3p39i" } }, { @@ -44931,26 +45756,26 @@ "repo": "emacsorphanage/helm-gtags", "unstable": { "version": [ - 20200409, - 1559 + 20200602, + 1610 ], "deps": [ "helm" ], - "commit": "25b81d7774622911c1e95d9020209ae4ace1542b", - "sha256": "14k0yrf8p015gsgdgq8ykvrjjhd1brq2gsfx7m3jv0p789yxw7zk" + "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb", + "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi" }, "stable": { "version": [ 1, 5, - 6 + 7 ], "deps": [ "helm" ], - "commit": "dbe0d2d9d08058d469ad2d729bd782515b5b3b62", - "sha256": "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx" + "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb", + "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi" } }, { @@ -45071,6 +45896,26 @@ "sha256": "1ih2pgyhshv8nl7hhchd4h0pbjgj45irp5dy1fq2gy05v4rn7wi4" } }, + { + "ename": "helm-icons", + "commit": "388e1c96b251fd68adc08288c9109dad19840bc7", + "sha256": "074s4pv0lgvcmvfqv34bsi45cy4rlskc6skmfffkflyf1kddpz1g", + "fetcher": "github", + "repo": "yyoncho/helm-icons", + "unstable": { + "version": [ + 20200719, + 1359 + ], + "deps": [ + "dash", + "f", + "treemacs" + ], + "commit": "d8c15dc61c1f321686b447e83abb17e14bc6f1c6", + "sha256": "0na4nks6l7917r64rc49b38lwsdj7wvslnnikms92882z5c8c6nn" + } + }, { "ename": "helm-idris", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -45295,16 +46140,16 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20171102, - 1454 + 20200620, + 915 ], "deps": [ "dash", "helm", "lean-mode" ], - "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c", - "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n" + "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd", + "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws" } }, { @@ -45371,14 +46216,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20191127, - 510 + 20200519, + 912 ], "deps": [ "helm" ], - "commit": "18c53b62bc758b9d8ad4e94a94f58d143ccb29db", - "sha256": "0r4dj6422g2zsbm2kig369j39lw4d68zpcr2xr02p02sfyhg1c0f" + "commit": "4da1a53f2f0a078ee2e896a914a1b19c0bf1d5ed", + "sha256": "12fi08w20yjsdfkxl1pk9q4w0z9l92va5fa5ghay9w33xlymc8dc" }, "stable": { "version": [ @@ -45450,16 +46295,29 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20200429, - 1457 + 20200808, + 713 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "6b5ce182d7c94c62b55b8f7d0c7e643b2c30e560", - "sha256": "0f6a26h1n6h0x3dal40180w3vb7gz3h8qwxvr3b0zq4f7byikisb" + "commit": "4263c967267b0579956b3b12ef32878a9ea80d97", + "sha256": "1j0w6391ivw7gyx03vmmhccj25d5p94dnbblhd6vxl8d22azdfq3" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "dash", + "helm", + "lsp-mode" + ], + "commit": "5c960e7800dc8f4432f3a1466a637d484b87dc35", + "sha256": "1vq3qpqm3ndqyvf5bk8qhqcr60x9ykc0ipk2a43rr3yjm4z1b6s9" } }, { @@ -45504,11 +46362,11 @@ "repo": "abo-abo/helm-make", "unstable": { "version": [ - 20200228, - 1742 + 20200620, + 27 ], - "commit": "a52b3a34ade00e695a412bc0c5873d4f4d22c323", - "sha256": "1jqihwh24f190zsc3a2xc7ja6j6q3nl742a0m9d6fiw28aijg34f" + "commit": "ebd71e85046d59b37f6a96535e01993b6962c559", + "sha256": "14jvhhw4chl94dgfwbyy7yirwchvcz5zrsgr9w6qy4z0fhqba41a" }, "stable": { "version": [ @@ -45693,10 +46551,10 @@ }, { "ename": "helm-notmuch", - "commit": "98667b3aa43d3e0f6174eeef82acaf71d7019aac", - "sha256": "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1k1kj5n6r32qc139ms5cvj5x5xpbd5v8c64j3jpcrmgg8d396f1m", "fetcher": "github", - "repo": "xuchunyang/helm-notmuch", + "repo": "emacs-helm/helm-notmuch", "unstable": { "version": [ 20190320, @@ -45800,8 +46658,8 @@ "org-multi-wiki", "org-ql" ], - "commit": "8b056103d6f5320563e9fd794a008fd4e0719702", - "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17" + "commit": "2541e1b0798a1c9d4b4b8778e6c97a579ac3fa14", + "sha256": "1mcpbq1qylkxpd6nzq04jrji6p1xll5a30dc7dpxpcjrkgvbzf39" }, "stable": { "version": [ @@ -45820,10 +46678,10 @@ }, { "ename": "helm-org-rifle", - "commit": "f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615", - "sha256": "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "05arqjadly6qf2slw8109wk828sd4f76spklpnxwjc98x01vacxw", "fetcher": "github", - "repo": "alphapapa/helm-org-rifle", + "repo": "alphapapa/org-rifle", "unstable": { "version": [ 20200512, @@ -46138,31 +46996,30 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20190731, - 1538 + 20200625, + 443 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "5328b74dddcee8d1913803ca8167868831a07463", - "sha256": "0a811cblrvc8llpv771b8dppgxs6bwjyvjy3qn2xns4nigvn93s0" + "commit": "2f3a2a03d6cb9419c25b432637aa11c8d2f9f3b7", + "sha256": "0h6r8v2lj6abjz73iv8568ijs7l37j76nf58h4p9r9ldpdigihzz" }, "stable": { "version": [ + 1, 0, - 14, 0 ], "deps": [ "cl-lib", - "dash", "helm", "projectile" ], - "commit": "1a90f93732f1a1e8080098d65eadd6a1cd799e31", - "sha256": "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4" + "commit": "5eb861b77d8e6697733def65288039df5be81a0e", + "sha256": "05gpg90gg03yalmv9fw1y9k21i2l617iipvs0p9n80aln8nrzs8g" } }, { @@ -46400,14 +47257,14 @@ "repo": "emacs-helm/helm-recoll", "unstable": { "version": [ - 20190729, - 453 + 20200805, + 1235 ], "deps": [ "helm" ], - "commit": "219e517dd79a7879414ca36e8de28a159a49c78a", - "sha256": "0yjz8g8v839fs42lmmjbm5l4yzkq9npjlb6jxz6nv5j71xvz5lbf" + "commit": "c021a3b5e8c010bdad062cceb80fb49788f89e9f", + "sha256": "09aj1hsj81vx761v5ai48hvl17i2i60gx3szk8qcmmpcn00m3ps7" }, "stable": { "version": [ @@ -46429,16 +47286,16 @@ "repo": "cosmicexplorer/helm-rg", "unstable": { "version": [ - 20190130, - 1734 + 20200721, + 725 ], "deps": [ "cl-lib", "dash", "helm" ], - "commit": "785a80fe5cc87e27c5ea3d00a70049028d9e2847", - "sha256": "1cfdnwlgwil7fp228p5sb3jkwrgnhnad4p2m1vl2wn0fjb89dppp" + "commit": "ee0a3c09da0c843715344919400ab0a0190cc9dc", + "sha256": "0m4l894345n0zkbgl0ar4c93v8pyrhblk9zbrjrdr9cfz40bx2kd" }, "stable": { "version": [ @@ -46537,8 +47394,8 @@ "helm", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -46623,10 +47480,10 @@ }, { "ename": "helm-sage", - "commit": "09760a7f7b3cff6551c394fc7b2298567ca88eb0", - "sha256": "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1v1j2ipmzxcflknzmy1asm2ifalj2yb5qiv24wi7a323izlaxy2m", "fetcher": "github", - "repo": "stakemori/helm-sage", + "repo": "sagemath/helm-sage", "unstable": { "version": [ 20160514, @@ -46674,6 +47531,35 @@ "sha256": "1n6sp6bhlz01b1d87cgrgxhap0ch1bkh7fl45dzidx5fjz9lccdf" } }, + { + "ename": "helm-selector", + "commit": "91193d76993bc65cc71bfa06148ef375b8034bd7", + "sha256": "19v1xvrbc9pn6ilbf28g4bjd4psmb34as6cjmksyaw5rn71ps2ay", + "fetcher": "github", + "repo": "emacs-helm/helm-selector", + "unstable": { + "version": [ + 20200808, + 858 + ], + "deps": [ + "helm" + ], + "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4", + "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "helm" + ], + "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4", + "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6" + } + }, { "ename": "helm-sheet", "commit": "010c5c5e6ad6e7b05e63936079229739963bf970", @@ -46886,16 +47772,15 @@ "repo": "jamesnvc/helm-switch-shell", "unstable": { "version": [ - 20191223, - 1418 + 20200817, + 1725 ], "deps": [ "dash", - "helm", - "s" + "helm" ], - "commit": "690e20f0d95f81151b34cb424a201f39d93eb430", - "sha256": "08p9dfjkf1ssnzd8n69a10mkvdvm8w229fy32z95dh9vbxsp7aqv" + "commit": "9cab3dfd2f006148e969555bc3bfb6456d1b3f84", + "sha256": "0z1785cw5sbcyqs2zbi35b5y6ac9lws1wxp89la7hwdlzwzk1c2a" } }, { @@ -46906,26 +47791,26 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20200515, - 417 + 20200814, + 448 ], "deps": [ "helm" ], - "commit": "2efc552591102ab8b4408ad60a3c4be991bb8e93", - "sha256": "0fbahbcgdcbmnhv3m2pmxy8n01qab5x0468bikygs80krch84qh5" + "commit": "1f7d3cf0d742b199e4ce13fcb8b19c977a44611e", + "sha256": "1r03d3ivmi0r5knsrlfx2cq5jljjl36h2l5n0mbs3sc6iad9wz20" }, "stable": { "version": [ - 2, + 3, 0, 0 ], "deps": [ "helm" ], - "commit": "c5ec1f3acfb07155273c2de021f3521e198e4a9d", - "sha256": "0k0ns92g45x8dbymqpl6ylk5mj3wiw2h03f48q5cy1z8in0c4rjd" + "commit": "533dcd14198b61fd2fbf8c6f286f65feae5b6bd2", + "sha256": "1qjay0fvryxa8n1ws6r1by512p2fylb2nj7ycm1497fcalb0d706" } }, { @@ -46943,8 +47828,8 @@ "helm", "seq" ], - "commit": "4e257fc84472d3d85ee2b413ca8a45aa0fd0118c", - "sha256": "1p89zggsqhif6dadajapq8vr9ffxbzq7v8sv8iaxyn0cg2sn6fdl" + "commit": "d6ad2f682d744048ea0ac47c470be5a159a6541b", + "sha256": "01zsl1g8r3rkgwpdphgmbljjnrhk6mmk2rjqhykjk5f3bdk02rwk" }, "stable": { "version": [ @@ -47181,6 +48066,24 @@ "sha256": "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz" } }, + { + "ename": "helm-wikipedia", + "commit": "317729c132a993dd14f25876f753c8f1636d7b91", + "sha256": "0wnyzqz0q79bl2fmq0wszkhv10wm7ydqvqy4mmi4hi78skqmykq6", + "fetcher": "github", + "repo": "emacs-helm/helm-wikipedia", + "unstable": { + "version": [ + 20200630, + 504 + ], + "deps": [ + "helm" + ], + "commit": "a6c8b1d1ab5dc0a69cb44bb5f3eb6792ef091147", + "sha256": "1him1sqdl15qfjqrkgmnhligwqc6a9liiqndssa1law3bd36c2jb" + } + }, { "ename": "helm-wordnet", "commit": "11626120951afc589beac4cf5a0f49bffa752349", @@ -47258,10 +48161,10 @@ }, { "ename": "helm-z", - "commit": "48c9b83fff8fc428d9d1ecf0005d47f2adb8cb00", - "sha256": "1m268zsr4z7a9l5wj0i8qpimv0kyl8glgm0yb3f08959538nlmd1", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "0vazbn8i0yz59310zq839jr86nwv6hh2mn1a9m8a7jv0l3121hzq", "fetcher": "github", - "repo": "yynozk/helm-z", + "repo": "zonkyy/helm-z", "unstable": { "version": [ 20171204, @@ -47426,21 +48329,6 @@ "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc" } }, - { - "ename": "heroku", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1wavsymviybfcmwdfrffbkdwbiydggx55jqg6ql79wf9bx7agacp", - "fetcher": "github", - "repo": "technomancy/heroku.el", - "unstable": { - "version": [ - 20120629, - 1813 - ], - "commit": "92af1c073b593c4def99c8777c869992aa4d0b3a", - "sha256": "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj" - } - }, { "ename": "heroku-theme", "commit": "348f0e7aec86c3efd87ab06849a5f1ce90ba23e2", @@ -47761,11 +48649,11 @@ "repo": "Lindydancer/highlight-doxygen", "unstable": { "version": [ - 20180829, - 1818 + 20200520, + 1713 ], - "commit": "53f2250018725fa19548e1771ee79fcc23641694", - "sha256": "0l6zh5cmp771h30i16bv3qvcq40pz9fxn3j7a8yx708vanb4d7kc" + "commit": "eec4874e2e89d4eb39091aad89a67dff8f8ec84c", + "sha256": "0r3rv1px43r265716l3g20c1ss4381h1mc1kjxin22vdmrj6cmxy" } }, { @@ -47806,11 +48694,11 @@ "repo": "DarthFennec/highlight-indent-guides", "unstable": { "version": [ - 20200412, - 2328 + 20200528, + 2128 ], - "commit": "1b12c7b440ff988c7237936187c1375ac4ddc7f4", - "sha256": "03dpwklrwbkminfds8v129w0i47p5mkwdyhlhv05a22xnmlanyrs" + "commit": "a4f771418e4eed1f3f7879a43af28cf97747d41c", + "sha256": "0zwp7kh10b0gxwp6128am94fwc5lmn73qar13qzyh3r1jsc8f95y" } }, { @@ -48050,10 +48938,10 @@ }, { "ename": "hindent", - "commit": "9a15a17a5aa78aed72958b2a1bde53f0c0ab5be7", - "sha256": "0az2zhdi73sa3h1q1c0bayqdk22a7ngrvsg9fr8b0i39sn3w8y07", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz", "fetcher": "github", - "repo": "commercialhaskell/hindent", + "repo": "chrisdone/hindent", "unstable": { "version": [ 20180518, @@ -48062,8 +48950,8 @@ "deps": [ "cl-lib" ], - "commit": "1583be4a8a01b765841f7306284528ae713abb7b", - "sha256": "1l8v3vq3yw7zr1yxyscfw8lggcf0klnyszhv18505c6myybp2dkp" + "commit": "50242bb64e946555defc9fff11ab32bcb05300b6", + "sha256": "0k062mswihnpl1h7r0w37siv57fi5k90956ji2vix9r9qc33zsxc" }, "stable": { "version": [ @@ -48283,14 +49171,14 @@ "repo": "laishulu/hl-fill-column", "unstable": { "version": [ - 20200404, - 306 + 20200607, + 757 ], "deps": [ "names" ], - "commit": "43cb3c35a92c912b7205b8a36f1ad0ec0a5b4a22", - "sha256": "0pf1hk21xbahccw1cdz95haqvhrf50cwg32qa36v9nammd37752z" + "commit": "5782a91ba0182c4e562fa0db6379ff9dd472856b", + "sha256": "0sfki2844yjlvnjlaia0n46af3c5y1bi74x91icwxccqwlkyg8jg" } }, { @@ -48341,20 +49229,20 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20200103, - 1239 + 20200813, + 1419 ], - "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9", - "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w" + "commit": "0598b98f63b623c1778cbd2e2f60b774b7a311b9", + "sha256": "1y57q3s6hrjd134mkwzcz5ii2jichvccpvc6bcj1vfl4d7yrxsal" }, "stable": { "version": [ 3, 1, - 1 + 2 ], - "commit": "5d2ea49f83a7e6953f9d71de94dee478d08f9543", - "sha256": "1v51mlq13wr890ijwcwf0ymmc768cipj7a1nvmbmwh7y4ymlrsgn" + "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9", + "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w" } }, { @@ -48406,8 +49294,8 @@ "deps": [ "cl-lib" ], - "commit": "f17360fe93de6df99a05b4b64b0a1ca4ee45abb6", - "sha256": "01sfba4sd3mjc7bs1y4qdzryfawg1xzg3hbwy9afwfaz0w5czni8" + "commit": "5646d9c0b9e7598b20b2004eab5439fdc6dbeda5", + "sha256": "1w442h5wzxylrbmqn1blpv2pmvyvq7avsk5h8xxsjfqw5580riri" } }, { @@ -48436,16 +49324,16 @@ "repo": "thanhvg/emacs-hnreader", "unstable": { "version": [ - 20200321, - 1900 + 20200726, + 654 ], "deps": [ "org", "promise", "request" ], - "commit": "5dd287e932e2398aab0f34cb23b99457b81ac370", - "sha256": "0ynq9dg00frk1sriraglzsszxpx51mpfdkbd1iqdz648rlhzyp3m" + "commit": "7ff808d4728ce4e269b6d99a73604063dd9b374a", + "sha256": "0kxx8pvl99qdbldsn6lvxj69j1jpmmc33wxcr2aw3h423ibcna3s" } }, { @@ -48456,11 +49344,11 @@ "url": "https://gitlab.lrde.epita.fr/spot/emacs-modes.git", "unstable": { "version": [ - 20191010, - 1132 + 20200610, + 1339 ], - "commit": "558e55429acde26423332a03a3b65b12efdbce5f", - "sha256": "0a6jagjimr00dvzrbxj078vyranmv14zl2vn4dkcww4swjzpaag9" + "commit": "18f5c981e256f867f29a93376ccdc04717b159cd", + "sha256": "1814si09xjimmn1a8yp6q13lz1lr6cwnaz7fqfszqcil8lldcwvx" } }, { @@ -48616,11 +49504,11 @@ "repo": "aodhneine/horizon-theme.el", "unstable": { "version": [ - 20200129, - 1957 + 20200720, + 1832 ], - "commit": "040d19abd397d2132508a50e1266e86d324f7c69", - "sha256": "04impsvfmna1vyssjs2id9hsk9cq7wx317z4h16wr1jvng6m1jig" + "commit": "9595549c514a9376c61d5d303405f6a6982e9e46", + "sha256": "1m7wwf17p7qa6dmm0qykz0qnqz7rxvxhsmn9287y8f6wahzd8yfb" } }, { @@ -48717,16 +49605,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20191118, - 2222 + 20200805, + 1739 ], "deps": [ "org", "promise", "request" ], - "commit": "23407fb7a950f08498b5586062ba69962a20ea24", - "sha256": "1hcwac7fjsshnjapb1hdh9x0liap4n1i5q6bsar5zanmz1h9i94q" + "commit": "6bf4d5964299c5b51a2299869c0402079869343b", + "sha256": "0rzyh71w5ccimzy1wm489sj96119bnn86mdfshhyk753h9ldjjgp" } }, { @@ -48893,11 +49781,11 @@ "repo": "hniksic/emacs-htmlize", "unstable": { "version": [ - 20191111, - 2130 + 20200816, + 746 ], - "commit": "86f22f211e9230857197c42a9823d3f05381deed", - "sha256": "0n117rb4d9dydl01b65d09rp8bmkir3m09zs02dhlmqmljpy25w8" + "commit": "49205105898ba8993b5253beec55d8bddd820a70", + "sha256": "0caw0wwbscfr4a9ynfabrpkvgibf0hlrkwisib82nhcqcaanf962" }, "stable": { "version": [ @@ -49107,11 +49995,11 @@ "repo": "nflath/hungry-delete", "unstable": { "version": [ - 20200309, - 209 + 20200807, + 2257 ], - "commit": "4a341cfa3a19185c5ecb687970e299082e1144e3", - "sha256": "1gwksvvizz3kdpfzgwp45l1idjbrn8kz4jf0zx4fva20mh6mjz01" + "commit": "671d941de0176255b79820a662d5a694607cf28a", + "sha256": "1cnbyixm1dihcvvfqx591qcjcrs963d2swn9rbrwkplm4a5fyxhf" }, "stable": { "version": [ @@ -49131,16 +50019,16 @@ "repo": "hylang/hy-mode", "unstable": { "version": [ - 20200508, - 502 + 20200730, + 2340 ], "deps": [ "dash", "dash-functional", "s" ], - "commit": "a18b0b8bfcd79a30bfe9ef960244ec6748a9430d", - "sha256": "0vvwilfj1sv7r1xsv7m6w0qc3077jfaflwxmq54dmrbw6qypqx1f" + "commit": "55e84cadbdb63427a8d531992df3990414a26688", + "sha256": "0mrml5cy3isgy5mybxm8mrzqcrxrw4nn9yxchyjakkqzvfjk8gm1" }, "stable": { "version": [ @@ -49187,6 +50075,21 @@ "sha256": "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm" } }, + { + "ename": "hybrid-reverse-theme", + "commit": "efea6a0ea9176f61cb5a97f5fdce22b3ba28894e", + "sha256": "1lfssdga5y1h42qqbr1lg4rjb8rn8kkv0yxbqyxfv1w1yybn924l", + "fetcher": "github", + "repo": "Riyyi/emacs-hybrid-reverse", + "unstable": { + "version": [ + 20200819, + 240 + ], + "commit": "18b1b786fb4346ad31ec76df75cb672ef5cc7cbf", + "sha256": "03wgxhly8n3j05l9k3pzixczj4xzqd499k0l3d4nngsxps2v67w3" + } + }, { "ename": "hydandata-light-theme", "commit": "51edfd2eed17b79058bbef836bc3edff50defa6e", @@ -49242,15 +50145,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20200504, - 1747 + 20200711, + 1210 ], "deps": [ "cl-lib", "lv" ], - "commit": "87873d788891029d9e44fa5458321d6a05849b94", - "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g" + "commit": "112e689f75b59398d8eca79ac6562dca12b8a959", + "sha256": "0famsjgsgd61fm3l5m9mqg4szf8lcgcb57paxlg8rxnsmxmwga7d" }, "stable": { "version": [ @@ -49266,6 +50169,21 @@ "sha256": "0fapvhmhgc9kppf3bvkgry0cd7gyilg7sfvlscfrfjxpx4xvwsfy" } }, + { + "ename": "hyperlist-mode", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0c3jdwbarxvnczfx2g3g1m53kiyjls7l48s6l4bzxl2w4x8axvsw", + "fetcher": "github", + "repo": "Vifon/hyperlist-mode", + "unstable": { + "version": [ + 20200515, + 2209 + ], + "commit": "374cdc04761df23e7a50ca276319ba9745cda9d7", + "sha256": "11940wmzhnj6yxgdkadkwak4k9gad4y1bbf0k39sca13j10j48n7" + } + }, { "ename": "hyperspace", "commit": "0696a12acba676015640de63fc6e011128bca71c", @@ -49334,11 +50252,11 @@ "repo": "mkcms/interactive-align", "unstable": { "version": [ - 20181202, - 1146 + 20200711, + 1117 ], - "commit": "e1308c8f6aea05ad6dbcaa33b9bee4eb7e05ee39", - "sha256": "0b7a2z4v1nyyaw0lvql9xrakpsi1a6kflqr74k56ndm3ivmqwx09" + "commit": "eca40b8b59ea713dba21b18f5b047a6c086b91dc", + "sha256": "1nvj47d62dffgry0dy08m8rz5fqsrn1yhmkmp5jn57fyhbk6nfal" }, "stable": { "version": [ @@ -49411,14 +50329,14 @@ "repo": "purcell/ibuffer-projectile", "unstable": { "version": [ - 20200304, - 2205 + 20200805, + 604 ], "deps": [ "projectile" ], - "commit": "504b0edaa0d937ce60ccc8fdf09f2dae0a90fbaf", - "sha256": "18cqxnwzzbkcj9jcaw89b210432yzhrl1dwsv48p0jbhfnr17k41" + "commit": "ecbe482804a217b1471593f6c7a8b3d64f3cdc47", + "sha256": "0gcars1zmfrysq1n3bv40nwqsk821bz3pffrsjw14fg2mwjpmaxq" }, "stable": { "version": [ @@ -49497,14 +50415,14 @@ "repo": "purcell/ibuffer-vc", "unstable": { "version": [ - 20200304, - 2207 + 20200805, + 604 ], "deps": [ "cl-lib" ], - "commit": "1249c1e30cf11badfe032ac3b1058f24ba510ace", - "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5" + "commit": "5fa6aea09bc67f71ea743302d609f459967b1e81", + "sha256": "03xkhr8vq741pgbv0b184j5ksqhhdvb7pzwa1arpymsarc6hjwsy" }, "stable": { "version": [ @@ -49526,14 +50444,26 @@ "repo": "conao3/iceberg-theme.el", "unstable": { "version": [ - 20200515, - 934 + 20200812, + 943 ], "deps": [ "solarized-theme" ], - "commit": "9615307cbd37e698d6939a04128162ef893313cb", - "sha256": "02lsbzk5215z1rdvs6idnv2yff2487i4pqi1ljdjfn3g43ly5lr2" + "commit": "183b41eae07d94d4a8f299306078410bddc41d34", + "sha256": "1sxadaip63mhfjvgkax45jlv3c8cnbjnq653qbvw98vb8xsrmjc4" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "solarized-theme" + ], + "commit": "04b8d04c30276a471b37ff93d73409508e88d295", + "sha256": "13m6sq3ld8cm28jq7kxmv4ygrvyi7pjh1lsxwzvgaj6ncjqdi87v" } }, { @@ -49544,19 +50474,19 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20200504, - 1916 + 20200616, + 2322 ], - "commit": "fe835acce91b0f088c8d27801bf42e24bb2dbab5", - "sha256": "1az3m6zwrggj4w2lh5qhnbh09dvxpyj5m2a85yhcha2p7g1hpym1" + "commit": "a5871d39c5850ac4d9aac48350eaa1d31f3aaef7", + "sha256": "00sp2n8kb38nrkgs11m3jpijj9qnsdmy3sp37c1v6p7lgnzly80i" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "a2ee9254085431ec9e5c88d522e2c700355003ef", - "sha256": "1bqnlvv1gvrjriazvzd3bq98r8ii6fqax0zznhvkl1ij5pf55a90" + "commit": "2c328a19f617b538986977a897d3af051ae7f355", + "sha256": "1bm02qd71r3j35b861rgbxkv3kcmg2458c70vwfaw9sjjba0ssng" } }, { @@ -49747,24 +50677,6 @@ "sha256": "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp" } }, - { - "ename": "ido-clever-match", - "commit": "add68b4815cdfe83402b217595a4a46068f83a2a", - "sha256": "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m", - "fetcher": "github", - "repo": "Bogdanp/ido-clever-match", - "unstable": { - "version": [ - 20151011, - 1726 - ], - "deps": [ - "cl-lib" - ], - "commit": "f173473e99c8b0756f12e4cc8f67e68fa59eadd3", - "sha256": "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6" - } - }, { "ename": "ido-complete-space-or-hyphen", "commit": "59e11094068d3a0c0e4edc1f82158c43d3b15e0e", @@ -49796,16 +50708,16 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20200310, - 25 + 20200520, + 1535 ], "deps": [ "cl-lib", "memoize", "seq" ], - "commit": "98d3a6e56b1d3652da7b47f49f76d77f82ea80ba", - "sha256": "0rmqyxb0cr3avm6lzz26r2d9fmja2csrh3whmky8h2giz79mjf7d" + "commit": "b9ca2566b867464c25b720e2148d240961c110e7", + "sha256": "1vkk311wghhnkmybv3h5a6hf3vxlgy03iqzwl6xyxdw3hgip8in5" }, "stable": { "version": [ @@ -49821,36 +50733,6 @@ "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj" } }, - { - "ename": "ido-describe-bindings", - "commit": "31b8e255630f1348a5b5730f7b624ad550d219ad", - "sha256": "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2", - "fetcher": "github", - "repo": "danil/ido-describe-bindings", - "unstable": { - "version": [ - 20161023, - 1102 - ], - "deps": [ - "dash" - ], - "commit": "a814e25cb272401bdfee94cb98d915119d307414", - "sha256": "040mpwwldivyapmj0pjxsk8drgi113k7rpx8ym4jqz1hah5n33s1" - }, - "stable": { - "version": [ - 0, - 0, - 11 - ], - "deps": [ - "dash" - ], - "commit": "a142ff1c33df23ed9665497d0dcae2943b3c706a", - "sha256": "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw" - } - }, { "ename": "ido-exit-target", "commit": "b815e7492eb0bd39c5d1be5a95784f9fe5612b62", @@ -50007,36 +50889,6 @@ "sha256": "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr" } }, - { - "ename": "ido-occur", - "commit": "8a576d8569bf82be01e7d50defcc99a90aab1436", - "sha256": "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji", - "fetcher": "github", - "repo": "danil/ido-occur", - "unstable": { - "version": [ - 20160820, - 1440 - ], - "deps": [ - "dash" - ], - "commit": "6a0bfeaca2e334b47b4f38ab80d63f53535b189e", - "sha256": "0q4w0akmnwk42ldbzqxbr7swz026q8wr1g27bl4i4k25bidqlx9q" - }, - "stable": { - "version": [ - 0, - 2, - 0 - ], - "deps": [ - "dash" - ], - "commit": "b0e67fe4835c162cbcf8a982bdf377955b9ac5ae", - "sha256": "13f21vx3q1qbnl13n3lx1rnr8dhq3zwch22pvy53h8q6sdf7r73a" - } - }, { "ename": "ido-select-window", "commit": "775c8361322c2ba9026130dd60083e0255170b8f", @@ -50184,28 +51036,27 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20190427, - 1539 + 20200522, + 808 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "acc8835449475d7cd205aba213fdd3d41c38ba40", - "sha256": "0n9xbknc68id0mf8hbfmawi8qpvrs47ix807sk9ffv2g3ik32kk6" + "commit": "b77eadd8ac2048d5c882b4464bd9673e45dd6a59", + "sha256": "1v8av6jza1j00ln75zjwaca0vmmv0fhhhi94p84rlfzgzykyb9g1" }, "stable": { "version": [ - 0, - 9, - 19 + 1, + 0 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "314a0baea5752069de08e814bb134a9643fb675d", - "sha256": "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92" + "commit": "b77eadd8ac2048d5c882b4464bd9673e45dd6a59", + "sha256": "1v8av6jza1j00ln75zjwaca0vmmv0fhhhi94p84rlfzgzykyb9g1" } }, { @@ -50231,11 +51082,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20200412, - 756 + 20200807, + 853 ], - "commit": "0fb3d380866664c3ab543acede606d343c257406", - "sha256": "0fz3p41j6d6bwk95v626j7w1z4rvbdxms6a4azy9dfncplnbnih0" + "commit": "59430e8c11c1fa9a294a070a3b1d571bd3887806", + "sha256": "1phm9n25hdg7v7gjjb5l173hrsgb64rc5frmdpchkd7li4ka4g91" }, "stable": { "version": [ @@ -50271,19 +51122,19 @@ "repo": "jrosdahl/iflipb", "unstable": { "version": [ - 20190817, - 547 + 20200731, + 1655 ], - "commit": "aeeb85633566ed3c13dbe94a6a4925d8930b7b85", - "sha256": "07010alf6ymhs0nyj3arafksba0rdvgzjw9wqqhayzw6qqannbb2" + "commit": "d48884212499cd128d103c5ceba3173a90ebd2b4", + "sha256": "0qbdaf41zpm846jjkr9sgarb7iivpvb1qj5izsd5v4w1sz6igwf4" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "a5ad1fbd1173cff5228dab265515c92c0778f86a", - "sha256": "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2" + "commit": "83e698f312a6e621f6d2c87b27d1e4acce96b4bf", + "sha256": "1nnkxzf35gx6a7a2xjf73wc5jzzpg4x0hj96jb3j6rim19yrfs8f" } }, { @@ -50545,14 +51396,14 @@ "repo": "alezost/imenus.el", "unstable": { "version": [ - 20180505, - 1717 + 20200730, + 855 ], "deps": [ "cl-lib" ], - "commit": "149cfa579ee231014d3341a0e05add69759757a5", - "sha256": "00licvs457wzqq06a8cx7vw22kyqky20i7yq7a2nzf3cfl7vaya7" + "commit": "90200f5f22377903b405082eabe185447968f3e2", + "sha256": "04zhyn69bihxqddzsn9j0l6lxjpqkgdvbslh77cfdb4fp02cxsp1" }, "stable": { "version": [ @@ -50592,20 +51443,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20200308, - 1330 + 20200818, + 638 ], - "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441", - "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9" + "commit": "d7f18842f5e97977684c3dbb550c418b7625b343", + "sha256": "0gfw8fdl1wh7m2p449qxs2kfixqbhl4lc4zgmx1l3llv1kdq9qkw" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 5 ], - "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441", - "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9" + "commit": "d7f18842f5e97977684c3dbb550c418b7625b343", + "sha256": "0gfw8fdl1wh7m2p449qxs2kfixqbhl4lc4zgmx1l3llv1kdq9qkw" } }, { @@ -50655,15 +51506,15 @@ "repo": "skeeto/impatient-mode", "unstable": { "version": [ - 20200327, - 1619 + 20200723, + 2117 ], "deps": [ "htmlize", "simple-httpd" ], - "commit": "fc84f4a333d47ca853842570cf35e659753a3ebe", - "sha256": "14zycqky7xkmbfacmfdqbmq1qs3sj2r41nfmg09dv0hl97pavir8" + "commit": "cbddfd54242210df3e1c3b590fada5bb5423f5ed", + "sha256": "14jnni828ndl1sj92cy49r0aa6y8qwqbm2rrxc87j0yfn5sdckc7" }, "stable": { "version": [ @@ -50753,8 +51604,8 @@ "epc", "f" ], - "commit": "86f17856db194c5f18b30f35df40fb029d5544b5", - "sha256": "0cak79lnlbfigl6lh3c5wzphxssq78vyd9xxj3zi7ln5q9ijl6pp" + "commit": "701dfcca5f3ab42be0f26a8d381d7116c79be850", + "sha256": "035830aizamh4c8hpnmfrbz9v9gy23d3nx0dv366l3q8mrh36l44" }, "stable": { "version": [ @@ -50823,15 +51674,15 @@ "repo": "conao3/indent-lint.el", "unstable": { "version": [ - 20200129, - 2046 + 20200812, + 949 ], "deps": [ "async", "async-await" ], - "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797", - "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29" + "commit": "c55f4ded11e8e50a96f43675a071354a8fb501c3", + "sha256": "0d7vkgzsx6ka4zliscsg6drqhg2bj16i911ryzmsp4v6hj294jrc" }, "stable": { "version": [ @@ -50962,26 +51813,26 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20200425, - 1648 + 20200801, + 1128 ], "deps": [ "clojure-mode" ], - "commit": "f29861204ddbb032b425c7d693e8c006b7b027c6", - "sha256": "127kl64hqdy04qdbqr1xfzky3d8fzgbmp7z4hv6mjsc0p4s19azw" + "commit": "2c8e46b584be71fe1a585c9072da86382710dc59", + "sha256": "13rk3g58vaizp67c1plhfc80vsshdvvsz81wsf3076xp35p05w9b" }, "stable": { "version": [ - 2, - 2, + 3, + 0, 0 ], "deps": [ "clojure-mode" ], - "commit": "ff72d667c2709166d19ac15a36f7aac3423cefa1", - "sha256": "07l8wkm0j6y2cj7bbb24x4rkjgf4q6ag0c1kcjs0sfmf1kaf14bk" + "commit": "2c8e46b584be71fe1a585c9072da86382710dc59", + "sha256": "13rk3g58vaizp67c1plhfc80vsshdvvsz81wsf3076xp35p05w9b" } }, { @@ -51037,11 +51888,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20200327, - 1418 + 20200730, + 1456 ], - "commit": "41e5ed3a886fca56990486f1987bb3bae0dbd54b", - "sha256": "12qgd2p664rh0ks5kq6sxaqi5nlmxrzj5p0kpqrx40caicj6jfpl" + "commit": "9f0f79ff459c7c417e8931ca020db121e24b45b5", + "sha256": "0h0kxgihjrabklnwfphaf86b67q0wmfjywffrydhdmlidi56rbis" }, "stable": { "version": [ @@ -51177,11 +52028,11 @@ "repo": "dieter-wilhelm/inform", "unstable": { "version": [ - 20200512, - 1351 + 20200723, + 500 ], - "commit": "54e0c51960c7f50de31a6831c034ea6adc5a8892", - "sha256": "0j3hc3f7yx9dklbvvwpcq0d2n3lp0z47l5066ngvmm52aihhhiyd" + "commit": "8ff0a19a9f40cfa8283da8ed73de94c35a327423", + "sha256": "1rg3v554zjx1mrw1wz2agfrr9317fzj1bqkn82m9r4ys91gx1qh4" }, "stable": { "version": [ @@ -51269,11 +52120,11 @@ "repo": "emacs-jp/init-loader", "unstable": { "version": [ - 20160528, - 1315 + 20200520, + 2345 ], - "commit": "5d3cea1004c11ff96b33020e337b03b925c67c42", - "sha256": "17bg4s8yz7yz28m04fp2ff6ld0y01yl99wkn2k5rkg4j441xg3n2" + "commit": "44829fa70f5c4cba03d36db5fa2c969001325b91", + "sha256": "1863s0qvnh7hcy2f86d86zajkqldvnz71q16dd9b4wvgnnicwk8s" }, "stable": { "version": [ @@ -51333,17 +52184,26 @@ }, { "ename": "ink-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "02q95xay6z56i4l0j24dszxnfpjbxijlj4150nsadbv55m7nnjcf", + "commit": "8e5ed03afe02f3a53150c6046b8d6bfc12c9eea0", + "sha256": "027k27w9yjzmf6rm9ax2njf9aq4j1y4fa4i5388lf1mf8za9sv2s", "fetcher": "github", "repo": "Kungsgeten/ink-mode", "unstable": { "version": [ - 20160814, - 1116 + 20200611, + 1807 ], - "commit": "e35f26abbaf8ea23c5aa0a0c7ef15334cdfb7b48", - "sha256": "0ixqgk101gnm2q6f2bjk2pnqlrj41krqz56lss6fmf81xhxavmpp" + "commit": "f610a2e7a5a5b176bdc831c66e52f85dc0e7e450", + "sha256": "0bssmf9nsg58xavf55wz1y7akw90bacxqd2czhmj4fnmykqd7cnz" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "commit": "f883fefb739d62e75a3f7247ea5c6ba8a0895c23", + "sha256": "1hr1n0xzjs84a2rgz4mfhhz3d2a7ibgn3wx4kg3qbjlwlwz17x0d" } }, { @@ -51354,11 +52214,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20200515, - 421 + 20200616, + 434 ], - "commit": "0f289a3f465728ed41d532674166eef09ac7209b", - "sha256": "1bchvrmmcbw8ird7i1klz0ds2xkfmwccz2pp59ixgys0j8cxnq4b" + "commit": "0a5f50c3aa590404ae81cdb08eb869ffc04da625", + "sha256": "0hnhq51r0rrl2i3hiwzqzax6cwm3j480w1w2nn8hy61x5p37wn06" } }, { @@ -51423,6 +52283,33 @@ "sha256": "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q" } }, + { + "ename": "insert-esv", + "commit": "de7f7ac1b8e67da50a1bce7f23a0805f8b8dfc06", + "sha256": "02s0jikma4qp38pf46jw0l6mqlx9kkfl7ny9zxzr6w2jmi8nc9nr", + "fetcher": "github", + "repo": "sam030820/insert-esv", + "unstable": { + "version": [ + 20200808, + 1832 + ], + "deps": [ + "request" + ], + "commit": "cf23d1d7e230c0b9212f8eeceff398f86c991b07", + "sha256": "0jqz6krd8b606nqr4q169qcg7dbbwa86gi2rcxvnx5i3jhfhrmab" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "8a09629bfafa87f8cd75e92fee6655cfa8be67f2", + "sha256": "00w9k2r07nyzqrbqp9q77jgx1h976d1gmiq2nv6zxm36sqfvr0xl" + } + }, { "ename": "insert-kaomoji", "commit": "216fcef758036cf466fa5b52599394709eed48b3", @@ -51601,10 +52488,10 @@ }, { "ename": "intero", - "commit": "1b56ca344ad944e03b669a9974e9b734b5b445bb", - "sha256": "15n7ipsq8ylmq4blsycpszkx034j9sb92vqvaz30j5v307fmvs99", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1a25lsm1psjvn9az3vd0an46p9qwrrmn09r16dqnhsjcaiabinxi", "fetcher": "github", - "repo": "commercialhaskell/intero", + "repo": "chrisdone/intero", "unstable": { "version": [ 20200125, @@ -51760,14 +52647,14 @@ "repo": "dotemacs/ipcalc.el", "unstable": { "version": [ - 20170926, - 805 + 20200809, + 1444 ], "deps": [ "cl-lib" ], - "commit": "2720f7e3e662e04e195f8338b81a499cf321296a", - "sha256": "1kmqbb9ca3sca59462ha21grbgxkl4wynz2lr4yqb4qk7cijgd6g" + "commit": "58b2b6c90af93ae46c5445b33ee4d1ef4bac1efb", + "sha256": "0v6ahhixp57p94m0sagidvq95m45bf4lfwszjzsn7a2wcrvap7r9" } }, { @@ -51840,11 +52727,11 @@ "repo": "a13/iqa.el", "unstable": { "version": [ - 20181024, - 2253 + 20200520, + 1137 ], - "commit": "b45614f5204ed851de0abe93907aa94de5e37379", - "sha256": "11wrmiwlp91x59cn9k2j2pqgvzbrnzvf81dqgm9l5ph5fym0jqsd" + "commit": "c1077aca6553cb2011f21b178e10271a17fe4f58", + "sha256": "0rr8m477hma3aaqxzmsayms6qgpf3ff1vx5bgcvbz27ddri375hh" } }, { @@ -51901,8 +52788,8 @@ "cl-lib", "json" ], - "commit": "5f75fc0c9274f4622470e2324e2f4457087aa643", - "sha256": "107ry1jxl7qiqa0ackn03whygndkabg20s7szl5xm1l87vx5xghc" + "commit": "1e1aabaa686a08767ab33e5cd43ce8f0ebf8d020", + "sha256": "1v3q0k93sviv2nn6qsi8f0537w2g0g6c3wamaidlcb019a5rj4vn" }, "stable": { "version": [ @@ -51926,15 +52813,15 @@ "repo": "ikirill/irony-eldoc", "unstable": { "version": [ - 20170502, - 1908 + 20200622, + 2214 ], "deps": [ "cl-lib", "irony" ], - "commit": "0df5831eaae264a25422b061eb2792aadde8b3f2", - "sha256": "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd" + "commit": "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978", + "sha256": "0nwwghsdv11bxqar4ppraxxmm6i076s7nmi9l2c53m708xn4p6pi" } }, { @@ -51963,26 +52850,26 @@ "repo": "jcs-elpa/isearch-project", "unstable": { "version": [ - 20190505, - 819 + 20200717, + 807 ], "deps": [ - "cl-lib" + "f" ], - "commit": "4d660afa365c82c3ed00f685b53f0d2358972d36", - "sha256": "0klngpw69kdh3l9jrvjq63xlgpqd86j8rrvivrzipddmplppz9gy" + "commit": "9113d9452a9a879dc0e503f35e8c1fb4d44d9b64", + "sha256": "0gvr758kbfxcvrcwkvf8msibwbfqfp44zl99s7ls0gi81pgzwryj" }, "stable": { "version": [ 0, - 0, - 7 + 2, + 4 ], "deps": [ - "cl-lib" + "f" ], - "commit": "462b8100451b947367aed2970c2669ea6d15edbd", - "sha256": "0b8ncpi6kps7fx3fmgfwd2czaal52laf2k6pn46yh110sz6dl30m" + "commit": "9113d9452a9a879dc0e503f35e8c1fb4d44d9b64", + "sha256": "0gvr758kbfxcvrcwkvf8msibwbfqfp44zl99s7ls0gi81pgzwryj" } }, { @@ -52132,20 +53019,19 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20200512, - 2111 + 20200517, + 1623 ], - "commit": "b87c1e8ac50f728e8d33b5b69bf4124ef90b88ba", - "sha256": "09yasj1vfakryjvs22a3gd27wwa866b2pkvajwp8hlngk11sc3p3" + "commit": "987045585d60700b4b9e617313c1a73618a144c9", + "sha256": "0gaq3z2v1q4r9mkyq71dzmqakhi0p8g7ph4z0n3a11rvyc3z9ykx" }, "stable": { "version": [ - 0, - 9, - 11 + 1, + 0 ], - "commit": "a6e228eefed8dd6a405c235c15e7a4ea726cae02", - "sha256": "1n65202ap7qf44mv8f3ly5msp9fn12ap3cckhqb62ib3yw46ilwk" + "commit": "987045585d60700b4b9e617313c1a73618a144c9", + "sha256": "0gaq3z2v1q4r9mkyq71dzmqakhi0p8g7ph4z0n3a11rvyc3z9ykx" } }, { @@ -52205,17 +53091,17 @@ }, { "ename": "ivy", - "commit": "06c24112a5e17c423a4d92607356b25eb90a9a7b", - "sha256": "0xf5p91r2ljl93wbr5wbgnb4hzhs00wkaf4fmdlf31la8xwwp5ci", + "commit": "de5b4f40470cdfb4d2b4b3078436a7457f5703af", + "sha256": "0lrf3xxxi3b78z80sg6jkaz07gzqrv242ajiiy0rvly6da17i06z", "fetcher": "github", "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200515, - 1845 + 20200818, + 1250 ], - "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", - "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" }, "stable": { "version": [ @@ -52227,6 +53113,25 @@ "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" } }, + { + "ename": "ivy-avy", + "commit": "d820ccd91bcd265539276baedb656ab63d4a9c75", + "sha256": "1zanwbf0jcbi0v07n2j058r814dh0qs2qxmwlqrv12j7d1w72kd4", + "fetcher": "github", + "repo": "abo-abo/swiper", + "unstable": { + "version": [ + 20200615, + 938 + ], + "deps": [ + "avy", + "ivy" + ], + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" + } + }, { "ename": "ivy-bibtex", "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", @@ -52294,15 +53199,15 @@ "repo": "wandersoncferreira/ivy-clojuredocs", "unstable": { "version": [ - 20190907, - 2053 + 20200714, + 1111 ], "deps": [ "edn", "ivy" ], - "commit": "dd33a25f1de4339f75f05689ed60fe1b1c97f554", - "sha256": "0km1par5jhhbdbn1sccpsz0drqvmmjg1905xyc2bbfc2xx38cg1i" + "commit": "0ea57b70a144ecfa80fbd2ec383ebabedb524c37", + "sha256": "1hqs45573651jw248zcyczby4fwp4pdgil2n9rk4lvgb89531qlz" } }, { @@ -52339,11 +53244,30 @@ } }, { - "ename": "ivy-emoji", - "commit": "f1121a85321a3184d1fa990ae86f5d1f3b04f145", - "sha256": "0sp8z7r1kffgfm4jrn5cqfi335vaynn27hs9345ybrxi3r4a3c0g", + "ename": "ivy-emms", + "commit": "12b434e4c78b3428ee144559cb57ea41df8fb4c5", + "sha256": "1kqjdw94f2mg5m0zcnah1xk59dp152dm4si2rd9c66jn79s2ai4a", "fetcher": "github", - "repo": "sbozzolo/ivy-emoji", + "repo": "franburstall/ivy-emms", + "unstable": { + "version": [ + 20200629, + 801 + ], + "deps": [ + "emms", + "ivy" + ], + "commit": "6f547f9f3dcbf0d5b88595760b3505c7195dc96b", + "sha256": "0bqn0hqdrw8psc8r6xcx6dxrjy7llkfpm0fd1k6ra4ybncgaznfg" + } + }, + { + "ename": "ivy-emoji", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "037r1j2s632a1v05gynlclh6slnhp6mxn55fyx02qw1507l5ap74", + "fetcher": "github", + "repo": "Sbozzolo/ivy-emoji", "unstable": { "version": [ 20200316, @@ -52518,15 +53442,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200421, - 1120 + 20200608, + 1010 ], "deps": [ "hydra", "ivy" ], - "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", - "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" }, "stable": { "version": [ @@ -52550,15 +53474,15 @@ "repo": "julienXX/ivy-lobsters", "unstable": { "version": [ - 20171202, - 2041 + 20200818, + 1406 ], "deps": [ "cl-lib", "ivy" ], - "commit": "4364df4b3685fd1b50865ac9360fb948c0288dd1", - "sha256": "1cfcy2ks0kb04crwlfp02052zcwg384cgz7xjyafwqynm77d35l0" + "commit": "3f7f90751d15ebcf91253ef3cda18c0aa7d856ff", + "sha256": "034ln7r1fgsgpxgmk4iv08pkjkxmdc0c0q44hqv2ryb1zkbwija1" } }, { @@ -52603,45 +53527,15 @@ "repo": "akirak/ivy-omni-org", "unstable": { "version": [ - 20200125, - 807 + 20200810, + 1050 ], "deps": [ "dash", "ivy" ], - "commit": "113477ae46ec857c5794fc0a031c1e579615f0a9", - "sha256": "1j9gwl3azh6y24yiy2s9p9yh6vhs2rmydv2496ivwxqnq9md5b49" - } - }, - { - "ename": "ivy-pages", - "commit": "93f1183beb74aa4a96de8cd043a2a8eefdd7ad7e", - "sha256": "0zz8nbjma8r6r7xxbg7xfz13202d77k1ybzpib41slmljzh7xgwv", - "fetcher": "github", - "repo": "igorepst/ivy-pages", - "unstable": { - "version": [ - 20160728, - 1920 - ], - "deps": [ - "ivy" - ], - "commit": "47b03a1f9384502cf22369ff31a2898c863d3aff", - "sha256": "0jv74s8jn1sdwdhxkx11gnaqcc49369gld1g6a1hl62521j897rc" - }, - "stable": { - "version": [ - 0, - 1, - 1 - ], - "deps": [ - "ivy" - ], - "commit": "428a901f94c9625c8407fd2bf76f9d7714d40d87", - "sha256": "11lcv8dqlmfqvhn7n3wfp9idr5hf30312p213y5pvs4m70lbc9k2" + "commit": "a6b284f65b229d9b118b4316c2f6377de93400b1", + "sha256": "028c51z4glxxrni1vjdzs9l1475jmcjagpgwaryiqdwx6clia59x" } }, { @@ -52690,15 +53584,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20200331, - 536 + 20200528, + 553 ], "deps": [ "ivy", "posframe" ], - "commit": "ae9bafe94fe6b77b6fe45766ae6172646f6a5d50", - "sha256": "1j6yns5d7lh2v1nfcznrirl7qicdli9csciqvfgj4gkh72a97pw1" + "commit": "44749562a9e68bd43ccaa225b31311476fab1251", + "sha256": "12wj8v483jjnpjvcgkhlm0p971s06c58c3fd73pgnzzppf0fn7xd" } }, { @@ -52709,27 +53603,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200415, - 1457 + 20200716, + 1414 ], "deps": [ "ivy", "prescient" ], - "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", - "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" + "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530", + "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p" }, "stable": { "version": [ - 4, - 1 + 5, + 0 ], "deps": [ "ivy", "prescient" ], - "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", - "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", + "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" } }, { @@ -52771,14 +53665,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20200428, - 110 + 20200601, + 104 ], "deps": [ "ivy" ], - "commit": "3f818b201769bc13cc75aa73645217e374136aca", - "sha256": "19w1mmqg15xy963f2h50i0cz0gmii75yarkmv2ssfh164pkyvhdk" + "commit": "10970130b41c6ef9570893cdab8dfbe720e2b1a9", + "sha256": "0zpkgj2q16hncafpbap32ypm3666j2vvcrwsn78mca9i82j7xg7l" }, "stable": { "version": [ @@ -52808,8 +53702,8 @@ "ivy", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -52886,8 +53780,8 @@ "repo": "mkcms/ivy-yasnippet", "unstable": { "version": [ - 20181002, - 1655 + 20200704, + 700 ], "deps": [ "cl-lib", @@ -52895,8 +53789,8 @@ "ivy", "yasnippet" ], - "commit": "ebf05761cd890bccd8072051f988dae7ab11c9ce", - "sha256": "01dc8hv464r3q3d6whix76sqwfkjcvhdg55jmw0ck9jwmhwsvc7x" + "commit": "83402d91b4eba5307f71884a72df8e11cc6a994e", + "sha256": "07a4bk3hva41qzz8x4qyswa2f89psxhih89k0slhngw5d8iidx3i" } }, { @@ -53075,11 +53969,11 @@ "url": "https://bitbucket.org/sbarbit/jack-connect", "unstable": { "version": [ - 20200325, - 1639 + 20200519, + 1027 ], - "commit": "c227d1ed3016960c8666a60e4215bbb029436bc7", - "sha256": "1w66dpn0cmdqwgjd1528cd2739ijxhsr62zyx2arlr9ldrnqy5f6" + "commit": "fae8c5f9b383f7606f3883badfd1294e8affb0db", + "sha256": "0r6dihw5dar7w6h5xvif25fv9alwarb74mmaxq2ld8rbhv4il66c" } }, { @@ -53163,33 +54057,6 @@ "sha256": "041rww8ngvjmgkiviqwq6wci8wgh4bs0wjjc8v8lqpwqhbzf65jy" } }, - { - "ename": "japanlaw", - "commit": "6192e1db76f017c3b1315453144cffc47cdd495d", - "sha256": "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa", - "fetcher": "github", - "repo": "mhayashi1120/japanlaw.el", - "unstable": { - "version": [ - 20160615, - 643 - ], - "deps": [ - "cl-lib" - ], - "commit": "1bbdef942f28c61a0adb89d1b3c2cca5b10ca2dc", - "sha256": "1vj5b551383acp77lawvlw5cfvnqidjhd52sig3kz8v4bzz73cch" - }, - "stable": { - "version": [ - 0, - 9, - 1 - ], - "commit": "d90b204b018893d5d75286c92948c0bddf94cce2", - "sha256": "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h" - } - }, { "ename": "jape-mode", "commit": "b034024bd31c4be96c478a951b0ef63d8f89a1b7", @@ -53353,14 +54220,14 @@ "repo": "zk-phi/jaword", "unstable": { "version": [ - 20170426, - 627 + 20200816, + 647 ], "deps": [ "tinysegmenter" ], - "commit": "ac062b0e5ab4bd3270497e80aa0f3ac033a0493f", - "sha256": "05kbscympb59njfrs94w4b2lwkc3057wzib65kq0l93bx4pcw2iy" + "commit": "45e350895fc55f087a2102fded5b306811089a7d", + "sha256": "02ncm22wldx8g3iibdw92gk4hdig0209f7bmhxrhgdv8xp544c2h" } }, { @@ -53594,15 +54461,15 @@ "repo": "rmuslimov/jenkins.el", "unstable": { "version": [ - 20200115, - 2133 + 20200524, + 2016 ], "deps": [ "dash", "json" ], - "commit": "29e27a685ec971b518251ce0e66a0b67d78ea395", - "sha256": "0ms9i4dww801q09n4wzjpaqd6k89xdkn5vx3i565p748kp9lqhz6" + "commit": "bd06cdc57c0cb9217d773eeba06ecc998f10033b", + "sha256": "0g99bi3i27ay8xhz409k9ska9yy77j3k687l817k1fyhlyy5lpjk" } }, { @@ -53621,15 +54488,33 @@ } }, { - "ename": "jest", - "commit": "a656c058c423ea6396b831d45c6dbb9bce6c4881", - "sha256": "10xsqcjskh2s6mlh07vf10whaas3aqm18hk3w309r3n1qmqihf75", + "ename": "jenkinsfile-mode", + "commit": "a579d11271a8f46a65cf557b74f84db36a7b8bb4", + "sha256": "1j70gp8w5f3nli5m08s9ysl3k7pys6n4bzdzmbq0r9yzl02i6m8r", "fetcher": "github", - "repo": "emiller88/emacs-jest", + "repo": "john2x/jenkinsfile-mode", "unstable": { "version": [ - 20200318, - 237 + 20200725, + 2325 + ], + "deps": [ + "groovy-mode" + ], + "commit": "00d259ff9b870d234540e00e1d7c83cccdb063b8", + "sha256": "0srf6xdjnrd4v4ks9pal7i48wmkcl4q5ry7d0yzfx1c9pz2qg9zx" + } + }, + { + "ename": "jest", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1x9dqyrpri2giqzzlcg0nnq6wjfdfmy9fqqrq159qvw8rshvfzcz", + "fetcher": "github", + "repo": "Emiller88/emacs-jest", + "unstable": { + "version": [ + 20200625, + 1611 ], "deps": [ "cl-lib", @@ -53640,8 +54525,8 @@ "projectile", "s" ], - "commit": "b51be19c1de9e82ee1dc62921be2222fc5685eed", - "sha256": "1jdphlhp9vxvkj51cswqfgka910216snyjhql700x4dgpmvkcv56" + "commit": "4c6ddd3304e199211f0fbdc8a5b83ccbfe1f7fcc", + "sha256": "1v940c6p77dhs3rf016qqzhaniifkfsspbkpknf7vdssxgk9g1a5" } }, { @@ -53718,11 +54603,11 @@ "repo": "paradoxxxzero/jinja2-mode", "unstable": { "version": [ - 20141128, - 1007 + 20200718, + 730 ], - "commit": "cfaa7bbe7bb290cc500440124ce89686f3e26f86", - "sha256": "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381" + "commit": "ecd19a40b7832bb00f0a2244e3b0713d0bf3850d", + "sha256": "05z380d8ln53mx1gqa7awnv4wpqdhv7ggc91dds57681wzsqgz15" }, "stable": { "version": [ @@ -53756,15 +54641,15 @@ "repo": "nyyManni/jiralib2", "unstable": { "version": [ - 20200331, - 1940 + 20200520, + 2031 ], "deps": [ "dash", "request" ], - "commit": "ccf69e417911e091ec4c28d47d178ee63196c626", - "sha256": "170fjz7k9bk17qk7wrd56xw484xp8zckx635360pm0lfg4dvycpc" + "commit": "c21c4e759eff549dbda11099f2f680b78d7f5a01", + "sha256": "0yrcc9yfz9gxkhizy03bpysl1wcdbk0m6fj9hkqw3kbgnsk25h4p" } }, { @@ -53823,6 +54708,29 @@ "sha256": "0v4xiq3xf7c52rmyymw8a4ws85ij0xy7pr7625gf15359cs5chs9" } }, + { + "ename": "journalctl-mode", + "commit": "38710d44fba3c886431d1acb7477ae4035cf00c1", + "sha256": "126gj6rh6j0j6lbygx15lg5qxfaz4bpspbzd1hv3h05nvnnykv3h", + "fetcher": "github", + "repo": "SebastianMeisel/journalctl-mode", + "unstable": { + "version": [ + 20200607, + 754 + ], + "commit": "e8e057f387266d1c11f8fb68023ceb9607404948", + "sha256": "1l9z0w8kb15vsfpwcl9rfhflmvy8illsssfqjxkcwl8d7pzfhm8n" + }, + "stable": { + "version": [ + 0, + 8 + ], + "commit": "457e38af67427e92d6217abbb362ca9673b33ed5", + "sha256": "1lnjgpbvs3b7h1m1lnd4g3965pjn1sw4vyjd3f4106s10llmkd8x" + } + }, { "ename": "jpop", "commit": "2a52a3cf909d12201196b92685435f9fa338b7ba", @@ -53892,11 +54800,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20200516, - 1606 + 20200604, + 833 ], - "commit": "85214664a9f20faab7c45087b28bedd0feabb560", - "sha256": "0kvi1cqn4hdcs2mc4lsddy01yyixvm2ykqq6j4yb9h07lixrxih6" + "commit": "42ad0a99f0114233e2cb317585cb9af494d18a2f", + "sha256": "1n4w45yv1k7979j42dahhp9356p9bmk6ldybqa0z65k9gz4abkxl" }, "stable": { "version": [ @@ -53953,8 +54861,8 @@ 20180807, 1352 ], - "commit": "306abcfb9f6e46962061a34b68d4f6baa8c7aba4", - "sha256": "1pifplr4qr9667bbbqgqg39v8dyglvg6ljglkjga0d2n39am7r2q" + "commit": "9d9460b17f59e4e7a4e5cc34576ba72b2ca56524", + "sha256": "0hil53mzvxz71l908wm6804migvm7hm0nwm8qpyy2dgnfzl996hg" }, "stable": { "version": [ @@ -54144,14 +55052,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20200427, - 33 + 20200725, + 112 ], "deps": [ "cl-lib" ], - "commit": "515d876c6ae45a61cf67a7bd5723fe4c9e518756", - "sha256": "05pgyisb2szbrfbv6wjhfi8c00gakv51jxb8j73pji30v2a9rapn" + "commit": "40aab27581279d0fdbfeb9afeb85f39d401a927f", + "sha256": "0ysd0ji3vvk2zpjcg1wl7b2hva8471vq0ypib4h6spnpjdr43vzk" }, "stable": { "version": [ @@ -54202,6 +55110,24 @@ "sha256": "1iwblf5i7k1i1ax9pjv7n8zv9q157krirdn0gwcib6dwza2i30jp" } }, + { + "ename": "js2hl", + "commit": "7c7f441e411427ed570f0aa0b04e46d088debecc", + "sha256": "09jp7cy5jgcmhrpa2x48q39shpcgw1xm3g73aqmlhcw7wfn6q1b5", + "fetcher": "github", + "repo": "redguardtoo/js2hl", + "unstable": { + "version": [ + 20200729, + 146 + ], + "deps": [ + "js2-mode" + ], + "commit": "0255339dbb9fdfb009c94beefdc60e78baae11a7", + "sha256": "19vw96z28zgkkb93zq6ndslc20yg3qip44fqzvnsf8qr9wxxl3g1" + } + }, { "ename": "js3-mode", "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", @@ -54479,11 +55405,11 @@ "repo": "mgyucht/jsonnet-mode", "unstable": { "version": [ - 20200218, - 2217 + 20200812, + 1558 ], - "commit": "d8b486c8376a4785a7f2dc8a16fe1f2d82c6bfae", - "sha256": "0xpy699jh6ia46brd7i2qrfi0zrcdrhj3dc8d275va9w8a78paks" + "commit": "c8422a617438c79ade98f8d9eeb2086dacb0378c", + "sha256": "1r2ic7gbngbwmjjcigphj8jamaff42s7bsn6xz7yfzrci0gm8jrd" }, "stable": { "version": [ @@ -54558,11 +55484,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20200504, - 1726 + 20200717, + 1915 ], - "commit": "839726af374991223ffe56f7e7d10bef81033d09", - "sha256": "0lspmp519py7adippfmz70zcd9dpz46x8a3wlda71a5pdjs5szfq" + "commit": "b5f5983d2b232c8bba4c5eff75cccdb787c19d98", + "sha256": "0pxaga920bab6n5byag6h0wql2akiybhsh9nlinfx708i9dzmvv6" }, "stable": { "version": [ @@ -54581,14 +55507,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20200310, - 1145 + 20200625, + 924 ], "deps": [ "s" ], - "commit": "5fa04de4e76e10d5ee37d4244f48ddae4503faa1", - "sha256": "1xnb3r5999ipkkvh7fl2kr0yy0j3vmnw7a6n23m9ps4fvy6hpl9n" + "commit": "d073acb6339e99edf77833f82277afd9a076f16a", + "sha256": "1p2d92mcbdl8j22qz04iwdlpkbv2qn9p8ds8n2vpf4m9mgzjplzi" }, "stable": { "version": [ @@ -54620,14 +55546,14 @@ }, { "ename": "julia-snail", - "commit": "4b80da8bdccaa0992deb07cef7ea4a582d9707ae", - "sha256": "0yljiqgamm5gjr1dbzjfqvnrijhgrpjd7gj8and1w33s1d2qh8gd", + "commit": "5510bd5788fc1dab3049100f9a993d89fcd10601", + "sha256": "0bbz4r0xygx9hcddk5r64w9hycvxqvl7y6z53smlwns1pj7n9wvp", "fetcher": "github", "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200515, - 2010 + 20200810, + 1941 ], "deps": [ "cl-lib", @@ -54638,8 +55564,8 @@ "spinner", "vterm" ], - "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", - "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" + "commit": "44d06e18cf9ded6c05936ce10aca0a73f768f457", + "sha256": "0hpypirqc2hd1zga5qjcx2i7vp3h2vif76npd0j10hiimxal1kxz" }, "stable": { "version": [ @@ -54803,8 +55729,8 @@ "websocket", "zmq" ], - "commit": "785edbbff65abb0c929dc2fbd8b8305c77fd529e", - "sha256": "1l1fd062dmig3mgkwixr4ly8x12z9skh5wj18hkyc84n7rwdar47" + "commit": "360cae2c70ab28c7a7848c0c56473d984f0243e5", + "sha256": "1bn0jwpigpl5n45vpz73vv12g078151vyhkkhkwy5xqx627swxf9" }, "stable": { "version": [ @@ -54860,14 +55786,26 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20191006, - 849 + 20200803, + 1549 ], "deps": [ "yaml-mode" ], - "commit": "5984acee6f3891afa78acfd1d08c44a24953a233", - "sha256": "11x602pmqa3833azkzph1ghm354nypv6rr1y53k6kdrkwviwkcpm" + "commit": "9364cdbbae00055c4efa1eeb80503e0b0a215743", + "sha256": "1ap8nwlv9ha5a03gc10sva12sc6qzq1vig8hibg1igbsc1qmfkad" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "yaml-mode" + ], + "commit": "9364cdbbae00055c4efa1eeb80503e0b0a215743", + "sha256": "1ap8nwlv9ha5a03gc10sva12sc6qzq1vig8hibg1igbsc1qmfkad" } }, { @@ -54999,16 +55937,16 @@ "repo": "jmorag/kakoune.el", "unstable": { "version": [ - 20191017, - 1502 + 20200621, + 1818 ], "deps": [ "expand-region", "multiple-cursors", "ryo-modal" ], - "commit": "d73d14e69ea38076af50cc69f846808383ff539d", - "sha256": "0nk6jdy1y5mc3ryd0smiqghrk6iv34d5grc7f7migmshlbq0np92" + "commit": "ea8dde5dfe59c54d7729b141024976535b472573", + "sha256": "04ixj4cpw5iayxxwly5sr19lfnyss5cac0vsd0q1x3ys57y9v9im" } }, { @@ -55121,28 +56059,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20200508, - 1621 + 20200817, + 1844 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "15e2612eba2eeb223f6b4e5ac4a55dc5da09b14a", - "sha256": "0qay924qz5ab7a4d7cnancfnb7ivra33dr6knwqmy3wf089jl6kk" + "commit": "380bcb745c9bbf7328b7f190680a0e51231e3c3e", + "sha256": "1yw1c97ynjjr3md2shrhviiqycaggcmzhkb0i5y49b2w2mdvp1fa" }, "stable": { "version": [ 1, - 5, - 4 + 6, + 0 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "db1c43915fe68f31fffa00159b4198c32e87c8ed", - "sha256": "038bqg66m5cpg1w70la3jr57rq9fngmb1g67z27lpqcf3xf416xc" + "commit": "3e2c700aa1cf9f0ee17486ef9a7a68f77fb9946a", + "sha256": "07lydl1b8fz4g4q22ffrl6li9kc3zp9zq5rpqghzr9b8f56ddfqj" } }, { @@ -55217,11 +56155,11 @@ "repo": "delaanthonio/kconfig-mode", "unstable": { "version": [ - 20190818, - 2030 + 20200628, + 1721 ], - "commit": "02bb919596cf673828e95872dc329f2424a99864", - "sha256": "1h0v9528d2ssjgqa8813l3anhz15aggsmf8yln0qpphhrlrkfmpz" + "commit": "d9fdf751646abe2b75b7bbeb46e7552e0f36f290", + "sha256": "0dhkggvni5k4rnj2m6lva99hj1925b4w24dh9nv3m9w0x7b49263" } }, { @@ -55263,6 +56201,39 @@ "sha256": "0kyzcws47ch3pkw9ijb4gjr7l933c3mrxc9bsy16ddkc8dvl7yng" } }, + { + "ename": "keg", + "commit": "78d46bbc822f5df56aa83b986a4f283949533d5b", + "sha256": "1cmbpak0rn6xz0ccpn1629qp0wn7rpv40js4jr958a2z89448g3g", + "fetcher": "github", + "repo": "conao3/keg.el", + "unstable": { + "version": [ + 20200726, + 228 + ], + "deps": [ + "cl-lib" + ], + "commit": "fea2f831d84d7642c35820bb63250487e46683e5", + "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga" + } + }, + { + "ename": "keg-mode", + "commit": "bb72a113cefcc1e42a1fe9ea00404fbc6ee8d917", + "sha256": "13g43mfja6b84bkfzinr2f39viyrix5xf4xwg7kg66zpy12bshiv", + "fetcher": "github", + "repo": "conao3/keg.el", + "unstable": { + "version": [ + 20200601, + 333 + ], + "commit": "fea2f831d84d7642c35820bb63250487e46683e5", + "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga" + } + }, { "ename": "kerl", "commit": "166afdc776689b0da93576dbeaa71ff6dfb627db", @@ -55407,20 +56378,20 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20200418, - 2028 + 20200612, + 2247 ], - "commit": "a912c4db1b88390f76b14e3b47ded314fdc8f48c", - "sha256": "07gfldj9y4jfvna1rqlr7w6y6daqdsvc1fb2m7acjn37bpmfrc3b" + "commit": "038475c178e90c7bad64d113db26d42cad60e149", + "sha256": "1926khkdak2d1wgrgrfzhsv9l5f0rrl1rws78c3zw8ikwl8k7wbl" }, "stable": { "version": [ 1, 0, - 1 + 3 ], - "commit": "adb55497c0f16e90069d6e5e86b4f9f65f13624b", - "sha256": "1sprdfx0gvyqmq0fkf4bf56q3d8xxig2vxi38nzjx90llzvka35q" + "commit": "038475c178e90c7bad64d113db26d42cad60e149", + "sha256": "1926khkdak2d1wgrgrfzhsv9l5f0rrl1rws78c3zw8ikwl8k7wbl" } }, { @@ -55517,13 +56488,13 @@ "version": [ 3, 0, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "0b9bb7f4959ca54f0827b202f513ec7508c11e0e", - "sha256": "11y1vdrj2isn00mh428ynzqnfxjsg0138wx0bs619j0pv6d3j09g" + "commit": "195e0ca5b1b9967faf94a3e5a634d8975b796705", + "sha256": "0ckv9mbqb1f2lp17sv3nxjwww4ph9v3bhlxwvchvkkdlbcg87i5n" } }, { @@ -55549,11 +56520,11 @@ "repo": "chuntaro/emacs-keypression", "unstable": { "version": [ - 20200514, - 822 + 20200819, + 534 ], - "commit": "1e00bbdb451fd88bde9917526fd0b13b2a1bd26c", - "sha256": "06j8pqss8izhyahf0nw95mg34lbclhzk4f5vzfg35qcmjmbmqzg6" + "commit": "9427241f3fa539e4b5ad7581a05eb7e49f2cf518", + "sha256": "0p2pag2hzxswsf5hzjfm0nf4wpp40lsmxf1x6n9vfwfrpfk5b9ar" } }, { @@ -55571,8 +56542,8 @@ "cl-lib", "dash" ], - "commit": "41bbfc4dbed5de6ecf3ec1dba634c7c26241ca84", - "sha256": "0cm6naqlwk65xy9lwnn5r7m6nc1l7ims2ckydmyzny5ak8y5jbws" + "commit": "45ce83c4b56f064874256db37e697a63b2c69e65", + "sha256": "0fcz1qw3mw4m8albs1ybixrcz8yqgwip69fr99cd5bxfyr6zqj6d" }, "stable": { "version": [ @@ -55730,8 +56701,8 @@ "deps": [ "cl-lib" ], - "commit": "e77fcf46284afa1fd13499db695745112f41c8cd", - "sha256": "0c65qnsibcppyrf3bqp4blv2bfamisfwgxqy90z0gkbxzw9q4lxw" + "commit": "7db85a3f3004ff400e24105d1875f4e3a6eec7a6", + "sha256": "02nv6hzzr60gn24ra88smrwmkfjcb33c987dcgxqv7rzjpdjagnx" }, "stable": { "version": [ @@ -55842,8 +56813,8 @@ 20180702, 2029 ], - "commit": "c0227c5ce4011033b5f0cf2815c352d123a13305", - "sha256": "1l3fjljm7abk29ibbbvds7nq72yqrgcsy5bv42s1czbffw62zcn6" + "commit": "f34c43f235f35767ed04765a90d68b23807436ba", + "sha256": "06pgjd79kvkpznniw90hrsb7fvc0y3hhnxs6pyay869d50vbyw53" }, "stable": { "version": [ @@ -55851,10 +56822,10 @@ 0, 0, -1, - 2 + 3 ], - "commit": "78fb93b88f9941c22be02d36a786db8ca7639c59", - "sha256": "1z59fi9q32xql1w7pjh4w1jzfz1n63a0lr5x38kwjj79dpz3ccal" + "commit": "20c14b2a2bac73288a4c2808843910364565f66a", + "sha256": "1mf3if96cvxc8sqy22h4j2aq320ngw6q2286psvpq9v1mhv0wna4" } }, { @@ -55865,15 +56836,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200512, - 1321 + 20200714, + 1357 ], "deps": [ "cl-lib", "request" ], - "commit": "dd02284149027694e4cf16d6f4daf1f6dd011249", - "sha256": "0zhg9467id0jd516hnz4c6aqmjp5q1s95fkhjxbk3g9j11cnfjf0" + "commit": "cb3e2531a55b896b9b41f38f97a597c26433da8e", + "sha256": "077bng1mwnd1m8ji4a44aqly94d07k09grwk0j52kgxlhvv3p3di" }, "stable": { "version": [ @@ -56130,16 +57101,16 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200429, - 1454 + 20200812, + 2143 ], "deps": [ "dash", "s", "transient" ], - "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883", - "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg" + "commit": "55099f130803b56eb1f7595ba34a313df4ec138a", + "sha256": "1sly3fgdrynazaab0nb7hbxs0vb42g0r00m7zr162kqw7n57gxaw" }, "stable": { "version": [ @@ -56165,8 +57136,8 @@ "evil", "kubel" ], - "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883", - "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg" + "commit": "55099f130803b56eb1f7595ba34a313df4ec138a", + "sha256": "1sly3fgdrynazaab0nb7hbxs0vb42g0r00m7zr162kqw7n57gxaw" }, "stable": { "version": [ @@ -56351,11 +57322,11 @@ "repo": "MetroWind/lab-theme", "unstable": { "version": [ - 20200204, - 1931 + 20200815, + 2104 ], - "commit": "2cd61072d2b4c563d961f80918fc6b1dc45f7ba4", - "sha256": "0jwslzxjyclr4iw8ir0glcj5iasgx2z9i16qn7705sdmdmbzkdwz" + "commit": "9d7deb9635959d3a50ccb1082eb1207275f4b3e8", + "sha256": "0ifpg3vz84x87a1xsx0db79v14bfdnbaha6p4hcvaj67hi58qa81" } }, { @@ -56405,15 +57376,15 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20200513, - 1043 + 20200706, + 1546 ], "deps": [ "eglot", "math-symbol-lists" ], - "commit": "a3d4ae8863e268c88664ce869e9469c8a42d2e05", - "sha256": "1v8w70x1jnald6k22ipa7d9z1ggcf2imr97wbw3i48dp4iv21zqd" + "commit": "665cb18e484b8e41b0314fc442422b671cda2962", + "sha256": "0qsd30xnhzcvfdk0p2adzrbzl6hw4z5is0wwirzr79qx025zm4gf" } }, { @@ -56472,26 +57443,26 @@ "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20200117, - 441 + 20200529, + 230 ], "deps": [ "cl-lib" ], - "commit": "a71ed02ce06920ae3cafd6708de1c21811ce14c3", - "sha256": "1ars70nx8gxb8szlp6jyqjll9gr7j9z5cd9ip1izqv00si6p1fvn" + "commit": "8276eccc5587bc12fd205ee58a7a982f0a136e41", + "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz" }, "stable": { "version": [ 2, - 0, - 4 + 2, + 1 ], "deps": [ "cl-lib" ], - "commit": "adb80f55665db65a46fc552d364386d3cc703d94", - "sha256": "15bbyc0fqdn7d0k8zrn71jljkq9cc8a5rcllywvph46lnfnqy3p6" + "commit": "0fe79567244ca719448c55a89082505596a2359a", + "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz" } }, { @@ -56520,26 +57491,26 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20200409, - 607 + 20200726, + 1813 ], "deps": [ "cl-lib" ], - "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", - "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" + "commit": "aa541a4461a07add17374fd56aef6e2fd1a61c60", + "sha256": "0mxwch6692mb5d9l5hzbscrg61a3sxf2wjbn66q06b5a2r2wkqvn" }, "stable": { "version": [ 0, - 5, + 7, 1 ], "deps": [ "cl-lib" ], - "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", - "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" + "commit": "aa541a4461a07add17374fd56aef6e2fd1a61c60", + "sha256": "0mxwch6692mb5d9l5hzbscrg61a3sxf2wjbn66q06b5a2r2wkqvn" } }, { @@ -56574,8 +57545,8 @@ "repo": "mihaiolteanu/lastfm.el", "unstable": { "version": [ - 20200320, - 1839 + 20200701, + 715 ], "deps": [ "anaphora", @@ -56584,8 +57555,8 @@ "request", "s" ], - "commit": "54636059512adec0176950e8fce3b9bf7423619d", - "sha256": "1ffvh71vgsdv118hhz0x2xfmqb2bayk7i3mdxc1ybs2vrdggnim4" + "commit": "cfa5e9b0b1f54884dc36ae5d8f35e3c6b841ef74", + "sha256": "1m1qf5f7kq7d720inkks6wwwn4hf40lrz4755gwnnn6d5zf0b1ix" }, "stable": { "version": [ @@ -56784,11 +57755,11 @@ "repo": "pekingduck/launchctl-el", "unstable": { "version": [ - 20150518, - 1309 + 20200531, + 1043 ], - "commit": "73f8f52a5aa9a0be9bdcf68c29ad0fa2b4a115a4", - "sha256": "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj" + "commit": "96886b7e64d15ffd3319c8b4b04310ccdc648576", + "sha256": "0mw1c14ysh186lbgmmyp01hszdgjm605diqfq6a17a7dd7fn549a" } }, { @@ -56820,8 +57791,8 @@ "deps": [ "colorless-themes" ], - "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37", - "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn" + "commit": "736f7a105535901b4783d19534e7855920e25115", + "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73" }, "stable": { "version": [ @@ -56896,11 +57867,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20200511, - 821 + 20200817, + 1226 ], - "commit": "59c85a53385a3c55ce6b3b0e62a4fca1556389eb", - "sha256": "0scmdb99i20xk8rvlv2xjg54lqqvfp9gv8q9kpqa8jpcq21nbav0" + "commit": "7d2f13a103ff275f64086f4ad12308266d1fb48a", + "sha256": "1ggcbnpahxxjm4h21z9pl9164jwv7mhq4n6k5zagna863a9hlrbw" }, "stable": { "version": [ @@ -56920,16 +57891,16 @@ "repo": "conao3/leaf-convert.el", "unstable": { "version": [ - 20200415, - 1725 + 20200812, + 1306 ], "deps": [ "leaf", "leaf-keywords", "ppp" ], - "commit": "2a8ec045d5d36e85e7deb2a46aefacaecf4bfafe", - "sha256": "133id4zd9dnx962r71m0irxvqs9dwaqnv5l4b8bjd3gigijah1dp" + "commit": "d716e0bc3be91a79c791e7a4cb8335132a69d195", + "sha256": "0a2rqylqzvvfs62rrqkigga9jaxs89b2l8sdzkfb30vwp0y3d0sb" } }, { @@ -56940,14 +57911,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20200428, - 1803 + 20200812, + 1025 ], "deps": [ "leaf" ], - "commit": "bdf225b2b2cc76b87f5bf55dfa09c3a020ac1e7d", - "sha256": "0wdxxwh64l013vpkb7xpjqzyy4c0qy7h9l6l5cr4pncp7nx3bcns" + "commit": "c38d9d0d8cdb5a95df788af784e4eb989b674622", + "sha256": "19a1wrzikbzn2lswf5xwy8145a60mrj9ndj7cx29qrbr8fjcz431" }, "stable": { "version": [ @@ -56967,8 +57938,22 @@ "repo": "conao3/leaf-manager.el", "unstable": { "version": [ - 20200414, - 543 + 20200812, + 1004 + ], + "deps": [ + "leaf", + "leaf-convert", + "ppp" + ], + "commit": "baea372b3cfc7e1ad6d341d2f06e2932dcebf801", + "sha256": "031qgwc3pdxxqzkbdkaxd9lq4chngjba1s6q01wm98i5bdj4n4r0" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], "deps": [ "leaf", @@ -57017,8 +58002,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20200319, - 838 + 20200620, + 919 ], "deps": [ "dash", @@ -57027,8 +58012,8 @@ "flycheck", "s" ], - "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c", - "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n" + "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd", + "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws" } }, { @@ -57082,8 +58067,8 @@ 20200224, 2229 ], - "commit": "e3424b3ae3f7d85ef020d030c2fa58df86ed8955", - "sha256": "0a8x2c0lxa0xihpbc9i1dvn1l00nsmawl1nv3i06r6iq5486pqdn" + "commit": "86505672be0aabc9fa1048bc453ab2fc855b27e1", + "sha256": "00j6j2n0z616r9p78wp8hk62d9s2dpzlmflfm7ilrx40dnd4nlgj" } }, { @@ -57094,14 +58079,14 @@ "repo": "DamienCassou/ledger-import", "unstable": { "version": [ - 20200302, - 943 + 20200522, + 853 ], "deps": [ "ledger-mode" ], - "commit": "955e915fef9d46c968ef9101f7770870e2d2d80f", - "sha256": "018f7k4j8q1ka36winv2higjp8vmm90vss7vwyck9hg4w708m85p" + "commit": "027a6caf173948feacd2f416a7995d82f82165e7", + "sha256": "08aqqhbrcgn72wjw4c9wq5pyxdswbhly2c2izmy316bjh3cqvbhf" }, "stable": { "version": [ @@ -57124,11 +58109,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200509, - 1136 + 20200530, + 1710 ], - "commit": "5a517cee3dfedfd1b90c2f01d6d8e01198a198d1", - "sha256": "1gldvp2gp8vh97skrkxbcxh1qvjpndankjckm1q1h7jpkznjvc2v" + "commit": "805507fd6c14839be4efc7aee2017f9c03e36834", + "sha256": "1sil9kdkcb0r165qm8vpxll0ikfnm0cqjd3gmj8vi6k8n6awv9zv" }, "stable": { "version": [ @@ -57163,32 +58148,34 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20200101, - 1111 + 20200730, + 1433 ], "deps": [ "aio", "dash", "graphql", + "log4e", "spinner" ], - "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04", - "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5" + "commit": "153a3a6a9ffb64ffce37b3d203c13a85cc1884ab", + "sha256": "0600njpn3dvd8xrj21r5p69mc1r76ri1bjcxy2krp53dnsy3nvfb" }, "stable": { "version": [ 0, 1, - 10 + 18 ], "deps": [ "aio", "dash", "graphql", + "log4e", "spinner" ], - "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04", - "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5" + "commit": "ef59344158ae4b7842ca2531ec77c439ed6e6997", + "sha256": "0sxrzr34x43dcxw9l3ib982rz4327fpwnjmj3hi17bc5gk6zzfq2" } }, { @@ -57362,11 +58349,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200513, - 1742 + 20200707, + 1143 ], - "commit": "afda2d80b0bc98d431a3ac7c1563c76b8ace3a65", - "sha256": "0fapzkjnm3w4fgc5464a9bz2sld3m81zzls7sy4h0yxq9rpb284d" + "commit": "a116202c82613c087440d2e8a6a504b08f1862ce", + "sha256": "1pqv4idkbqbxxvdfqxwf5rq2isl1jikba5nd0z8d7fr09wv48pv7" } }, { @@ -57410,8 +58397,8 @@ 20170121, 1254 ], - "commit": "a6c9922f31f59686bb48db1b8d5b75e74e79757a", - "sha256": "0wvk341hx0fsv4hihlr508grqzgzza0w3gfqh4c1f88mdpmm62if" + "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a", + "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w" }, "stable": { "version": [ @@ -57490,11 +58477,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20200511, - 46 + 20200804, + 147 ], - "commit": "a631d3d575b5ffa2dc9a3a950c53f425c21380c1", - "sha256": "1gx3nxxcw5xz2n85xqgnghw04gaakhcnqcs9bnxx2fh4qpwkqggp" + "commit": "2a6f1bca1aff64a9136368c4afa15c0ea1042893", + "sha256": "1nvpy2mclcyi75clcnic7ap5rihccvgf7yn10an4y50sas8g2jiv" }, "stable": { "version": [ @@ -57568,11 +58555,11 @@ "repo": "buzztaiki/lice-el", "unstable": { "version": [ - 20191011, - 631 + 20200607, + 103 ], - "commit": "3ff90745cd43d1cc41216a01f55f871a00692ffe", - "sha256": "08aiwyd0cxwd37jdy1m78l1r35h7fiq7wygpys2yrms6mdl8063b" + "commit": "482e58ab83fff86ed754b00be27b62a219597e7c", + "sha256": "0yxkjyhfk8kpr8yqz54gdx6xwkj4s8bnbz60162jh12crj0bs5n7" }, "stable": { "version": [ @@ -57606,26 +58593,26 @@ "repo": "jcs-elpa/line-reminder", "unstable": { "version": [ - 20191016, - 1528 + 20200816, + 1151 ], "deps": [ - "cl-lib" + "indicators" ], - "commit": "f50f8474db7c9b26ab3cf56d08e5184209f25cec", - "sha256": "1frf77ilyadrzil8sjp3rpr6v7j1nmmk1dz84d0kf8yr2cl48d9h" + "commit": "4eafedb1f4f9b0fb9c6268ac6c72fea4b786233e", + "sha256": "1vygzd7gw9a4cwg554hdvpy4h6ywjk4gg6iffcgwxhvdwg2vmrvs" }, "stable": { "version": [ 0, - 2, + 4, 3 ], "deps": [ - "cl-lib" + "indicators" ], - "commit": "ea7fc43210b5293beac4ac453b1bdde415f5183e", - "sha256": "13vspm2c53ph25li4xd77q2v7rqwsszsy8a842ivcgn0k3qn6w0r" + "commit": "4eafedb1f4f9b0fb9c6268ac6c72fea4b786233e", + "sha256": "1vygzd7gw9a4cwg554hdvpy4h6ywjk4gg6iffcgwxhvdwg2vmrvs" } }, { @@ -57639,8 +58626,8 @@ 20180219, 1024 ], - "commit": "d083a9f0c74830bd77b794babb09fe0f0fdb3854", - "sha256": "1fgd2kfwh7gl4yxrmvv8yrv6wvvwy6y0nwibqqsy55698a1qb2fm" + "commit": "ffa07b82102945f18efb4430a6554835c450f6bf", + "sha256": "1zpqydk8s01f1qmk8aycn67pw48mll0rvrnrjd9q41p2aklhncms" }, "stable": { "version": [ @@ -57744,15 +58731,30 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20200405, - 1607 + 20200718, + 1737 ], "deps": [ "avy", "cl-lib" ], - "commit": "7440704cacb5c0fab35fff8ec59d30fbea17f44a", - "sha256": "0j609j69lxyfvr2g89gdkjrk1vy0c1qq6m0p0ay468bh7l6crs7v" + "commit": "be735e5b57dfad891a7394c116b584bf005fe3b4", + "sha256": "0vg0pmvyya3gncih6rj83zx6qjm5gh9qs4svxb8f3wd053ppnvk9" + } + }, + { + "ename": "linkode", + "commit": "8c03a8d88fa65f1ebc0b335b27be896232e8277d", + "sha256": "0wp55j17zms6zn90win35g203jzc4hjsj27500sq6iihci9gyfjk", + "fetcher": "github", + "repo": "erickgnavar/linkode.el", + "unstable": { + "version": [ + 20200607, + 2152 + ], + "commit": "675e612e30b74764c57de4117d950ea803b15f74", + "sha256": "1iqgii1zdv1q2gcknszxfgs09gvylr2l1yvyp104jriyy8qlsakg" } }, { @@ -57854,20 +58856,20 @@ "repo": "marcowahl/lisp-butt-mode", "unstable": { "version": [ - 20191128, - 835 + 20200727, + 1441 ], - "commit": "9eca319bdbb96dac4d44d19cd21937ed82a67268", - "sha256": "1biyvcwrqgyy7dmrv6i972lrcr5xhsyjq5nwc035c341jcxkp0g5" + "commit": "1b178fec96cb200574a17cb26ac0742d9df571a9", + "sha256": "01hj2kzy1mrzqc806jvgvkiyf7mkjacg944l3dblblyl7zgx8plx" }, "stable": { "version": [ - 1, + 2, 0, - 4 + 2 ], - "commit": "1ad373fd18d9db62b236d9d85603cd923f62f084", - "sha256": "0nhikhnqnxyxx6s14vafhfwd4ph2bwvxz0m7mn0arrf6hjqzw7ws" + "commit": "008d2093608ee8fac184a6682e4ccf7b461dcaa1", + "sha256": "1kxvwd9y9q5ax9509b3xy3qqjpamfxzljyvbm1fc89qy50pdjxyr" } }, { @@ -57937,8 +58939,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20200510, - 1533 + 20200818, + 1151 ], "deps": [ "ace-window", @@ -57947,8 +58949,8 @@ "iedit", "zoutline" ], - "commit": "3660a8a6acf9a7faee4af4bf5249ceb85a5d8bbb", - "sha256": "0s20wrdqf51mxfnnpll38nzp5ira59l83yz9dg0svz0vj5mrrwr5" + "commit": "0a9dcfdfbc20cadbb9cb29b224dc64b8efdd7b70", + "sha256": "13hzkh0rij40d58v6h232s784p40q1qv24n6bycd89lacn8xrcsr" }, "stable": { "version": [ @@ -57999,16 +59001,16 @@ "repo": "noctuid/lispyville", "unstable": { "version": [ - 20200129, - 243 + 20200808, + 2240 ], "deps": [ "cl-lib", "evil", "lispy" ], - "commit": "25a70126ea807653e0a8c512d4128c90ed673d7a", - "sha256": "0h4zz3k5chipswpp7abmd9agwacrss1dd5981x70wblpabdxm39m" + "commit": "0f13f26cd6aa71f9fd852186ad4a00c4294661cd", + "sha256": "0ah59s9c24addlx1rxgm11jihn7w45xrf0wrmrb7mbmqf3rj3izc" } }, { @@ -58230,6 +59232,24 @@ "sha256": "0nh14f3fv0b4i3rlx120s9a0s8gsaip0r15ki38446igl1macbq2" } }, + { + "ename": "literate-calc-mode", + "commit": "3b6b9d96bb894744f61d65ebd3a813b3c3493f42", + "sha256": "1ck61af2lg2rk0r8rlqjsh1am9xw71lk99i3sb71vi2ipd9dq9nb", + "fetcher": "github", + "repo": "sulami/literate-calc-mode.el", + "unstable": { + "version": [ + 20200703, + 723 + ], + "deps": [ + "s" + ], + "commit": "e855bd718fa7d0d70b8f43264e10664369dd3a37", + "sha256": "0mk4cig8g8ibz97mvyan79fkypyanh7r0h7h20ibafq09nb0mw01" + } + }, { "ename": "literate-coffee-mode", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", @@ -58267,14 +59287,14 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20200327, - 620 + 20200708, + 803 ], "deps": [ "cl-lib" ], - "commit": "732d649136051a4b6d43c2fabeb5233c3e5f16d7", - "sha256": "1d4p6s9dj5368ywfpp46pysxvcqwsiacih3n1hia9c4y7p0xx4cz" + "commit": "722b7b3988336642167e0e0db12800a23410ab07", + "sha256": "19fckshqp1dxf7msjjk6cd506i0ydzqb1fqz879pfbbvhg6iclva" }, "stable": { "version": [ @@ -58343,11 +59363,11 @@ "repo": "lassik/emacs-live-preview", "unstable": { "version": [ - 20200419, - 2143 + 20200730, + 1517 ], - "commit": "7af1c74e0479c5b91d6368a4a3ff1342b83ef477", - "sha256": "0ifk0k6lfjzb0x0mgzh69jx0m166ljdg3ad69p51jw3m85c0wc6b" + "commit": "b099cd4d9d4b30d432ffd2ca76f8db1b4c13cd08", + "sha256": "1sgl9152f16wlafpd1d2sik044h3dplx0ins3b9kwkm0hxgncdfj" }, "stable": { "version": [ @@ -58367,20 +59387,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200510, - 1939 + 20200709, + 422 ], - "commit": "38a3cf447fd7d9c4e6014b71134e178b0d8a01de", - "sha256": "0yah03sblz9i510cq6q2bj0mkz6sqdifpwhzxhs4kn8zdircr0f4" + "commit": "fdc85e5f2ddc72934be704ac90d5436d379c3381", + "sha256": "1g74m9v5818v8wg2zsm4zb74lzw28zfvlpv98b2dkqzikpxgz362" }, "stable": { "version": [ 4, - 1, + 2, 0 ], - "commit": "0a0d881d8ff30a6007b998e9bb9dddb999cca16e", - "sha256": "1mdnbbd0kr5y4vr2xbay80v4n07gg5jkkn0k3ywypsin7fz5ihhl" + "commit": "de3ce16dbb054b6d1b14f3274935bbdccadd9790", + "sha256": "1vl6v8lsid4p82clvp62079jnxhmibza3p5hb1frdlsycyc9d1bv" } }, { @@ -58466,11 +59486,11 @@ "url": "https://hg.serna.eu/emacs/lms", "unstable": { "version": [ - 20191102, - 3 + 20200616, + 1814 ], - "commit": "0967d3bada2ab70784a944d56c81691b8e87dbd8", - "sha256": "15ksvdf2cfa8hwvazdza56iln244xlv1l65gydhjw8388hr7gbr0" + "commit": "8090ba32866033c3ab580190cc79cac61463a180", + "sha256": "0l97i08k9qqr76xniac912id0hx5f56psf3v3l4mprs5k8myihj6" } }, { @@ -58514,11 +59534,11 @@ "repo": "rocky/emacs-load-relative", "unstable": { "version": [ - 20190601, - 1221 + 20200722, + 1109 ], - "commit": "dbcd7cbcca6503ef93f4b8d19bf7a9efd7f6bf9b", - "sha256": "010f2mhvlzkxarw298850khqc6srzb01l2vay0jsp46dh3jfmdhf" + "commit": "85b88d6fbf472381dfdaf0a762215b7e35ceee9b", + "sha256": "0jajdk2685d1jdw72hp4g0pq9xwbwbnls79nizkydamwhnj8sfcp" }, "stable": { "version": [ @@ -58553,11 +59573,11 @@ "repo": "rocky/emacs-loc-changes", "unstable": { "version": [ - 20160801, - 1708 + 20200722, + 1111 ], - "commit": "4d1dcdf7631c23b1259ad4f72bf9686cf95fb46c", - "sha256": "0a81933l3rrsbi9vkvfb1g94vkhl5n3fkffpy4icis97q7qh08mc" + "commit": "0a55bcba684f78417e831eef2cc32da24a207f29", + "sha256": "1fywhx8jk25mxrv0i446r519x4vjdsgvm1rzwdd0mcnjbwpv90b4" }, "stable": { "version": [ @@ -58748,11 +59768,19 @@ "repo": "Wilfred/logstash-conf.el", "unstable": { "version": [ - 20170524, - 1929 + 20200725, + 1843 ], - "commit": "4e127f9aec190786613445aa88efa307ff7c6748", - "sha256": "119yb1wk1n5ycfzgpffcwy7yx8ar8k1gza0gvbq3r61ha5a9qijs" + "commit": "131565042f8f12b9b88bd477959246dd034fa7d6", + "sha256": "1cyrmhnc38piw8q6d8j8xwyk0vl0a00mzjhmswkwd76w06adr9md" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "652dddecf19f3e39a36055823e44fcffc5b44aeb", + "sha256": "0xdqfkcpv1677xfp54j2rwc9wjl3mfs9542jjcs0ym2063r6fzla" } }, { @@ -58795,11 +59823,11 @@ "repo": "xuchunyang/lol-data-dragon.el", "unstable": { "version": [ - 20200321, - 2142 + 20200705, + 1822 ], - "commit": "6f53bb3971daad60bd0529d1e3889d5f9fedf235", - "sha256": "0xblv8l6krp3581m0xava95pm6wcsjm3rsl47dsvzpgns1kyz8lx" + "commit": "0deec9867bd7ba96220ee2968a9b2a94fd474431", + "sha256": "136x1yqdzjh6a2vhyd73yhgg6kmwl00c5c14ny5davlghwd5g7aw" } }, { @@ -58932,6 +59960,29 @@ "sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh" } }, + { + "ename": "lox-mode", + "commit": "8a4f385fd128097781b563ad91d4aa8301167f5e", + "sha256": "14mqn4r2jmz661gyvzm48s9qb98w75sjflmrgqg6sslaca98jrpi", + "fetcher": "github", + "repo": "timmyjose-projects/lox-mode", + "unstable": { + "version": [ + 20200619, + 1700 + ], + "commit": "b6935b3f5b131d2c1c7685cf6464274f7cd64943", + "sha256": "0yx6j44284zv1ldqk44xfgqbrkcraznr0xfpaxy7797bmn9bajnp" + }, + "stable": { + "version": [ + 1, + 3 + ], + "commit": "083a2299e188a516d1e46ef2dd1cbb89db1aec49", + "sha256": "0wwx1vs7gw8f3p63ql5mf311iydxlzar7wzbvig14k785rfzq69c" + } + }, { "ename": "lpy", "commit": "e0e7941d9efc303b8cd5d3e7b29606316307fd8b", @@ -58940,14 +59991,14 @@ "repo": "abo-abo/lpy", "unstable": { "version": [ - 20200504, - 1918 + 20200722, + 1159 ], "deps": [ "lispy" ], - "commit": "39d05463939398168dd8c8dca22d76af93aa87ae", - "sha256": "03wa94wn9a1lzdmi5fj5r446cvpqk7km9r9h8sq1hmwpr6qwymw7" + "commit": "c6744639ee313ee6dd4bc1e14b651d944b2ee1fd", + "sha256": "1vypwkx3020wx95cg34zi03pgarbjdhxpchbfvsj6bkd5v4bq6mc" } }, { @@ -58958,40 +60009,38 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20200515, - 2152 + 20200814, + 1405 ], "deps": [ "dap-mode", "dart-mode", "dash", "f", - "ht", "lsp-mode", "lsp-treemacs", "pkg-info" ], - "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", - "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" + "commit": "437c548d411c9e166b7c658fd45294775235fd5f", + "sha256": "1pl7payda8i9cyca2j808inb8pmnyhh1sjc9f4qvxpbwd7b94vlr" }, "stable": { "version": [ 1, - 10, - 5 + 14, + 6 ], "deps": [ "dap-mode", "dart-mode", "dash", "f", - "ht", "lsp-mode", "lsp-treemacs", "pkg-info" ], - "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", - "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" + "commit": "437c548d411c9e166b7c658fd45294775235fd5f", + "sha256": "1pl7payda8i9cyca2j808inb8pmnyhh1sjc9f4qvxpbwd7b94vlr" } }, { @@ -59009,8 +60058,8 @@ "dash", "lsp-mode" ], - "commit": "af56404c383102344f9b99e2e168e69b7d8d50d0", - "sha256": "16fsyr77bwa7gipsafsacqy1ad51kgm5im0js5yinkg2ipwi75xk" + "commit": "5053b697d1541afd436bc4a93f51b6afd8f2b79f", + "sha256": "0kxvzhrm8l99bmf3zjig7axkfm5mn0yl4l4yfxpvvfsb04iqj10k" } }, { @@ -59031,6 +60080,38 @@ "sha256": "0m5hxlx0cnx4rdcz5chxqp074z9h1wj1nvg8dzmilsnmg3kmsshx" } }, + { + "ename": "lsp-focus", + "commit": "a71079ecb60d84bded984d856f52590f64adbd9b", + "sha256": "0w0kywrs3pcs4kgdwhh4r9c1hdjblbdfcn66iz0xhrv1qxpv0zqv", + "fetcher": "github", + "repo": "emacs-lsp/lsp-focus", + "unstable": { + "version": [ + 20200809, + 1413 + ], + "deps": [ + "focus", + "lsp-mode" + ], + "commit": "c8270663c1fa8650cf0e248caa6a8e3d8f25d80d", + "sha256": "13d7s2pm7nqz06bj6qkibi50f69slqwz6dc0fik97glxnlqqqva5" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "focus", + "lsp-mode" + ], + "commit": "30a19e9d616b341e41469b141e86ff825070cb67", + "sha256": "1xzyz59bgsjpvb32x60wk2n6x6pj5pk65sfd677h898rvlxnn1lz" + } + }, { "ename": "lsp-haskell", "commit": "1a7b69312e688211089a23b75910c05efb507e35", @@ -59039,15 +60120,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20200510, - 941 + 20200527, + 2014 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "1a541e2459b918012cd655407920600ad35736ef", - "sha256": "0bmyjgydyr0mppx8c4kv4vrfivyz1lpxxg966danh7rv9c90ps3b" + "commit": "17d7d4c6615b5e6c7442828720730bfeda644af8", + "sha256": "1kkp63ppmi3p0p6qkfpkr8p5cx8qggmsj73dwphv90mdq0nrfsx8" } }, { @@ -59076,16 +60157,29 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20200418, - 1500 + 20200701, + 2043 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "81e81ced99829358674c5a6bbe2c3e15cecd4ed8", - "sha256": "011126hz98qzb8zn1628z77j2s5w1hgvmb5saj2fr9wncgv1nax9" + "commit": "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d", + "sha256": "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1" + }, + "stable": { + "version": [ + 0, + 4 + ], + "deps": [ + "dash", + "ivy", + "lsp-mode" + ], + "commit": "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d", + "sha256": "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1" } }, { @@ -59096,10 +60190,11 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20200430, - 1659 + 20200804, + 1609 ], "deps": [ + "dap-mode", "dash", "dash-functional", "f", @@ -59109,13 +60204,13 @@ "request", "treemacs" ], - "commit": "bbbe4297fd470d0eb9492d011b0b4daf628763f5", - "sha256": "0qm9hwl88qwm19xwpsnv1rp9ny664440di0rd2lh3h7w1bczf76s" + "commit": "260016236fa0520b5b6ec7f51ca2086288524cba", + "sha256": "1h0hqgjpk5mbylma1fkva0vx45achf0k7ab2c5y8a2449niww90h" }, "stable": { "version": [ - 2, - 4 + 3, + 0 ], "deps": [ "dash", @@ -59127,8 +60222,8 @@ "request", "treemacs" ], - "commit": "004516ed2f0803e068f50e00d5bc3bad76af45e1", - "sha256": "1n7prbj3fppl5d2qvjfyfsw280grr3yywvazrhygjrr5920jxarh" + "commit": "811760ad89a29939c28f47d0925f58d9eeea9fa3", + "sha256": "1grcapmd9k0a128vhgpy2a5dh6iqmf8bdvz0hykl4v7d55vcm423" } }, { @@ -59150,6 +60245,36 @@ "sha256": "0r0ig73hsa0gyx8s6hr1mbdgf9m1n2zh2v7yhq3405l4if08s5m6" } }, + { + "ename": "lsp-jedi", + "commit": "65d0fa5e46e336e0e93db1bea062e79253861de4", + "sha256": "1hxw4nrjds9ir7f6j2zypazf208cc7v2621c11rdxkik8iykqikf", + "fetcher": "github", + "repo": "fredcamps/lsp-jedi", + "unstable": { + "version": [ + 20200812, + 1826 + ], + "deps": [ + "lsp-mode" + ], + "commit": "10c782261b20ad459f5d2785592c4f46f7088126", + "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "lsp-mode" + ], + "commit": "10c782261b20ad459f5d2785592c4f46f7088126", + "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb" + } + }, { "ename": "lsp-julia", "commit": "ca6a06ed4de499bcccce05163ea3d54e4dca9539", @@ -59190,26 +60315,69 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20200425, - 920 + 20200718, + 928 ], "deps": [ "lsp-mode" ], - "commit": "5cd7b6bb35bc54f3e9341d6a64605a3bb50db0a0", - "sha256": "0lc3hidi1s993fz432090ab31r5pgb62ivw6y755332bgr359i4p" + "commit": "a9a26a21bf16b9444021563d844719ace0c5c3b6", + "sha256": "1waysrxhihg099czr2hydsvipdm8kf1zxw725r84lv5363cijw0b" }, "stable": { "version": [ 1, - 0, + 2, 0 ], "deps": [ "lsp-mode" ], - "commit": "d016440fe364a016935bd90ae07e22d9012bcf8f", - "sha256": "0a6nryx7vshh4k0amlw3w3fn4yr8zlqxq5py8vj3pz4zkcndhxks" + "commit": "a1376d3f4d4467aaf7fc5750c437e3edc91d2116", + "sha256": "044jivz2w6xs2kyjasndy00c0j9f63qf66s5wmkjjxbyamd7viwi" + } + }, + { + "ename": "lsp-metals", + "commit": "ee055cc258692a92f727633306adf7df31267479", + "sha256": "1nl9ay741y7qxvgdr6vywavr3aayh6z3a3bvmc4q5g5vsh3inwya", + "fetcher": "github", + "repo": "emacs-lsp/lsp-metals", + "unstable": { + "version": [ + 20200727, + 1925 + ], + "deps": [ + "dap-mode", + "dash", + "dash-functional", + "f", + "ht", + "lsp-mode", + "lsp-treemacs", + "treemacs" + ], + "commit": "039aa72439e3c52cfef4bcde416ba49d88ac0991", + "sha256": "12b2f1d07rqnbj27whdkk74c3fkqp7qrsqmwnyv0ysc870w29sb0" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "dap-mode", + "dash", + "dash-functional", + "f", + "ht", + "lsp-mode", + "treemacs" + ], + "commit": "efefcc0e936ec463f0d19b6cae7c8336dcd186e4", + "sha256": "01396r17ipmp0s5k5njm8m4vqw0g1sj9rq6dpkxv7wbad1c4izmx" } }, { @@ -59220,8 +60388,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200515, - 2000 + 20200819, + 1349 ], "deps": [ "dash", @@ -59232,13 +60400,13 @@ "markdown-mode", "spinner" ], - "commit": "17614737b6ae881d0e94ad6f0b87a01950062dba", - "sha256": "0zh2mllm7n3gj0w5rn4y6491kx361mrf6w0fa46jgdck26fkazfw" + "commit": "4145a70ce1d4bfb2463606ba34c5965080b080d9", + "sha256": "01nji47mh79ip67vagi8yb5dd9kscnvg4070zklnfyp9v0rfl73r" }, "stable": { "version": [ - 6, - 3, + 7, + 0, 1 ], "deps": [ @@ -59250,8 +60418,8 @@ "markdown-mode", "spinner" ], - "commit": "bdbd2d0ccfe02f6721ea942e82e5178f4b216228", - "sha256": "125rpmhlyd6wmq7p71j54x3rzmk07vn1hdcvvdjjip5481raxcwx" + "commit": "4db1151dbf1fe84769433d841e90803448b0b354", + "sha256": "1z8zm7qr21hvhl6rnbznv2l9drh1pp5y4zkjrx5ac4x77b8i4aaz" } }, { @@ -59284,15 +60452,15 @@ "repo": "emacs-lsp/lsp-origami", "unstable": { "version": [ - 20190331, - 1723 + 20200809, + 1537 ], "deps": [ "lsp-mode", "origami" ], - "commit": "c7653602a2f2396b1a42d6053fd2be55fce8e0a2", - "sha256": "02qxqjiqfi82j0bqfr22a9ynxnbdw470whfky7405x90nis50k7l" + "commit": "110c40eafde81179ec7a78aab94b0b2059689374", + "sha256": "0z2z0idzpc8mql3mc0szb81j712ad54kpnxj28j6giid1a540bzd" } }, { @@ -59360,6 +60528,26 @@ "sha256": "0g9vijpq7n38b7rvgbshh4s46m1387d7k2lcvy4md17sak5ivxrg" } }, + { + "ename": "lsp-pyright", + "commit": "42a1aeef2b84b55e6e683066a3aed83331812476", + "sha256": "11dxq3419cq7lq2rnfka9kkkl4la627d0fki99djq6nrzddqf56p", + "fetcher": "github", + "repo": "emacs-lsp/lsp-pyright", + "unstable": { + "version": [ + 20200810, + 354 + ], + "deps": [ + "dash", + "ht", + "lsp-mode" + ], + "commit": "9603dda12afaae9c82608c7d3762f98b24b8563f", + "sha256": "1xh0q356q7sy68m9syfbclabamdnw5y772inspn5y8640ig4rg21" + } + }, { "ename": "lsp-python-ms", "commit": "dd67aefa5a6df2d1388a7516e529e388615c8fe0", @@ -59368,28 +60556,26 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20200501, - 1408 + 20200811, + 1204 ], "deps": [ - "cl-lib", "lsp-mode" ], - "commit": "97ad997c6c2e3bc8d12c02b2809960d47ad316b0", - "sha256": "11jad58shbrxd1r2r4amlvddx0qlx3ikbmq598sfwz2253ndzny1" + "commit": "a884a9a4eb1a3acd3d70c776aec5e968bbdc1731", + "sha256": "02fws6ph1ikpx86709dswlag180m6b34nchqcsfcvx4zp7qg2wj2" }, "stable": { "version": [ 0, - 6, + 7, 0 ], "deps": [ - "cl-lib", "lsp-mode" ], - "commit": "5d0c799099aa5810858174f390e28fff3894bc06", - "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp" + "commit": "7a502e6c09456cbe8b5f6c64883c79f5ce08e5a9", + "sha256": "0rkxhm9lmvsalyzq96452cgpn5cqljw7b9d9xcxkkl2cwz1745f3" } }, { @@ -59411,6 +60597,40 @@ "sha256": "05l563j1wz01rqwd4r639i88ln3bkn0m4swvj3hs11d70brlw981" } }, + { + "ename": "lsp-sonarlint", + "commit": "ee843ab9cc6188b4f1b8f31ab4a4e69688fb36df", + "sha256": "19a189aaws5i6klzjbplh4wxq7z38399wpmkgcji5cc7anzrkzqn", + "fetcher": "github", + "repo": "emacs-lsp/lsp-sonarlint", + "unstable": { + "version": [ + 20200702, + 2351 + ], + "deps": [ + "dash", + "ht", + "lsp-mode" + ], + "commit": "e0a27c07e886a147e2b8750471660af02e142086", + "sha256": "1kfgqdxynzpy98j1hc07zsygi0npw4xfm80jx3h30wyvxmgy7flp" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "dash", + "ht", + "lsp-mode" + ], + "commit": "5f519612c6a10b189292083b04dcd652b64bc7d1", + "sha256": "04xs8n0lxx54hyj1y002ps52cxwb7s79k38q3dqzzbfax1nxwfw3" + } + }, { "ename": "lsp-sourcekit", "commit": "a1e15078916dc053ca2413a6afae51df22321e9e", @@ -59437,8 +60657,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20200503, - 1640 + 20200815, + 1841 ], "deps": [ "dash", @@ -59448,8 +60668,24 @@ "lsp-mode", "treemacs" ], - "commit": "bd2c3727dd1e46e972477f11ba84999697ed842c", - "sha256": "03jlwbzkkpqn0a68m991b6zhbnpna1rvjsdjmqqvyng209lgcgph" + "commit": "3f8ca910c8e8724f93d8268a91771a51427684ff", + "sha256": "0xnbw3j7n10wp6jbzrgrr0xfzilrlhrmmzs4d00y56g1fmqn3jja" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "dash", + "dash-functional", + "f", + "ht", + "lsp-mode", + "treemacs" + ], + "commit": "08e256c45d2e95b510a98a8b88b0531e8785e519", + "sha256": "1z9cb7i546pbzvxii6lsj31jq8m70xrzscphl5z71vh93sydyhkb" } }, { @@ -59460,8 +60696,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20200503, - 1650 + 20200816, + 841 ], "deps": [ "dash", @@ -59469,13 +60705,14 @@ "lsp-mode", "markdown-mode" ], - "commit": "271b47cb33f11915295911f7cf8575f8a82a5e1c", - "sha256": "181j9anm3h5sfallls3sxik6cd7dw1fbi3q9mlfhk979wk6varjk" + "commit": "c39ae3713f95a2d86e11fd1f77e89a671d08d18a", + "sha256": "033ah4mz3pa6da3xdn6yk3lmkv6lanpj07b0icf30c6bp7rmk3il" }, "stable": { "version": [ - 6, - 2 + 7, + 0, + 1 ], "deps": [ "dash", @@ -59483,8 +60720,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "207bc8d61abff7c3024f8a484f63bc60bc4ad58b", - "sha256": "024753bi0p1jyjhw7wk8k6s16kbwab5ar4cfasvbn8g08acf293b" + "commit": "449f3a6b80a60d88c4ed300e69d64eb8e875f1c7", + "sha256": "09dmhhxmfjnzdc5kygwsjf8nwqlnq9rbgrca679s2wy93miqj7vc" } }, { @@ -59550,14 +60787,11 @@ "repo": "sjbach/lusty-emacs", "unstable": { "version": [ - 20200415, - 1456 + 20200602, + 228 ], - "deps": [ - "s" - ], - "commit": "1b7053b41083666c6805bcaeb55ece6dcc0d77cb", - "sha256": "1y3nzp6rpg7anv5xscbp4lzmfdvzffcxha9vx3mrclhjg6giz510" + "commit": "a746514ccd8df71fc920ba8ad0aa8dca58702631", + "sha256": "0sjs3gn7mrmm60v0yi77fha9b6wdqfnydqz9f4dg2fvwj4a9w2rr" }, "stable": { "version": [ @@ -59580,8 +60814,8 @@ 20200507, 1518 ], - "commit": "87873d788891029d9e44fa5458321d6a05849b94", - "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g" + "commit": "112e689f75b59398d8eca79ac6562dca12b8a959", + "sha256": "0famsjgsgd61fm3l5m9mqg4szf8lcgcb57paxlg8rxnsmxmwga7d" }, "stable": { "version": [ @@ -59874,14 +61108,14 @@ "repo": "zk-phi/magic-latex-buffer", "unstable": { "version": [ - 20191106, - 241 + 20200816, + 648 ], "deps": [ "cl-lib" ], - "commit": "8597f4db70732d6e479396e2f2a7e78742387253", - "sha256": "16zv10rir99wl16d79479204h5fbdx78wpgahlg6kf74001fr3sv" + "commit": "8a6e33f79a930d2c1977409f1980afc4cc99b909", + "sha256": "1f052yx0fib6vv2kqr21fv1nlsxc1b0mlcxasppxr6kig1jbj2x9" } }, { @@ -59916,8 +61150,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200514, - 1330 + 20200816, + 955 ], "deps": [ "async", @@ -59926,8 +61160,8 @@ "transient", "with-editor" ], - "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", - "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" + "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe", + "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n" }, "stable": { "version": [ @@ -59955,15 +61189,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20200428, - 9 + 20200516, + 2028 ], "deps": [ "cl-lib", "magit" ], - "commit": "ef5dce6267e9118a5eca82a22bcad0b67826c23a", - "sha256": "0vzkydgl889cq173zjl89g2vrddb9abc4a8gljiz3b4a7n5b1nrd" + "commit": "c5ecb4b53ea2461e737ea00242ef1e69e35da398", + "sha256": "0f1psh03hsb57h3r66zfa0jmwkky12121lhvpynlgj330ryxl5bj" }, "stable": { "version": [ @@ -59999,6 +61233,25 @@ "sha256": "10iinizl99aivrf9zihykabb5lyg62kxbmydwaf7swzxf4dgxn2k" } }, + { + "ename": "magit-delta", + "commit": "6e045d09ceec253bbd033b561ab077d897e9b6b2", + "sha256": "0r7g8p7g348cfz31q0mgxxa591n8clwpaack487ycc1nzsqbj726", + "fetcher": "github", + "repo": "dandavison/magit-delta", + "unstable": { + "version": [ + 20200518, + 2205 + ], + "deps": [ + "magit", + "xterm-color" + ], + "commit": "d988abd99882c6b89f21f2746f721a4d7ece6ad4", + "sha256": "1dj2kw2wzxnms4z54pk7qngylvy903jwd84x3k5ys3wsydmk4bbf" + } + }, { "ename": "magit-diff-flycheck", "commit": "a5d28982425519157a6116c077fbc4be7cfa53be", @@ -60185,14 +61438,14 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20191105, - 2245 + 20200516, + 2029 ], "deps": [ "magit" ], - "commit": "3b588991d30a69d2209dbcbb041777ae8af62bd0", - "sha256": "19fyrann61k8viak05y0f5v9xr2p531ysrcq05d8pq8qf3vna1y1" + "commit": "f4b88f0c127faa154f138907bf4e98b1baf12fb6", + "sha256": "10l0z0c0q6sbf3id5dajws30cxzjvi5rgx1hl8jf6nxr5zcmcmm1" }, "stable": { "version": [ @@ -60254,8 +61507,8 @@ "libgit", "magit" ], - "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", - "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" + "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe", + "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n" } }, { @@ -60335,26 +61588,26 @@ "repo": "magit/magit-popup", "unstable": { "version": [ - 20200306, - 223 + 20200719, + 1015 ], "deps": [ "dash" ], - "commit": "b8e886c4f2242d6c58f84d4549af712e86360db1", - "sha256": "14l989m5pxzxk6164z8lgvshy45aq0ab78mjz5f6zw58h5rvnbdg" + "commit": "d8585fa39f88956963d877b921322530257ba9f5", + "sha256": "0znp6gx6vpcsybg774ab06mdgxb7sfk3gki1yp2qhkanav13i6q1" }, "stable": { "version": [ 2, 13, - 2 + 3 ], "deps": [ "dash" ], - "commit": "df9abf1a1bce3fadb5e0657eb8f4c7026efa3c69", - "sha256": "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw" + "commit": "d8585fa39f88956963d877b921322530257ba9f5", + "sha256": "0znp6gx6vpcsybg774ab06mdgxb7sfk3gki1yp2qhkanav13i6q1" } }, { @@ -60383,16 +61636,16 @@ "repo": "jtamagnan/magit-reviewboard", "unstable": { "version": [ - 20190211, - 2244 + 20200727, + 1748 ], "deps": [ "magit", "request", "s" ], - "commit": "f3d5ed914243e3930f9c06f59021305e7e43e67d", - "sha256": "0xlhy328h2wxklpy71dhy1fk7zv6hs2v4jrl1mm9x5mnrbrdfvxx" + "commit": "aceedff88921f1dfef8a6b2fb18fe316fb7223a8", + "sha256": "0agk53san02n49jna6g2ndw4wbqkpr0kfd4ravbs9b4w6l3r30xb" } }, { @@ -60403,14 +61656,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200513, - 1503 + 20200816, + 955 ], "deps": [ "dash" ], - "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", - "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" + "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe", + "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n" }, "stable": { "version": [ @@ -60484,14 +61737,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20190918, - 6 + 20200519, + 418 ], "deps": [ "magit" ], - "commit": "0162390581c1165a0c4c68081d8fc5ffae4cf1a9", - "sha256": "0blwbgr4by0rawzw2hdpc5jcckmj96p0dxvgcml61rg3andsqyyl" + "commit": "e52e8ab4906996c410f6c6db890b9bfe0951d4ce", + "sha256": "0mp466bnm63pas8z0p6b0684i3rakb6cs5xzkz8jv3z3x34ak12c" }, "stable": { "version": [ @@ -60994,26 +62247,26 @@ "repo": "jcs-elpa/manage-minor-mode-table", "unstable": { "version": [ - 20200302, - 1517 + 20200717, + 809 ], "deps": [ "manage-minor-mode" ], - "commit": "cd126cbeb2e99c8d00b48310938a85448ebc2e1a", - "sha256": "1lk2rmv0qhzfyg57h461qdxgqciwqjggipl9i146m9bpjp7bjjvx" + "commit": "d377094c4ff5e93321e12f53892113083148bdaf", + "sha256": "0dpljs8qmpvpb0y2cvcr71ashzrm2ypb8p6anay4sjmiphkb60p5" }, "stable": { "version": [ 0, 1, - 1 + 3 ], "deps": [ "manage-minor-mode" ], - "commit": "0636f376d9bc169bd1bd20c5847eb9f029b9467c", - "sha256": "1n4a9msfzspk0dfkr1i515ibrwg5yk3hyap2kym05yqpn4wq5xwp" + "commit": "d377094c4ff5e93321e12f53892113083148bdaf", + "sha256": "0dpljs8qmpvpb0y2cvcr71ashzrm2ypb8p6anay4sjmiphkb60p5" } }, { @@ -61277,22 +62530,19 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20200514, - 16 + 20200815, + 203 ], - "commit": "705c77b9533970a425b09fb4c2fabf3b406117c7", - "sha256": "0i40pp0157azw2jkkr08f4cbal9ansp9dbscdbdzmlp9lf27kqjs" + "commit": "ef2cb4d94af68908a4963afa492afba876725128", + "sha256": "0pi971jgil2wpfnrg7j7i9hh3a418nxf82jkammzry2ijv2q5kj5" }, "stable": { "version": [ 2, - 3 + 4 ], - "deps": [ - "cl-lib" - ], - "commit": "cde5c5d2bcce470c494b76e23cfe1364b6291c20", - "sha256": "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7" + "commit": "7b854c8e70b6d6edee12aec4194f4eb239586804", + "sha256": "0g0ja4h651yfabm3k6gbw4y8w7wibc9283fyfzb33kjj38ivl5d7" } }, { @@ -61383,30 +62633,30 @@ "repo": "ardumont/markdown-toc", "unstable": { "version": [ - 20200502, - 742 + 20200517, + 1233 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "a9f13eecd0c7d8be960055dbc2d6f5d3fe6f40ca", - "sha256": "01xls8jd6l8c8xiyx8l15j5ca96gsln1m32prnhw4sfmrlw996h6" + "commit": "9565eeaa1d26bc0ab83eb65bd30470888f724044", + "sha256": "1l49hi4nwralx5kg4aqjj2b592y71ba4i91vmlzk5rrcjmdnc6b0" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "e6de0f5c4c6dfdb8da37b34a16fe7e8edc88765c", - "sha256": "1xqrrf4gwcr64xgbyvgplmcrcl7knfsm0v8yzrhscq65pb7zf3zj" + "commit": "9565eeaa1d26bc0ab83eb65bd30470888f724044", + "sha256": "1l49hi4nwralx5kg4aqjj2b592y71ba4i91vmlzk5rrcjmdnc6b0" } }, { @@ -61426,10 +62676,10 @@ }, { "ename": "markless", - "commit": "5542e142d47f6f52839a44b8ee16327f88869f50", - "sha256": "1a5kp46xj4b5kgcypacxcwhjjwi4m7f6shdda8l8my3s3x8ji5bj", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1nd7np60h0k1p9pwp3dn8068584h7r7lhfl9j7yn2jrf2r51806h", "fetcher": "github", - "repo": "shirakumo/markless.el", + "repo": "Shirakumo/markless.el", "unstable": { "version": [ 20190306, @@ -61521,20 +62771,20 @@ "repo": "jcs-elpa/marquee-header", "unstable": { "version": [ - 20191017, - 1017 + 20200720, + 1034 ], - "commit": "cb694a9eee79ea807dbc1587c47e209dd7e250fc", - "sha256": "0h191mip2yjvj1ha6cqvghd45g5ccd3p0qsvh9l2g0gg9d2salxk" + "commit": "d8e83b837bacdd45d274be42fe2d172fd1cbbba2", + "sha256": "1iy8vg2wlrzb01nc6sx21ijg62ak94k2x2w6gy56krp7frakacrv" }, "stable": { "version": [ 0, 0, - 8 + 9 ], - "commit": "77e4becd8a812377eb219c77641a22a77b4fdfef", - "sha256": "0a51aw567gkdxz58v7h2vdfs2rmnvyllqhq4a1yy4gslr0xsqk9c" + "commit": "d8e83b837bacdd45d274be42fe2d172fd1cbbba2", + "sha256": "1iy8vg2wlrzb01nc6sx21ijg62ak94k2x2w6gy56krp7frakacrv" } }, { @@ -61633,19 +62883,19 @@ "repo": "cpaulik/emacs-material-theme", "unstable": { "version": [ - 20171123, - 1840 + 20200620, + 943 ], - "commit": "b66838d220ad380a16da1d8878936974b26f815d", - "sha256": "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2" + "commit": "2710e61ecee1bbec943538305c26af4fe4fca68a", + "sha256": "1qg59w216iv1yk594xjgazfqx5qhw3jgjqf32pcwwbkcnyj5f6zw" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "b66838d220ad380a16da1d8878936974b26f815d", - "sha256": "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2" + "commit": "2710e61ecee1bbec943538305c26af4fe4fca68a", + "sha256": "1qg59w216iv1yk594xjgazfqx5qhw3jgjqf32pcwwbkcnyj5f6zw" } }, { @@ -61712,11 +62962,11 @@ "repo": "rudi/maude-mode", "unstable": { "version": [ - 20160222, - 1607 + 20200725, + 2035 ], - "commit": "c9543bb8a172fa77af592388e7f520a4a6d38987", - "sha256": "1sn9bdaq3mf2vss5gzmxhnp9fz43cakxh36qjdgqrvx302nlnv52" + "commit": "008f372631a1efe15be033792cfb1686b1736aeb", + "sha256": "07a51iwlzj88b6jaxzz8p8r7l9kcbflw8l11h67sx5y0gv23a6vv" } }, { @@ -61760,8 +63010,8 @@ 20170120, 1705 ], - "commit": "daeb5c35bb677a23df69336b4843ea59517e57ed", - "sha256": "1qpzha7j7g5fw1lazw5l6mspgrnsnqybqgpq48icbx2vvil9y3q7" + "commit": "f7048ce95443f2c06cb6b140814451e3a037103a", + "sha256": "0kjhfc2jlhq9qdwigx1iq8wpvzfr7jlv8jfqa2j2va8h0jp2jnp6" }, "stable": { "version": [ @@ -61972,20 +63222,20 @@ "repo": "hexmode/mediawiki-el", "unstable": { "version": [ - 20170813, - 555 + 20200718, + 1529 ], - "commit": "8473e12d1839f5287a4227586bf117dad820f867", - "sha256": "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04" + "commit": "932497604fd417964e4f04614e28d96f4eee028e", + "sha256": "1446vihy9cpg0hbvqjrp82ya1k889gpvgbsmw9bk7kyd983jhfar" }, "stable": { "version": [ 2, - 2, - 9 + 3, + 1 ], - "commit": "8473e12d1839f5287a4227586bf117dad820f867", - "sha256": "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04" + "commit": "5178a1a1dbe37a144d9c82622eb683bd3c61bef1", + "sha256": "1d05jw2sa19rgzskvavh21bfmbh07yza1drfbgypsvay3nkjfd2z" } }, { @@ -61996,30 +63246,30 @@ "repo": "mopemope/meghanada-emacs", "unstable": { "version": [ - 20200506, - 743 + 20200628, + 247 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "e119c7b3271281d60892b80a0cc6488503baf38f", - "sha256": "11nvhvxm39pcxjknzik6n07l309x9r5maf24pnlgk2wxkr28xmzs" + "commit": "1e41f7f2c7a172e9699f3557c97c3f39a149bfc2", + "sha256": "1cplw3x94xc2yqvvimkjgppbb36mnj8n3gcx0k2gy7zwzdvzg4c6" }, "stable": { "version": [ 1, 3, - 0 + 1 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "83ee6c6520a8cf063742e1b16fef3efebbcf8b73", - "sha256": "1hk4953dk93pa7srlgnjh9pskpl67f90gm9g0iv9zffwsxw4kwaw" + "commit": "1e41f7f2c7a172e9699f3557c97c3f39a149bfc2", + "sha256": "1cplw3x94xc2yqvvimkjgppbb36mnj8n3gcx0k2gy7zwzdvzg4c6" } }, { @@ -62186,15 +63436,15 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20200510, - 154 + 20200727, + 851 ], "deps": [ "cl-lib", "dash" ], - "commit": "56e7ba100eb0ae92a37bcd0fcce77affa26d2fb8", - "sha256": "1jz0jpdr4imzs7rr21q19j59y04kw518qpisrrsmyw6fywi8k22g" + "commit": "c9296491e923a678ac9a42a2743f21ce1e0552c4", + "sha256": "00636in9cgcnij1sz6vj5y5vijdd13g5akwj1facf0v4lrlvacpn" } }, { @@ -62208,17 +63458,17 @@ 20191025, 851 ], - "commit": "db957668fa2be7b9d076f0c066178a65c48dd085", - "sha256": "0abg2c0lcdiwmf1jlybrjw0n17hwqfmj29r7gbvrsm16snf27rag" + "commit": "3751cbfff75022c396c4ff4dc1729048f80daa4f", + "sha256": "0vbzbjajm0ww864cl7aaj70s3fkgg79cq8srdf5dmw1vwdrqq6ld" }, "stable": { "version": [ 3, 3, - 4 + 6 ], - "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e", - "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va" + "commit": "464df1a60775fd2bb70f4efff4f8603eaf834b74", + "sha256": "0yw3a8mhjsjh9359cvk7kr5ch6dhwvhv9zilk12fgyii9iw08mlz" } }, { @@ -62258,14 +63508,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20200420, - 2258 + 20200804, + 2107 ], "deps": [ "f" ], - "commit": "b8673381ff8bbfbdf3f165ae928e7c775a3117e9", - "sha256": "14w2mwqiksmng8pzm4l0c458q0i2m3p4wcfvvmagyqk6mfl05m4l" + "commit": "795bcf830d9345474fad864602180408891b292d", + "sha256": "0qdpbayxar0vkan0m83k4jir8saqy47nq2240608l8h9bjv48hz2" } }, { @@ -62276,11 +63526,11 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20200216, - 2254 + 20200806, + 1325 ], - "commit": "bc6c09136c7f7de6f4b6ce9294e9b998e24b93c7", - "sha256": "113vj7z8zk80653ldq4sfxkk3pja8yjscywb0cwpkaq0088n5jf7" + "commit": "b471b9282724d6f324dbd6fa25d083635fc4293a", + "sha256": "0y5a1sfk4h4szv4v6693i3ylrf3xiwf8khrahdaz0bx210h2qmpg" }, "stable": { "version": [ @@ -62302,8 +63552,8 @@ 20200428, 124 ], - "commit": "a8b761d665c17694a04eccf1c2bc135d35bdf482", - "sha256": "0rg34w1nsvmwxn9z3aipj32fk26fykzqxkr0x7am7icigg02dsbn" + "commit": "ce506b27b15cc39a47c58ff795026eaea8632e2f", + "sha256": "0wpj3ich8wisq0jy304fngj0nkkvdqzfkfcx0s8ib6l04v29ypa5" } }, { @@ -62401,17 +63651,17 @@ 20191018, 242 ], - "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", - "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" + "commit": "a56346bf1517118b2a960eaadbf138ae1695ddd1", + "sha256": "09iycpdj6dkvz5axfx85bkrrf5128ws7clg1jn9yli06rjsw36ba" }, "stable": { "version": [ 1, 1, - 8 + 10 ], - "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", - "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" + "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab", + "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr" } }, { @@ -62422,20 +63672,20 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20200503, - 1425 + 20200602, + 1032 ], "deps": [ "seq" ], - "commit": "6d68118eee409a2b671537129eae1154421ba82c", - "sha256": "1i7fzla9i3s4439ckkny09fq3r2q0q2153qzyhxsfbcxb47vbx26" + "commit": "6283e1fc5ddb65323513eb77638181551bda967b", + "sha256": "12sw627rhvqldbg8cvgg4fim91h3r9qlki5ni1fi0y5sa9iqh20j" } }, { "ename": "metronome", - "commit": "2f77239fecb41487a6aa03e6fc219cba96dee18d", - "sha256": "1kkm7s6hiyk3h1bnf9pfnsikmfpp998041wg0bwqnpzhzzlq6fy4", + "commit": "123d2788dc05d53862ebbf31476cfd3a43f2f348", + "sha256": "0arsx39lrbwp3a4krjn8pggqrqm250c8sk3c6z37q8d2g3sazp11", "fetcher": "gitlab", "repo": "jagrg/metronome", "unstable": { @@ -62478,11 +63728,11 @@ "repo": "sggutier/mexican-holidays", "unstable": { "version": [ - 20190506, - 245 + 20200622, + 132 ], - "commit": "663633be1d693f6081d7d000e05d15ddbf71aa10", - "sha256": "09b0292d87xm5mrhfhv7j11ljl4j9hv8h5dibzrrlh1b3vsg2xkj" + "commit": "5b5dd6e71505e8938bac9e9733b30bd394631923", + "sha256": "04d4148nq3lmrpkxvzzkn88j30iv2l2466ps035x7v8hc83wxnjw" } }, { @@ -62745,14 +63995,14 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20200424, - 647 + 20200801, + 1554 ], "deps": [ "dash" ], - "commit": "4f1dce78916cccd2e7066345ae2be3394a675c46", - "sha256": "0qbd6jdaqfs43i9cgs4n4d8vkv3nbcxcmwkd9xrj1d03rdmyzxh0" + "commit": "754a28efdf043e193922a897fc724ad9b9f2e8de", + "sha256": "1jx1baw6zskpnfdi02as59736jx4iy0q1n4x5n5ypvr7csrs1nz3" }, "stable": { "version": [ @@ -62887,8 +64137,8 @@ 20190113, 2132 ], - "commit": "063b4d8ca33d55d04c341f0b2b777ec241a3e201", - "sha256": "0lvg7iym6sxhgl4ab9a6x8c2mh2d32vkf0033bs3vphx657gra6l" + "commit": "221b43aad320d226863892dfe4d85465e8eb81ce", + "sha256": "1zsabgn5mi63ry8jg1li866jcix9mf588ypdfajk8747a6127qd0" } }, { @@ -62899,26 +64149,26 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20200204, - 1950 + 20200522, + 1052 ], "deps": [ "dash" ], - "commit": "bc1edab09d3fc1b248c17775ae2eb7d35b96be40", - "sha256": "09z5wynw3xaxx2jr55ymlnhczryp5c5zgb1g9nr99k2rksq2j980" + "commit": "36d39bd25ae58d1359d17f99142520339bea5974", + "sha256": "1rvsfg9aabvyzzxd38kvjwkm9675zcmrfhzj5x6wj0ba3n0k34q5" }, "stable": { "version": [ 0, 3, - 3 + 4 ], "deps": [ "dash" ], - "commit": "c331c1516111b9d2136e632a218c1d7707215356", - "sha256": "095yx8zg61nka6f7biyj1binbp8g872vq275ycwgmd2ix462zyf4" + "commit": "36d39bd25ae58d1359d17f99142520339bea5974", + "sha256": "1rvsfg9aabvyzzxd38kvjwkm9675zcmrfhzj5x6wj0ba3n0k34q5" } }, { @@ -62992,8 +64242,8 @@ 20200306, 1220 ], - "commit": "d1e04ca03aadb942dc4bee82f44848c3ce52b25c", - "sha256": "1yrjmyh8a0xqijyg16v20iqh13s7j4pf410f0214a4m9lp07pxpx" + "commit": "e4dcdec3a4472a507d6b249ae2194dacaa885ecb", + "sha256": "03m4rnfdfsbs44cfqjy8j2z6nbxs2yzhzgizlpsvg64441hdkfa0" } }, { @@ -63137,21 +64387,33 @@ } }, { - "ename": "mmm-mako", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn", - "fetcher": "bitbucket", - "repo": "pjenvey/mmm-mako", + "ename": "mmm-mode", + "commit": "ddf7604d914273aef49e75ae1d45c2a9a4bbbedc", + "sha256": "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw", + "fetcher": "github", + "repo": "purcell/mmm-mode", "unstable": { "version": [ - 20121020, - 651 + 20200714, + 1714 ], "deps": [ - "mmm-mode" + "cl-lib" ], - "commit": "5c9ff92137b547569264eeca1ab2a86e4ba12f55", - "sha256": "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr" + "commit": "9ffe364f3a31c7a771fe3401b8924642609953e8", + "sha256": "1yr7nd6kmvy3mc5k6vvwaikzy9cvly4617l4s9zrfrbnldpsyjk7" + }, + "stable": { + "version": [ + 0, + 5, + 7 + ], + "deps": [ + "cl-lib" + ], + "commit": "ff0b214f27d5dddeb856acb4216e77a864dcc0b2", + "sha256": "0lxd55yhz0ag7v1ydff55bg4h8snq5lbk8cjwxqpyq6gh4v7md1h" } }, { @@ -63168,8 +64430,8 @@ "deps": [ "cl-lib" ], - "commit": "6d3eedf4fae3c88dee33691aa2856514122adc8c", - "sha256": "0fykf7svgsbcjfcsbp1r571mgjhxwkdvmmhhl2clyi5z3mwg0s1g" + "commit": "d7729563e656a3e8adef6bce60348861ba183c09", + "sha256": "05f218f0lncgx2bbipjz7db09rrka8fq0qf5qkvbgssagxyl7rav" }, "stable": { "version": [ @@ -63240,15 +64502,15 @@ "repo": "scottaj/mocha.el", "unstable": { "version": [ - 20180321, - 2322 + 20200729, + 1130 ], "deps": [ "f", "js2-mode" ], - "commit": "cfd5b1a8a32162575f1c30b82e17b74efb67cf1c", - "sha256": "015pinqd2bxac372dvmcxnc7z9qayq4xpa254sp31bdzn4r5xns4" + "commit": "6a72fa20e7be6e55c09b1bc9887ee09c5df28e45", + "sha256": "0xp0xps5xvamp7jdxq6hkmyp63ww9ca7imf0nz35xivwwkk17ri6" }, "stable": { "version": [ @@ -63335,8 +64597,8 @@ 20190713, 1335 ], - "commit": "8f71e0a85c2f6039111663e65d9a13f3310f12ed", - "sha256": "0vz58nk044jm97wh77v02h24571nwg57j1vx2v4rx9wmwrnifwid" + "commit": "4b2b92b14ed0b64fb0a0fa80a374ec9f87fbfeb6", + "sha256": "18dbnicaqryq4xhv4d7hds61k85kj3bnpcqv7rippvlyrqm2r6wx" }, "stable": { "version": [ @@ -63433,11 +64695,11 @@ "repo": "ludwigpacifici/modern-cpp-font-lock", "unstable": { "version": [ - 20190331, - 1528 + 20200530, + 1010 ], - "commit": "02f104701bc34c146d22e3143ae59ef362999098", - "sha256": "14vxxvvm12jnq4llb759h8y4w3cv71d3xic1mbp0jmyd0j4dkqzp" + "commit": "865955d0035382a17a7f03add0d00d0bd812b103", + "sha256": "1x04jgc94gpdci24rahb1awvkjii1vdv7bdr9gyiksbry75dsxi1" }, "stable": { "version": [ @@ -63451,10 +64713,10 @@ }, { "ename": "modern-fringes", - "commit": "c765214f003426ac7a0e98c5764b14dd61ccce52", - "sha256": "0acp18v97k2iahbd5kp240g46wqdmrk4ddrsgvckzm0chsmjmm8q", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0rkcpjhcw4nfsmsr83zng941cf1mpdparbmqn5ps3qwifiw19m5f", "fetcher": "github", - "repo": "specialbomb/emacs-modern-fringes", + "repo": "SpecialBomb/emacs-modern-fringes", "unstable": { "version": [ 20200321, @@ -63495,20 +64757,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200513, - 601 + 20200819, + 628 ], - "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", - "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" + "commit": "26a211835b6e62e4ad29b2feee75472e02046fa8", + "sha256": "12rqgyrnk6x2a7b635wg4c5ihyh9s8ig7s1431xqj91pdx7756kx" }, "stable": { "version": [ 0, - 8, - 1 + 11, + 0 ], - "commit": "89a31f6242dac52071ee6be18feadcb604b548d7", - "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il" + "commit": "c376b08059028737390f41fb82f64d748c42970c", + "sha256": "08alhr6d7shmm1fcvca0a0ipi9mvnaqp5klvqdb1d171h457fcv3" } }, { @@ -63519,20 +64781,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200513, - 601 + 20200819, + 628 ], - "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", - "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" + "commit": "26a211835b6e62e4ad29b2feee75472e02046fa8", + "sha256": "12rqgyrnk6x2a7b635wg4c5ihyh9s8ig7s1431xqj91pdx7756kx" }, "stable": { "version": [ 0, - 8, - 1 + 11, + 0 ], - "commit": "89a31f6242dac52071ee6be18feadcb604b548d7", - "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il" + "commit": "c376b08059028737390f41fb82f64d748c42970c", + "sha256": "08alhr6d7shmm1fcvca0a0ipi9mvnaqp5klvqdb1d171h457fcv3" } }, { @@ -63695,11 +64957,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20200504, - 237 + 20200525, + 1430 ], - "commit": "06f907e4a954688ec2096420fea1c9935d819e07", - "sha256": "1k73bnwyjnmgvx4664pqrk1ig0rr0rwxzlf165dh5fspzqkmrjqh" + "commit": "d1bc669200bf5753cf1963e5e65269e0d60648d5", + "sha256": "0zqrn1pvlrgbf0yc34bycahvrl8sl67jmc0436yx3lgjwpkvhf0f" } }, { @@ -63749,11 +65011,11 @@ "repo": "sanel/monroe", "unstable": { "version": [ - 20190912, - 1624 + 20200703, + 1254 ], - "commit": "508f5ed0f88b0b5e01a37d456186ea437f44d93c", - "sha256": "01dwnb7f6c49q8vr3qb9m5h1wh9h119axxalqa71wahi1ygrcydc" + "commit": "b540e13cf767055086c37b2878e551fd3eddf5c5", + "sha256": "0sfj0b7j3385la01d8vq1s8ynpl5vzwdx7vdpyhbi3hrh02xkcqh" }, "stable": { "version": [ @@ -63773,20 +65035,20 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20200429, - 309 + 20200722, + 2327 ], - "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8", - "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk" + "commit": "64cbd61c3d9ebf8eb7e1b6366279e32382405f90", + "sha256": "0fh9j9fkgl433nykfzjnzap5labi4sdndfk1nv4f904ij69pmvxb" }, "stable": { "version": [ 1, 2, - 2 + 4 ], - "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8", - "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk" + "commit": "64cbd61c3d9ebf8eb7e1b6366279e32382405f90", + "sha256": "0fh9j9fkgl433nykfzjnzap5labi4sdndfk1nv4f904ij69pmvxb" } }, { @@ -63797,20 +65059,20 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20191029, - 743 + 20200730, + 18 ], - "commit": "77ff4bfd954d46bc7580175ef443a9168938f9cd", - "sha256": "02aqp3na2401n0mc6fbqvlwrfvbq283kyn9fhan4d0i6mrgvdblx" + "commit": "00e2d3797a271c0b3ecb0bab56dc705558015311", + "sha256": "0cq5y5fcx581vv8fzbxn5k71r95ss92yvddw4nk85h3710scclds" }, "stable": { "version": [ 1, 0, - 4 + 6 ], - "commit": "98c2f3ca27dce87cec1bd7ffd322b48129213588", - "sha256": "1rs9az5d4279jqldvx963qx0plbxp49c3crksmcq6si0x1iwg86x" + "commit": "00e2d3797a271c0b3ecb0bab56dc705558015311", + "sha256": "0cq5y5fcx581vv8fzbxn5k71r95ss92yvddw4nk85h3710scclds" } }, { @@ -63831,10 +65093,10 @@ "version": [ 0, 5, - 3 + 4 ], - "commit": "2751d36152abcc2ac1479225392182b53f1e02dd", - "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586" + "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", + "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" } }, { @@ -63845,20 +65107,20 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20191118, - 902 + 20200725, + 126 ], - "commit": "f16c8c509990932f3db7570a838a441d5c22dec3", - "sha256": "172ih3wa3n6q46i7hcjddvnpy4h3vjldj42wvid4lpny0ibjazfy" + "commit": "d6dc1f42ccf0d53c8f5d5a327442ae52b2de7aed", + "sha256": "0s0liwc9sriv2ar6905n2vsdf9x8l85mwfyw05kr6vmxh9w08wbx" }, "stable": { "version": [ 1, - 2, + 3, 0 ], - "commit": "536eac1dd2b187f65ed85ad8efc95f7e2bcaadb2", - "sha256": "12v2m66dlvnggmraxgmcfq4ycv6wdc56dv63gggrcy7zhlxwi9vp" + "commit": "1d8344cec018a417cb5845c0717c7400c281caa1", + "sha256": "0ig5j4dzb0vxx145yv4ly93hndc2hkbx6dfng2zy7agf124ygh37" } }, { @@ -63966,6 +65228,29 @@ "sha256": "1yxy6m5igvsy37vn93ijs0b479v50vsnsyp8zi548iy2ribr0qr5" } }, + { + "ename": "most-used-words", + "commit": "5c240664b29e0e455d3d2503381b9db1ed0ea20f", + "sha256": "1129wbn7myzqijzcs1bsy3fh6iizijfpkpa1mw6j9s618anj282p", + "fetcher": "git", + "url": "https://github.com/udyantw/most-used-words.git", + "unstable": { + "version": [ + 20200808, + 931 + ], + "commit": "f712879493660c3c3ee3793470b8f8939b79c2b0", + "sha256": "0aim8kzs95xjf6ldc4qy9xma1crxybmafs40sqaq35cbfszg0mf0" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "90c09da92b30c6497e9141f0edfe7842440c4d53", + "sha256": "0bcqg5p7v6wi3g68c9qpv3rvi9lh6427dd0gmmnwvs1qysz28f1b" + } + }, { "ename": "mote-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -64029,20 +65314,20 @@ "repo": "wyuenho/move-dup", "unstable": { "version": [ - 20200506, - 2305 + 20200819, + 940 ], - "commit": "fa9be365fcd6a2b89388b4d27dec93928d506678", - "sha256": "0pb5xfzk5lfdz613hqsr9x1f0i5ls61xc0np43kqaxnr4xjz2fld" + "commit": "c5a346d3058011b8152cceeb45858f9b4cef1b69", + "sha256": "1dfsfxy7v85qc2gl14gxhngnvkcdbq9gadnsabs1fq56qdgmq814" }, "stable": { "version": [ 1, - 0, - 0 + 1, + 2 ], - "commit": "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0", - "sha256": "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8" + "commit": "c5a346d3058011b8152cceeb45858f9b4cef1b69", + "sha256": "1dfsfxy7v85qc2gl14gxhngnvkcdbq9gadnsabs1fq56qdgmq814" } }, { @@ -64233,8 +65518,8 @@ "dash", "mozc" ], - "commit": "01f09b6c0b308e9f7057fb2aa80171e2ce328bb8", - "sha256": "0vgyx7v79224mg3ci8i5kjasnh1w0c48jzwgxbjj270lrra3gfsr" + "commit": "90a6eb1db8fa1283b944432cfb83739286b37f92", + "sha256": "03pqqzzca9z3a1nbrfdkvfczzi7nr3bn75x7m4mdww9z3wxxda2c" }, "stable": { "version": [ @@ -64611,20 +65896,20 @@ "repo": "mkcms/mu4e-overview", "unstable": { "version": [ - 20200218, - 546 + 20200817, + 2046 ], - "commit": "151d5d9e0dd5e8e8c775035203d3e17538151f33", - "sha256": "1gvlh306pcn1g4b7j5pk5m2n2wa72bl9vscfsp0gqr4fwrfnm3r6" + "commit": "467a7dfda4e534783469a137545193ded8a66723", + "sha256": "08lwvgwfsxmvm5bnw0sl96dry57h4wcjsi2fr2mmfq190kdjrizy" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "commit": "c34f45b3ab9cce892835e14c6701b531a4f54cce", - "sha256": "1jc291xwym2ddiqvn83s2b2jw6a08dd63x0f6526qv8g3yr1jl1s" + "commit": "467a7dfda4e534783469a137545193ded8a66723", + "sha256": "08lwvgwfsxmvm5bnw0sl96dry57h4wcjsi2fr2mmfq190kdjrizy" } }, { @@ -64657,6 +65942,25 @@ "sha256": "1wpcv4wdk735w701d9bm9qqji98mmzg7l7qkq1jmjw1hbpqhnwl2" } }, + { + "ename": "mugur", + "commit": "7f218af9e4a50c53d0cacdd3fbbfc514d2f98e8d", + "sha256": "05qn7b3jsprdcyc4p6h70qvaydgq3b71y2hb4jfqx19prcbcly7k", + "fetcher": "github", + "repo": "mihaiolteanu/mugur", + "unstable": { + "version": [ + 20200602, + 642 + ], + "deps": [ + "anaphora", + "s" + ], + "commit": "5333d0ff56cb4d1448e4cdf48278abcbc32e96eb", + "sha256": "07xglyc05d42inlh4j3nvdyi55pa0cy013c5yk8rv94xs31pjd8k" + } + }, { "ename": "multi", "commit": "c9fea5cf529bcdf412af2926e55b8d77edc07eca", @@ -64689,14 +65993,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20160306, - 2223 + 20200517, + 1747 ], "deps": [ "dash" ], - "commit": "bd0331854774e7a269ce8a7dd49580cd397c0ec2", - "sha256": "1aswpv1m02n26620hgkcfd38f06bzmmijlr9rs5krv6snq5gdb8g" + "commit": "e3772f7e68968f7fa2c97615115cd3fc0f701229", + "sha256": "0r1ahchfhyqjyc0q0xp5x0p34d6hg4ga3cga1l6dlaw1xjflrsq2" } }, { @@ -64809,15 +66113,15 @@ "repo": "suonlight/multi-vterm", "unstable": { "version": [ - 20200329, - 940 + 20200614, + 548 ], "deps": [ "projectile", "vterm" ], - "commit": "11f1b0cc97a24aba66fb561a0a94e9a66375b30f", - "sha256": "0pzcwn13yj21qcga2agcv8as0jyrmw055fr8nbzvkp1jml4l3vwj" + "commit": "723658c162d483acc07fccf2dd8ae5b8582616f7", + "sha256": "1wgsqrr6jxv8dwf89406m53w1xzsvq45hrcc72x12hxkc1hay2vk" } }, { @@ -64961,16 +66265,16 @@ "repo": "Wilfred/mustache.el", "unstable": { "version": [ - 20190905, - 2214 + 20200726, + 553 ], "deps": [ "dash", "ht", "s" ], - "commit": "6443e1563ddf4eee2236ca1bb1fe87ddfde4b2bb", - "sha256": "0wbmknx4pjgfw6y1482a3y1fxv054r0k2qj3qzc47xrkdsjw47y8" + "commit": "4649a47340b63214c7b8f1dcc178806d96288839", + "sha256": "1vwngm8fvfmh6p7p54pf01gqsmcg7f86nbyg18qphny9zsss1zjl" }, "stable": { "version": [ @@ -65159,6 +66463,30 @@ "sha256": "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86" } }, + { + "ename": "mybigword", + "commit": "77cae5811b20615f356c520e200f771805642976", + "sha256": "1v7llcas9hzv2gwjvsxb0i29zcqizg7qgmzx3zyrkbww3ciwwfmp", + "fetcher": "github", + "repo": "redguardtoo/mybigword", + "unstable": { + "version": [ + 20200818, + 1059 + ], + "commit": "182a972cc48c30ba73ebf5424cdf27601a77399f", + "sha256": "1k3bxxc3fyh5zimwvw1b0fis95x0q9kp0cxdgdy3y2iayavm203r" + }, + "stable": { + "version": [ + 0, + 0, + 9 + ], + "commit": "182a972cc48c30ba73ebf5424cdf27601a77399f", + "sha256": "1k3bxxc3fyh5zimwvw1b0fis95x0q9kp0cxdgdy3y2iayavm203r" + } + }, { "ename": "mykie", "commit": "e10504a19e052c080be2ccc9b1b8fd2e73a852e0", @@ -65238,14 +66566,14 @@ "repo": "mallt/mysql-to-org-mode", "unstable": { "version": [ - 20200503, - 1239 + 20200602, + 2019 ], "deps": [ "s" ], - "commit": "7dcd6486f374814908bdb3c6d4c88cd6cece1e2f", - "sha256": "1jpz68pf8j7f4jin5qk4lrkxfzjwyqs16fn3j9ll21z4lc2mj2a8" + "commit": "f3afc506f8b0d037238e49290de4b028c6ad9dd1", + "sha256": "19g21zvvamlhy1yrqhqbd1x3km6q2m650xsvl613rpcdqsk8l2ic" }, "stable": { "version": [ @@ -65592,10 +66920,10 @@ }, { "ename": "nash-mode", - "commit": "c8bd080c81b163a6ddcfffc710316b9711935b4a", - "sha256": "1d6nfxn7fc2qv78bf5277sdwfqflag2gihgic8vxrbjlpnizxn1p", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "1rkqcf8whk6g8ic0vlahf9m0kphd83515cr4yqv21qg2yx8irf2w", "fetcher": "github", - "repo": "tiago4orion/nash-mode.el", + "repo": "i4ki/nash-mode.el", "unstable": { "version": [ 20160830, @@ -65637,11 +66965,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20200424, - 1635 + 20200814, + 2301 ], - "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41", - "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5" + "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52", + "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd" } }, { @@ -65869,8 +67197,8 @@ 20161029, 2023 ], - "commit": "f5fe5832889d7b6eab7d45724e051f4edbe1983f", - "sha256": "15ljrcmmpfwqxvci0ilmn3xgjxj19wq638zvij0wh2g0n6nil6xx" + "commit": "db4bc9078f1b6238da32df1519c1957e74b6834a", + "sha256": "07axi57f4q7rvsk3w15jrbql20fwmxn2rk07cc9ahqkzys66jfv1" }, "stable": { "version": [ @@ -66034,16 +67362,17 @@ "repo": "felko/neuron-mode", "unstable": { "version": [ - 20200503, - 930 + 20200806, + 833 ], "deps": [ - "counsel", + "company", "f", - "markdown-mode" + "markdown-mode", + "s" ], - "commit": "4329de608ca14dc67448ad576645eabb084009ef", - "sha256": "0wk4cjcj98yym1cca2k1wgail9rvxaqs7n9fkccnxv9bddjmymv9" + "commit": "18d230ce6b126fe7193db9c20ac93811ccfe779d", + "sha256": "18s7phs285jc4whd54x3dvbajqil7yff18xirbvf9pjlzivqwfk5" } }, { @@ -66099,14 +67428,14 @@ "repo": "AdamNiederer/ng2-mode", "unstable": { "version": [ - 20190524, - 1912 + 20200703, + 1610 ], "deps": [ "typescript-mode" ], - "commit": "52fdfe27247548b46f6171eebaf887a90dd67463", - "sha256": "1g8za385clky1waba4ggi5bl2q4h26gz00lkzghn3zvxg5nbh47d" + "commit": "d9feee65d882723b955483d2b8af01e49df21652", + "sha256": "0i0xad3h6rnkrbglmv10vv0zs3nf8kda19n176h6v4zy5bazgrqi" }, "stable": { "version": [ @@ -66196,11 +67525,11 @@ "repo": "aaronjensen/night-owl-emacs", "unstable": { "version": [ - 20200118, - 1513 + 20200622, + 1943 ], - "commit": "b52fbf83ffef1ca265c9ea273bf51827532cef67", - "sha256": "0blgf7wx8i7am943m1jc7q4ndkb7pdczfgigrdnqsaf861m0nhng" + "commit": "4b9b5cb4fead9c5f145ba399d172c7e6bf577121", + "sha256": "0hkjy8qnpjwqc6c8zczb68s7kg5cx8wq9067rvwx4hraxv1bjqmm" }, "stable": { "version": [ @@ -66274,11 +67603,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20200203, - 1941 + 20200812, + 915 ], - "commit": "32c5c88502aec1afb6700a798c215b7fc6ce6101", - "sha256": "1s0f7wgik5383ffkys27376s0gzhhz6m0rap7l8iqq67yz0k6hxw" + "commit": "1a828c1fa0574503014afe8dda3229fb76a4bf64", + "sha256": "1qapsq7mxayjjr7y376p9vb7k871rwjgmyvmv756xg98lf7vm3fb" } }, { @@ -66292,17 +67621,17 @@ 20181024, 1439 ], - "commit": "c6148b0c3377a7d12b679f99f35e09cc7f36e940", - "sha256": "088znrs8hygsfx0ndqhpfdgra3l3jf6dyfwz2l6h4s7w4kc8mlnk" + "commit": "9ddd3c917793bb97eb19d571429cdedf07501c03", + "sha256": "0lrj3k5ng748faarz63rspnd4sh38qvkxxcgbmk81h4cqvv529fy" }, "stable": { "version": [ 1, 10, - 0 + 1 ], - "commit": "ed7f67040b370189d989adbd60ff8ea29957231f", - "sha256": "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4" + "commit": "a1f879b29c9aafe6a2bc0ba885701f8f4f19f772", + "sha256": "1bmv7zfqwp48ga6vnqvy0gzkclv40xgq19q4ihl58r6cn4swccn3" } }, { @@ -66343,11 +67672,11 @@ "repo": "akirak/nix-env-install", "unstable": { "version": [ - 20200113, - 751 + 20200812, + 1305 ], - "commit": "b343a7e885206e78544da7313b860442abbd7440", - "sha256": "06sq5biv15pgz8azp1kkbkj6ifi2xpa688gx8hj3xvkms9hy6b29" + "commit": "79c34bc117ba1cebeb67fab32c364951d2ec37a0", + "sha256": "12f16pfki1jwnw1ghdsqcrb11039njffl9hz3aa7sflwr95g2pbb" } }, { @@ -66391,20 +67720,20 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20200515, - 410 + 20200811, + 1947 ], - "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", - "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" + "commit": "0cf1ea1e0ed330b59f47056d927797e625ba8f53", + "sha256": "0wsiyvv23jcazh7jrbkg3d0qs1y5i88ahsdi3pp2s8q9h3lyhwnb" }, "stable": { "version": [ 1, 4, - 2 + 4 ], - "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", - "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" + "commit": "e4e604ae3ac91748c4e7d51a591cb9ee60961b7c", + "sha256": "19f36kl00pxm2a18hn4cdsdvxlfsdx1pnnm6s6zxd8nw6y8ynvn0" } }, { @@ -66482,8 +67811,8 @@ "deps": [ "reformatter" ], - "commit": "cc8ee143d4ef45a8c540901852326ccdf6ff8482", - "sha256": "0a1ih8w8xk8rdd96k7236v6xh2xr1r6gaiv2b6js95k04igdqxnh" + "commit": "213251f82a69edc033766ec96948e83aeb428cd2", + "sha256": "1hx13p9rs33j2ajbg0dp6a371hr0dcxbcyzr5xlvkg6gf746lmg8" }, "stable": { "version": [ @@ -66575,8 +67904,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20200418, - 2355 + 20200524, + 1649 ], "deps": [ "anaphora", @@ -66585,8 +67914,8 @@ "json-rpc", "rbenv" ], - "commit": "103eb5c13ad2d154c9386b2aa9dbea532435ee7a", - "sha256": "04nympxjg1dhahk7m71769c5lzsxxsnd9c62lqrkn22gvfzm0wm5" + "commit": "e8d99d132d649e179f7cc81b80d873436b4e8ce1", + "sha256": "03iqbb3svidczzci0l8b19zk8yx9xdslf9y0hpn2y8fzhf4gszrp" } }, { @@ -66597,8 +67926,8 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20200407, - 1525 + 20200730, + 1052 ], "deps": [ "anaphora", @@ -66606,8 +67935,8 @@ "dash-functional", "request" ], - "commit": "d5e58b373ab6c5f13174e76f5ae62539dc5cfc95", - "sha256": "0gqqdjmasjs1p6nal9s2yhas1xr2nm99rd3rns2b8cd5j04ccvaz" + "commit": "ad20d17f196a1b99c683ad2ffc39a9b4b2fada58", + "sha256": "1b5jnprpvlsn7cnxj6pab8kr0kdzm8xqrzhsga6dlaww6max26xp" } }, { @@ -66633,8 +67962,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20200417, - 1757 + 20200524, + 1647 ], "deps": [ "anaphora", @@ -66643,8 +67972,8 @@ "request", "virtualenvwrapper" ], - "commit": "7f6e3bdbfa872af8e92ed339671772b46bc7f7f0", - "sha256": "1dbb4pm2dvyvgw6lxjhhdqplb1b1jbvnywy8d3abr5dpzfqzij8s" + "commit": "4f41473221ea3312085c9f562db59d8f22bf8910", + "sha256": "0b42z866igmh8lvykcmac19zb6irdyvaag5dnaa54w2xc9ms52hj" } }, { @@ -66670,26 +67999,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20200426, - 2105 + 20200817, + 1831 ], "deps": [ "cl-lib" ], - "commit": "e67d7edac513892c5997468899f177a6e7956906", - "sha256": "0b1f1lxzp2i2liysl8fs1lqcyrz220m232pzk8h6l7iq8y5fp15q" + "commit": "85629e5979f2159ab8cc77814dd4cb219e6ba69c", + "sha256": "0ii19sbmsl35y1glj2mz309aila8954rmpah7y7mr2b34ami6hdw" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 2 ], "deps": [ "cl-lib" ], - "commit": "d1d6965c70fc6ce0cfb38a5115d0e112aefac1d7", - "sha256": "17is06l0w6glppabv2kaclrnqi3dqb6p6alpslpg7lrjd8vd45ir" + "commit": "aaa3c36b25e07017595b54e91e190f69f0de0487", + "sha256": "0v642qbd65w5jq44zsl4vy525vjmhr948p1jmpq4mpvhfgmxx88c" } }, { @@ -66806,11 +68135,11 @@ "repo": "abicky/nodejs-repl.el", "unstable": { "version": [ - 20200320, - 1645 + 20200802, + 1310 ], - "commit": "6fad7d764fa0d818ba497450bd722ae10cb8efed", - "sha256": "0saky39n0p8w7lmalg3j4da0crrx40yz0rz1zdjzwpd2bd9v2izg" + "commit": "3b841055cad00f442e4a9159b1056f59411b6646", + "sha256": "0371lz9378x3vjj2kqir89sjy0l5d5j6ha5yz1381nkh15dcww15" }, "stable": { "version": [ @@ -66846,21 +68175,6 @@ "sha256": "1s19sshsm4cdx8kj5prmsq8ryz4843xcqmdayvlfl99jxsp9j4pm" } }, - { - "ename": "nodenv", - "commit": "272df58a1112c8c082c740d54bd37469af513d4a", - "sha256": "15wqlpswp4m19widnls21rm5n0ijfhmw3vyx0ch5k2bhi4a5rip6", - "fetcher": "github", - "repo": "twlz0ne/nodenv.el", - "unstable": { - "version": [ - 20181023, - 1543 - ], - "commit": "832fb0cbac4513edde7ebd6d1ab971c54313be36", - "sha256": "0hn29y8gv9y9646yacnhirx2iz1z7h0p3wrzjn5axbhw0y382qhq" - } - }, { "ename": "noflet", "commit": "df33a7230e0e4a67ce75e5cce6a436e2a0d205e8", @@ -66908,11 +68222,11 @@ "repo": "arcticicestudio/nord-emacs", "unstable": { "version": [ - 20200108, - 833 + 20200620, + 1122 ], - "commit": "d828752e270978a56bde19986c98b1bbe8f51386", - "sha256": "096f8cik4jz89bvkifwp3gm9iraqrd75ljy2q9js724v7yj88711" + "commit": "4f5b64605709d5803285953026137e905756c35f", + "sha256": "032lgin0pn07ysshsdfdfqd5ck1fhrwdfz64sxwwc4gxlg5p4p98" }, "stable": { "version": [ @@ -66938,8 +68252,8 @@ "deps": [ "colorless-themes" ], - "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37", - "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn" + "commit": "736f7a105535901b4783d19534e7855920e25115", + "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73" }, "stable": { "version": [ @@ -66968,21 +68282,6 @@ "sha256": "1yin5i38jdp47k6b7mc0jkv9ihl8nk5rpqin4qmwbhb871zxn7ma" } }, - { - "ename": "nose", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682", - "fetcher": "bitbucket", - "repo": "durin42/nosemacs", - "unstable": { - "version": [ - 20140520, - 1648 - ], - "commit": "194d7789bf797f31ea0adc45f08beb66ae9ea98e", - "sha256": "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm" - } - }, { "ename": "nothing-theme", "commit": "8f69a676e9adfb45f8fbd4467e86a4cb0fbf6ae8", @@ -67006,20 +68305,21 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20200427, - 1036 + 20200816, + 1342 ], - "commit": "627460d7bbbb6b95a07084c2b6fc7f647a5547e1", - "sha256": "07fm4ndg42c0fw2dhj2rl32yrdnyprhidgkrwyckghwj02gjfwrj" + "commit": "8776faf6d5118e8152ecfacf94accf35ccebf1d2", + "sha256": "0r4f12m2xbwzl0fhqcz2vv7dcr0psnhy8ahhv6b5gsdfdfd2w4w3" }, "stable": { "version": [ 0, - 29, - 3 + 31, + -1, + 1 ], - "commit": "a59ef7d02cb229c2ec3569024918024003568aea", - "sha256": "0w9k7jfhcp34inkqciisrjfgflrx8h5q4svfa6bij9p93g1hig0b" + "commit": "75ec89dfb4c254ba0b88ddb479e6ede6bfb7d0c7", + "sha256": "1pc4nkbhxmx1qlamnjzd1arzr3sgp0m95vn1jmmfivgddy3xh8b0" } }, { @@ -67089,28 +68389,28 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20200506, - 1245 + 20200813, + 821 ], "deps": [ "dash", "esxml" ], - "commit": "55a3b41aa71740826a1cd410fa8d24a313f27b7c", - "sha256": "0zw6iq2iwv06jixb5cv73b832y576v0vs51l0j80d8w5d09zpfz3" + "commit": "6cfd80124038504038bcb5d4cf2e8b037c36841a", + "sha256": "1zr8q9kl3i1900vp08c52ywx2lpwp4iyqs8vm3kb8a7dsc4hpggf" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "dash", "esxml" ], - "commit": "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596", - "sha256": "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz" + "commit": "3d32aac0f895c8605e254c8b7f246537816744f5", + "sha256": "13r7lvyyyv62m57m4s4xjs4qz2ckhqk6ib514px7qzc7mdzcz9i9" } }, { @@ -67160,14 +68460,26 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20200406, - 1429 + 20200812, + 1850 + ], + "deps": [ + "jest", + "transient" + ], + "commit": "26d5cf79dfd1a2a74a66c44de129483d26354345", + "sha256": "0akjjb5xqpzg784qi6hbjfjm335mixqszzrxwz69ggl50iy9s6rk" + }, + "stable": { + "version": [ + 0, + 1 ], "deps": [ "transient" ], - "commit": "187ddd2732deb49df1e87fbaace153afb8a3e7e1", - "sha256": "0kh8y0izab3rra5vb1229h77ykz704wh28m7vv0bsfn5lg02ridx" + "commit": "a699cba6a8798af709b2576f2df54abd7eb1701b", + "sha256": "1w9a9pjpp3lchl4k8y1zhdpdnmd090s8vp7vbfb89xawp1gavhxg" } }, { @@ -67255,8 +68567,8 @@ 20181022, 2154 ], - "commit": "1efc30d38509647b417f05587fd7003457719256", - "sha256": "0px64jsdps477s9xiw96mhcf1fmgxf0gsp30gzhqfb1b1k4f306j" + "commit": "60273e764bf8d95abc40dd2fdc23af87ea9ee33b", + "sha256": "0cr0y0mflqr434223rfwlzzp2zdaddqymsrysbsrbv3qhh157sk3" }, "stable": { "version": [ @@ -67487,20 +68799,20 @@ "repo": "TeMPOraL/nyan-mode", "unstable": { "version": [ - 20170423, - 740 + 20200526, + 1054 ], - "commit": "a85ac925367ddc542827182a2d9f0133b421c41b", - "sha256": "1178zinzaq0hj1n57yhbpakgky952jhj7dfwhwvsvfclmk9dlrr1" + "commit": "06e67ab2c490756d3eeed4a68aba7c33e508a5d5", + "sha256": "0d0hdjliad8afz4br38gwidph9zhmm5s09y45n95kqlazq62jfsx" }, "stable": { "version": [ 1, 1, - 2 + 3 ], - "commit": "4195cd368aca8f05a71cbff4e60cfa9dde10319a", - "sha256": "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7" + "commit": "06e67ab2c490756d3eeed4a68aba7c33e508a5d5", + "sha256": "0d0hdjliad8afz4br38gwidph9zhmm5s09y45n95kqlazq62jfsx" } }, { @@ -67797,8 +69109,8 @@ "repo": "zweifisch/ob-cypher", "unstable": { "version": [ - 20170725, - 1420 + 20200521, + 936 ], "deps": [ "cypher-mode", @@ -67806,8 +69118,8 @@ "dash-functional", "s" ], - "commit": "114bdf6db20ee0ade060bb5df379ddee48ff4f26", - "sha256": "142d91jvf7nr7q2sj61njy5hv6ljhsq2qkvkdbkfqj07rgpwfgn3" + "commit": "da9f97339474a48d759fc128cee610c0bc9ae6c0", + "sha256": "0r4dsbrdxhyyh708pm8fqn423v21xk7a940nbajw9y07n28y5hgk" } }, { @@ -67884,14 +69196,14 @@ "repo": "BonfaceKilz/ob-elm", "unstable": { "version": [ - 20200102, - 2000 + 20200528, + 1857 ], "deps": [ "org" ], - "commit": "8b49ca0ecdff9df7c3f428bac22a96ed675ee5dd", - "sha256": "0prc0bddyppdzckfkjd6h2j5qg9plfzccg2gyn4jkmjhkx0gi09g" + "commit": "d3a9fbc2f56416894c9aed65ea9a20cc1d98f15d", + "sha256": "1wdlr0cbsb2drdmcn2bnivjkj1f2v52l6yizwsnjgi4xq3w6k56h" } }, { @@ -68075,6 +69387,24 @@ "sha256": "0ganip7077rsi681kdsrmvpjhinhgsrla34mll0daiqid7flnk4g" } }, + { + "ename": "ob-latex-as-png", + "commit": "5a9c900e82ff9e9726ce9cad98d8067752a53fdf", + "sha256": "0r355k7h5nq91dir1rvmq0hbrx6pr9kan6qblls6fzi1r0f4d1ph", + "fetcher": "github", + "repo": "alhassy/ob-latex-as-png", + "unstable": { + "version": [ + 20200629, + 1013 + ], + "deps": [ + "org" + ], + "commit": "d21d436814e9605cf2a942b709f957695298dc70", + "sha256": "0zmckisi9q9kv25jh0jn0ab9xbh2b7d4mzyyi1sdgnkg0ayzvvhb" + } + }, { "ename": "ob-lfe", "commit": "d595d3b93e6b25ece1cdffc9d1502e8a868eb538", @@ -68150,6 +69480,30 @@ "sha256": "02k4gvh1nqhn0h36h77vvms7xwwak8rdddibbidsrwwspbr4qr1s" } }, + { + "ename": "ob-napkin", + "commit": "675b76ed3aa7b3bea74ff7103f004589b6cc6b74", + "sha256": "1v6s28ahc8xzd4hdl9v4cnigg21978rj6z7xnryv35nzm6kdxn15", + "fetcher": "github", + "repo": "pinetr2e/ob-napkin", + "unstable": { + "version": [ + 20200816, + 1245 + ], + "commit": "7af5e8af08da8455c489909afbd9528a61f570e7", + "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "commit": "7af5e8af08da8455c489909afbd9528a61f570e7", + "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6" + } + }, { "ename": "ob-nim", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -68227,10 +69581,10 @@ }, { "ename": "ob-sagemath", - "commit": "dc074af316a09906a26ad957a56e3dc272cd813b", - "sha256": "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1xb8s4xm9wzfpdlhj5rym2lh4naz3h13v4sjqh71zxw6hy82gba3", "fetcher": "github", - "repo": "stakemori/ob-sagemath", + "repo": "sagemath/ob-sagemath", "unstable": { "version": [ 20191106, @@ -68515,14 +69869,14 @@ "repo": "clemera/objed", "unstable": { "version": [ - 20200403, - 1500 + 20200815, + 1504 ], "deps": [ "cl-lib" ], - "commit": "e89d8dae3b2d4331a4455d2a7b203500537d184d", - "sha256": "1xjcbfqxpda73l8imw1pj9my71qqacri269cv7wnzsfrphqh526x" + "commit": "dea5a64a4da32e8947fe5b45de569e293aaa8a96", + "sha256": "1jmr14bfs489g0czpmn987gpmmdqx72blkzcnd8sn1sfyk5n18ng" }, "stable": { "version": [ @@ -68733,26 +70087,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20200503, - 853 + 20200813, + 1540 ], "deps": [ "org-re-reveal" ], - "commit": "b5ac03800294272d2deba115bcd08c9176580691", - "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5" + "commit": "165eaf9d151c589226f7a4e0edc3a3100c0a9efb", + "sha256": "06740c4qdpdrim5wj88gw973lbh59h6sx4kzrpl37cqjvdsawbzv" }, "stable": { "version": [ + 3, 2, - 12, - 0 + 1 ], "deps": [ "org-re-reveal" ], - "commit": "b5ac03800294272d2deba115bcd08c9176580691", - "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5" + "commit": "7a99fa342eae234069344893b5bc851280ff2dc9", + "sha256": "1fsp6li73dk2272lgj4kxapd1sqw2pqj42rlcbl5hhh35hva714h" } }, { @@ -68777,6 +70131,48 @@ "sha256": "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b" } }, + { + "ename": "oj", + "commit": "f271f03feaa578e3e8ad9b02e0ca3ac99142fd60", + "sha256": "0qzyl7h8rdwyy1d6xralzcxgrc4nwx1hq30n5daa0cy3l5yix5xz", + "fetcher": "github", + "repo": "conao3/oj.el", + "unstable": { + "version": [ + 20200811, + 517 + ], + "deps": [ + "quickrun" + ], + "commit": "2dd65324ac9833e07eaed5fb04acebafc6d5cbd2", + "sha256": "00lxjl1i6kcvj9lym2m59xb5hrx2gcdpvsvq972d8iczp2jmcfxr" + } + }, + { + "ename": "olc", + "commit": "1e21abd021d72c491ed1503146c51761e18c56c4", + "sha256": "0kcqwnhhy5wa0r61yqg9gly9jd6b1846q2w43fmhzk3l4nzky32r", + "fetcher": "git", + "url": "https://gitlab.liu.se/davby02/olc.git", + "unstable": { + "version": [ + 20200818, + 1221 + ], + "commit": "d2dc62dbc3cf6460cc12bd96857a988bc80ac37e", + "sha256": "176w03pybs5rg87cj94s0dy365pxp981mlkbh3zv3d34kpmrzh10" + }, + "stable": { + "version": [ + 1, + 5, + 1 + ], + "commit": "d2dc62dbc3cf6460cc12bd96857a988bc80ac37e", + "sha256": "176w03pybs5rg87cj94s0dy365pxp981mlkbh3zv3d34kpmrzh10" + } + }, { "ename": "old-norse-input", "commit": "84780a6ebd1b2294b86ae8c6df5bd6521cf4e85a", @@ -68815,20 +70211,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20200430, - 519 + 20200702, + 601 ], - "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42", - "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp" + "commit": "0bc5e98b8456493084d1bd3df35e92a12c5da3b2", + "sha256": "121dzm051jivskssfvxs5kxkviqivf1j0fr3q8rkfqii7rxdw84r" }, "stable": { "version": [ 1, - 9, - 5 + 11, + 1 ], - "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42", - "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp" + "commit": "57ca8e70bc9ee975f0e2a60bfc4121064dadd2e0", + "sha256": "0rghxjdzyfykd4qc2zkavvbyf9xc899k1b8hbk890f1y3vakqvqz" } }, { @@ -69122,11 +70518,11 @@ "repo": "balajisivaraman/emacs-one-themes", "unstable": { "version": [ - 20190424, - 740 + 20200720, + 1444 ], - "commit": "e62e4ebef7ef8ccb1e90781d613638d30cf24d7a", - "sha256": "13vjlgac3ikd5xr6cjqb3aaj8qr201lc3ndvwhj3k617474312jh" + "commit": "0e77d31f9fc0cd55f3d92ec0db79513d616b2efd", + "sha256": "0dc2xkgnl5x542332cnlilbzy9ps060gjx0hkg8pfhismvavr4mi" } }, { @@ -69380,19 +70776,19 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20200504, - 706 + 20200614, + 1920 ], - "commit": "5b292ac136b891d574f0d9827904e6ad527a9c35", - "sha256": "0973fksap71cya30g3a58jqdd4hxkv4ia603dgl06qgirjvpl820" + "commit": "1f1e0380e2a8cd4fc29b8cc2e00cb01b56d86fbc", + "sha256": "15an4y0xdaih86p33zmb6r7qx5n0cs54flcnnq50jakkxlg9s8xh" }, "stable": { "version": [ 0, - 3 + 5 ], - "commit": "b69b52289fdb0023a3123b1ddec5b490125345a3", - "sha256": "0vxpaqsad3x1lqga1ky7sipm8lk8ps66wpcvz52jdqasxmxzvrjm" + "commit": "c6432b086f9c8ccb50b3656ba5895750f2a15541", + "sha256": "032lfwflkpaxbcxl4jf438vapswsdagipjczcn30sc4dfdh3p42c" } }, { @@ -69587,16 +70983,16 @@ "repo": "diadochos/org-babel-eval-in-repl", "unstable": { "version": [ - 20191204, - 18 + 20200723, + 838 ], "deps": [ "ess", "eval-in-repl", "matlab-mode" ], - "commit": "e111b4b5c6844bb389317354ea172cd96a8bb658", - "sha256": "0j1z1kp85fvn874l7s8h0cf528khaa38bs5ccx5dwf8mkb68vjgm" + "commit": "85136ac7397fcdf0a4700a860de44d7912bb6b4c", + "sha256": "0pkp1w8ivgbr7jy90fymws2k9bambayrfq9rcad9qfzl76i412z9" }, "stable": { "version": [ @@ -69644,11 +71040,11 @@ "repo": "scallywag/org-board", "unstable": { "version": [ - 20190203, - 1424 + 20200619, + 1016 ], - "commit": "2e01e801abc04b8fb718ca4bc19636242ac0cb52", - "sha256": "044nqxrg11qk0lnipzvhvdyd37vjkklaksyasrn6k1ifcfdx2qp8" + "commit": "1393bd46d11a81328ed4fb8471831415a3efe224", + "sha256": "1kryrg988c3sbxyp1sdgc6xdv2iz6kiflpzn2rw4z3l4grzab53b" }, "stable": { "version": [ @@ -69693,8 +71089,8 @@ "repo": "lepisma/org-books", "unstable": { "version": [ - 20200510, - 844 + 20200522, + 1800 ], "deps": [ "dash", @@ -69703,14 +71099,14 @@ "helm-org", "s" ], - "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1", - "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90" + "commit": "49617901d087f532d7cae1aa23637671fd153d20", + "sha256": "09nq7na9r39pl6aljrf5vpkfih92ms7s081nxdrhxcscaysk08kb" }, "stable": { "version": [ 0, 2, - 18 + 19 ], "deps": [ "dash", @@ -69719,8 +71115,8 @@ "helm-org", "s" ], - "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1", - "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90" + "commit": "4b93bb1e20e2e66b9e64819b21ca75f36c389370", + "sha256": "1ksvdl8liqv74am1r7brn8slkwgbc83jv7l92qk9md7s1krcb6y0" } }, { @@ -69731,14 +71127,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200516, - 1343 + 20200625, + 2050 ], "deps": [ "org" ], - "commit": "3ce2a33b81ce611695ad74bf21cb911ef90d9a1a", - "sha256": "0br8mqhxfx9pf1nslvlqk4x5rdlpjagixi6il0i0xpxhca7z3fya" + "commit": "671db0e08b91c7d2637d765a7afca8b2561275c8", + "sha256": "17i0lnp9xyzbky0xh1qi6q7jpnpz950j2zxwv2hg007zziqd21ks" } }, { @@ -69836,14 +71232,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200512, - 2102 + 20200729, + 2021 ], "deps": [ "org" ], - "commit": "1dd73fd3db0e9382fa34d3b48c8ec608e65f3bdc", - "sha256": "0wfl416hd7f42j1fidap0f9zlcm3vhgjs12k99k672fggl0459h1" + "commit": "5b461ed7d458cdcbff0af5013fbdbe88cbfb13a4", + "sha256": "171ybf5n6a6ab3ycghc2z016qxbgqyj13kkcdsfqy0691wx7dcqb" } }, { @@ -69869,15 +71265,15 @@ "repo": "dfeich/org-clock-convenience", "unstable": { "version": [ - 20200123, - 1029 + 20200705, + 1527 ], "deps": [ "cl-lib", "org" ], - "commit": "4e522706a90a504c75d377161005f9543575ea02", - "sha256": "08d0hv2shpbw01pjh8ks04avyl4zc0zcyqlmn4hbdhwjz7lzp8dv" + "commit": "efc9773a8dedf834cf4a78fb6f5f8fffe55ef8eb", + "sha256": "0xnzw4p0wvahkfnxpj2ysz9nylzndp4pvy90vlf0l0d2ff5dymbh" } }, { @@ -69888,15 +71284,15 @@ "repo": "atheriel/org-clock-csv", "unstable": { "version": [ - 20190418, - 1505 + 20200714, + 2109 ], "deps": [ "org", "s" ], - "commit": "e2fbaa1ad1a1be40fceecde603a600b292b76acc", - "sha256": "1fpjga40v2wlkvq4ap75hd844m47gm55dkraznqz078k5f8fx8kk" + "commit": "499b961f26e1f9a9898bf0b1725b49d783893639", + "sha256": "08li6il9rhbm62pcb15cd40b6vjqjlywk07jcs9m85q589v6q2yg" }, "stable": { "version": [ @@ -69981,11 +71377,11 @@ "repo": "thisirs/org-context", "unstable": { "version": [ - 20200418, - 1540 + 20200615, + 1554 ], - "commit": "bbef096dc20b206b792b0ef310f2eed7c70ca3a0", - "sha256": "05s73wn2q3a0mfc14qlgcb1bas9addby0m43id2v8ljvxyigicr8" + "commit": "8ef429124c13b1a68f7672cb6e6cb9c8b9d9db93", + "sha256": "178hpp3ylafmr2n3ydcqwqjxa8avlb8g1n3swzndc3jjk0gy6vck" } }, { @@ -70056,10 +71452,10 @@ }, { "ename": "org-doing", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "10vg0wl8dsy12r51178qi4rzi94img692z5x3zv8dxa29lmn26xs", + "commit": "8377b69021bda729b9e96e59a5d7ce2c120838c5", + "sha256": "1hbdyvfqybbgzmcllys6bqip799j79j6h4b28pp6mnlyfqi64msp", "fetcher": "github", - "repo": "rudolfolah/org-doing", + "repo": "emacsattic/org-doing", "unstable": { "version": [ 20200510, @@ -70104,14 +71500,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200506, - 1829 + 20200818, + 1117 ], "deps": [ "async" ], - "commit": "d248fcb8f2592a40507682e91eed9a31ead4e4a6", - "sha256": "1m8683hkxs70754kqxxw6sb0wfvjkb9ghf9ny7zsyzvz0yj02gkm" + "commit": "67b3c744f94cf0bf50f7052ce428e95af5a6ff3f", + "sha256": "0f94drnfkyd1vpdhkr463zv952lk1v895dwrzk1251j8fb9vdf9m" }, "stable": { "version": [ @@ -70397,14 +71793,26 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20200215, - 2217 + 20200703, + 229 ], "deps": [ "org" ], - "commit": "8eca8084cc025c43ce2677b38ed4919218dd9ad9", - "sha256": "0irr4l40djgmgvg41gx7kqza6zwi2mz69drq7dyrr10pz5hd0ikp" + "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7", + "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "org" + ], + "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7", + "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6" } }, { @@ -70415,8 +71823,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20200501, - 24 + 20200809, + 2137 ], "deps": [ "alert", @@ -70424,8 +71832,8 @@ "request", "request-deferred" ], - "commit": "2ee2b31547e6f4e33db70fb812d552e55d612fd6", - "sha256": "1gwz1avfbvn5pf72qfg3q6v8qhjihs89avzgx4v7mx6x34fgnpby" + "commit": "2cad2d8c175975dea42903cd4e3fd8bec423c01a", + "sha256": "013h09gdd7zlcrrvwf2i2ipyazvsjg2hwcfracb9bbv4r5bc0syf" }, "stable": { "version": [ @@ -70442,6 +71850,38 @@ "sha256": "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498" } }, + { + "ename": "org-generate", + "commit": "7bbcd2fe177abe7d823dd5576cce6ba50054e51a", + "sha256": "18hlqlzvlgs2gnabsawjxbp9gn6w3b9fgkzg4sp3plxaqayhayas", + "fetcher": "github", + "repo": "conao3/org-generate.el", + "unstable": { + "version": [ + 20200815, + 736 + ], + "deps": [ + "mustache", + "org" + ], + "commit": "98825efb73c4537f05f653ce40e639a220d2ee5d", + "sha256": "0p4xc4rznkq0vp0bbm1k69bfbmlp46lap12q75wdpkdrn5k4sr2p" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "mustache", + "org" + ], + "commit": "0c25f12cd25d835428dece427f26df53f1d60ce3", + "sha256": "0z2frp5mn3lp2xskwanw2rncrwa50x3aphy87vfxmhx4fqlqrzy8" + } + }, { "ename": "org-gnome", "commit": "4f7ebd2d2312954d098fe4afd07c3d02b4df475d", @@ -70493,6 +71933,42 @@ "sha256": "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c" } }, + { + "ename": "org-gtd", + "commit": "26f2af3e31a2ddbf8600cb9a625d138c924d8a53", + "sha256": "1k264yb9n544zzf8ivzm16vqrklghrhiqs6jfwyx85675088vp6m", + "fetcher": "github", + "repo": "trevoke/org-gtd.el", + "unstable": { + "version": [ + 20200809, + 2319 + ], + "deps": [ + "f", + "org", + "org-agenda-property", + "org-edna" + ], + "commit": "6837b4b192c850ae45b042a78b79f4e7cca2d56e", + "sha256": "1m3na0xswmndhjmgpqh1m5pj9cy5jp3vjmga74x2igrhk40ba8ly" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "f", + "org", + "org-agenda-property", + "org-edna" + ], + "commit": "ee10b8cb70d27d01280de8f282d9602f3497b8ab", + "sha256": "0j555cfi312j0kkpba91np3vwly26y7hyyyaxr2lcg84jd17frjg" + } + }, { "ename": "org-id-cleanup", "commit": "2d59dfe413397ba07a74b7d344e9f9a73c0e3db0", @@ -70501,15 +71977,15 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20200516, - 1339 + 20200523, + 735 ], "deps": [ "dash", "org" ], - "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", - "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" + "commit": "e79540b64e0ee5ef11adfeb932a9b04beb905680", + "sha256": "0qn85515lzhqhn49byf0vpyhbgfwyibf21f7xl2j7cj306x1f79c" }, "stable": { "version": [ @@ -70609,16 +72085,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20200505, - 137 + 20200714, + 41 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "c3c69aaeff743da4be415579444732c2904e9d3b", - "sha256": "02bl3qgplfn45wqj5gi43cz54j0i3c2nd2yn1ay2wjmdscm6akb0" + "commit": "5c90dce918fcb873754bff375e988b17dcc69701", + "sha256": "1d38szx1vq4k1pfdisr3czwaasfw7jkwa2vswfcrnk3d65akkgzk" }, "stable": { "version": [ @@ -70644,23 +72120,26 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200514, - 1648 + 20200815, + 1335 ], "deps": [ "org" ], - "commit": "2c43b10eed0659f8e47797e5e53d2973f939284d", - "sha256": "1ppzq6hx7nc2iy6pnpgxd39znc701mgqbi2v4v71a0yp8zl6kbgs" + "commit": "a2728e25b854af21cea8e8d313714c993eb1c848", + "sha256": "1rvlrn0jlw6a3p48zg50vw4nll2cffk9nkng0qvh8ws0a161w2j1" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "8eda1119f561561b993eea72a550a6b1f0ef35e1", - "sha256": "18dqd0jy2x530lk0h4fcn9cld9qh4w7b3vxa60fpiia628vsv1dg" + "deps": [ + "org" + ], + "commit": "f7bfc592ec11e9e5d0b0bfa377961167b68bba72", + "sha256": "1imrfvzc52l976598df2243s4jdwicznnxs3q91m5vrjsk23zfp2" } }, { @@ -70686,30 +72165,30 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20200329, - 543 + 20200729, + 2120 ], "deps": [ "dash", "org", "s" ], - "commit": "544aac80f1c7113cfe42cf1a2b89f5ca6bd9ead6", - "sha256": "0sx4mvr5g2ipj1s1jg82vr1q90jkq9lm0pg5cdab8lrx464lqf2c" + "commit": "70b4c9823b32ae299f3da521966b6c5abacf73e2", + "sha256": "159g13m1zpc1b2ggs9iw2l51pj0h433y1x00bgznhc9fvamysasd" }, "stable": { "version": [ 0, - 4, - 23 + 6, + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "93f8135f2b7ae2d5ed807cb92954640796bbe273", - "sha256": "1wxc4y5swldqv3jqdz9gj1gx30r4xzis8g2m572bbsrdfjf04c26" + "commit": "fbb27c3983ad735a333c766815642a6615cea2ed", + "sha256": "0xclk323hq4lszqmvba4v8785v57bxfxln5n1hy0vaf0f45hfkjw" } }, { @@ -70761,6 +72240,36 @@ "sha256": "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8" } }, + { + "ename": "org-linkotron", + "commit": "6105d5302a5fdec261f30168f811fa1e277bcb21", + "sha256": "10smvy4h178cqrn0d6kj86mqjnj23np1a2z9q8hp0n1dxyisjfhg", + "fetcher": "gitlab", + "repo": "perweij/org-linkotron", + "unstable": { + "version": [ + 20200112, + 2235 + ], + "deps": [ + "org" + ], + "commit": "d0adc5247b205bc73d2f1a83d4a512d2be541eb5", + "sha256": "1w80kwh17b4svw0md7is8ajc732cbkknychsqcp1ia42qxqq4y8r" + }, + "stable": { + "version": [ + 0, + 9, + 3 + ], + "deps": [ + "org" + ], + "commit": "d0adc5247b205bc73d2f1a83d4a512d2be541eb5", + "sha256": "1w80kwh17b4svw0md7is8ajc732cbkknychsqcp1ia42qxqq4y8r" + } + }, { "ename": "org-listcruncher", "commit": "5bed5078a3e56a825be61d158ca8321763b92f7c", @@ -70839,14 +72348,14 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20200502, - 1133 + 20200520, + 1100 ], "deps": [ "cl-lib" ], - "commit": "484bf3b0b8af461805b9e30d175510c031bcfbc3", - "sha256": "1shp3xfjifvwcj67mvfiv0dwpwyz846s6xa5zs269fwbvdvmx65q" + "commit": "9bb6351b25c62835c7881fc64096028eb8ef83ef", + "sha256": "1h9dv1rw42c4yhdxp2cnxpyv49aklxgljhbw1adl4p7sp4zgrqbd" }, "stable": { "version": [ @@ -70863,10 +72372,10 @@ }, { "ename": "org-mind-map", - "commit": "3c8683ee547a6a99f8d258561c3ae157b1f427f2", - "sha256": "07wffzf4dzfj8bplwhr9yscm6l9wbz8y01j0jc8cw943z5b8pdgs", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "0qgh74dzvpkij8xzdgwyd70wnfmjhjbmvqyw0zgkabw7s059yysk", "fetcher": "github", - "repo": "theodorewiles/org-mind-map", + "repo": "the-humanities/org-mind-map", "unstable": { "version": [ 20180826, @@ -70880,6 +72389,38 @@ "sha256": "0mkmh1ascxhfgbqdzcr6d60k4ldnh3l8dylw4m7wglz15hm3ixbm" } }, + { + "ename": "org-ml", + "commit": "95cc2843698e2341697a223a463c4d51348aec5e", + "sha256": "013rlpq5in8mq02pnlpsl0mbgflv6bwx2cr18j0jcyd4sd1r1srz", + "fetcher": "github", + "repo": "ndwarshuis/org-ml", + "unstable": { + "version": [ + 20200806, + 2244 + ], + "deps": [ + "dash", + "s" + ], + "commit": "e3df332fac6dea0810db0286ef154e917c971c49", + "sha256": "1pdl13hmvyznvk1k1096pid628rmhfif09bhryla7xjqkczpv25g" + }, + "stable": { + "version": [ + 2, + 0, + 1 + ], + "deps": [ + "dash", + "s" + ], + "commit": "c36f8a7f6b15dddcfa9e270a86d48a5e5f2beea3", + "sha256": "0vv8rk1mn7vhwz5riadg1fdjx5nmvm8h578yb9b85a100nq7av2w" + } + }, { "ename": "org-mobile-sync", "commit": "f0a8eb0eefe88b4ea683a4743c0f8393506e014b", @@ -70930,14 +72471,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200513, - 1617 + 20200722, + 2238 ], "deps": [ "htmlize" ], - "commit": "d8a571c720b2b7dec9115fd85b114ae46d4ac4b7", - "sha256": "094nrd7fy7m7m758gks14kz7yfdcclcwvbz8p90dwg3dv311hii2" + "commit": "2db6725c4a4f4342a9c61895b7c3c82795b01fee", + "sha256": "0ijll4fbm0231zig9ia3bpm2padjyj9w0c89nv5aqpilx2fk84v8" } }, { @@ -70948,8 +72489,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20200419, - 1833 + 20200810, + 1055 ], "deps": [ "dash", @@ -70957,8 +72498,8 @@ "org-ql", "s" ], - "commit": "8b056103d6f5320563e9fd794a008fd4e0719702", - "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17" + "commit": "2541e1b0798a1c9d4b4b8778e6c97a579ac3fa14", + "sha256": "1mcpbq1qylkxpd6nzq04jrji6p1xll5a30dc7dpxpcjrkgvbzf39" }, "stable": { "version": [ @@ -71296,8 +72837,8 @@ "repo": "org-pivotal/org-pivotal", "unstable": { "version": [ - 20191116, - 530 + 20200607, + 1505 ], "deps": [ "a", @@ -71305,8 +72846,8 @@ "dash-functional", "request" ], - "commit": "f073f3ed8c2e78f5080c617d01b1f6bb3df63d1c", - "sha256": "13bqcwlappxz0gsiyvklrf0xv4an6s4id48s3ydi0hki1na9fzzk" + "commit": "125e70f9a682751e4ed7c3a350b2794af9600f47", + "sha256": "1w91wb6l3vsri015awig1kfs986zf49466x4ni0m24hcg00n2m7n" } }, { @@ -71374,8 +72915,8 @@ "elnode", "org-present" ], - "commit": "d66aa2022eea65c83b6e5e5b99a1331284a7ec30", - "sha256": "1ji1qqhp6hpsmri0lgwzvvn1477njlcv60958xf6akvryk6azqh3" + "commit": "ba7e07af3bd1142e310e868893b919286758a007", + "sha256": "1vzipij1wy3g1lh13igbmf16p16llgnm90ydjrr6mlb35d141i20" } }, { @@ -71522,8 +73063,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20200501, - 1131 + 20200713, + 309 ], "deps": [ "dash", @@ -71538,14 +73079,14 @@ "transient", "ts" ], - "commit": "c847afe0b538a1a44c73e40b067831cbea132ba7", - "sha256": "0x1dymh7brhfznr6xkgc2vib4p1s5aqxq9kfjlcvi8q0cfasg9b4" + "commit": "6633dbb276d51767c3f401d0f68ef99e7b9364b6", + "sha256": "0rqhdf9g6n14v1ixwnb3d6jl85zxlarg28fz0jpzzikj4spiy772" }, "stable": { "version": [ 0, 4, - 5 + 6 ], "deps": [ "dash", @@ -71558,8 +73099,8 @@ "s", "ts" ], - "commit": "5a031bf5c19d274934f80d616d6fde62a6db5786", - "sha256": "133x49kr7nf7jhi5r7ww5pydgq8wq3g31klirwgkc29698sd6n78" + "commit": "00800556907408ee11a23de3a4982061d08d3b85", + "sha256": "08xax4fp9rzi8iimkyw2gvp2rd0lgb2f83qrhhnhnc1kgpkdl6y1" } }, { @@ -71638,28 +73179,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20200512, - 1701 + 20200813, + 1104 ], "deps": [ "htmlize", "org" ], - "commit": "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b", - "sha256": "0lkqq5n4dspnpiywaparn95wriwh7ffypdykz0a3mmlnv96rizyi" + "commit": "7fe39d5d03ccc75d2811445d25cbbb473b53de76", + "sha256": "1cmvqr97vx22lw510z0k2nsy5xfgnz2lvchmx5sdxrqz54pz1wfq" }, "stable": { "version": [ - 2, - 12, - 2 + 3, + 1, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "fa6f656f561ebb8377bfd904795aec90b4332bbd", - "sha256": "19nz77f2r49hqavz50ri222prhrd5890vhvc7jfazbascbcdjbqv" + "commit": "7fe39d5d03ccc75d2811445d25cbbb473b53de76", + "sha256": "1cmvqr97vx22lw510z0k2nsy5xfgnz2lvchmx5sdxrqz54pz1wfq" } }, { @@ -71670,15 +73211,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20191022, - 1426 + 20200624, + 615 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "1f56a1fc9a52f3815bb2115ebeca3c355688d722", - "sha256": "1xrswpkr7hgsb9pj991z4m0820f1nksfad184x0j7kir2xcx0myg" + "commit": "d60e7b000e863c60485f866f14f552506317f5b4", + "sha256": "03p3fhrllrx42dzx4v2lc4w6bpw5wxgncd8mivg3lqhkm8sb5qwj" }, "stable": { "version": [ @@ -71770,8 +73311,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20200509, - 1756 + 20200814, + 1307 ], "deps": [ "dash", @@ -71785,8 +73326,8 @@ "pdf-tools", "s" ], - "commit": "4ce80644377f2369efb475bd58a57cf6950d8c41", - "sha256": "1j15agy19n0qc4a1750qpyz6wbkwlzasq0cnk16isyq60bszgxx4" + "commit": "831fe96c242bf178f0c55b93fd076dfb549f7791", + "sha256": "18r9n6vln65czjvk46r5lbr7d2rd2dpcqrzhs37jffz9qj93cpcc" }, "stable": { "version": [ @@ -71841,14 +73382,14 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20200325, - 1003 + 20200812, + 1340 ], "deps": [ "dash" ], - "commit": "afac070eb64cc24917c0ab0e14686258da4916f6", - "sha256": "1737r8c5kpb68yb2sixp88fm7fcmr7rvpkpywyxzwgqk30xpsjgq" + "commit": "e0b04fe953de43bec51dd867d5fe12498099f2b4", + "sha256": "0r5vkx5la5dvw8vbrmmbxfffxjmhjmzdfbwy6c31lr60p55m5m7d" }, "stable": { "version": [ @@ -71910,36 +73451,36 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20200516, - 1203 + 20200818, + 816 ], "deps": [ "dash", "emacsql", - "emacsql-sqlite", + "emacsql-sqlite3", "f", "org", "s" ], - "commit": "265182a698be6babcbb11718c2821c747b1cff52", - "sha256": "159zi0a392p1f8bzlxvfkwmx12xm749cia5m0b3paz23mvvhgzgi" + "commit": "c33867e6bc282ff0a69d4ef4a020db82604039bb", + "sha256": "0nklci9ixnkawa0ryffcnxvj7hm4vhklsv7whdynhr9w6aw6f7kq" }, "stable": { "version": [ 1, - 1, - 0 + 2, + 1 ], "deps": [ "dash", "emacsql", - "emacsql-sqlite", + "emacsql-sqlite3", "f", "org", "s" ], - "commit": "27a63b59b176f9d2048de69eb0f525f3c7be8f5f", - "sha256": "18ljww204kf1pbgrrnx7bn6177lw1bs3npywbx2k1b5j35c3j8xv" + "commit": "89e9121f26cf03bb7820d257cd9d9106916cd1e9", + "sha256": "10s7mcyshgj6yva4k1j086xm61k9zck3r586f1maar5b2z6hwvsa" } }, { @@ -71950,34 +73491,66 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20200516, - 1742 + 20200803, + 1209 ], "deps": [ "bibtex-completion", - "f", - "org", - "org-roam", - "s" + "org-roam" ], - "commit": "4d60c7824e028b4bcdbe5dd589e416ec682a63c8", - "sha256": "010vgf2dlafx3673dpcpy94273i65pffpn5rz5vqvh0k3wwxhqyn" + "commit": "a92d9e6f523f449314e72911ba300192a42fc4dc", + "sha256": "1np029bspw14lcv8qzzgfyqimjz697wx2isasad06qbnhqbyc84m" }, "stable": { "version": [ 0, - 2, - 3 + 3, + 0 ], "deps": [ "bibtex-completion", - "f", + "org-roam" + ], + "commit": "ed148cee7d09538664fd22fc6bdf72adbe225617", + "sha256": "0a7jhpmjkb4d66zakgajs5anr4nrhs94l60x62s5qdxh5dn0m7gh" + } + }, + { + "ename": "org-roam-server", + "commit": "40932819ae514a015f998a687d3cf651b30a79a1", + "sha256": "1bizzzmi1bx996n9g9rmkvpm229ipmpdacmh2jd3pvn8kx6252bm", + "fetcher": "github", + "repo": "org-roam/org-roam-server", + "unstable": { + "version": [ + 20200816, + 819 + ], + "deps": [ + "dash", "org", "org-roam", - "s" + "s", + "simple-httpd" ], - "commit": "02803c85cb312608172343c2d33bf9684d4bcefe", - "sha256": "0403ic5zc2sbrg3ryxk55n52ii4qzg1373h4j8bibfal2jv5i3ir" + "commit": "5ea3d1403bd68af49ac0593a8cdff7514595d025", + "sha256": "0ajsid9p5znxqz7bq39jbf779s46ymmxwpfki4yxpa9308pwjwgc" + }, + "stable": { + "version": [ + 1, + 0, + 4 + ], + "deps": [ + "dash", + "org", + "org-roam", + "s", + "simple-httpd" + ], + "commit": "fe0364ef63928337f442c1d987d17cfe9619df2d", + "sha256": "0a5b625i7gv467xm8p92nvrh2wzgmldm8gzcbrc15al1gvnwpbqm" } }, { @@ -72006,8 +73579,8 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20200504, - 648 + 20200523, + 2004 ], "deps": [ "dash", @@ -72017,14 +73590,14 @@ "s", "seq" ], - "commit": "fb4026df05b8e05c6aefd9483bec0e8f43d87d7e", - "sha256": "1qf0hpcscplpxd8xzf0yzkh87chbv3fgsfrr7bxh81g0akjiw03j" + "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e", + "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs" }, "stable": { "version": [ 1, - 0, - 6 + 1, + 2 ], "deps": [ "dash", @@ -72034,8 +73607,8 @@ "s", "seq" ], - "commit": "53e8876a1587190ec4d103f9e94380f34797ce49", - "sha256": "1cyb956s3vshh2i4gd37m1cjxwq5s0xj55pwysgganwgxxw22c8n" + "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e", + "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs" } }, { @@ -72084,11 +73657,11 @@ "repo": "lordnik22/org-shoplist", "unstable": { "version": [ - 20190809, - 2156 + 20200603, + 1515 ], - "commit": "9591a4747eb2e5cab53203a120f9b854c75e629b", - "sha256": "1b721xp6dn54x2j73ysnzw9qxd9fxpvnqiy2y0issmz6xmccgzac" + "commit": "e1e465ef815500140940c3a247d508b8f7dd09c5", + "sha256": "03a39q495ivxn0bc9wsdl61d2qlxs2w618d5f3lkny9567wcrxgx" } }, { @@ -72215,28 +73788,28 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20191224, - 1909 + 20200812, + 1341 ], "deps": [ "dash", "dash-functional" ], - "commit": "4c0f01a493a6dc9ab3fec50e0b458aa0d35464f9", - "sha256": "1c2vjxgscngg0k7qxr67ad0cws9yv88yhmdrn9qq4rxzc9fdjkzg" + "commit": "dc69138a42745aac79dec9e8de1b6aacde3a4511", + "sha256": "0vshlr6kzri4c86yd54g3xccgj6q0vbi920858lg5ij3si4a2z2x" }, "stable": { "version": [ 0, 2, - 6 + 8 ], "deps": [ "dash", "dash-functional" ], - "commit": "7ea72ec530a340af61da215327a7fbb66a07ad2a", - "sha256": "0y1i4zpgmk6i2nj5l6dvdvqkp5a8cww8y4vcpps85blj586xgby3" + "commit": "64ed31f7c012f37219f306a4b232de2767c1911e", + "sha256": "04zdh6rw07zy6mf69hy754vp8p7kp56ny56dcnsns8ay7dd581zj" } }, { @@ -72254,21 +73827,21 @@ "org-starter", "swiper" ], - "commit": "4c0f01a493a6dc9ab3fec50e0b458aa0d35464f9", - "sha256": "1c2vjxgscngg0k7qxr67ad0cws9yv88yhmdrn9qq4rxzc9fdjkzg" + "commit": "dc69138a42745aac79dec9e8de1b6aacde3a4511", + "sha256": "0vshlr6kzri4c86yd54g3xccgj6q0vbi920858lg5ij3si4a2z2x" }, "stable": { "version": [ 0, 2, - 6 + 8 ], "deps": [ "org-starter", "swiper" ], - "commit": "7ea72ec530a340af61da215327a7fbb66a07ad2a", - "sha256": "0y1i4zpgmk6i2nj5l6dvdvqkp5a8cww8y4vcpps85blj586xgby3" + "commit": "64ed31f7c012f37219f306a4b232de2767c1911e", + "sha256": "04zdh6rw07zy6mf69hy754vp8p7kp56ny56dcnsns8ay7dd581zj" } }, { @@ -72279,20 +73852,20 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20200508, - 654 + 20200720, + 715 ], - "commit": "38a74456af863e07ab0b838c10830ce796886302", - "sha256": "1zmmv4izv5na0y29a55df1fa309xj25jdvhpwir879pfa15807bl" + "commit": "58019b6dd1ae1323b72d491e65bf9636a9278dd6", + "sha256": "00yhgxg87mfaflrkh0i905hr873yd03a7znw5hkrps43zxha9kb9" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "commit": "afe250fc43cd1beffd7946b54692d712d9263ff2", - "sha256": "15iy3z8rglaqbx1fz14inh18ksgjsmq30b8hyv3lgjvcc9ssaiw0" + "commit": "58019b6dd1ae1323b72d491e65bf9636a9278dd6", + "sha256": "00yhgxg87mfaflrkh0i905hr873yd03a7znw5hkrps43zxha9kb9" } }, { @@ -72370,26 +73943,26 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20200416, - 2354 + 20200818, + 2257 ], "deps": [ "org" ], - "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", - "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" + "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d", + "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb" }, "stable": { "version": [ 1, - 2, - 1 + 4, + 0 ], "deps": [ "org" ], - "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", - "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" + "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d", + "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb" } }, { @@ -72512,6 +74085,43 @@ "sha256": "11rfn0byy0k0321w7fjgpa785ik1nrk1j6d0y4j0j4a8gys5hjr5" } }, + { + "ename": "org-taskforecast", + "commit": "757def05a6104d8aab2dde9977762bdaef63241a", + "sha256": "1xbck5kdbfzjw55amjfxsjscmdj7yl3fyrfzgqpdicdih0fas7kz", + "fetcher": "github", + "repo": "HKey/org-taskforecast", + "unstable": { + "version": [ + 20200817, + 748 + ], + "deps": [ + "dash", + "dash-functional", + "org-ql", + "s", + "transient" + ], + "commit": "fc160ce255a98da36c59da4d49a628dd7f742087", + "sha256": "063myyg4p2qwbvhb8kcgnz15xp48rv8zhcb86kxh51bm92ifwgb0" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "dash", + "dash-functional", + "org-ql", + "s" + ], + "commit": "036da7c14e0defb85917293f00a5fa9ac0977da4", + "sha256": "0lz6c1hq35qw44fllzsrzv9p4r4sjikciyzvi6nyf0fw189b0c4h" + } + }, { "ename": "org-tfl", "commit": "d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf", @@ -72582,15 +74192,15 @@ "repo": "leoc/org-time-budgets", "unstable": { "version": [ - 20151111, - 801 + 20200715, + 1016 ], "deps": [ "alert", "cl-lib" ], - "commit": "1e81ea29af1ccc7b4ddb42fe4e3fbfc0adf891b0", - "sha256": "0cqk9q26qby2y1l6x39jfrdrw9x9419mlx2zhndmlb6gv3lv35f9" + "commit": "1d6bfc323013bbf725167842d9e097fad805de03", + "sha256": "0cny7ck4acj8s2l6hzp48mvz0v0yk7q91mmzxn8vgrggsb02qm5k" }, "stable": { "version": [ @@ -72734,11 +74344,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20200114, - 2334 + 20200611, + 1143 ], - "commit": "7bf09a02bd2d8f1ccfcb5209bfb18fbe02d1f44e", - "sha256": "1pzgb1z5k8zsbdqiaa7l94xlrncji1l09zqxvq62fyc0slxcf4ix" + "commit": "7126a4365072a32898f169ead8fb59265dabc605", + "sha256": "0lbqq3kzh8pd991c3s76parsl49ci5sclfq3sx0aqbcla0qzvh3y" }, "stable": { "version": [ @@ -72850,11 +74460,11 @@ "repo": "flexibeast/org-vcard", "unstable": { "version": [ - 20191130, - 703 + 20200720, + 638 ], - "commit": "4f5d71225e946999f45ac9f96996705fee83df5a", - "sha256": "1w8miq52d2rlyslbss5173gnbv7rmkn2cicd9h272v6ybb585hcd" + "commit": "1ae97371b207dabfecaf6b4f7118abafe6cc5e2b", + "sha256": "0k9slz20gxcdpvpz8kgvvwff6cif74wybpqgg9x03wqqqda3f37v" }, "stable": { "version": [ @@ -72874,11 +74484,11 @@ "repo": "tesujimath/org-wc", "unstable": { "version": [ - 20180610, - 253 + 20200731, + 2244 ], - "commit": "0716c1e8276f6953e139e357e97566e792c8be19", - "sha256": "0wx4z6y3wn6948bz2pgrpffd4jzwgplvjkh0rnra4gihrapg1bv8" + "commit": "dbbf794e4ec6c4080d945f43338185e34a4a582d", + "sha256": "0j58591jnj182hps1zc9an692hhnxinlpbw762l7xdc0sa5pjrgb" } }, { @@ -72963,20 +74573,30 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20200516, - 1341 + 20200819, + 708 ], - "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", - "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" + "deps": [ + "dash", + "org", + "s" + ], + "commit": "d6f2d1ebcfe0b6ccb3a799f04ba6842ca86c9115", + "sha256": "1lkf497qpydvw5f7vi0v7yr43j9v03hys16qz6nsqkbizr54b5jh" }, "stable": { "version": [ 2, - 2, - 1 + 3, + 4 ], - "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", - "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" + "deps": [ + "dash", + "org", + "s" + ], + "commit": "d6f2d1ebcfe0b6ccb3a799f04ba6842ca86c9115", + "sha256": "1lkf497qpydvw5f7vi0v7yr43j9v03hys16qz6nsqkbizr54b5jh" } }, { @@ -73009,8 +74629,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20200317, - 2136 + 20200814, + 543 ], "deps": [ "htmlize", @@ -73018,14 +74638,14 @@ "metaweblog", "xml-rpc" ], - "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", - "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" + "commit": "a56346bf1517118b2a960eaadbf138ae1695ddd1", + "sha256": "09iycpdj6dkvz5axfx85bkrrf5128ws7clg1jn9yli06rjsw36ba" }, "stable": { "version": [ 1, 1, - 8 + 10 ], "deps": [ "htmlize", @@ -73033,8 +74653,8 @@ "metaweblog", "xml-rpc" ], - "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", - "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" + "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab", + "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr" } }, { @@ -73099,32 +74719,28 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20200516, - 1727 + 20200622, + 1519 ], "deps": [ "dash-functional", - "deferred", - "kv", "s" ], - "commit": "36d7789b7b3dfa2f4739a83692d322b601a0f4ea", - "sha256": "1j1cckvvghz9656bjkdxrc3gsfpz1wjvq3hlh6zblmnlbhhvbsan" + "commit": "571249c977e0340edb3ef3af45b7841b62ec8065", + "sha256": "1hjqawygbmvdlvzi908b2l4k7ca3g0dg32mpk7vld8xwi49hb1kp" }, "stable": { "version": [ 0, 2, - 2 + 7 ], "deps": [ "dash-functional", - "deferred", - "kv", "s" ], - "commit": "7be4a71ce55f2fdc7fe7f6414f03d58f19d43410", - "sha256": "0cxhmbbznvv9d3nmqfn0ggr164fa6yjbfac9wqi3c58vm3zri00k" + "commit": "c05ba707190cfab20938afd1b5d4966511ca63b7", + "sha256": "03ddrc40qab285i7sj438kicaxxmixkk0b6d8512cn44f42zczyq" } }, { @@ -73179,11 +74795,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20200510, - 1645 + 20200717, + 1937 ], - "commit": "2a88a70a5c2a57150c80d306f2475e351a59039c", - "sha256": "1y3g180q96vx7l8qs0l2jwjv2wbmk6aqzfm2p1h130h05lhgv31w" + "commit": "01fe614086e31e166d2a2f1d6b34e301f060458e", + "sha256": "1hsidgcyqsbm96gh0nfrdpnm4vq1sw8777d0zslsczr1fp51il6d" } }, { @@ -73194,30 +74810,28 @@ "repo": "jcs-elpa/organize-imports-java", "unstable": { "version": [ - 20190922, - 1520 + 20200717, + 757 ], "deps": [ - "cl-lib", "f", "s" ], - "commit": "8299bdfd65105feb8d7fb85d2951954d73671cd2", - "sha256": "023gkvhaxx54gcfz6m3pc0yhygf2y43391r1dghivk8420savdjg" + "commit": "c431b338d34c94345217b2b904d9c6f331d4015c", + "sha256": "1dqvx49lcfi5472aq17nd7y7v7d2ljxcmy5zhks2mfbhhzgdp8n6" }, "stable": { "version": [ 0, 1, - 3 + 4 ], "deps": [ - "cl-lib", "f", "s" ], - "commit": "de094d6d56c85aa9820c77055b54287ae6b46d20", - "sha256": "0hgdgz1jx292dfxcm1av4v9v6400jpnyp1j21d4fzfi0wj2srfrr" + "commit": "c431b338d34c94345217b2b904d9c6f331d4015c", + "sha256": "1dqvx49lcfi5472aq17nd7y7v7d2ljxcmy5zhks2mfbhhzgdp8n6" } }, { @@ -73260,29 +74874,64 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20200417, - 1720 + 20200714, + 1943 ], "deps": [ "magit", "org" ], - "commit": "e147f055772cc934fe1f1d8619059badeb647c93", - "sha256": "1q3v22drqbjzzr6d0zdwczz1rq37iyh78k2nk1wirbs5z4ixfyx8" + "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646", + "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481" }, "stable": { "version": [ 1, 6, - 0 + 3 ], "deps": [ - "dash", "magit", "org" ], - "commit": "e7cddf39e301c87c36c7de13e429dee74874d5c8", - "sha256": "00s3a8i221didw8phlbvdvihj9pxkq9k9j9vh1g1mzd7cz58dm07" + "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646", + "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481" + } + }, + { + "ename": "orgit-forge", + "commit": "d180f7bb9d937d574726326b788f3721266e31a8", + "sha256": "1v1a8cz2r84f9y1arzlhpff2fkqyx598pd1lqf81fr6l6l2y9j5n", + "fetcher": "github", + "repo": "magit/orgit-forge", + "unstable": { + "version": [ + 20200621, + 2144 + ], + "deps": [ + "forge", + "magit", + "org", + "orgit" + ], + "commit": "63a19d1df1434e583aac1329ba4dcfa2ee59d7c1", + "sha256": "1vd7wnas53z0985if22sv0wpww2dp0g8b0z9hwlzdhlcrsjay5fz" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "forge", + "magit", + "org", + "orgit" + ], + "commit": "63a19d1df1434e583aac1329ba4dcfa2ee59d7c1", + "sha256": "1vd7wnas53z0985if22sv0wpww2dp0g8b0z9hwlzdhlcrsjay5fz" } }, { @@ -73293,28 +74942,28 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20200413, - 2124 + 20200719, + 917 ], "deps": [ - "dash", - "org" + "org", + "seq" ], - "commit": "a5f5da06174d22dc21bbac167a8c2361fa84bf2b", - "sha256": "0sxali4vnqzk6mj0m7d82yr2ixvxxj5lzmxffyznpa7j6yndi2mm" + "commit": "2f1939488204f67d2a427f224b45596361b402b1", + "sha256": "0ipy1p2cr5i0465hchqazmgn9jrgwzbyrb3prfgkl7z2m1gd7fcg" }, "stable": { "version": [ 1, 1, - 4 + 6 ], "deps": [ - "dash", - "org" + "org", + "seq" ], - "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161", - "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q" + "commit": "2f1939488204f67d2a427f224b45596361b402b1", + "sha256": "0ipy1p2cr5i0465hchqazmgn9jrgwzbyrb3prfgkl7z2m1gd7fcg" } }, { @@ -73364,11 +75013,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20200516, - 1344 + 20200708, + 2131 ], - "commit": "7426df13512f5eee921c26aa68cfc6e32e3061fc", - "sha256": "18n2xzwpqq8159qwqy7hy0b93a5qxdb5rjh0ls4jk8lmahk5jrqk" + "commit": "99c6bc8c9b72dc9ce886a09540ed24ec83bcc056", + "sha256": "03q02cxz76wnx20rhwqiysxnskzs7caw428ij3jj4nsmjkhxdfv0" } }, { @@ -73394,14 +75043,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20200512, - 721 + 20200708, + 2127 ], "deps": [ "cl-lib" ], - "commit": "5bfe2f6d53798d0fe071f9990e03d7428623e4a7", - "sha256": "16xcps2qlzh5z8c20sl0cnc0mlj8153vk6j1dnfd6l3a6kni88af" + "commit": "1aa352a09a2c543352fceb32a505c44e080efcb3", + "sha256": "0aczwlssnhn1xpgk3s7l2smrxmhb8af6gg9xjdsfysss4ybbcgy6" } }, { @@ -73448,6 +75097,35 @@ "sha256": "0ycjbsn03cjzx6adabcvi1j7f92yhx3xjzj3xc68m1hw9r2f2gzf" } }, + { + "ename": "origami-predef", + "commit": "0cda4d6554f8c99928973a0bf718766b7135ffeb", + "sha256": "1wr0fs0a2p43yr9fsbdm52z767rbj4j1w3m25w299zf71h263pc9", + "fetcher": "github", + "repo": "alvarogonzalezsotillo/origami-predef", + "unstable": { + "version": [ + 20200615, + 1044 + ], + "deps": [ + "origami" + ], + "commit": "edcba971ba52a14f69a436ad47888827d7927982", + "sha256": "1r3dbnjwmg7y1zsimvqw3bi4168ikwdd5fqkjqd6gm905w32hwc0" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "origami" + ], + "commit": "edcba971ba52a14f69a436ad47888827d7927982", + "sha256": "1r3dbnjwmg7y1zsimvqw3bi4168ikwdd5fqkjqd6gm905w32hwc0" + } + }, { "ename": "ormolu", "commit": "ab315f96d9b8d01ffc3b4748d01c70861daf8c1a", @@ -73466,6 +75144,39 @@ "sha256": "1j7q9rmcn6fkhbcvfh8w4y9dir2y0hhhqmjpsafs8m4zm1rvffbn" } }, + { + "ename": "osa", + "commit": "df18def95ae792387da2e21f1050cfc25af772fb", + "sha256": "1knzkwvdq9wwy2x7kgl1nf0p564247l2y82ms77r0j5vfqhsfd9s", + "fetcher": "github", + "repo": "atomontage/osa", + "unstable": { + "version": [ + 20200522, + 2103 + ], + "commit": "615ca9eef4131a23d9971691fa0d0f20fe59d01b", + "sha256": "1p651fqivyfyqjs6zz9p4n19r9d23xiswhyjz7r93llmsqs702qi" + } + }, + { + "ename": "osa-chrome", + "commit": "b9c83566892095706033869da370a12e8eccc590", + "sha256": "1spihfihcd5iblsl1xp19ayk65mn9ik32jlqn2pg15jwhyfmvyfs", + "fetcher": "github", + "repo": "atomontage/osa-chrome", + "unstable": { + "version": [ + 20200627, + 1344 + ], + "deps": [ + "osa" + ], + "commit": "07894b9cb40171702b4c89b75542af1f1ac1403c", + "sha256": "0brhn6qlminzamwl90ynaik03xvaw3rlkdccdyxfpckjd5npa9wr" + } + }, { "ename": "osx-browse", "commit": "081aa3e1d50c2c9e5a9b9ce0716258a93279f605", @@ -73729,20 +75440,20 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20200429, - 2055 + 20200720, + 1954 ], - "commit": "b616b0d90a7c3d7b87bd164f2d213a5e009c39eb", - "sha256": "1b2mjzym8x42rz3qvmr0va21naw3aycvc2blfxx91i7pwpp8n3qg" + "commit": "cb9c529bb992c6f60b054caf4e993b03c7b3ba9e", + "sha256": "1s76zfzpwhcql2c4kr5maxc53vznqw6p7hx9n8nihxjgz2rywcas" }, "stable": { "version": [ 0, - 1, - 3 + 2, + 1 ], - "commit": "d6247aaec44f60a9bd161c1d56960f80ab314a49", - "sha256": "0mscnbbv6cap818zhzz3ig6ychrw0zw84zyl2g1rksir0qj4hznf" + "commit": "cb9c529bb992c6f60b054caf4e993b03c7b3ba9e", + "sha256": "1s76zfzpwhcql2c4kr5maxc53vznqw6p7hx9n8nihxjgz2rywcas" } }, { @@ -73975,11 +75686,11 @@ "repo": "fishyfriend/owcmd", "unstable": { "version": [ - 20200427, - 633 + 20200517, + 2039 ], - "commit": "cdd2280f34328f65fe470046c928b0018914584a", - "sha256": "15601vbng2vn45zcdp51vkgycfpcfkaw0xidrq13rg5544x9h7lz" + "commit": "05fb8f8f81838b5888fdec8b3947096dd2222e61", + "sha256": "0y9ldprxhp6nq8m5bxmhw4iq4n78wvdx2jmr5w9wbd0znvi4cbfz" } }, { @@ -74064,8 +75775,8 @@ "htmlize", "org" ], - "commit": "bd36f9fb4e3b1b9e8686b993b02ccd780ff75a96", - "sha256": "03wj3gx09lbfmsanfhqfbzz61zaszia1mhfvlywhygknpagxr3lp" + "commit": "f5eac28734ea33d0b7a3dbe10b777907a91cf9f9", + "sha256": "05ndpkqr4kh2942ygjsa1w53056d60qvl0gmp30dxmzc57v0wb2x" } }, { @@ -74175,14 +75886,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20200501, - 1317 + 20200722, + 1939 ], "deps": [ "org" ], - "commit": "8f36181977377383cb54803651d93b24e370122d", - "sha256": "1rxkbkgvylwnh5n6zc6hiqa9zhxwc8j1if7mxribw44xrg3150a1" + "commit": "75b849e9561c4a6022babf6eaf0e037310ded7c1", + "sha256": "1xsxljf99h2pyvpp9gvma6g42q1n2xmhnwvpmciwj5rajw5xqc5v" }, "stable": { "version": [ @@ -74198,10 +75909,10 @@ }, { "ename": "ox-impress-js", - "commit": "e5e79b4b897daca80f26440107abaddf0a480db9", - "sha256": "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1n7g5ykn95565z7kp83pqvm4y8r4p1jmwh0g7pl3kbw48y1521vc", "fetcher": "github", - "repo": "kinjo/org-impress-js.el", + "repo": "nullpofy/org-impress-js.el", "unstable": { "version": [ 20150412, @@ -74271,14 +75982,14 @@ "repo": "stig/ox-jira.el", "unstable": { "version": [ - 20200218, - 2301 + 20200616, + 2310 ], "deps": [ "org" ], - "commit": "00767df8ba024eb1ef09fe16c3aed30d729d6add", - "sha256": "0fbic43vzp0dp8wbx12cq22ca192v2jl2w131xcqmbhbww6j5xv2" + "commit": "e9a47ef51862f11a5c006cf9e8c5f4ec5517aced", + "sha256": "1ws3myl2z6vv3idq28m8q97zlrmsfg5z3i8y3adsbm56ga9jqvdj" } }, { @@ -74340,6 +76051,25 @@ "sha256": "15wxyzsfp4gilnravs2h4h8vwk0rf8ylzsxzdzlqx0i62wbb79l9" } }, + { + "ename": "ox-leanpub", + "commit": "20e1ea346ac6d912e3fbb597b7c65c98a6785132", + "sha256": "10nz3dy7dmy8p70fsglbc0gdfhhvr286wby5yccjfaacjkg77ifj", + "fetcher": "gitlab", + "repo": "zzamboni/ox-leanpub", + "unstable": { + "version": [ + 20200818, + 1116 + ], + "deps": [ + "org", + "ox-gfm" + ], + "commit": "8c8d026aa3a31cb6dcd2530ac5902e551b161343", + "sha256": "0i88bzcczvhsylcbk7nwx19gn6ydiw8vrgwl2p5njm10vngrjlny" + } + }, { "ename": "ox-mdx-deck", "commit": "13d1a86dfe682f65daf529f9f62dd494fd860be9", @@ -74471,14 +76201,14 @@ "repo": "0x60df/ox-qmd", "unstable": { "version": [ - 20170402, - 1657 + 20200813, + 408 ], "deps": [ "org" ], - "commit": "3a24c7a0b3ec80e494b977e14a3dfb94c9f1d8ec", - "sha256": "030nay81c49ings96akzzy108a6agg91rvpmg0pf05qmjysfysmf" + "commit": "8c3d8ce2a21044fc85e5e4e06be0220900d7ba4f", + "sha256": "1j6zmjy3s2l2wj500q9i75xd3hf8wlh04ycmmad45swrkgp70f2s" } }, { @@ -74489,14 +76219,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20200429, - 1533 + 20200802, + 710 ], "deps": [ "org" ], - "commit": "e8b2801ab2210187ab1cfacad09bb07e4b61ca56", - "sha256": "0xa34y0v6z78gpida59jc3gzng68n0has5dnkccv4vdxi4yb6ii9" + "commit": "553e1a9d678e74c2646e4c19bd9f6c08d8a00486", + "sha256": "18khlffdmg88pd50vwg00vz143ysqhkdkvva9h4bkw618inz70wq" } }, { @@ -74525,14 +76255,14 @@ "repo": "msnoigrs/ox-rst", "unstable": { "version": [ - 20191013, - 551 + 20200815, + 1511 ], "deps": [ "org" ], - "commit": "9158bfd18096c559e0a225ae62ab683f1c98a547", - "sha256": "11v1h45ipjh95ksk6cdgp0azfmb7y3i8hdd46m7psmda08x8kqm5" + "commit": "99fa790da55b57a3f2e9aa187493ba434a64250e", + "sha256": "0dxadzbha2fvg42jh4ng8hjb582mv7avlzmpxlzf32qxf6x8r638" } }, { @@ -74683,20 +76413,20 @@ "repo": "marsmining/ox-twbs", "unstable": { "version": [ - 20191216, - 1011 + 20200628, + 1949 ], - "commit": "cf56accf8633f72c741fff19a49c24cc8bdd8974", - "sha256": "12w58nvpzn0fbica3m679n08hczzikqr1xi1n4k7a6h1l60qykl7" + "commit": "e8a27dc78b7be494d9918f26db7a3bbb6b45020b", + "sha256": "0nffy7ivs8fw0dj3s66hbsby0riz5wrv7xzm8g9mrfvhki938pqa" }, "stable": { "version": [ 1, 1, - 2 + 4 ], - "commit": "cf56accf8633f72c741fff19a49c24cc8bdd8974", - "sha256": "12w58nvpzn0fbica3m679n08hczzikqr1xi1n4k7a6h1l60qykl7" + "commit": "e8a27dc78b7be494d9918f26db7a3bbb6b45020b", + "sha256": "0nffy7ivs8fw0dj3s66hbsby0riz5wrv7xzm8g9mrfvhki938pqa" } }, { @@ -74877,14 +76607,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20200426, - 2253 + 20200601, + 1939 ], "deps": [ "cl-lib" ], - "commit": "5fe5156491145c667286cb92be4191a348eaa31e", - "sha256": "1r9ir8jqfi2sqjjx9yxs4phxrpfw8x35nm58xfrqsjw158dspzai" + "commit": "4cb0f98a21729f9ef0189f095384555c9d2b6fe4", + "sha256": "0ij6p7i5x0fs0yn8zxcx7gf9ldanflh7mj7mblr8snpgbzx3jwnz" }, "stable": { "version": [ @@ -74921,27 +76651,27 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20200419, - 406 + 20200816, + 24 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "495da67557d35acb146ec1f38f7576126aec6bfc", - "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq" + "commit": "c4b16a90196d6d83d6ba668923c1ce725e13a5d6", + "sha256": "0kz8snjl0802ypxzag2n7552f6ssmj0hxx4lkal4v421pr2cqka6" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba", - "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw" + "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc", + "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70" } }, { @@ -74958,19 +76688,19 @@ "deps": [ "package-lint" ], - "commit": "495da67557d35acb146ec1f38f7576126aec6bfc", - "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq" + "commit": "c4b16a90196d6d83d6ba668923c1ce725e13a5d6", + "sha256": "0kz8snjl0802ypxzag2n7552f6ssmj0hxx4lkal4v421pr2cqka6" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "package-lint" ], - "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba", - "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw" + "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc", + "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70" } }, { @@ -75128,8 +76858,8 @@ 20200305, 244 ], - "commit": "314b397910b3d16bb7cbcc25098696348e678080", - "sha256": "106w2n01i9d6z2r43lwwrm7hlppi9bkf8g8nsqd91f0f06921plw" + "commit": "f8c4cd7fc67638ae4113551dcffdf87fcd252d9b", + "sha256": "1jh7mdry3ysgl9dvrrbx7b9f5dh4bm6gccibpcdnm9pgpfj2bm29" }, "stable": { "version": [ @@ -75181,11 +76911,11 @@ "repo": "danielsz/Palimpsest", "unstable": { "version": [ - 20200211, - 641 + 20200804, + 2308 ], - "commit": "389ec5b4c5067fa903c543b7fe1d804f30b6ced5", - "sha256": "1yki1sl2m7fj4m52gmb768h2qkv0j93lmd72jv21n20bnzvjp73v" + "commit": "f474b3ad706373d9953abdc401d683a2a023d28e", + "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh" } }, { @@ -75252,11 +76982,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20200424, - 2206 + 20200715, + 338 ], - "commit": "bdd9f80283d8ae4a69f8789e5f18b1560b94fe43", - "sha256": "1ld4igmmjk7p7dxm0mnfks3k0cqpqjxrvlmjdi0m7w11ba8dsah9" + "commit": "6508ac3228975c39d10a1caa70b9ce34ff3ed21d", + "sha256": "019nigy5yh1qrzw0agp2kgjfpfm503fgkj07c9m2xqs9hww781x1" } }, { @@ -75440,14 +77170,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200514, - 2047 + 20200812, + 1259 ], "deps": [ "autothemer" ], - "commit": "4fa14adbc043497fc942568fdb78505ca549e5b7", - "sha256": "1ply18yzdf1lxyia8knn6fk8wb4yzwicgdiscr2z87bpk8p5d2pb" + "commit": "271ab4b7d023d730e3d684a1505cc77e2d0cc14a", + "sha256": "138n4fs33cv2ly89cvs7lkh372kghldhw8pw18zsi39qfvggw6wm" }, "stable": { "version": [ @@ -75470,8 +77200,8 @@ 20191121, 2328 ], - "commit": "814999bb320e6d5aaa9c8ff663b1933157129571", - "sha256": "0jb3qwx8bxr7x17cgqbd6v53634i9lmrcnqn847bnnlsvy0j094x" + "commit": "8330a41e8188fe18d3fa805bb9aa529f015318e8", + "sha256": "10zm5nfs8sx1cmjifjcy6xj3285hx1936xc3kbf6ndzpcqgb9yd5" }, "stable": { "version": [ @@ -75622,6 +77352,30 @@ "sha256": "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk" } }, + { + "ename": "parinfer-rust-mode", + "commit": "b35f28995db0c21ecaadd5504a10aa2ee5ac2070", + "sha256": "06003hh19k1087s8lvsbl04as2yph1zw9qr844s4rbyi838d4pc1", + "fetcher": "github", + "repo": "justinbarclay/parinfer-rust-mode", + "unstable": { + "version": [ + 20200802, + 2026 + ], + "commit": "9e2e91cf1697582a396a5365f24d74634acfc744", + "sha256": "1ii73zlpdvi5fxp6ajyn8h7xvxgc5iz58zr5g4vk0flm1vw6v5kn" + }, + "stable": { + "version": [ + 0, + 8, + 1 + ], + "commit": "9e2e91cf1697582a396a5365f24d74634acfc744", + "sha256": "1ii73zlpdvi5fxp6ajyn8h7xvxgc5iz58zr5g4vk0flm1vw6v5kn" + } + }, { "ename": "parrot", "commit": "b1b393ffb9b7691e8fc99bee5fc676463038a68d", @@ -75669,28 +77423,26 @@ "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20191209, - 549 + 20200720, + 1047 ], "deps": [ - "cl-lib", "s" ], - "commit": "ff9f9049ac039473f0ba5d070ac0e6d89cfbf851", - "sha256": "05ckrhkxffzcz1igqwznbkxc1hpidvsnwv6cxp8n4q6kmniagx4i" + "commit": "abf2b7528ea2ec5c45f99664a6ab9509ccd954f3", + "sha256": "1v4a07gnaccqnl1r0r8yhw6ka6f8nh0p8j0lr562ik6cbfljf04a" }, "stable": { "version": [ 0, 1, - 7 + 8 ], "deps": [ - "cl-lib", "s" ], - "commit": "318cb29153c6ae0032ddceb69bb8c1f2a7df5ef6", - "sha256": "0f2fjb0a0yj62dy3j820fgxlpg2gsv1awaswwrb2rv7mp44drr4f" + "commit": "abf2b7528ea2ec5c45f99664a6ab9509ccd954f3", + "sha256": "1v4a07gnaccqnl1r0r8yhw6ka6f8nh0p8j0lr562ik6cbfljf04a" } }, { @@ -75933,8 +77685,8 @@ "s", "with-editor" ], - "commit": "07b169ec32ad6961ed8625a0b932a663abcb01d2", - "sha256": "1dl3bck16zwhpspjrms11dknqgadnmpjqhcplkvv3v4f7vbnij6v" + "commit": "06f499994071bb6131244218b25d637103afe1d5", + "sha256": "05w0jkl7m55h30szvgknbwg7xayilk4bh3nf70hrsy3czisxmccx" }, "stable": { "version": [ @@ -76568,29 +78320,6 @@ "sha256": "1b7csqypqkalkzq6vrbq5ry1gdk0qnhnk43rlj514mph0s1nywdd" } }, - { - "ename": "peg", - "commit": "9b9b55a02e903ae7e75f8b636fdb1cf907c5db7c", - "sha256": "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm", - "fetcher": "github", - "repo": "ellerh/peg.el", - "unstable": { - "version": [ - 20150708, - 641 - ], - "commit": "081efeca91d790c7fbc90871ac22c40935f4833b", - "sha256": "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n" - }, - "stable": { - "version": [ - 0, - 6 - ], - "commit": "081efeca91d790c7fbc90871ac22c40935f4833b", - "sha256": "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n" - } - }, { "ename": "pelican-mode", "commit": "aede5994c2e76c7fd860661c1e3252fb741f9228", @@ -76639,14 +78368,11 @@ "url": "https://hg.serna.eu/emacs/per-buffer-theme", "unstable": { "version": [ - 20191101, - 2333 + 20200527, + 1256 ], - "deps": [ - "cl-lib" - ], - "commit": "7df4d2f4be64dbcf0bf10a2b9ac3db858fbcd9c8", - "sha256": "04s14x3qi5aa18bfcr3zjbb109nm2pgwgnl36g7fw2crj8mz03v4" + "commit": "f29b5c57198ebfedbf142f95129190c6c00b4822", + "sha256": "0b39m8zmy4yfj3z93q3gqqqhhmyb10kd76fl7347pm6xgq4sl1g0" } }, { @@ -76793,11 +78519,11 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20200222, - 1106 + 20200617, + 2154 ], - "commit": "391a7dc248c9c04b7ad424c696bdff578e14dd2c", - "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g" + "commit": "14325c11f7a347717d7c3780f29b24a38c68fbfc", + "sha256": "1kb5v7pl2vhx6zdwf9kip38qjk8nkd9xpgdy74q8p3c56ap9lg6g" }, "stable": { "version": [ @@ -76871,25 +78597,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200513, - 1416 + 20200814, + 554 ], "deps": [ "cl-lib" ], - "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", - "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" + "commit": "74e811ccbada09dd9a3d90b983e78d146542121b", + "sha256": "1xfcm69nd6f9chwlqfz5vd8nnyl5mwharxjrn1m515568dqrk62x" }, "stable": { "version": [ 2, - 8 + 10 ], "deps": [ "cl-lib" ], - "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", - "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" + "commit": "74e811ccbada09dd9a3d90b983e78d146542121b", + "sha256": "1xfcm69nd6f9chwlqfz5vd8nnyl5mwharxjrn1m515568dqrk62x" } }, { @@ -76929,8 +78655,17 @@ 20200321, 504 ], - "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023", - "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" } }, { @@ -77039,15 +78774,15 @@ "repo": "emacs-php/phan.el", "unstable": { "version": [ - 20191125, - 1408 + 20200805, + 356 ], "deps": [ "composer", "f" ], - "commit": "2a6e1b66c2aad25fddb8b4f706a28a1aafaaa4c7", - "sha256": "1ivkkmjg9drp22l5hvira5m0ialca8kzw6pzj01wm4ykqsaajnlf" + "commit": "b7d523630bb072c4dbcfa9995dc734b25b72a69f", + "sha256": "0xif2hmlfcnhf716964zmzzldxsyhmpp2y40i9l1cxlcliszwscv" }, "stable": { "version": [ @@ -77071,14 +78806,14 @@ "repo": "zk-phi/phi-autopair", "unstable": { "version": [ - 20191220, - 311 + 20200816, + 535 ], "deps": [ "paredit" ], - "commit": "5685b9541c4c9d4cc8a892743fdf245aceea1682", - "sha256": "16kib35s7pffcs8kiljydbf5z1qq5l2d04dqqcnbbi0539y979n5" + "commit": "3e78793f9c480adf79b12d441fae5571e97b9e5f", + "sha256": "003dnixrnn7qcm25dbibc4rc8yrqsj9jci9rxp9l7ci6ya1bi0i2" } }, { @@ -77089,14 +78824,14 @@ "repo": "zk-phi/phi-grep", "unstable": { "version": [ - 20190920, - 908 + 20200816, + 1027 ], "deps": [ "cl-lib" ], - "commit": "06b740e3fb20074be9bae87530f5616a122c3aca", - "sha256": "0lwqlz6jp44dq7yhj5yvfrhnjlxlihkpqjil6d2ma20b2946n9ny" + "commit": "d9dbf69dcf0e06944dcfb89375b09d0d2b0ef4ee", + "sha256": "1lgixvg5668kb1y8a2xxm1nlbppj5a8sswjrcxasqnxmrif6lkls" } }, { @@ -77107,11 +78842,11 @@ "repo": "zk-phi/phi-rectangle", "unstable": { "version": [ - 20151208, - 654 + 20200816, + 650 ], - "commit": "0c12716afc71d803d1f39417469521dc465762d9", - "sha256": "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4" + "commit": "4ea8b40a614c1cc9087b9c0bd924a2d9d6cc0a83", + "sha256": "1ajjdpx4xbgig11380lyy10gqfmp23k5zwb77pwdl1rhapsdpjp8" } }, { @@ -77144,14 +78879,14 @@ "repo": "zk-phi/phi-search-dired", "unstable": { "version": [ - 20150405, - 714 + 20200816, + 1542 ], "deps": [ "phi-search" ], - "commit": "162a5e4507c72512affae22744bb606a906d4193", - "sha256": "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn" + "commit": "f014a9fb0b6a94af2df0e22f91ef79ce6996afd7", + "sha256": "0ivb7d33qajccvs1sz4fc3h031qkqmz8w93k6di47qyfzd4vrvjm" } }, { @@ -77347,17 +79082,17 @@ }, { "ename": "php-mode", - "commit": "2e41dc09413eaa93704e7d9f55bd2bd01f658806", - "sha256": "1gqmcynz2wx09xjnk70db1a2pbnrh1vfm5vd6mks1s10y59bh0zq", + "commit": "5593a586ce7579fd3a136e2416b89721157f98e1", + "sha256": "1xa9dmjinm6qm4cbzqanw5njmif71sg3jxnvgvi17jj9j3125d9f", "fetcher": "github", "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20200507, - 1755 + 20200812, + 1129 ], - "commit": "a7687e454adc2e6c1e13d90beac122af32169eb8", - "sha256": "1nlikgyflksdzbd8k2l3f0nmv3gisj145fi45kw971ianihq476x" + "commit": "f4c7c6995dadcdc6da5fefadfd362f8418b2eec1", + "sha256": "0vg8xzpm4lbahlldgfsc63wfans3wx0nfkm2x2k3qkgp9r7wbh38" }, "stable": { "version": [ @@ -77369,6 +79104,30 @@ "sha256": "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c" } }, + { + "ename": "php-quickhelp", + "commit": "955f58195517df08f69dd4c85cba31c94c88d345", + "sha256": "0w9r3h5pqbsg88ki3zny6mznmz39w5cq21lzzg2521a4hddi8g44", + "fetcher": "github", + "repo": "vpxyz/php-quickhelp", + "unstable": { + "version": [ + 20200818, + 1944 + ], + "commit": "f1d79fbed01b667495f64438687f1fbd6bf486c6", + "sha256": "0lnjd0ris288ia6i2wvw30yg57fmh5xgq1dln243s57yvm1wccfd" + }, + "stable": { + "version": [ + 0, + 3, + 4 + ], + "commit": "325668a47127bee77f094ed2b09171b8656c7429", + "sha256": "16cm754r1cg1rb6blfqcja41klr4hy90gkhg6p9p79qgxjrnbbbd" + } + }, { "ename": "php-refactor-mode", "commit": "ad4a9bb43e131e2eb0d8b09b13245bc268c524a5", @@ -77445,18 +79204,17 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20200405, - 1544 + 20200618, + 1845 ], "deps": [ "async", - "cl-lib", "composer", "f", "php-runtime" ], - "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", - "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" + "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24", + "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc" }, "stable": { "version": [ @@ -77510,14 +79268,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20200411, - 531 + 20200807, + 1101 ], "deps": [ "php-mode" ], - "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", - "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" + "commit": "e675cf0881408e10b76f2e70c6158237cb94671e", + "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f" }, "stable": { "version": [ @@ -77731,14 +79489,14 @@ "repo": "davep/pinboard.el", "unstable": { "version": [ - 20200402, - 919 + 20200630, + 1544 ], "deps": [ "cl-lib" ], - "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", - "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" + "commit": "d426f9d2ebec5f907c8a89d6b38ccbcb13750d4f", + "sha256": "0jganb5ws2qlzyncyhaw1hldqbpxm44ddzzy17hmriy8n5701fyv" }, "stable": { "version": [ @@ -78053,11 +79811,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20200425, - 616 + 20200818, + 1742 ], - "commit": "bc22301198b3f581d89352510e847454fb1cb9ff", - "sha256": "11il65myybgfj30psicfgqpjwwpa6hwapf55d497x8kbixx2kpg1" + "commit": "887c01cb06420501c7780fb01a8a76bdb0864cca", + "sha256": "17v71sd1i7wyvjzz0nir7p28cskzgws4dcpm83ch1khhljh3r7kl" }, "stable": { "version": [ @@ -78076,14 +79834,14 @@ "repo": "abo-abo/plain-org-wiki", "unstable": { "version": [ - 20200507, - 2135 + 20200617, + 828 ], "deps": [ "ivy" ], - "commit": "99cd7f90e5c741cf3327f464852203baee7c488c", - "sha256": "1s4ida511fi6mbrckn9kvssr4vmiy4w5qkkby7s1jlqvlydnsa8m" + "commit": "5e32e7e6216e24d515624008fa0898077403aa7f", + "sha256": "0d3nhvkzzharjv54w3rinqcpwhqb61flgvvcngfdxkrgs1yazaqk" } }, { @@ -78291,11 +80049,11 @@ "repo": "akirak/emacs-playground", "unstable": { "version": [ - 20180624, - 326 + 20200812, + 1336 ], - "commit": "9212790026bea9ab5fb4ecf0da1163be8ab00776", - "sha256": "0g6d7z9sv7fdc918gay7rd71frzqn75mcwnljgmqksfh5890apa6" + "commit": "77d2faab0bc3f6e1f2c65c66644c52167304610d", + "sha256": "1xl6fp246wk764jkyr7km7lgqfdyvbjxr9ri20dzaadfvwqyfzg5" } }, { @@ -78478,6 +80236,21 @@ "sha256": "0nwrzf7lvimay83k1s4nxz86d1a82v55j23vp2915c307gkwrl8z" } }, + { + "ename": "pnpm-mode", + "commit": "c12d8b34a72c2ac8b29109492e203e45619116a6", + "sha256": "0vwsvadl6z31mzskjaykffv68vb8k4nffccdkb71vmrrbnpii6k5", + "fetcher": "github", + "repo": "rajasegar/pnpm-mode", + "unstable": { + "version": [ + 20200527, + 557 + ], + "commit": "391207e6505948b0d0cb57b802ee4885e3292c21", + "sha256": "0pgh9fnghj5f6vfkfb2l4jgf5j4lmidnfs949q0xik3b3hz4j4h3" + } + }, { "ename": "po-mode", "commit": "38e855cde9264bff67016d23e7e5e00f113c55bf", @@ -78486,11 +80259,19 @@ "repo": "emacsmirror/po-mode", "unstable": { "version": [ - 20190511, - 1542 + 20200610, + 1743 ], - "commit": "1916142f6a817c733d5ec37e3b4fbae3da67e499", - "sha256": "0nvpr5ry86by1dm7mp2w5p534qg4c9dpdich3x13gbbp9vazc7h6" + "commit": "3114e245c2ee6208e9b506f3e65e631e1b236019", + "sha256": "1f84fziibcc1bjhcmmzvbsvsw2lwabsb70vl4x2jpqsraygzhw0b" + }, + "stable": { + "version": [ + 0, + 21 + ], + "commit": "25eb1bdca30ed25d2e5d51b9feeb28a3faff51ec", + "sha256": "00ff5njs4aghkhipw5pmha4mj1a5s35g1cxihhbqpn9gr7kmbg02" } }, { @@ -78615,14 +80396,14 @@ "repo": "lujun9972/podcaster", "unstable": { "version": [ - 20161020, - 1535 + 20200607, + 1054 ], "deps": [ "cl-lib" ], - "commit": "9854517025deb5d556168a68955fb7b662239f5c", - "sha256": "06ag0idz7cf6i9kg7kqr03js9b6cw6my1jzd1x3wkgazx5slqk4q" + "commit": "7a21173da0c57e6aa41dbdc33383047386b35eb5", + "sha256": "1b2bhwipsyyydrqdxjsipzy170xdkfamd4mw5pwzjcgdjqz9wvxa" } }, { @@ -78675,11 +80456,11 @@ "repo": "kunalb/poet", "unstable": { "version": [ - 20191215, - 201 + 20200606, + 2343 ], - "commit": "ad998dce8a953eb6101e61bd6bb5ff871535d383", - "sha256": "030qm41sf4z29f0gghrk6a4lpf775lgg9vvlmcnl678vgy7p9fa5" + "commit": "16eb694f0755c04c4db98614d0eca1199fddad70", + "sha256": "0zm8jbviddyj7jnyssh77jx43jghbpjwr77n9s3cjp3bmadwkrv5" } }, { @@ -78690,15 +80471,15 @@ "repo": "galaunay/poetry.el", "unstable": { "version": [ - 20200326, - 1328 + 20200805, + 1259 ], "deps": [ "pyvenv", "transient" ], - "commit": "6dcc9d22cac6642a861770b5518398d8ee4fcc9a", - "sha256": "1za8s1k5ni11yqz64rz777lps400jnga151cca2f3l3xx2lcc2c7" + "commit": "22a76cdcba180b4689a6b45c97669e3c76cd36ed", + "sha256": "099sxca06zxfvlvmsgjicira4r4csqv2m4l0d7icji57qahbp5h2" }, "stable": { "version": [ @@ -78768,6 +80549,21 @@ "sha256": "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav" } }, + { + "ename": "poke-line", + "commit": "e608228443b10d1cd883ed8044b624480647ed17", + "sha256": "1j94pzhp1wsaa4nipbfx3bdapvf38h6g352dxakw38jimqyp6cvw", + "fetcher": "github", + "repo": "RyanMillerC/poke-line", + "unstable": { + "version": [ + 20200818, + 1403 + ], + "commit": "fe876cd6e8fdf3a68037285eda4ac2eaf977eae4", + "sha256": "04dpfg22nqmqrw3rzpyh62kb17iqdadmimrnrvy9cnyd8mla0k5z" + } + }, { "ename": "pollen-mode", "commit": "97bda0616abe3bb632fc4231e5317d9472dfd14f", @@ -78957,14 +80753,14 @@ "repo": "polymode/poly-org", "unstable": { "version": [ - 20200316, - 1315 + 20200817, + 756 ], "deps": [ "polymode" ], - "commit": "8f4d11489532be98a291258ca27405aa528fc126", - "sha256": "1srnwcsn2bh8gqzxixkhffk7gbnk66kd4dgvxbnps5nxqc6v0qhc" + "commit": "0793ee5c3565718606c514c3f299c0aa5bb71272", + "sha256": "011nacpyxc969qyvbzwhz0hr3bcbkjiwlaqa27sb4hffnl4p1py9" }, "stable": { "version": [ @@ -79098,11 +80894,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20200411, - 915 + 20200606, + 1106 ], - "commit": "2a61fb6d3e805bc0e4ca7b6510510a955c6bfb6a", - "sha256": "0cphikjz9hwij1k41radyar6nh7md8v98qwn2j9lzcbyz69hrvaq" + "commit": "3284ff10017d280ba82f27dc20fe5223b0df709c", + "sha256": "0756c0fi5msqdsks95bcs0ghhk90b340y4zrkijhaz4b2cnm07h4" }, "stable": { "version": [ @@ -79122,22 +80918,20 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20200513, - 1054 + 20200722, + 1402 ], - "commit": "308a438550173685cb852a8aadef75c25701513e", - "sha256": "1w4sds6h6q80drqzkmiz51nvy942a88s99zfrvmyvfrvwv7wlqqb" + "commit": "60da23c97c30e08254a914dca411b2e3fd639c99", + "sha256": "19a5155gxz97yqhfxp48d6lnhh0qqai4pd5rg1xy79mq0hxy31p7" }, "stable": { "version": [ 0, - 3 + 6, + 1 ], - "deps": [ - "alert" - ], - "commit": "590e64d316d9210bd00cb4eb39d2f07ddc16809a", - "sha256": "0001k4p09il5f20s0jgyi96wzslfcgv3y35wfxj771gixlacnrhi" + "commit": "bf3ca99c24a84befe9ed76b9636ec9adb37ab844", + "sha256": "1qsgx1vh0xsk1wwpyx8lpnpa4879bzf0gil28v94sncbri2c6f7w" } }, { @@ -79208,26 +81002,40 @@ "repo": "ponylang/ponylang-mode", "unstable": { "version": [ - 20200510, - 200 + 20200724, + 137 ], "deps": [ - "dash" + "company-ctags", + "dash", + "fill-column-indicator", + "hl-todo", + "hydra", + "rainbow-delimiters", + "yafolding", + "yasnippet" ], - "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf", - "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59" + "commit": "136cc4f7ab4f2ab549633392a72d55051c8b31ac", + "sha256": "0pjjccd145bla2gshs648kwhlw9r4n449g318nw81v2nn10z6qwl" }, "stable": { "version": [ 0, - 0, - 12 + 5, + 3 ], "deps": [ - "dash" + "company-ctags", + "dash", + "fill-column-indicator", + "hl-todo", + "hydra", + "rainbow-delimiters", + "yafolding", + "yasnippet" ], - "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf", - "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59" + "commit": "0b876e6a2d602f94cc118e6b76f5f79d18244325", + "sha256": "00xn2mhnf5qvn4v6yncmfa9ijrb33zl49mlc7pqn8pzr8nhbxzvc" } }, { @@ -79285,26 +81093,26 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20160709, - 1429 + 20200610, + 317 ], "deps": [ "cl-lib" ], - "commit": "4839797cd1db25be6f3f98bc8d401b6c2af01f9f", - "sha256": "1sxzv4zdmyra6b6nicnng0zpixlpxnczhq0qjyfzxvvhks7jyyf3" + "commit": "9d104d4bbbcb37bbc9d9ce762e74d41174683f86", + "sha256": "0qrsz4z9q2bfq9xv4n94mvyslm232v2ql9r1fjycx7rnmpqggiwl" }, "stable": { "version": [ 0, 5, - 3 + 8 ], "deps": [ "cl-lib" ], - "commit": "46632ab9652dacad56fd961cd6def25a015170ae", - "sha256": "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h" + "commit": "9d104d4bbbcb37bbc9d9ce762e74d41174683f86", + "sha256": "0qrsz4z9q2bfq9xv4n94mvyslm232v2ql9r1fjycx7rnmpqggiwl" } }, { @@ -79411,15 +81219,15 @@ "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20200201, - 1913 + 20200701, + 2034 ], "deps": [ "cl-lib", "popup" ], - "commit": "e275ec35de3b9cdedf0d6b2a4a78e91c605381be", - "sha256": "1zm6zk7c2i7gmn5am2d7090j1a71vbis8lbrzrbxdx53q6sklgi7" + "commit": "68bbe23f7ceaca889529be95762925ac29515545", + "sha256": "18nfrhmdjsgmrpr82qqmxj3rdv85ml2pkssrkrljzzgaxavx5ind" } }, { @@ -79531,20 +81339,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20200426, - 819 + 20200818, + 606 ], - "commit": "093b29a53cbeda6d637ccc9ef4dfc47123e79b9e", - "sha256": "0wca1w667h930dyi3hm1kqiqapggnwbgqjbxiwpgj7l773s7xdbw" + "commit": "7b92a54e588889a74d36d51167e067676db7be8a", + "sha256": "1638qw6m588a1dh8gfic1n2mzacm7rzs99ds8qwdfqs3ids857nj" }, "stable": { "version": [ 0, - 7, + 8, 0 ], - "commit": "83b4d39fdda34355c01aecc22677f7376ae0f013", - "sha256": "0cjrl4xgs70hbw1a1mqkdmpcmrxaakw8csrz365c31vj14nii0ax" + "commit": "7b92a54e588889a74d36d51167e067676db7be8a", + "sha256": "1638qw6m588a1dh8gfic1n2mzacm7rzs99ds8qwdfqs3ids857nj" } }, { @@ -79626,14 +81434,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20200105, - 2053 + 20200817, + 1321 ], "deps": [ "cl-lib" ], - "commit": "edbb464eef680efc9d408730288c716cd4cac404", - "sha256": "0j1bb9dyr76m68gn94qk6k6bxhdqbiq59fzi4mnx3ivnnkbfz6n7" + "commit": "e15e77ab2e589bd73f9e90498747d77d042789ea", + "sha256": "1sw9aicv9xbcg0fz6584hfycwibzxx2jxlav0kf83d3wg3lprgps" }, "stable": { "version": [ @@ -79697,16 +81505,16 @@ "repo": "SavchenkoValeriy/emacs-powerthesaurus", "unstable": { "version": [ - 20190721, - 805 + 20200720, + 1546 ], "deps": [ "jeison", "request", "s" ], - "commit": "81a262ec0c9294ad377bafc6cc4e6d91b461acb6", - "sha256": "0ffy2c56difdhgpwvvvgyvifldxlmijcs11hs6hx6gv3hndmym7i" + "commit": "93036d3b111925ebc34f747ff846cb0b8669b92e", + "sha256": "0l45n12b8jny7g4bfdn3sc7lp9kyxd7pyisr0r9svr9sls7cybv4" } }, { @@ -79749,14 +81557,14 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200418, - 1551 + 20200812, + 844 ], "deps": [ "leaf" ], - "commit": "27683aa4a0df67b4539bcaa2e82d865023cf1fae", - "sha256": "0azqpmlz6r2amklzrgi0wgmy89fbkz0kkpikgf5gccfmks5pij6y" + "commit": "86dad69c3a7dae770f6b99285647dff2aad81930", + "sha256": "01c82h5j7yggsbhbrlbcwl562mpd79c0i878129r4ivvhka3nha3" }, "stable": { "version": [ @@ -79814,19 +81622,19 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200412, - 1607 + 20200818, + 1400 ], - "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", - "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" + "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530", + "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p" }, "stable": { "version": [ - 4, - 1 + 5, + 0 ], - "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", - "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", + "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" } }, { @@ -79874,6 +81682,38 @@ "sha256": "10pvjdnb48fk663232qvh4gapk2yiz4iawpffzjrbs3amxh50bi7" } }, + { + "ename": "prettier", + "commit": "e9992d6d5ed3bd677976262d8a887e5c0a4f4914", + "sha256": "07zhjbb40jl6xkfdzavqg33z17z8s4nyrv3qjh8c0m3si8abh6zb", + "fetcher": "github", + "repo": "jscheid/prettier.el", + "unstable": { + "version": [ + 20200714, + 859 + ], + "deps": [ + "iter2", + "nvm" + ], + "commit": "000244b82ca9e2118376f6a44506bac8ab225677", + "sha256": "1mrxjvx16ixcyqvqvc8lmvh3jdkcriq9djhiak0pg8y6nbrj4dqa" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "iter2", + "nvm" + ], + "commit": "d5ccedc7a8ed84aff292bce688c73648dc8f567f", + "sha256": "1rk2hwpxvnc1hadvdg86jnzz4nh5kmkwp18iwvsbkgmx47cnyni3" + } + }, { "ename": "prettier-js", "commit": "968ac7bb98b385f8542dc150486982c0ded73187", @@ -80263,20 +82103,20 @@ "repo": "jcs-elpa/project-abbrev", "unstable": { "version": [ - 20190517, - 521 + 20200724, + 901 ], - "commit": "22830177a0cea19acf29fb9910b784ea5f66f551", - "sha256": "05ks95j6706rabfh1487nix2cjbxa6pjjr0xm01nhd3vcfr1m2b0" + "commit": "7b5749eae33eda576da3293dc386794c1248bb48", + "sha256": "0fvfp5hy93ggqspbnishzp0x0j1652ayismb8bpzkf6vra8vjrdw" }, "stable": { "version": [ 0, 0, - 2 + 4 ], - "commit": "fc4e9f774cae42a6fe135833774daaecf2b3dac0", - "sha256": "07056jd1z9i65db4pcshhdfrk5yb6xc28k3ihq7pixmya71l15pk" + "commit": "7b5749eae33eda576da3293dc386794c1248bb48", + "sha256": "0fvfp5hy93ggqspbnishzp0x0j1652ayismb8bpzkf6vra8vjrdw" } }, { @@ -80416,26 +82256,26 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20200507, - 650 + 20200819, + 531 ], "deps": [ "pkg-info" ], - "commit": "f650faecf699e4b4659374cf5a949f6927feff3e", - "sha256": "142is55cbyya511zp0yl5d1x6i8mvxqjn8zky4gxif15rmmqrk9n" + "commit": "46d2010c6a6cccfc4be72317f10ea99fd041ab54", + "sha256": "1xd4ag6sypqhfn85vnr8609cl9nip0l5j77226p6apv6yhdippqx" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "pkg-info" ], - "commit": "34b2665023f9a29ebd2a415bfb8091db3c804d46", - "sha256": "16p79m8mkrlczx4b5v28nnlcd1ny49861lax28r7cb9ps9jhdz7d" + "commit": "dc0e7a5ba46f92bd224a5e89f0af2ace0ed05ade", + "sha256": "1kf34p2jwcjcqniia8bx3kn14ybwcq81x7gcm1vkd9cj7x0mx96n" } }, { @@ -80509,26 +82349,6 @@ "sha256": "01jsj0pv9qqbkdmbykvk4ic40hc1nhaiaqvx17hi7p89hq3nzffr" } }, - { - "ename": "projectile-hanami", - "commit": "9c0123322baee1e96afd055de3f44827574d2b5f", - "sha256": "0qi9i4wdggrmihf1j42fqrf38psmb33rlafg3y6da5r7lpn03j1a", - "fetcher": "github", - "repo": "avdgaag/projectile-hanami", - "unstable": { - "version": [ - 20160505, - 1311 - ], - "deps": [ - "inf-ruby", - "projectile", - "rake" - ], - "commit": "c4b8e7d4dfec789ef8493a7c5d4ce0cf7937e579", - "sha256": "1pqmyfz0vil30x739r18zpw9n76297ckisimq2g0xl1irhynsvbk" - } - }, { "ename": "projectile-rails", "commit": "b16532bb8d08f7385bca4b83ab4e030d7b453524", @@ -80788,11 +82608,11 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20200429, - 440 + 20200727, + 900 ], - "commit": "ed9b073ee5b0975a35ee15bc12e25e02f796d787", - "sha256": "1mqqsnwkwfg2i6rhx747hcnk725siw6qsxh5yni3l1sfizbyvw03" + "commit": "d7b59805e7a8da1f5edea9313b6e2d0f1115fec0", + "sha256": "08f30fwwh86mnymbjxr9gswkgvsfdxa1mqajsmsbkk5nvmz1jx0n" }, "stable": { "version": [ @@ -80868,11 +82688,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20200506, - 1948 + 20200623, + 1748 ], - "commit": "ea62543527e6c0fcca8bbb70695e25c2f5d89614", - "sha256": "0jzyj3a3b9b26b2cksrcby39gj9jg77dzj3d4zzbwf33j1vkvfd2" + "commit": "03e427a8f19485e12b2f95387ed3e0bff7cc944c", + "sha256": "0ykxb4xdsxv2mja620kf61k2l18scs0jdsfsg1kzs2qf4ddjscyn" }, "stable": { "version": [ @@ -80972,20 +82792,22 @@ "repo": "google/protobuf", "unstable": { "version": [ - 20170526, - 1650 + 20200619, + 1742 ], - "commit": "63da77bc971e08c2241cc1d9e65ede4bf335c421", - "sha256": "0b0shac978n6djxid6z9h4mfb2ah4hc1vvb0rg8rf65gs4cxjzlz" + "commit": "214c77e1b76e63e512bd675d1c300c80438642b6", + "sha256": "1fxf5gydjcfc9gdwv6yfcwv85ww5glqbzlfv9hcnkddwlz6schxa" }, "stable": { "version": [ - 3, - 12, - 0 + 4, + 0, + 0, + -1, + 2 ], - "commit": "0dd036d675508a4ecf69e61626fd0c88235a661d", - "sha256": "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a" + "commit": "6c61c1e63b9be3c36db6bed19032dfc0d63aadda", + "sha256": "1910pnpy0mfzqga4mv52ybjfbxrbdflgb6nsh2vbpbpsv4jl58dq" } }, { @@ -81032,6 +82854,36 @@ "sha256": "1wmj3ahjj1g7sx36fda6fhicvmxkm8qm64zqdk3qqj808jik1pry" } }, + { + "ename": "psalm", + "commit": "148d9b28e683a6602bb18eecaaf3cbc8dede65b1", + "sha256": "0j54gj76xz7hkbbsb3dahxy1yf3y7kfg1ls060cskd6sdds412zq", + "fetcher": "github", + "repo": "emacs-php/psalm.el", + "unstable": { + "version": [ + 20200510, + 1157 + ], + "deps": [ + "php-mode" + ], + "commit": "b2a1e8a9524b0004e62996c70da5536f86e56182", + "sha256": "0r0qz5bdznzdj7zxq6a6fz7fwn2c978bq57yywj3fcy8f5vh8jcf" + }, + "stable": { + "version": [ + 0, + 6, + 0 + ], + "deps": [ + "php-mode" + ], + "commit": "aaa77b4ceb61d41a520baa0b84b9b236c99c4156", + "sha256": "1fnr8sbx74c4mdz91y6b4m0n6njjb0qa01r4i9975q197vwzni48" + } + }, { "ename": "psc-ide", "commit": "9eb5ff1de1d207317df052ecbd65dbe0f8766f5d", @@ -81040,8 +82892,8 @@ "repo": "purescript-emacs/psc-ide-emacs", "unstable": { "version": [ - 20200317, - 1013 + 20200702, + 1540 ], "deps": [ "company", @@ -81052,8 +82904,8 @@ "s", "seq" ], - "commit": "7fc2b841be25f5bc5e1eb7d0634436181c38b3fe", - "sha256": "0r0fymyai30jimm34z1cmav4wgij8ci6s1d9y7qigygfbbfrdsmj" + "commit": "663f4e2cf9cbafdd4b9a60c34346596e2a40c87c", + "sha256": "06zgi5inlg244qhabsp4a24kda83i6rdpxf78qb7ygpxwdj4hf44" } }, { @@ -81099,15 +82951,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20200509, - 803 + 20200714, + 555 ], "deps": [ "async", "cl-lib" ], - "commit": "ddeccf7808cf39fedc41cd33204b0ef5fe4253b5", - "sha256": "083srsvnv8ks52qsi6hv02v4j4xlm67bld9ynm8cl8fy500ghpzz" + "commit": "d2b8f8d8c6acd2f86f3a7774a7079f40b1b75f8e", + "sha256": "1pks2xvnampp74d1m7rrq6801bdhcmdsx9gbrcvr8ljxxlzbka1w" }, "stable": { "version": [ @@ -81187,8 +83039,8 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20200502, - 2153 + 20200618, + 2203 ], "deps": [ "deferred", @@ -81196,8 +83048,8 @@ "s", "unidecode" ], - "commit": "d781870e2f57e40110e07768289ab81d8554f122", - "sha256": "17d2v7q6sfafk8j1ish053xsmihi4f1hbk53fkkmhwan6sw9c4sc" + "commit": "88aeb71ed4354af0b58354636ee6a9485887213d", + "sha256": "154lkpipi5wgcwx4j9w6h3zysciw7hblf03an2irr9xgdhs7xs7q" }, "stable": { "version": [ @@ -81365,14 +83217,14 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20190522, - 2230 + 20200708, + 827 ], "deps": [ "cl-lib" ], - "commit": "8db1d0243c03da31adac4d7c5287407a4df6aff2", - "sha256": "07z5m8h5a1dhqlzf8wqyxqw2mz3kxzjfpb0p7az3bhs3xsxq6q1q" + "commit": "154ad16b61fb9dec83a6c863ffaf92638278f00f", + "sha256": "14046nryg870s366j6hxqpwza0y057hxaiq3kwlnpf1avlzdwhib" } }, { @@ -81689,21 +83541,6 @@ "sha256": "1m0jb5pk1a1ww5jx2y5nz21by4dh7nlnhdn6bigz53ra449rrxii" } }, - { - "ename": "pydoc-info", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf", - "fetcher": "bitbucket", - "repo": "jonwaltman/pydoc-info", - "unstable": { - "version": [ - 20110301, - 834 - ], - "commit": "151d877c8fb8e418a573b1e879b1263c18e22776", - "sha256": "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh" - } - }, { "ename": "pyenv-mode", "commit": "c756ccbae044bc23131060355532261aa9a12409", @@ -81712,14 +83549,14 @@ "repo": "pythonic-emacs/pyenv-mode", "unstable": { "version": [ - 20170801, - 2348 + 20200518, + 1521 ], "deps": [ "pythonic" ], - "commit": "aec6f2aa289f6aed974f053c081143758dd142fb", - "sha256": "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3" + "commit": "d191037fe62ed8d4fee5888845da3e2c386d8e89", + "sha256": "0dipwjdkx4887g61gn22wga4pvvkwv6rx7izq73l8b6x1mc17c0h" }, "stable": { "version": [ @@ -81754,21 +83591,6 @@ "sha256": "1gz7145jnjcky1751pqrlhh3pq02ybsmz49ngx4ip2589nry7iyv" } }, - { - "ename": "pyfmt", - "commit": "68d477025ae5af50bf8f7b37f2adfa9159502e13", - "sha256": "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6", - "fetcher": "github", - "repo": "aheaume/pyfmt.el", - "unstable": { - "version": [ - 20150521, - 2056 - ], - "commit": "cb92be2cf0804cc53142dc5edb36f8e0ef5cec32", - "sha256": "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i" - } - }, { "ename": "pygen", "commit": "e761724e52de6fa4d92950751953645dd439d340", @@ -81929,10 +83751,10 @@ }, { "ename": "pyimpsort", - "commit": "97eb7c0934298d393910419fd55d7d5f1b0cfc38", - "sha256": "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k", + "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d", + "sha256": "105i63d05hlpwb4n5mn71jjgnav95s8n6xy0gb2smq9ljvxbbgl0", "fetcher": "github", - "repo": "emacs-pe/pyimpsort.el", + "repo": "emacsorphanage/pyimpsort", "unstable": { "version": [ 20160130, @@ -81953,8 +83775,8 @@ 20200503, 1624 ], - "commit": "1fc490c0a1d0df5d4d6a64da0ccf2dd711b9bf67", - "sha256": "0fkcn6dk67ljx73ww1zxxkmqp551xsshhz40z2fh1dxw00b470ga" + "commit": "52fd8e17c6aedbc68f58f1169363d6cc216f405b", + "sha256": "0nvgv67gq80hriaasck4zrr3v7qqrw6apxhnyixyavabdvvrawqz" } }, { @@ -82049,20 +83871,20 @@ "repo": "poppyschmo/pytest-pdb-break", "unstable": { "version": [ - 20200426, - 2335 + 20200804, + 848 ], - "commit": "22e54796b0522f812423b2fb0ec842e2984ff0f7", - "sha256": "0gsnbpk14iw4mqxk7c0409dibsb6f3j936hd781ly956mvn0afil" + "commit": "05d227493b7b96f3556cba22f215cb85f9282020", + "sha256": "0dsvi5scrhk6mypz8wggvy9zlnkbm2fmb5a24jprqh3bihg077xl" }, "stable": { "version": [ 0, 0, - 9 + 10 ], - "commit": "3ff296d14e7350241b22fcbe09325a16bb834d16", - "sha256": "0pipbp6i0vq3maiwf8cj8g43zk8nq3dpgbgacdk9v2bhcgwl3im3" + "commit": "05d227493b7b96f3556cba22f215cb85f9282020", + "sha256": "0dsvi5scrhk6mypz8wggvy9zlnkbm2fmb5a24jprqh3bihg077xl" } }, { @@ -82195,11 +84017,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20200508, - 1756 + 20200608, + 737 ], - "commit": "a4ee6e9f60ff63f0706661e54308281ed7c900e3", - "sha256": "02gfr692xr3clrim5l6bqzn1kzcv232ylvd5k33421s21wb9vhzv" + "commit": "6658e5d768db0c0d8dbc6fdedff3a85b65327061", + "sha256": "1mf6bbx4brwzafxwrv37x14b286vlza9knswhcccvcb3aplvll6h" }, "stable": { "version": [ @@ -82219,34 +84041,34 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20180725, - 1146 + 20200812, + 737 ], "deps": [ "dash", "dash-functional", - "magit-popup", "projectile", - "s" + "s", + "transient" ], - "commit": "09ad688df207ee9b02c990d3897a9e2841931d97", - "sha256": "18v7kxdhrayxg2pgbysm0y47xpdvwa15fmazpkfg0q8dfp2j3022" + "commit": "fc056faf2757c42641ed94d36a090e56eb13572f", + "sha256": "00dwbh549ygnrp98s883v45f5pbb34f2j5qwvw92camhp6daw38y" }, "stable": { "version": [ - 0, 3, - 1 + 0, + 0 ], "deps": [ "dash", "dash-functional", - "magit-popup", "projectile", - "s" + "s", + "transient" ], - "commit": "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70", - "sha256": "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk" + "commit": "10ad9afc840ac2d9d5616abf4bd92ab8fee2ce48", + "sha256": "1lc5qlsznzw8hdcdwjwn8fcgfmqjvb1wplsr2gaxwvm8rbw22g1l" } }, { @@ -82319,15 +84141,15 @@ "repo": "pythonic-emacs/pythonic", "unstable": { "version": [ - 20200304, - 1901 + 20200806, + 434 ], "deps": [ "f", "s" ], - "commit": "f577f155fb0c6e57b3ff82447ac25dcb3ca0080f", - "sha256": "10faqkfbr7n1zlbrs9c9slm2f7wr2liav8r367s00bw3vb2vm8nb" + "commit": "51233ec7ec9fbafd13e2b0479c7b2ee0930ccca5", + "sha256": "1v4n6wx0qff2ndlxy11acm21jq5yflk28axs6jc6yh7mdj44js9x" }, "stable": { "version": [ @@ -82383,34 +84205,6 @@ "sha256": "0di229ma7jr9jcck36qjrzilkbp428kkx53qs6c9xw9jhv6yklbz" } }, - { - "ename": "qiita", - "commit": "d8065a58e297c50c031de97d2d80bce5857bd803", - "sha256": "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl", - "fetcher": "github", - "repo": "gongo/qiita-el", - "unstable": { - "version": [ - 20140118, - 844 - ], - "deps": [ - "helm", - "markdown-mode" - ], - "commit": "93c697b97d540fd1601a13a3d9889fb939b19878", - "sha256": "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5" - }, - "stable": { - "version": [ - 0, - 0, - 1 - ], - "commit": "33b6d3450bb4b3d0186c2475f6c78269c71fd1ff", - "sha256": "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f" - } - }, { "ename": "ql", "commit": "475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303", @@ -82483,10 +84277,10 @@ }, { "ename": "qtcreator-theme", - "commit": "bf0caf3c60f4b8c6ed1c126a5feb91c99eea1f60", - "sha256": "0ic7a9zas8ndrp15xbw4j2987ajfjjq003fcmqhibp0sc66rldfx", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "01w4qxh9d8mkw7k0pawy0hvcdvvrkkhcnszpy5hixi5j6h7l24m0", "fetcher": "github", - "repo": "lesleylai/emacs-qtcreator-theme", + "repo": "LesleyLai/emacs-qtcreator-theme", "unstable": { "version": [ 20200203, @@ -82542,11 +84336,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20200514, - 1242 + 20200617, + 2205 ], - "commit": "9ece62efa829c6b89ba61cb674f337764b266482", - "sha256": "1mvrpyiw53lrz6i7r7zlcfvksh8lsjb4vib6gnj5b849njzcjwhm" + "commit": "f1fc228f217be692eaae2d53f51966ce922d6a32", + "sha256": "03h30qcixq54q212381cf7mahi2k9q4590vm44pqy9widpigmxz7" } }, { @@ -82576,11 +84370,11 @@ "repo": "renard/quick-buffer-switch", "unstable": { "version": [ - 20151007, - 2208 + 20200727, + 720 ], - "commit": "d5fdd67b4c9f04b7a7122da2215e4ae076a03b1b", - "sha256": "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5" + "commit": "ceb5222599b861f9d1133b1509516fcf07a3cd67", + "sha256": "09dfw42d5834z8x1c1mri7g61r91i1crr3h6r118nmszhbx9b7iy" } }, { @@ -82655,20 +84449,20 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20200514, - 1506 + 20200603, + 1902 ], - "commit": "a8752887b81fc2f4f4e4bcd3d2cf8abafb85edbb", - "sha256": "0zjhpgg6zkqx8v0gv7h7z73i64ipzszm9cqs4wwaldlz228316ra" + "commit": "ce7383c53215077f7e1d258d389cf8731309fbe9", + "sha256": "0dscg35hrywn8qr02q46y0cdclyscz6qxa0dqphkx3bv9xvzmqjl" }, "stable": { "version": [ 2, - 2, - 8 + 3, + 0 ], - "commit": "70e93e06778f44113f405aedec6187b925311d57", - "sha256": "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw" + "commit": "072ec7be93f31e9dd265fb834cd709d0c0d4a8bb", + "sha256": "1zx8hpm5wa9ad675py8676071pip6831d4jy2dqyrlxpfvi6q47l" } }, { @@ -82817,15 +84611,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200513, - 1519 + 20200810, + 1513 ], "deps": [ "faceup", "pos-tip" ], - "commit": "0f1efa4a3cdcd26de1d2b002868ffc851cff25ac", - "sha256": "1zhn50apdrysm9d6ynv92slah78i39cismj88ym4ahrllwr1jnj4" + "commit": "c55fd70c5e9a371f262486f7d5d8837481388b95", + "sha256": "13ngnm22h5rzmm9pvgbw9nidv8jkkcsckbypi2mn1k8j8wfjypx0" } }, { @@ -82930,6 +84724,24 @@ "sha256": "1zr2669savnmkc68hiqsq9wccm6bs1j6jbmlac1xqh6nq7xgq36g" } }, + { + "ename": "rainbow-fart", + "commit": "cdcc8091357c42f5edbc1a13886253130f104242", + "sha256": "0zi1r8bgzd3g1dvginlp5nywyjk3lh495j6j3girgjqhsblnhfrx", + "fetcher": "github", + "repo": "stardiviner/emacs-rainbow-fart", + "unstable": { + "version": [ + 20200718, + 437 + ], + "deps": [ + "flycheck" + ], + "commit": "16759a0aa1b39c43cdedcf6a6c9a5dc3c3895fd2", + "sha256": "14dh7bd40jc6vl6933575jivgmm3h6frphmwxspijb7c8pj1wfmv" + } + }, { "ename": "rainbow-identifiers", "commit": "975aadd9fe1faf9ad617ba6200ca77185b87e7c0", @@ -82996,14 +84808,26 @@ "repo": "Raku/raku-mode", "unstable": { "version": [ - 20200510, - 2005 + 20200524, + 1625 ], "deps": [ "pkg-info" ], - "commit": "43fd5628254754bee41575a55a7d1c7ad79837fa", - "sha256": "1c1l0c4pnza3bf0s1262z5r8xmbmhq3qdvgqq28k8raawdqszqfk" + "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8", + "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "pkg-info" + ], + "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8", + "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i" } }, { @@ -83065,11 +84889,11 @@ "repo": "ralesi/ranger.el", "unstable": { "version": [ - 20200218, - 203 + 20200607, + 2002 ], - "commit": "ae9b3816a6da927cca5beb62c45400103797a2da", - "sha256": "07fiyw0gw51dxc7r92pj75lbxppg0gixjv9317qx9c3v1lcxaqiv" + "commit": "d7c18370981c9e585bc0fb78f7e55033457ca643", + "sha256": "0xfg38ginrd0sdn194gpapi67q6i81csddgsf0rqmwihazpgs060" }, "stable": { "version": [ @@ -83190,20 +85014,20 @@ "repo": "thiagoa/rbtagger", "unstable": { "version": [ - 20191115, - 1858 + 20200714, + 1658 ], - "commit": "18ef567e65d1437e9a9e03d4f30a02d60e926d85", - "sha256": "0kr10j3f0dd7q102db4y16yj8yfv06wnqsgnx2l9jyc8qhkbxq6w" + "commit": "b3333b9dc9ffdaf5dfb2ea6ef2dd0f74e2f0f03f", + "sha256": "04zccf9bis259c13nzljfjajjgkrhhbb3b2v6q6q12c30ikj5b09" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 2 ], - "commit": "e46137e36a3bdba8dd4d27017b194a8524c7375b", - "sha256": "154y2adh2pgn77ycidkd6ndjg9wjxsjmbkb8cppf9csq31vmc313" + "commit": "b3333b9dc9ffdaf5dfb2ea6ef2dd0f74e2f0f03f", + "sha256": "04zccf9bis259c13nzljfjajjgkrhhbb3b2v6q6q12c30ikj5b09" } }, { @@ -83446,8 +85270,8 @@ 20200505, 1537 ], - "commit": "8e51241e5ba7b07b91d8188c14cf193017640292", - "sha256": "0yn0ibbda8bjqjhiqhmbvv7p8c52n65mi95v91nkfcj60hwyglnq" + "commit": "481a2d1460ab5a9b6df3721dda76ad515923bfd1", + "sha256": "1f1sqbqc0ckp7850ahvy0syky7lplwhb05r3cw4fdmz2xbywwg52" }, "stable": { "version": [ @@ -83460,22 +85284,22 @@ }, { "ename": "realgud", - "commit": "7a21be3673962d5706f12efa5179a5426bdce82b", - "sha256": "14n6d3jfhpa29nf4ywdg3aw4i51lfkr99b4z8q4833pmpz1jbq2c", + "commit": "fd34d2accd92d1473b743e2eee1309d329209cd0", + "sha256": "063bqpq05l29cvapp4xnvgbdx6l4p0ax83hhz4dv4cqbh1mi68b0", "fetcher": "github", "repo": "realgud/realgud", "unstable": { "version": [ - 20200513, - 418 + 20200809, + 2221 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "1238d8e72945a84bb06cd39d7ded75f37105d4d2", - "sha256": "0gx5fivzksanyp9a0ijdzrcbgg8nw94mbilhdh1jkra5mw3ndr63" + "commit": "332d13673074bee252ae7819b0898ee7c7895d2e", + "sha256": "0cnnhxgyrjvr75pin7kis5qzd54hh0qscbnvvm8jflmljzca77lz" }, "stable": { "version": [ @@ -83520,15 +85344,15 @@ "repo": "realgud/realgud-ipdb", "unstable": { "version": [ - 20191115, + 20200722, 1116 ], "deps": [ "load-relative", "realgud" ], - "commit": "347090928d7866a9909208c5bbe2cb8fa7b55cd7", - "sha256": "1m7v8qsqm8b8liyfdfqpcsjnlcbs0lpl6m91ff3449a94l1g99k7" + "commit": "f18f907aa4ddd3e59dc19ca296d4ee2dc5e436b0", + "sha256": "196zy8xmqkm6nc7074gsy4ymm6h4ikbd01f41karys7dwib3gg5i" } }, { @@ -83539,15 +85363,15 @@ "repo": "realgud/realgud-jdb", "unstable": { "version": [ - 20191125, - 1700 + 20200722, + 1120 ], "deps": [ "load-relative", "realgud" ], - "commit": "99b7f08e0fcec9e33dde8dbbe60e42cfec08bc17", - "sha256": "16q9wxa518f3g54zk3imgj8ml06bn66d9jyyg2k86j94ny7q1azd" + "commit": "1c183b2f8aae0de60942ea01444b896bf182c66a", + "sha256": "1i80llf9bncd5hkrk0wj3xswd36q1rkv5gaqgfqq4r1f8dkrhrz1" } }, { @@ -83650,16 +85474,16 @@ "repo": "realgud/realgud-pry", "unstable": { "version": [ - 20190520, - 1139 + 20200620, + 1006 ], "deps": [ "cl-lib", "load-relative", "realgud" ], - "commit": "fe04c0e1e1ce33361d12ad6f9bcf493f3fe228e0", - "sha256": "14b3104wlaxwbg3p2pmnxlap5q4msbhswpiq5cx5q1wwhzkjfp2a" + "commit": "7b502b9e802b8594c90da329b9716bcfd2c981b1", + "sha256": "1rwqzpcdapfdlf6hvypi16w6z13r1fhv91arbr34jzfzbsnk7sb1" } }, { @@ -83690,15 +85514,15 @@ "repo": "realgud/realgud-trepan-ni", "unstable": { "version": [ - 20190912, - 1418 + 20200722, + 1118 ], "deps": [ "load-relative", "realgud" ], - "commit": "6e9cac5e8097018aadf41c88de541168036cc227", - "sha256": "0xc80mhqk26vm1sv8xz0zw0pmbznvdpb8gla5bh3rnxpadpannc3" + "commit": "6e38cf838c7b47b5f1353d00901b939ffa36d707", + "sha256": "0qwzvaarl2vr6ca0kd9k195f5nbnkdjsrwrkhxggjqsk7v1hq6x2" }, "stable": { "version": [ @@ -84167,11 +85991,11 @@ "repo": "purcell/reformatter.el", "unstable": { "version": [ - 20200426, - 818 + 20200814, + 435 ], - "commit": "dc6278a6b1e3565604346ac41a6ffc3cbab04031", - "sha256": "147qrqs3ndc4xfbb9wiymjsskccp54qpj8bn3i19n9zwm4kmgdzr" + "commit": "45c0add95025f53ca644a6c8b9afa05b2da3c474", + "sha256": "1dfn7c3gpavpiwd73v2pasd8wd8b62dczhg9iv1cgh8vaqlsf92x" }, "stable": { "version": [ @@ -84259,11 +86083,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20190905, - 730 + 20200815, + 1555 ], - "commit": "ee86d6a79342c6e4b3cfad5ec73cb0a40e18ae3d", - "sha256": "06y1hbqgdw2y0isn26wmwrqjxb1ypwrqhcjg4n69mdn74cwlk4jz" + "commit": "07e2201db7a88b246a63e868e711749e1465d3d6", + "sha256": "0y9746pqinp0nir2afm181drs2qa63jpb834s3s7pzd2mvjrw0rc" } }, { @@ -84312,11 +86136,11 @@ "url": "https://schlomp.space/tastytea/register-quicknav.git", "unstable": { "version": [ - 20200325, - 1612 + 20200524, + 2006 ], - "commit": "06afa1efc490a6cbc1d814fc6f1e7a80a601ecc7", - "sha256": "055bffsa81chjpv39p2fn10dwikpzb034k19k0mc1026d8a423kg" + "commit": "c15ea92b0946c28b3f14986d42b15b0b534aa6a2", + "sha256": "03xm5rxhafzngdqnpl884d0zy9qkpx57zbcnh0psalmvswd4d4fh" }, "stable": { "version": [ @@ -84342,8 +86166,8 @@ "deps": [ "reformatter" ], - "commit": "41c99057d0406c7fb3895a03da777af3961a648d", - "sha256": "1dw6f60ysyvxgm5gpir37ay8z9csykxj0r7v9h6z38cswicg27sj" + "commit": "439a4d5e130e67e9e8c34e813fa1dc6631e7a8d5", + "sha256": "0lzlhmz0c4jv65phksh6aya93rlh8rqcffbvz1llcyj8i2gr7hqj" } }, { @@ -84364,56 +86188,6 @@ "sha256": "0kn07wgnz5bkkq66qfq16rvw9l7zgh0hzrsa705j1zbd6vc3wygs" } }, - { - "ename": "relative-buffers", - "commit": "ab22cea99fbee937bbd6e8fbc8bd27967aeaa8a5", - "sha256": "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i", - "fetcher": "github", - "repo": "proofit404/relative-buffers", - "unstable": { - "version": [ - 20191004, - 1205 - ], - "deps": [ - "cl-lib", - "dash", - "f", - "s" - ], - "commit": "6064cd0b3cbd42c4a46c70fc396f05be71f42bd6", - "sha256": "0wzxnbbzzjkzrnfdbdn7k172ad6mnhq5y3swcbilnk1w1a1lzyhn" - } - }, - { - "ename": "relax", - "commit": "67247451b39461db4a5fcff3827a09f53f9fc8ec", - "sha256": "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk", - "fetcher": "github", - "repo": "technomancy/relax.el", - "unstable": { - "version": [ - 20131029, - 2134 - ], - "deps": [ - "json" - ], - "commit": "6e33892623ab87833082262321dc8e1977209626", - "sha256": "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66" - }, - "stable": { - "version": [ - 0, - 2 - ], - "deps": [ - "json" - ], - "commit": "6e33892623ab87833082262321dc8e1977209626", - "sha256": "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66" - } - }, { "ename": "remark-mode", "commit": "083f2070eb27d66f09552bf42a346f41a9b9b4b5", @@ -84469,17 +86243,17 @@ }, { "ename": "renpy", - "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", - "sha256": "173391mcv56ljrkhl6hb9fhkl2vic9wj2xmd21hq88m3awpjmill", + "commit": "68635e3c52d12c234200680fd393a0b8748d2993", + "sha256": "18lnp1920c88j6fvjsrrymqh23amna9qyllh68mf7kssbsh5w2zq", "fetcher": "github", - "repo": "treymerkley/renpy-mode", + "repo": "Reagankm/renpy-mode", "unstable": { "version": [ - 20190419, - 1749 + 20200607, + 135 ], - "commit": "943e1af71d23128ff100d41d178ccffe28f97944", - "sha256": "1l2dglkbpb3d6c6cnifhngcjc4yy726mq6yic8x9409c6r0apn2n" + "commit": "f2f95a72a8c842f229f80999132e8ea8ee73f6fc", + "sha256": "1jka61j6zrc0yzjcplnyg1kp1d45ikwnkmayjg41v9w0pfrzzim3" } }, { @@ -84534,8 +86308,8 @@ "deps": [ "fullframe" ], - "commit": "a36caac7649fbffbe30f7b06541c9efd723563fc", - "sha256": "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd" + "commit": "f066782c10226d31ea8c1cc386cfa7fa3a4e3aa7", + "sha256": "14kap395xd3d5n7ini5cyif2ygz0db8bv0py5ipwlac2zcwgmfwl" }, "stable": { "version": [ @@ -84704,11 +86478,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20200219, - 2257 + 20200517, + 1305 ], - "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6", - "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2" + "commit": "d02d1347ffdf138cffd380cbeac62ac8732036ef", + "sha256": "1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs" }, "stable": { "version": [ @@ -84735,8 +86509,8 @@ "deferred", "request" ], - "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6", - "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2" + "commit": "d02d1347ffdf138cffd380cbeac62ac8732036ef", + "sha256": "1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs" }, "stable": { "version": [ @@ -84867,8 +86641,8 @@ 20200502, 831 ], - "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca", - "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh" + "commit": "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3", + "sha256": "1a2c7xzy7rsan1zcdskia6m7n6j29xacfkqjlfdhzk6rr1bpzkwk" } }, { @@ -84886,8 +86660,8 @@ "helm", "restclient" ], - "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca", - "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh" + "commit": "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3", + "sha256": "1a2c7xzy7rsan1zcdskia6m7n6j29xacfkqjlfdhzk6rr1bpzkwk" } }, { @@ -84919,6 +86693,21 @@ "sha256": "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih" } }, + { + "ename": "retrie", + "commit": "12ed1c6d8e2aa4f73b793f9e16e8e13985fae944", + "sha256": "1y0zknhc2wkq6kpmz2bylwqla1xd7n7l3650zj2bi8g84ly777af", + "fetcher": "github", + "repo": "Ailrun/emacs-retrie", + "unstable": { + "version": [ + 20200519, + 551 + ], + "commit": "976d6f01a3e214917f16b82e750d825cb9bfcc59", + "sha256": "08rwhkx2chphrfqd6l2bjr1w4rn394q8w5iy93cdprl5y56axvp6" + } + }, { "ename": "reveal-in-folder", "commit": "26682a1fb2d885168ca922521df7f3d8fbfe43a8", @@ -84927,26 +86716,28 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20191209, - 514 + 20200618, + 1211 ], "deps": [ - "f" + "f", + "s" ], - "commit": "e3cc73688d8dc3b47ccb1db49519a83b275b1cde", - "sha256": "0xdpm7r83nd5j4ss530l3srz4qy2z0m7wp084i3v2sfqi3in5qgl" + "commit": "cc4f56c8870136aafcdc5afc010e9a73a9bfd707", + "sha256": "09byr8lh1agar1mmxs82sg8ica1p9wrjjahpx3k3adfmgq2glzcr" }, "stable": { "version": [ 0, 0, - 2 + 5 ], "deps": [ - "f" + "f", + "s" ], - "commit": "715e34b7c4a93840f6188386a13d15231907257b", - "sha256": "0d75hgaskhc6gwjdcc19nligb4xj2irg33cirrc0wp23k7il1m6f" + "commit": "cc4f56c8870136aafcdc5afc010e9a73a9bfd707", + "sha256": "09byr8lh1agar1mmxs82sg8ica1p9wrjjahpx3k3adfmgq2glzcr" } }, { @@ -84981,11 +86772,11 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20200324, - 1113 + 20200520, + 853 ], - "commit": "c42a7a585c7b85bc402f63535ae6261f68c6aa57", - "sha256": "1lx23y4dzf5ln4ahf5dnnvx3blvjf3s65n3hgfv0qi5hgi8i8f59" + "commit": "90add9a1f8c4a3c78029d38087ff4d22fe5372d3", + "sha256": "05k2zp2hldzq5h6nl8gx79dd8lvfn507ad4x3naichdqgn2013nn" } }, { @@ -85019,11 +86810,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20200131, - 122 + 20200710, + 155 ], - "commit": "09e2df58398b392f19642a12c8cb78eae726dbd2", - "sha256": "13cy7wy2jv1cjncfnayp28w1ka4s0jim2sarcw0dn2iiniqlkbwf" + "commit": "343e7155f8238a7a53ef1f753319b8e2f9e8e8b9", + "sha256": "13wgrj5qbg2pv6d9yxkbsrrllvd40m4p7911g23wcwnnx211p943" } }, { @@ -85049,26 +86840,26 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20200215, - 1357 + 20200719, + 1241 ], "deps": [ "helm" ], - "commit": "88e6577a0e50f523f7da04de9f939b0bc168b514", - "sha256": "1k8330bgc9m7pnpvz3kjyjpjsmha43v4srnhns85xi0nv328g1iy" + "commit": "02546beecf4c495940885e7b7b911d84b12646ef", + "sha256": "1v52vbs2zbqv62wcgcrqgjcwcdq0w6hdb14nma4yhqldnqi57875" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "helm" ], - "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553", - "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3" + "commit": "02546beecf4c495940885e7b7b911d84b12646ef", + "sha256": "1v52vbs2zbqv62wcgcrqgjcwcdq0w6hdb14nma4yhqldnqi57875" } }, { @@ -85079,16 +86870,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20200516, - 1412 + 20200703, + 1250 ], "deps": [ "s", "transient", "wgrep" ], - "commit": "f5456e006f22b6bc947e799261b36d55b075c5a2", - "sha256": "120n4vkw3c1l130932pziz9ivw85wyh6b75836w82dhx9d41h4cr" + "commit": "853c1acaf999500d867180b9e71938366c8e1a7c", + "sha256": "0lp32mjmbzjbsvzia2zd29yv0i75mqvp1w7c0jcwvyyl6gqbg3k1" }, "stable": { "version": [ @@ -85238,8 +87029,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20200502, - 349 + 20200816, + 827 ], "deps": [ "cl-lib", @@ -85247,8 +87038,23 @@ "popup", "posframe" ], - "commit": "daf956df30d4007f70a4495560d656e517ab69a9", - "sha256": "0wr1ski9j7m7mwizdgxnnj61z1nqpyjp6gc7dniaac0m6svxf1rf" + "commit": "aab21695f1dee0db3ddf0f0c834b94aecec7057c", + "sha256": "0rzghfnrdyrqijw76f4vvsn3hsninwp3qyvr1p7r0ddz21xz04np" + }, + "stable": { + "version": [ + 1, + 0, + 3 + ], + "deps": [ + "cl-lib", + "dash", + "popup", + "posframe" + ], + "commit": "2a0b116d56bf54456eb5d6e8e80a7a6cf6944863", + "sha256": "08rzkiqwcl8j3i2yyibll5lcsj8720plzm9zfdgmxgkw7vhcyix5" } }, { @@ -85405,14 +87211,14 @@ "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "js2-mode" ], - "commit": "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0", - "sha256": "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8" + "commit": "0061587a06cdc2579a8d0e90863498d96bf982d8", + "sha256": "08b4hdgq4hc1yfd9pvyir2j3cqqdqa3j5svgaba97x5fzhsz7y8i" } }, { @@ -85438,26 +87244,26 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20190521, - 58 + 20200628, + 1225 ], "deps": [ "inf-ruby" ], - "commit": "68503b32bb3a005787ecb7a7fdeb3bb4a2317e2b", - "sha256": "1v4nbfr3rhdm1733gb88cv0f018iy53cw5hdcwpshrmjj36a2lpn" + "commit": "082da38797d247f9c64568ad712a345e041d5c84", + "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl" }, "stable": { "version": [ 0, 8, - 2 + 3 ], "deps": [ "inf-ruby" ], - "commit": "1908afd42ce05fc8b8bbf3f38301680264b68d19", - "sha256": "0qw18wi54yg971n4wnjqkd8lqj5lbs9ra8bvmngif2bzhqlfdsbn" + "commit": "082da38797d247f9c64568ad712a345e041d5c84", + "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl" } }, { @@ -85606,14 +87412,14 @@ "repo": "zk-phi/rpn-calc", "unstable": { "version": [ - 20181121, - 1154 + 20200816, + 545 ], "deps": [ "popup" ], - "commit": "27279f89c80eb3f28ff9f981eff06502056943e2", - "sha256": "0klzhscdvzwpcrfkq2v28in5fv01zqabgxdrziyhj666sly1scjq" + "commit": "1554be19acc2644898a2175fa277d1159327c8dc", + "sha256": "1b4v9x8f9ykz2dqiv7p7c2f6kbl374i2723idmnvm2c9bc0hbpyv" } }, { @@ -85647,15 +87453,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20200228, - 2348 + 20200615, + 1443 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "9a2a9d2935ae17b8570485bdea7c347533b464f6", - "sha256": "0plr71dbghzcnbrl9l4g52g59yvlcx1dh41fwcnp0b12x13vslay" + "commit": "f1029cad2a8d9fd096e9a0f1ae9e7d7e2c8bd1ec", + "sha256": "02818knhbnqqnfmlhzr2ak0i6cv6pmbxw2icns2lg8vfr430c286" }, "stable": { "version": [ @@ -85678,11 +87484,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20200507, - 1824 + 20200810, + 2326 ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -85707,8 +87513,8 @@ "deps": [ "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -85802,26 +87608,26 @@ "repo": "jimeh/rubocopfmt.el", "unstable": { "version": [ - 20181009, - 1703 + 20200713, + 1144 ], "deps": [ "cl-lib" ], - "commit": "fc96145719a65b2551339d087ddd95b72e14646f", - "sha256": "12sfzvb5lf20d4kqa1fzhz8s48lgr8w0x7qimjcy5c75yjb123wl" + "commit": "b84810105940aa5e0bde20c9a89359c95c9b6917", + "sha256": "1w922wl7zab61v6z09rh3xpjnfi97c802ijvv4g92nqds6fhnym1" }, "stable": { "version": [ 0, - 3, + 5, 0 ], "deps": [ "cl-lib" ], - "commit": "43ffa9d9c3dcc0574038bebd049102642f50b290", - "sha256": "0vzpfd9xv80ph9xz8psczz46blhsdnac8zh5i944klkxgqdw7x1x" + "commit": "b84810105940aa5e0bde20c9a89359c95c9b6917", + "sha256": "1w922wl7zab61v6z09rh3xpjnfi97c802ijvv4g92nqds6fhnym1" } }, { @@ -85998,15 +87804,15 @@ "repo": "ruby-test-mode/ruby-test-mode", "unstable": { "version": [ - 20190412, - 909 + 20200521, + 907 ], "deps": [ "pcre2el", "ruby-mode" ], - "commit": "e805a81c3ea787f3c82dbb252c21d747be20bc7a", - "sha256": "07j74hgq3d4y6m992y98y9n87ivk8a2wb3zlahkj32slkcqfz3kd" + "commit": "5bb6b7b7ba0a4c91ba2e029853215e76e5df7772", + "sha256": "19sacch06cxj1803m8ac246cl9sp1wsxbp7zgrhmw1gdpsnpxac8" }, "stable": { "version": [ @@ -86164,11 +87970,11 @@ "repo": "vmalloc/rust-auto-use.el", "unstable": { "version": [ - 20181125, - 637 + 20200608, + 1359 ], - "commit": "d924505ecd954625dcb2d56dfba97111dc6a17fa", - "sha256": "1yw9l13dgkfsdv4kgpbvzx12g8bqycclgq2gk4b1r29mxy72wnpq" + "commit": "d5205f7b9b9eae0f7d0893f87d3391464719f9c0", + "sha256": "01jhb4bjb4dc4m4nw6n16dc4cc7x9z7j2vri0s1y16v1bm4cv26g" } }, { @@ -86179,20 +87985,20 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200513, - 812 + 20200709, + 723 ], - "commit": "bfe40565753295a4cf8403f4124710acd2827d21", - "sha256": "1bx0hfilw48cz8n58lf427yg6sfi50wr91vcmj0w0m4s26zbdrr2" + "commit": "ca7d99c6fd90fc1e636aa9d4020a2f077786a0c3", + "sha256": "1m24g08q7w76aq0gnb2pdp0jbadi19fw4jmbgmx47180glz082qh" }, "stable": { "version": [ 0, - 4, + 5, 0 ], - "commit": "106aeab800fb3404baf231845d3e3549ec235afa", - "sha256": "0bcrklyicxh032rrp585rl5mxd26nb61dp6r5bl935rlcmxzsczh" + "commit": "00177f542976601d7f114fed82caaa3daad7b177", + "sha256": "1f3nnl0d7p9b5cv1bpm0hj898qmr2psxfvmqr61bh684z7fgc045" } }, { @@ -86226,8 +88032,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20200516, - 759 + 20200724, + 1517 ], "deps": [ "dash", @@ -86241,8 +88047,8 @@ "spinner", "xterm-color" ], - "commit": "52b632d161b64bdca3f35e35180af63b668ce9fb", - "sha256": "1pcqm8463hjlv70bn6cpl2sv3z2h992yvkzrcz0w2rpz6jgrcfg1" + "commit": "75b99201bb4e7a0bd990c006896ad7897f284ca2", + "sha256": "1ddma5fi2yaxg2c2hvigfz4hbp218l71ixcnnkzp8ilqr8m2jvjj" } }, { @@ -86256,8 +88062,8 @@ 20150402, 1442 ], - "commit": "134497bc460990c71ab8fa75431156e62c17da2d", - "sha256": "1z5psj8mfp0fw8fx6v1sibf8cxhz30yyiwjw17w80f9c24g0j4ii" + "commit": "081d5173158054c6d0780b9462c74c5697eac1fc", + "sha256": "1s950jmhrwjmzrr3qv3636sn2rhxfvaqlrl36h8700pq3791l1fs" }, "stable": { "version": [ @@ -86350,15 +88156,15 @@ "repo": "mattusifer/s3ed", "unstable": { "version": [ - 20180204, - 1349 + 20200720, + 1313 ], "deps": [ "dash", - "seq" + "s" ], - "commit": "13503cb057bed29cb00a14dffe4472b5cb7748ad", - "sha256": "1ak5nmay12s4ipmvm1a36kyny05xhzmj7wp6dry391db9n7g2wy0" + "commit": "3e3b962d3848e6cc8ce9dc491b2e29e915a5c351", + "sha256": "0v8c3zwnfy40clbq6lb03z33n5pj36sz5jpprmgppms3w2ba6fw8" } }, { @@ -86393,16 +88199,16 @@ "repo": "sagemath/sage-shell-mode", "unstable": { "version": [ - 20191103, - 1040 + 20200524, + 958 ], "deps": [ "cl-lib", "deferred", "let-alist" ], - "commit": "8ff9888fd84a96816512403a1b5ded93b4d4278b", - "sha256": "0rrp137r5cf049xqry3jz514pmdzfxkmri9z8kv08yk3w3c9sapj" + "commit": "855fb4ece47cea2c72295ce2158e0915829835b5", + "sha256": "12s289g5xc1b7szyp0zhxdxh6rzhlhkzwiwg14hf020c41mz27am" }, "stable": { "version": [ @@ -86598,6 +88404,24 @@ "sha256": "0h8bl28p5xrs9daapcjkslm066a4hqlb764i5nz1db0lwrvr0csm" } }, + { + "ename": "saveplace-pdf-view", + "commit": "94efcb8e99185753d73c7436c18a086c441c0d7f", + "sha256": "1z43sb8fyg8zhlcmpn2vbivjnzljka64q146v5v81k990pjvk3z1", + "fetcher": "github", + "repo": "nicolaisingh/saveplace-pdf-view", + "unstable": { + "version": [ + 20200719, + 113 + ], + "deps": [ + "pdf-tools" + ], + "commit": "bbbc466fff060b372a9d2b30e48ec6bbb7d03095", + "sha256": "13dxd06dicv50rl1kk6c5971iaj7x3imkqs5q2ndm0daqzrp0lva" + } + }, { "ename": "say-what-im-doing", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -86635,8 +88459,8 @@ "deps": [ "cider" ], - "commit": "277404a6bb0a979e195df5886fc143bb1d1f1e8c", - "sha256": "0whsfl6z39zhjm6b3wcliwfs70xz3pg9b1r6s2bcwnp5ld1v65m9" + "commit": "cbc3546fb6b1374080f1646ac3a6532a5723b7eb", + "sha256": "06aysbwr4lr9cd8mbfdpkiz8458hwl5qg41nq1wnl5dx0gvw3fgn" }, "stable": { "version": [ @@ -86659,11 +88483,11 @@ "repo": "hvesalai/emacs-sbt-mode", "unstable": { "version": [ - 20200106, - 753 + 20200521, + 632 ], - "commit": "633a315ad453cd963588c9b8fba02d9cf75296b4", - "sha256": "0ha2lyw42ir16b2d09y27q0rsdx6azcfv258frp1ja63mx0jiqic" + "commit": "4358ed862a1b1ec18ac9699afb4862146669eb79", + "sha256": "1qm5ziilapfpafqch3pl5iijfj1kwccl2r7g4xl5a2pqnc480sjl" }, "stable": { "version": [ @@ -86683,11 +88507,11 @@ "repo": "openscad/openscad", "unstable": { "version": [ - 20190413, - 1246 + 20200628, + 2256 ], - "commit": "648206e2ea609e8f38599cd540368d54ff52ae8a", - "sha256": "0vsabvci7y5l1lbqmn0fw301wfnwbb7fw7vffm1gd0w7rjjhxw73" + "commit": "0c9a36b82c7129a0fdce20ce99e15ecdffd3b437", + "sha256": "0qsvi7d3bcsai99dvbdfm8n6qafvwj51r4g4ph5jch2f1yb8m995" } }, { @@ -86698,14 +88522,14 @@ "repo": "zk-phi/scad-preview", "unstable": { "version": [ - 20160206, - 1336 + 20200816, + 549 ], "deps": [ "scad-mode" ], - "commit": "fee011589671cc8f1296cb6aa81553e5bb699819", - "sha256": "13x00dls59zshz69260pnqmx6ydrjg8p2jdjn1rzgf5dsmwfy3sc" + "commit": "75fe00a9aaf875ac97930bdb334aef9e479e41d5", + "sha256": "0vdb9ib76fjdvm3f13v3kh7x04izq993crrzsqp0vs5nilbkrs8c" } }, { @@ -86716,20 +88540,20 @@ "repo": "hvesalai/emacs-scala-mode", "unstable": { "version": [ - 20190929, - 1522 + 20200524, + 1304 ], - "commit": "46bb948345f165ebffe6ff3116e36a3b8a3f219d", - "sha256": "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv" + "commit": "1d08e885b1489313666c7f15a3962432a4f757ee", + "sha256": "06g6szxb9a4ih90mcryv9r1h6nqbpk3x4icd1i6nh2ky1sj6s37q" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "56cba2903cf6e12c715dbb5c99b34c97b2679379", - "sha256": "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg" + "commit": "46bb948345f165ebffe6ff3116e36a3b8a3f219d", + "sha256": "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv" } }, { @@ -86813,11 +88637,11 @@ "repo": "emacs-pe/scihub.el", "unstable": { "version": [ - 20190801, + 20200604, 920 ], - "commit": "a32e8f47961d606c1315a972f2dab4d3a61945af", - "sha256": "06qcs7jq68ylmvw0kf1myhpgzci7i9qbb2h0hxh0g21mz8ssna3f" + "commit": "5a4666ca99de6a90108b4606b4c57270c03002ce", + "sha256": "1njvf7712ryfd83xk27b6d2nx653j57x3ckn7xba7an4i0g7gk4a" } }, { @@ -86881,14 +88705,14 @@ "repo": "technomancy/scpaste", "unstable": { "version": [ - 20200415, - 40 + 20200717, + 2007 ], "deps": [ "htmlize" ], - "commit": "ca95a8dd088e848bd1cab6be207c6a98343ee176", - "sha256": "01v199xkadcbdr627skhisixdqj0hbbyv912xgyypm1rxdjfhhx9" + "commit": "2aa1513fa0a402f03b993c0a6929daf39820b02b", + "sha256": "1cvkqb5v0v790nmhg4wi6kv6mbzfkfcgvn2xh9bmny37dcv0i2gk" }, "stable": { "version": [ @@ -86926,6 +88750,30 @@ "sha256": "0yiwq2gc4gdgfhaagpawhb7yrzc4fsnyb10w5d0q4whv64cj8555" } }, + { + "ename": "scratch-comment", + "commit": "9578c2878a7a5f89fd495531e03a8658696fc360", + "sha256": "06zn1czv7bw8akbgp61pxi1k4kd2r06d7nxvr14j3cpb3v7fs7kz", + "fetcher": "github", + "repo": "conao3/scratch-comment.el", + "unstable": { + "version": [ + 20200812, + 1025 + ], + "commit": "cf3e967b4def1308b6ef1cfeedd2cf15ee6e226c", + "sha256": "0wq1vf391h53ys3292ap7f4nvk4i7wz3cqfbb18bwzz7iga922qd" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "d62665ecbeb05d1f92761af185736609278ffba2", + "sha256": "1bnzijfp6jkhl59y18qxnj39f06jzs39xgvj5aj7vlab5zrassmg" + } + }, { "ename": "scratch-ext", "commit": "a142d336a57d075dfd5caf44fa1c1254b83ac728", @@ -86979,14 +88827,14 @@ "repo": "zk-phi/scratch-palette", "unstable": { "version": [ - 20150225, - 842 + 20200816, + 551 ], "deps": [ "popwin" ], - "commit": "f6803b448079f4a81cc699cec7442ef543cd5818", - "sha256": "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2" + "commit": "c39cacb11992383887fa096ace85510baed94aef", + "sha256": "1va9c97cvdqf6404kixvgk0qwrlnc1lrz6khpkdp2w7w1brhf2f7" } }, { @@ -86997,14 +88845,14 @@ "repo": "zk-phi/scratch-pop", "unstable": { "version": [ - 20200504, - 2004 + 20200818, + 1820 ], "deps": [ "popwin" ], - "commit": "1a36cb5ab6668aa57b1b7192521a472feeec1ea2", - "sha256": "1hdbwzd52qhn2jc8ghkp0lwr2hzrs4zfnwj6vniffxd5xz3c21ck" + "commit": "b1bdd0f8a345737069194ab8727f164f5d8560b4", + "sha256": "03x0kb0cf4yzjxl9nqwl3sg9nl75l9n8k4ain0yw0h2vpi2g0wf3" } }, { @@ -87198,21 +89046,6 @@ "sha256": "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4" } }, - { - "ename": "seclusion-mode", - "commit": "b087d151b00f5251b15ebb071896995874afb274", - "sha256": "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m", - "fetcher": "github", - "repo": "dleslie/seclusion-mode", - "unstable": { - "version": [ - 20121118, - 2353 - ], - "commit": "9634e76c52bfb7200ff0f9f01404f743429e9ef0", - "sha256": "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239" - } - }, { "ename": "secretaria", "commit": "3eeddbcf95315da40d021a6913ccf344849c4284", @@ -87365,11 +89198,11 @@ "repo": "Kungsgeten/selected.el", "unstable": { "version": [ - 20170222, - 834 + 20200528, + 606 ], - "commit": "03edaeac90bc6000d263f03be3d889b4685e1bf7", - "sha256": "1d72vw1dcxnyir7vymr3cfxal5dndm1pmm192aa9bcyrcg7aq39g" + "commit": "3043fd2609f7e71d809763ae6e8dd4b6c904e63d", + "sha256": "11cr55g7rrr4gqb9r2znmff0bp112l7a96d26mznfdprzj7pdzvd" } }, { @@ -87404,19 +89237,19 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20200514, - 1440 + 20200817, + 1459 ], - "commit": "392fb1ba8a594a291854c27d2b6824b04cd0c2e7", - "sha256": "1rr7w8jlxsfn2kpryb1ywn066qlc31px1dbwd42hafp6k5cl870n" + "commit": "5448e7cbaeb8d58c5dfd474cd0e03d6db60ac532", + "sha256": "09xfi0gfk9jmjmz941cfzwrv15jlzqxzwlq4m0qb29g1r4kv62ng" }, "stable": { "version": [ - 1, + 2, 0 ], - "commit": "5995a4ba07a7b1b5f661ff050d93ad702f9014a4", - "sha256": "105zl102dwbzvk50xh6b824nq6p24kxhky18ghdnk5yi5sv620lm" + "commit": "51b75f4b287b13beff86810eb3a060747ac191e9", + "sha256": "08wm4ybidn8g7sy5a009lnsm0f1p7a3jfzpzxnzylvnyrmyhi3y4" } }, { @@ -87427,27 +89260,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200404, - 1550 + 20200716, + 1414 ], "deps": [ "prescient", "selectrum" ], - "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", - "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" + "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530", + "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p" }, "stable": { "version": [ - 4, - 1 + 5, + 0 ], "deps": [ "prescient", "selectrum" ], - "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", - "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", + "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" } }, { @@ -87492,14 +89325,14 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20200429, - 641 + 20200818, + 1252 ], "deps": [ "flim" ], - "commit": "57a948c5f07e57e78ab3c0e6fd76ffcd591bb4ac", - "sha256": "0y73l0zf2lg7kxz7kpbirpipzq007bdrgmlqfrv8najh4q03gf8g" + "commit": "10897f024fd9282c73385d24514cc4b57fe193db", + "sha256": "14d4j17l0ngg6fp00mf2zgyz6989cx9n5n3za7ifcfr8gjbbn7gp" } }, { @@ -87510,29 +89343,30 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20200419, - 1022 + 20200812, + 1027 ], "deps": [ "htmlize", "impatient-mode", "web-mode" ], - "commit": "4ca9d275948898602640a46573cb95d7eef913e5", - "sha256": "1wl5qsph19i0ll2ppn9va4563m4bfz1zpv99d7xd7w65x6cp29ci" + "commit": "7a9a8305f7b54ee59e4c29b33ef5fd4058ba4219", + "sha256": "0sm6kd0r7wjsvynfkhq33d6rz431j784jlbxjpag60g5avxha9s9" }, "stable": { "version": [ 1, - 5, + 6, 0 ], "deps": [ "htmlize", - "simple-httpd" + "simple-httpd", + "web-mode" ], - "commit": "f62f7a9f5e18ef8f370444a1fce710770227b0f5", - "sha256": "037p2kiwkkbk921ik15jalcci0p87q3my9mxzyh6i0mnc6qsh4zf" + "commit": "1f8bda7e5a4a36212f968b462cfc31ce53c6db85", + "sha256": "1hc0rwlgapbqf9965n3nsyvd4chdga5av7ya82wjzxn1mx4bhifa" } }, { @@ -87610,15 +89444,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20200407, - 728 + 20200702, + 634 ], "deps": [ "dash", "edit-indirect" ], - "commit": "e9a7b4402859d73f052330106d29ad14c3d9b6f3", - "sha256": "0d9w8n497j6q879rd9mqrmzvk3ssm95ayqbyfb5x0r3pnywdjp1b" + "commit": "fa752df206f8f6e64f27e2a6d998ddd58e3c444b", + "sha256": "1c0k5cg2si4i0hwdi7lbh058rq6vmry8ncddgq5dxbih14wpbys4" } }, { @@ -87893,11 +89727,11 @@ "repo": "sfztools/emacs-sfz-mode", "unstable": { "version": [ - 20200312, - 1153 + 20200716, + 1023 ], - "commit": "4d8ccde889b112896c7299cad9f1e9305bde8cb3", - "sha256": "1ccqb05xmnxpwxl9vdvkb3f8211kbj5rsb73xv1ghyx3i40qjmzm" + "commit": "aaf31d1b68817251affed7da719dfcb2acd4b51a", + "sha256": "1b9qi5vhqp2c2bmkyvmjj4nrb3n42g4w71p2phxssiwmyq80m28f" } }, { @@ -87908,26 +89742,26 @@ "url": "https://depp.brause.cc/shackle.git", "unstable": { "version": [ - 20200506, - 1231 + 20200529, + 1839 ], "deps": [ "cl-lib" ], - "commit": "4b81514191dd182a28a3e5b2fe3069264b6835fe", - "sha256": "0k3waffnd08x1vb7mj6ix21zcadn9ipx4fis26iy3dsj35cbd3fb" + "commit": "171c3f437d853f34782b201d86ef765665b755e2", + "sha256": "0s4br59zpd5qq7z9074ddq9lmwnddq2ixijwi666wp5gxw45fpgg" }, "stable": { "version": [ 1, 0, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "242bacc940c18b6f9c156e1912155d45537fd827", - "sha256": "0qqx8py21jaq1bdafkfqx18ns4zn305qg84zbmy65spiqnfq8hwk" + "commit": "171c3f437d853f34782b201d86ef765665b755e2", + "sha256": "0s4br59zpd5qq7z9074ddq9lmwnddq2ixijwi666wp5gxw45fpgg" } }, { @@ -87971,8 +89805,8 @@ 20190903, 1907 ], - "commit": "f3cbe25c82f99367ac009d67a2400eb6d56547ff", - "sha256": "10y7qcb61f0x17fy5h2flhvyyql99cshqmfy1varn1mgg2h36mn9" + "commit": "5f24c90bb8e7333ee4315619672dc2ec69d198be", + "sha256": "0msrhh41nyvyy17skd5y5lzdz7a6lxnlqnflgz4xf2qpnc390kd6" } }, { @@ -88290,8 +90124,8 @@ "deps": [ "reformatter" ], - "commit": "342c55fab27f1e62472eebbb53cfc73b0d422a34", - "sha256": "0hmxa856hlai9ydarfsn5s9i8cnfrydgpa7mkh4a36klhdj21gfh" + "commit": "465dc1fcaeed778b504d3d349a30e611368dcc00", + "sha256": "1gzky5xs63y7xl7j2hs81aja8qq6c5l3vk07hh050flw4yfxyi23" }, "stable": { "version": [ @@ -88355,19 +90189,19 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20200406, - 2209 + 20200813, + 37 ], - "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", - "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" + "commit": "7dcbab77334c5adf8309c7a93512c9f95a2c64e4", + "sha256": "0in8ir99b33d83nfxsnpj2dgyv4f558yrid77bp7f9k0qpgpj4zk" } }, { "ename": "shm", - "commit": "68a2fddb7e000487f022b3827a7de9808ae73e2a", - "sha256": "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0z9qwwqf63wmizzby3yanqa31050f9jp6zrfhx7grf8a9aj89m89", "fetcher": "github", - "repo": "chrisdone/structured-haskell-mode", + "repo": "projectional-haskell/structured-haskell-mode", "unstable": { "version": [ 20180327, @@ -88431,20 +90265,20 @@ "repo": "jcs-elpa/show-eol", "unstable": { "version": [ - 20190924, - 621 + 20200723, + 706 ], - "commit": "bd0e47d7d61bf04a923a1d1689693a47af3a2b22", - "sha256": "0nq02qf7rxswxqcsl1lv7skd14ixmmyjkhk7wdbn5j3dhw192bh7" + "commit": "9fe95a4b1cda218082eb1d977190cc66c7a6b4ea", + "sha256": "1nzid34cwgyqih46glw3r5hkav1px5wf8w2skbac1f3vvjfm6qk7" }, "stable": { "version": [ 0, 0, - 3 + 4 ], - "commit": "097a2a79e5bd7c297bcdc231559813056cd584ac", - "sha256": "0yhwd20azk6ib992fy3vzb9knqji3g6hz3ahz89sz71sjjvy1rrm" + "commit": "9fe95a4b1cda218082eb1d977190cc66c7a6b4ea", + "sha256": "1nzid34cwgyqih46glw3r5hkav1px5wf8w2skbac1f3vvjfm6qk7" } }, { @@ -88502,14 +90336,14 @@ "repo": "xuchunyang/shr-tag-pre-highlight.el", "unstable": { "version": [ - 20171113, - 914 + 20200626, + 1047 ], "deps": [ "language-detection" ], - "commit": "6182f43a36b0f82ba6edcf6e423b5f69a46a814e", - "sha256": "0916bpzi6sw5gyn5xgi9czf35zrvl04w10wz6fvz0lc57giihil1" + "commit": "931c447bc0d6c134ddc9657c664eeee33afbc54d", + "sha256": "09gcprqhl1ds4k407rlsjqr9y56a9wvjkli70wrf2l7w3dcm4qq0" }, "stable": { "version": [ @@ -88530,14 +90364,14 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20200508, - 1711 + 20200816, + 1032 ], "deps": [ "org" ], - "commit": "a146e7d25713c33999deff24338670a5d1308c6a", - "sha256": "17pm5ljn004wdsl2hryjla5my8a63mx3bpapkqfyvrkwswwzs3fw" + "commit": "9470de04daf0d917d0501432cea78cd6f5cefec4", + "sha256": "00qi4dg0684all2aw9dljzd3hp01vk3hsfqpf2pvri8l31a9dls5" }, "stable": { "version": [ @@ -88687,8 +90521,8 @@ 20200410, 639 ], - "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397", - "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73" + "commit": "5308d6891276b0aa2b0fd865f6c6f8c1a80ecb54", + "sha256": "01sz7iqny2r1zfipkria6r5w48rlbrp3ranqqyywvsxhwwr3apmp" }, "stable": { "version": [ @@ -88738,20 +90572,20 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20200311, - 547 + 20200617, + 1445 ], - "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347", - "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj" + "commit": "27c964334b8e30fa88e4278ae58dc3d00df34f1f", + "sha256": "1xl2ykdscrwpxm02ypnf68mkxf9dkp64cj465b69s874x10bxfc3" }, "stable": { "version": [ 0, - 3, - 1 + 4, + 0 ], - "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347", - "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj" + "commit": "27c964334b8e30fa88e4278ae58dc3d00df34f1f", + "sha256": "1xl2ykdscrwpxm02ypnf68mkxf9dkp64cj465b69s874x10bxfc3" } }, { @@ -88942,14 +90776,14 @@ "repo": "jorenvo/simple-mpc", "unstable": { "version": [ - 20180716, - 129 + 20200523, + 1804 ], "deps": [ "s" ], - "commit": "bee8520e81292b4c7353e45b193f9a13b482f5b2", - "sha256": "1ja06pv007cmzjjgka95jlg31k7d29jrih1yxyblsxv85s9sg21q" + "commit": "ce731fa390b7e4edfc461a9cfb4443c1aab4b011", + "sha256": "14fb52r5fzdcqqbh5kkajaz43iqq8g64g0rsswwwv6g1j23y93k3" } }, { @@ -89103,6 +90937,24 @@ "sha256": "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61" } }, + { + "ename": "sis", + "commit": "bea2374d589869dde682db96c35c530a051de3a9", + "sha256": "0zkfpmnnj30l36mcv90x90vs31x8q2rrs2ixy5w8lc96vn1dgavf", + "fetcher": "github", + "repo": "laishulu/emacs-smart-input-source", + "unstable": { + "version": [ + 20200816, + 1533 + ], + "deps": [ + "terminal-focus-reporting" + ], + "commit": "2568d04908af2d529f5ce0e71f0da541ff53e2a8", + "sha256": "0kmfhq6rypcc00ylmhf0m9nd51r6kzqfp6hcd22riynq51fb2cyh" + } + }, { "ename": "skeletor", "commit": "1e63aefc869900c2af6f958dc138f9c72c63e2b8", @@ -89272,8 +91124,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200512, - 1702 + 20200725, + 1052 ], "deps": [ "alert", @@ -89283,8 +91135,8 @@ "request", "websocket" ], - "commit": "b30525d63bb46882240de6f86e951305bcc7af10", - "sha256": "1f35lr19g5ci1jba6b9hkl7vajg4iy1yw6wb8bhg8dyppdkwnmvy" + "commit": "7570e82604b59b65e9ef31c5325bef45769ae027", + "sha256": "1i7fb4icj9h4lkcsfqqqhsi59msmslckcgxaa5aag4v3cdy93prg" } }, { @@ -89345,27 +91197,27 @@ "repo": "slime/slime", "unstable": { "version": [ - 20200414, - 1444 + 20200810, + 224 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "221518f0d3d224403743e6690f6bb66c42d9dec9", - "sha256": "0wbxv461lq7760gsqjw5djhjkzmwxz563l97csn2637gb1wkn461" + "commit": "fb12bac676ab51b75be19197e21ab4674479d627", + "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk" }, "stable": { "version": [ 2, - 24 + 26 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "c1f15e2bd02fabe7bb468b05fe311cd9a932f14f", - "sha256": "0w7j835p9riyd6n4znj3x255lwsrmy0lj51hpc7bhk0vdz2cv2qm" + "commit": "fb12bac676ab51b75be19197e21ab4674479d627", + "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk" } }, { @@ -89440,14 +91292,14 @@ "repo": "augfab/slime-repl-ansi-color", "unstable": { "version": [ - 20190426, - 1414 + 20200712, + 1226 ], "deps": [ "slime" ], - "commit": "fdd0c7a75a217abca2ff16ab9281d55f392bd841", - "sha256": "0d3q9js5vybddniyirvvabljmxasgdqimjdpy7pn48hh4rd875di" + "commit": "e38c7958d9657e41c426b4e96938b3f604238795", + "sha256": "0rbg6ndi59ycw54s2c21a3c2cr0wlymrpp4qr33yxv1ik00n5n5p" } }, { @@ -89570,11 +91422,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20200314, - 55 + 20200816, + 928 ], - "commit": "1382bda945ecfb4b177c7d05a36da8fd41e0384c", - "sha256": "1hmdx3nakhpsmg6zr52090pimmy0kpjz2adyi0m1wzh9zdg5cx4x" + "commit": "155cb0655e037477b592f8bde9c80022427293e5", + "sha256": "0g0ncqb7x3g3gafxm5j0v893cvnskq4idb5442f0v8d3y9pr0lyi" }, "stable": { "version": [ @@ -89679,14 +91531,14 @@ "repo": "joaotavora/sly-quicklisp", "unstable": { "version": [ - 20191012, - 2124 + 20200707, + 1635 ], "deps": [ "sly" ], - "commit": "01ebe3976a244309f2e277c09206831135a0b66c", - "sha256": "1vfqmvayf35g6y3ljsm3rlzv5jm50qikhh4lv2zkkswj6gkkb1cv" + "commit": "4707b62803d7a29f172e9c5ff993b91187a9aaf3", + "sha256": "1i4fqgd42khl85d4fifgfz2z6njpb8bxdry4chmgl8wfhh0mydza" } }, { @@ -89746,11 +91598,11 @@ "repo": "zenitani/elisp", "unstable": { "version": [ - 20200508, - 249 + 20200727, + 1249 ], - "commit": "f808ac53870d32c57a3cd01dd2850ee62d3af98a", - "sha256": "0dy3idfbvlrrim3rkv7lrr12gg2s4wlml6wcwgv1mazq3kdvjvvl" + "commit": "1f14c86af7ca5813ddc0b6dfcf2edd4a81371644", + "sha256": "0z1mmbgsx2lxrlyg59kz39khbir5k3cwb83mpz49ixfmy54byx5n" } }, { @@ -89770,16 +91622,16 @@ }, { "ename": "smart-dash", - "commit": "98a2cf93cc41cb2bba14f91a83b6949267623198", - "sha256": "1n3lh0ximwrqawdg8q9ls6aabidrawqca5w67f8vsfmrvyfx48n4", - "fetcher": "bitbucket", + "commit": "59d3ab87741a9290fce17307256e085b91dd1d8a", + "sha256": "1rs5xxmn2qdpwla55rq4ar1kani2acil3sq47gx15y3v0rsrxxkx", + "fetcher": "github", "repo": "malsyned/smart-dash", "unstable": { "version": [ 20200104, 1620 ], - "commit": "cc540eea7452e15d4ef2b09d8809d88174f509c0", + "commit": "9db5c6bb4a51457281588523a2725939a31d3f26", "sha256": "10xp7nf42v9rz9as3gspjcm3rjy075xza3yqbcppdk1zm59xxljr" } }, @@ -89831,24 +91683,6 @@ "sha256": "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi" } }, - { - "ename": "smart-input-source", - "commit": "82ef5414e63fe94905f042534d8bde88fb5461c6", - "sha256": "1dx3cvbm9hrdfrj4ggf0hbmfag2hybdlrqgpzy48fc07dscv0acd", - "fetcher": "github", - "repo": "laishulu/emacs-smart-input-source", - "unstable": { - "version": [ - 20200428, - 1031 - ], - "deps": [ - "names" - ], - "commit": "6d6db53db20712570cb99cd6a03f2be0349d87b8", - "sha256": "1h8vcdzgbg80c51cl3x6ic2d8q2sjlk5dp9j4wvmzqg6qdf34a6b" - } - }, { "ename": "smart-jump", "commit": "52f29e14e61b28cd1637ca5d6bd878d91a71251f", @@ -90441,15 +92275,15 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20200417, - 2230 + 20200720, + 349 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "03562dcd82964d53eff7314b844c2897d1d9af55", - "sha256": "1cj8628l196da5j54wl8wq7znvha44z1f6w9qqg37yw0pjynbvxz" + "commit": "44b88fc2aff7c970c2699de2d8615d81092342f6", + "sha256": "0538bfjaj19s5fa94x3s0np4jj7cw2wc77yngxk809h8bb82s7ba" }, "stable": { "version": [ @@ -90689,14 +92523,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20200423, - 742 + 20200812, + 1552 ], "deps": [ "cl-lib" ], - "commit": "adc8c0c60d914f6395eba0bee78feedda128b30b", - "sha256": "0kj6lhx57gl3809q4bmgv7cac8wk61g1sdyr4c2a0y9jkzf21x67" + "commit": "cd63b675140232f399e7733d7ce95a0b931b1058", + "sha256": "0c7l1q7xyzvxqlk7vawfrx7gmzsmycjy2lib12wmgvfh83bgc3bh" }, "stable": { "version": [ @@ -90719,14 +92553,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20200411, - 1026 + 20200717, + 1054 ], "deps": [ "dash" ], - "commit": "c8f09494330900081ed5a4f020c972a37fd7b02e", - "sha256": "0z5srqz4g81bsyw74q04fwz30qvi4i08s7fszmwnwyr5xrf5dx42" + "commit": "63eb59a7ef32abc6780883e27df69a6e42a8a6e4", + "sha256": "1hqqmji6vh468w73xi3fvkyzznr27f83czz0pcxzb00q62cbdqf4" }, "stable": { "version": [ @@ -90757,8 +92591,8 @@ "flycheck", "solidity-mode" ], - "commit": "022b3159832384a7dcdc2168809e698600826047", - "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" + "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e", + "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq" }, "stable": { "version": [ @@ -90782,11 +92616,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20200418, - 921 + 20200529, + 1924 ], - "commit": "022b3159832384a7dcdc2168809e698600826047", - "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" + "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e", + "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq" }, "stable": { "version": [ @@ -90856,10 +92690,10 @@ }, { "ename": "sorcery-theme", - "commit": "cdb6f1cfbf3bbeb1eeb6440fb216e8e3b523bb0f", - "sha256": "1qsavwbqidva4m0mdw393qbwlibhkkywnxj9mshfmkwaq050ivb2", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "18g4lkn98cjz5y4c2csziykq9ixafgixsxki04hfk9k1d9idixz3", "fetcher": "github", - "repo": "vxid/emacs-theme-sorcery", + "repo": "mtreca/emacs-theme-sorcery", "unstable": { "version": [ 20200413, @@ -90880,20 +92714,20 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20200505, - 851 + 20200803, + 1402 ], - "commit": "0f73c5a87b874e72ed286cf43e0b8dfec73769c3", - "sha256": "0pmsgvmf1ilv2jpay1mwb49rjc1y3h1hhc2kg3rzjpg10p3mak1n" + "commit": "d5274cc4a8e19ed0f1393a09192def951d025a11", + "sha256": "1zdcwccndgmn83xmlxqlx6azd03g7dxd2ldc3dj6yxbjasfx00x5" }, "stable": { "version": [ 0, 3, - 2 + 3 ], - "commit": "5edb9379cd21411fb182239ed9ac19be4a278f32", - "sha256": "103837zizm5iqv3sskxgkhjij2icjx9sjvjhq2l9zi66rlh9gca7" + "commit": "d5274cc4a8e19ed0f1393a09192def951d025a11", + "sha256": "1zdcwccndgmn83xmlxqlx6azd03g7dxd2ldc3dj6yxbjasfx00x5" } }, { @@ -90913,10 +92747,10 @@ }, { "ename": "sos", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "0d0n2h7lbif32qgz0z2c36536mrx36d22gq86xm7kmxday6iy19k", + "commit": "e8acf595ef51c928b4b41a9fea171fbfd40c080d", + "sha256": "1sny4wa2746fi9p18js0y9fm2f9ix7yblqyqa36ibkfj4b50hvxi", "fetcher": "github", - "repo": "rudolfolah/emacs-sos", + "repo": "emacsattic/sos", "unstable": { "version": [ 20200510, @@ -91288,11 +93122,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20200324, - 1107 + 20200808, + 1859 ], - "commit": "f79c40fb241e204539fde97200abae91e828e585", - "sha256": "1l2kkiyrskkpx8f901v0wrzaah1wjg15zdyv88spj3mh3hwd3b6n" + "commit": "462ef2ac16ab8c51de21d5f3d2b1b6122b314391", + "sha256": "1qhvf0xf58cm4x8wij1l6301q1y6jp8j7i61g8lizlb24f7fla9l" } }, { @@ -91420,11 +93254,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20200122, - 2036 + 20200706, + 1236 ], - "commit": "590278f2b37919d082f576e522cbb790167a7f8d", - "sha256": "0s2znn91jy342xrcsda6mbf78f19ixxf5lf401jls8l5gj9bnx7f" + "commit": "058f91b4d1b0350221218656202ea80cd6827d65", + "sha256": "0c9k68mnwm7hhd9mj6f3p8k83kmd67rgzcr27791mnjfkhipynvb" } }, { @@ -91497,11 +93331,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20200426, - 600 + 20200623, + 307 ], - "commit": "e62cfc4f08fc4743d6961fe3402adbf2260d7e70", - "sha256": "1w6jsn3p6956vk5pzwlbc211sswqai8ary8ad3fbhbjwxl5z3gsc" + "commit": "e94d01cdc822e02968971cde09276047a5d55772", + "sha256": "0fph3l2cpis9k09d6yhl8rv9yb727ayqq6qw6pbmxmn687xmxx9q" } }, { @@ -91669,14 +93503,14 @@ "repo": "remvee/spotify-el", "unstable": { "version": [ - 20181030, - 810 + 20200615, + 1418 ], "deps": [ "cl-lib" ], - "commit": "29577cf1188161f98b8358c149aaf47b2c137902", - "sha256": "0h6yhfvvyd9sd5d37d3ng3z56zfb546vl95qjq16kcvxq00hdn1v" + "commit": "7e28ef0b4519c6a46fce6a89c0ff1ed775eda71a", + "sha256": "0mi8g6ryjg7czrr6fchwq9459ijd5c9wsvj3s9j0l0w4jcyxrvrd" }, "stable": { "version": [ @@ -91930,8 +93764,8 @@ "deps": [ "reformatter" ], - "commit": "2f10382034cd5cd2356cc69b4a1e9116d77a0d86", - "sha256": "18z9hljifw63zy4jrsyg4x2lqzgx29sfibx3maj0dm90yzj6zmcg" + "commit": "9e6351dc97a6f58f221d6e1baa7bab292309c437", + "sha256": "1r49c8ick1vk7zl4h0472z0p6j3d5b839al3s687acgqdymb24kk" }, "stable": { "version": [ @@ -91957,6 +93791,21 @@ "sha256": "06ln4vijl8kii3nzc5cscgsadx1fqgxksflijd3ain83bn8g4wrd" } }, + { + "ename": "sqlite3", + "commit": "75bbc8a92954bd12b4c9d206a804c34c97b19e3d", + "sha256": "1c7j8hzz8xs1nrn931apyj7nhwr3dnfbsrimb6fpdfmms8095y7w", + "fetcher": "github", + "repo": "pekingduck/emacs-sqlite3-api", + "unstable": { + "version": [ + 20200710, + 1432 + ], + "commit": "e5b14b03183cde855059084eba425428ec4618c1", + "sha256": "1r7hs23xa2yhr0rbgdhxid8gg4fwhrk2wjrk1scrp37aj2szwpjm" + } + }, { "ename": "sqlup-mode", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -92012,11 +93861,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20200422, - 1941 + 20200813, + 1430 ], - "commit": "9630e465cc5166f723b7c5378e326561cf2a1738", - "sha256": "0ppaicggrrd3wrbjddw75mnsfli9a8db6bg21m1k7bafjkgraxfn" + "commit": "a3a4df9875ea6ae21cfb483dfd7b5c92278fb1c3", + "sha256": "1lc8796r5vy4n9nz9q10qy4brzd7c7i7dsjmvci6c9f7blqnz1la" }, "stable": { "version": [ @@ -92059,25 +93908,22 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20200512, - 2217 + 20200817, + 549 ], - "deps": [ - "cl-lib" - ], - "commit": "fd64b75f1051c4fe59209412f00a28625371588c", - "sha256": "1rh3nhwh75b698aq45cwmflv97r0596fq36w1rj08syfhmy3aari" + "commit": "1588f720ecd7f69a7972d5c9e113975af045c813", + "sha256": "136zx2sr0n4lb396vpz5nq60zjc3cav4kpx8r5h3nzgnmamqz61b" }, "stable": { "version": [ 0, - 1 + 3 ], "deps": [ "cl-lib" ], - "commit": "c0a1ae75bfb3fdc81bb722dff5f5e2fae3f07024", - "sha256": "1zymgidk09yyjdd23cz7rx2hql8vpmpqn21i07hwcr7032v0kl7k" + "commit": "98b8b1f9edd4ce6a05eeef49bed0d1966bd7c528", + "sha256": "1il0z6lb2jz495gdp6g7wc0n9a4z8z8ndhrrl71rnws53fah0lm3" } }, { @@ -92258,8 +94104,8 @@ 20200221, 2025 ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -92286,8 +94132,8 @@ "stan-mode", "yasnippet" ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -92303,6 +94149,38 @@ "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" } }, + { + "ename": "standard-dirs", + "commit": "3af817370f249a7e7a04b06ccc850b24c0f4b5bb", + "sha256": "0jcwav3dhvdxkxsc1nrwswrljam06llyspd9nk70pfpafis9smzl", + "fetcher": "github", + "repo": "lafrenierejm/standard-dirs.el", + "unstable": { + "version": [ + 20200621, + 1603 + ], + "deps": [ + "f", + "s" + ], + "commit": "e37b7e1c714c7798cd8e3a6569e4d71b96718a60", + "sha256": "0r814qcrhvx4qlx4sdzwdmrhiryslqclx0bnpp0qcrbx6g8qfl25" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "f", + "s" + ], + "commit": "e37b7e1c714c7798cd8e3a6569e4d71b96718a60", + "sha256": "0r814qcrhvx4qlx4sdzwdmrhiryslqclx0bnpp0qcrbx6g8qfl25" + } + }, { "ename": "standoff-mode", "commit": "98858a45f72c28eec552b119a66479ea99b60f93", @@ -92369,11 +94247,11 @@ "repo": "thisirs/state", "unstable": { "version": [ - 20180627, - 1956 + 20200727, + 1227 ], - "commit": "258fe1cba00bdc2c600f866bb0406c719661d0a6", - "sha256": "1miwmb4012a4pjxc0qi0qrs0aw7yf8fhiy72ndf80sj050wmpaqn" + "commit": "8cd9210f17c1b134274a7352b996839aed9a7d8c", + "sha256": "04h8n2wy9qr4bskq9znhadcf02wk4ydhyaaq44yvh55hzmn6gm25" } }, { @@ -92449,25 +94327,25 @@ }, { "ename": "stgit", - "commit": "726da64b7baea1735a916b826bdfb8f575860e21", - "sha256": "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0iv2fiv8i2h4pqbsvy10avijvlk2waprmn0z4jq4hcyvarwzxvp1", "fetcher": "github", - "repo": "ctmarinas/stgit", + "repo": "stacked-git/stgit", "unstable": { "version": [ - 20171130, - 1559 + 20200606, + 1308 ], - "commit": "fb180610de78c68736c963236afb28ee3ac952b4", - "sha256": "106jjrbjdgxp1s41h9vn877rq7a3m1jj9brlgdz1mrjgay266gcc" + "commit": "333e9e434cec9aa2f887083cdf2cefcaa316f438", + "sha256": "1q058qav0al8mb6f3f3jc4mnzlvhlis9dllchw3flw3gx57qcrx5" }, "stable": { "version": [ 0, - 22 + 23 ], - "commit": "9acc95666619699d4cdf0526305155407081d8de", - "sha256": "0rhdgakd4vc0549m6zjwcmsnvh2i3mbv5laks25wnfmsxr8dwqns" + "commit": "e6dd7eff206a6515aefced2ad701beaf625d7b7d", + "sha256": "157vdhdjzxsf7077916ibn0jbsxw9d71m8mwm4kn0i0ip7sj9xdg" } }, { @@ -92608,20 +94486,20 @@ "repo": "akicho8/string-inflection", "unstable": { "version": [ - 20180827, - 1301 + 20200517, + 115 ], - "commit": "e9a50855a4c718592c28a5a892f164ecf46e39a8", - "sha256": "03kvp5xrv9p46m4w25jr5nvi801yafq5vxzif42y0dav7ifmmdfp" + "commit": "1937db7513db570606ea8798916180b7dd75d3b1", + "sha256": "06n968iqh6w8grmk8w67g6la9cxpp8ww5mi9s3zgdjhfcs5g8xdl" }, "stable": { "version": [ 1, 0, - 10 + 11 ], - "commit": "9b08372301e3c5f91cb278ee0e00a48845a42cb6", - "sha256": "0j3ms2cxbv24kr27r2jhzxpdih6w43gjdkm3sqd28c28ycab8d4b" + "commit": "1937db7513db570606ea8798916180b7dd75d3b1", + "sha256": "06n968iqh6w8grmk8w67g6la9cxpp8ww5mi9s3zgdjhfcs5g8xdl" } }, { @@ -92795,10 +94673,10 @@ }, { "ename": "subatomic-theme", - "commit": "de7f6009bab3e9a5b14b7b96ab16557e81e7f078", - "sha256": "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0qh311h8vc3c7f2dv6gqq3kw1pxv6a7h4xbyqlas5ybkk2vzq12r", "fetcher": "github", - "repo": "cryon/subatomic", + "repo": "cryon/subatomic-theme", "unstable": { "version": [ 20190607, @@ -92878,14 +94756,14 @@ "repo": "zk-phi/sublimity", "unstable": { "version": [ - 20181121, - 1311 + 20200816, + 854 ], "deps": [ "cl-lib" ], - "commit": "4c8d0280815978fc11e1c5f86266a11c717b0c89", - "sha256": "1618ba3m36crh2wmmisi3ls5ijdqrwr58yda810jik0b6fjzzacv" + "commit": "133ac118eaa51cce81978ed78abba6aa8d427577", + "sha256": "0sqjdrzsp7pf1wj14vcr322n8fydjzzii4msdvlhj0xr3xhl0469" }, "stable": { "version": [ @@ -92927,14 +94805,14 @@ "repo": "nflath/sudo-edit", "unstable": { "version": [ - 20180731, - 1908 + 20200625, + 142 ], "deps": [ "cl-lib" ], - "commit": "cc3d478937b1accd38742bfceba92af02ee9357d", - "sha256": "1qv58x5j5a3v1s2ylhck1ykbfclq0mbi0gsvaql3nyv8cxazqlwl" + "commit": "0e2c32b5e5242d30f8780cbe8e1b1649476cac4d", + "sha256": "1z26i4hzi2mksl4nr8szzlnrnyv96fg7jjddbm5dp5dlmh2pndk1" }, "stable": { "version": [ @@ -93183,11 +95061,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20200327, - 406 + 20200816, + 354 ], - "commit": "48a26af6a3395a8bf3f09747d0a205c6dbc79313", - "sha256": "12gg55jdb6b5jk0xizx2cqc795bgll2kap3jp08s1vr16zkdaryn" + "commit": "5db0451429d4bf68f5dd131837faa6eb601a631d", + "sha256": "1ffr9yzxr1z8xmvl0lf7nfp9gjp79zps556d3kni45dbnkdi0z1h" } }, { @@ -93300,6 +95178,21 @@ "sha256": "1d45yanqk4w0idqwkrwig1dl22wr820k11r3gynv7an643k4wngp" } }, + { + "ename": "sweet-theme", + "commit": "a149448c38504bdf6f782a10cb1440da9102990f", + "sha256": "1ca56disxyr30anvpqahh33s062y35w003yxi1rhdrknka2cnl5q", + "fetcher": "github", + "repo": "2bruh4me/sweet-theme", + "unstable": { + "version": [ + 20200708, + 1202 + ], + "commit": "78f741806ecebe01224bf54d09ad80e306652508", + "sha256": "1yqz15l6xa1vkll4gaa3jpr30vq3yjgbgadjilsmz5p8mblawhyx" + } + }, { "ename": "sweetgreen", "commit": "63812707948e6dcc00e00ebc3c423469593e80fd", @@ -93343,16 +95236,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20200516, - 1836 + 20200701, + 2005 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "e990ea6f5ea932763d002c3794dd9589add1532d", - "sha256": "1a4yrj3yjqgd5jssxd38dvx06cigsszrvs6hv7slfl60p729i0lw" + "commit": "2c8c9cda5ed9d9e96bb3a39c6d0905a15dd9e2e6", + "sha256": "1kq4jxhig6bg4cifggy06a6ydksg68nr2gbnxn589znacxbs0iy9" }, "stable": { "version": [ @@ -93376,14 +95269,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20200418, - 617 + 20200606, + 730 ], "deps": [ "seq" ], - "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff", - "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592" + "commit": "d266fbd300a1bf1592e1462ead4be093b8b68f98", + "sha256": "0l3i74acv1msmbfkn99mz9g73kd7j1a7j0b082vcxw6kr69476yc" }, "stable": { "version": [ @@ -93466,8 +95359,8 @@ "deps": [ "ivy" ], - "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", - "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" }, "stable": { "version": [ @@ -93514,6 +95407,21 @@ "sha256": "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2" } }, + { + "ename": "swiss-holidays", + "commit": "2260acd32c74352c5b1c5622c527676a81223640", + "sha256": "1d91fnvm2sikfmy0s1gffzgn19088ggkkf992zbms7gy7njbgysf", + "fetcher": "github", + "repo": "egli/swiss-holidays", + "unstable": { + "version": [ + 20200526, + 822 + ], + "commit": "0995c9685033a09466f5b2dceb7316362bde997a", + "sha256": "098s55jsmr6na5qf8s5a3iws6zb47rbq7mk4garbxar9vyfi3bw7" + } + }, { "ename": "switch-buffer-functions", "commit": "d37ebd28f4a2f770958bd9a2669cce86cc76cbe7", @@ -93570,16 +95478,16 @@ "repo": "emacsorphanage/swoop", "unstable": { "version": [ - 20200321, - 319 + 20200618, + 905 ], "deps": [ "async", "ht", "pcre2el" ], - "commit": "7f6f20d0f32b76b7ce5b1459afa44c1ab700f8bb", - "sha256": "1d134f3dyh8sa8q8dgmla01wiky61y4jmhqb5whqpb7c2p53niyc" + "commit": "0c737a961970a2e61735545320367bafaa8dfc49", + "sha256": "1kjzc7543b7l0rcq9iiwf8sq39akzw5spsv51yl4wmwgnmyj2n1c" }, "stable": { "version": [ @@ -93662,26 +95570,46 @@ "repo": "contrapunctus/sxiv.el", "unstable": { "version": [ - 20200508, - 1620 + 20200803, + 1431 ], "deps": [ "dash" ], - "commit": "f1a030c538af6d47d32eef04ab6536eeef948268", - "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz" + "commit": "9eb6a121bfdf64433cd8ac7985d2c82b590b5abb", + "sha256": "0fjzzynlmqxxrr4520rh7ds0gip6l8cbmrgp7ghrgm07830arpcj" }, "stable": { "version": [ 0, 3, - 2 + 3 ], "deps": [ "dash" ], - "commit": "f1a030c538af6d47d32eef04ab6536eeef948268", - "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz" + "commit": "9eb6a121bfdf64433cd8ac7985d2c82b590b5abb", + "sha256": "0fjzzynlmqxxrr4520rh7ds0gip6l8cbmrgp7ghrgm07830arpcj" + } + }, + { + "ename": "symbol-navigation-hydra", + "commit": "ed20cf413c32e924506a4c4aa7129d1185b63d46", + "sha256": "1aw8ssjqsqnihri3qp8c3q6dv52mc3rnq2mgyncrbghq1yajh8ml", + "fetcher": "github", + "repo": "bgwines/symbol-navigation-hydra", + "unstable": { + "version": [ + 20200811, + 655 + ], + "deps": [ + "auto-highlight-symbol", + "hydra", + "multiple-cursors" + ], + "commit": "20a63121695452e39f1a3c9bfea1e313359c5f1e", + "sha256": "08fs5wr9p2rbwlydx2xmwqmvzr6q05fg4dji6wdf40dn3pb5w78g" } }, { @@ -93692,14 +95620,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20191224, - 250 + 20200809, + 2023 ], "deps": [ "seq" ], - "commit": "8096a684c29bae20e1f5a1c7adbe7881680a5c10", - "sha256": "1x7ghzxn5634amvj6r786j8nm25b780pz8h57z7qk40x0s6qk5a7" + "commit": "f2734ce633c2b498d3ea70042a3ae9f93f9f046a", + "sha256": "1n1a2jldshfyyyxc3msr16fzczjlpglzdy7ab4qpyyz6ghklaqys" }, "stable": { "version": [ @@ -93744,8 +95672,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20200425, - 1911 + 20200526, + 211 ], "deps": [ "cider", @@ -93762,13 +95690,13 @@ "slime", "smartparens" ], - "commit": "3dba2ae3f65bd1c40e3756e05a57ced039a15a7f", - "sha256": "1j2ycsi2ipbyaknscy0vgr1ybyvzl7j1q0gvazkl5rpihshz2shl" + "commit": "b35e3622601ca5b27bb8e1b7ab301cc6dd674a62", + "sha256": "118s8xxas5nmj181p7mf9lsal7jl0pkph3gs1gyr0x6c5y93b1ci" }, "stable": { "version": [ 0, - 6, + 7, 0 ], "deps": [ @@ -93786,8 +95714,8 @@ "slime", "smartparens" ], - "commit": "62bd31d8647b88ec179fb8ff89f583b55a0421cc", - "sha256": "1c2y65hcd0nydhkh7a903flq061x8hld272n00xn4dd0b8kvjp29" + "commit": "8209d63d88b596e5e4ed66c56085c978f33acda5", + "sha256": "0l0pb9d5q84wv4jiappm3wi800dslv9ciq9rla0mrv4xb2lhf3pp" } }, { @@ -93986,11 +95914,11 @@ "repo": "dantecatalfamo/sysctl.el", "unstable": { "version": [ - 20190720, - 2028 + 20200615, + 1824 ], - "commit": "0fc50305a96de059ad1ff4e6081c9b4089f5247f", - "sha256": "0v2andw08qawgbdzn0vplxd3drs41gqf2qbidhakmsssdd4nqiib" + "commit": "d8c2e18de1d7a3b2999a4d5054c0bbf30cb10fed", + "sha256": "0jvw5r4z9lq36yv58slpc8fw9ljzrppdsg9j7cs34m0wnhyid4a4" } }, { @@ -94251,10 +96179,10 @@ }, { "ename": "tabula-rasa", - "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", - "sha256": "14j92inssmm61bn475gyn0dn0rv8kvfnqyl1zq3xliy7a0jn58zz", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "041yl5727ba0b2ircmfmm693gg7vimrijd80k8w8j13xcrq5i1i3", "fetcher": "github", - "repo": "idomagal/Tabula-Rasa", + "repo": "IdoMagal/Tabula-Rasa", "unstable": { "version": [ 20141216, @@ -94391,11 +96319,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20200513, - 1728 + 20200701, + 1436 ], - "commit": "45625bd90cf5dbdcaed02b57baaa995e240ceb4c", - "sha256": "1s2xxscj675ps93hqczw1xcs3jsixblfzjcfpz74vbz9zkmq1ygm" + "commit": "5ded73ae13d58ab0bbd52ac7556ff29e114a96d6", + "sha256": "00bvjrbcqalwlw1lc883p8l7szb9qniqp120pwd6hgyvgpr7h3s1" }, "stable": { "version": [ @@ -94529,30 +96457,6 @@ "sha256": "0lh04mpa1yb3mwasvnnbdzffcig7ndlk13d96a0lavqn49a10fa3" } }, - { - "ename": "tdd-status-mode-line", - "commit": "25b445a1dea5e8f1042bed6b5372471c25129fd8", - "sha256": "1i0s7f4y4v8681mymcmjlcbq0jfghgmdzrs167c453mb5ssz8yxg", - "fetcher": "github", - "repo": "algernon/tdd-status-mode-line", - "unstable": { - "version": [ - 20131123, - 1716 - ], - "commit": "4c082e62f4915b573338a97efcc6854d132323dc", - "sha256": "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5" - }, - "stable": { - "version": [ - 0, - 1, - 2 - ], - "commit": "9b3c35b0a972772640e9fee653eab6a76e06416a", - "sha256": "0bvxc926kaxvqnppaw4y6gp814qc0krvidn5qg761z4qwz023rax" - } - }, { "ename": "tea-time", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -94583,6 +96487,21 @@ "sha256": "0l3mhn8m96d9mxs9kkp6clj5qzns5dw9w628kf9ibwbbc5fq01aa" } }, + { + "ename": "teco", + "commit": "f8c7a2d741bd0061f5edc30fd000a82cdd3b66e4", + "sha256": "0ahixvxvjbm7xngsqfjdb6lfg43bki9vays2yw2psmyw7c34zp3s", + "fetcher": "github", + "repo": "mtk/teco", + "unstable": { + "version": [ + 20200707, + 2309 + ], + "commit": "61caf8f419659a0567a269f290c90427a215d77b", + "sha256": "0jfrlpmcr8msj39fhm0sc11sxw46w0dk24zidsdp12lwgcnli44m" + } + }, { "ename": "telega", "commit": "e067f03ebe9dd8c90ceaa5a7983483087c74107f", @@ -94591,27 +96510,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200516, - 1007 + 20200814, + 1652 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "e2fd3b1b34ae659d306749ab3129ed498b3a2720", - "sha256": "0h851m3p9cqblr5wpl769g8dl5vxjgx62c6grkdk2g0ip2cm4vcf" + "commit": "9594ebcb0f605e5b01bc4ec6d1bd1b6470002bc0", + "sha256": "0hm6yvr4ygkcycw850sd4lcwmrr49s88nhan08hal0xylzazlq24" }, "stable": { "version": [ 0, 6, - 0 + 28 ], "deps": [ + "rainbow-identifiers", "visual-fill-column" ], - "commit": "ae09592498ce380e57fbb76725fd4c89ae248864", - "sha256": "0mv6i80958d9crzspzik5xh5g8326115bvg2frgv0dp9p6rm86m3" + "commit": "e53996777570a5bed84d21f6c8defd4f51c8e255", + "sha256": "058x6svgy33lyqjqq0l3byv8bysqig9jmh3kx8shaqr0ypfrjhi3" } }, { @@ -94645,16 +96565,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20200412, - 1614 + 20200516, + 2102 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "65198f72f3b1ae618507aa28094f05d6de4846a9", - "sha256": "177v612ii8nj9nsmfxlf17gr3wair4whzggi3pshch7ghbxdqv5q" + "commit": "110c578ccf6c0421cfd9eec7aa3e960b6fd49fb4", + "sha256": "157df4h9hr5mmwp0q5w0rdv7ndrjk3014r5xwwblszvx33s70gbk" }, "stable": { "version": [ @@ -94688,6 +96608,30 @@ "sha256": "1hfm0miqzym4fbj33hzh5iszp0i51imr1z54396vd81zjch9sxss" } }, + { + "ename": "templatel", + "commit": "0e43ad23f7b58ddb82bc08066d8b48e04708b5ba", + "sha256": "10sx3kd22z4qa1g60c3fzxpc55xlddmb4iqqdbiqkn6bqzdzrslq", + "fetcher": "github", + "repo": "clarete/templatel", + "unstable": { + "version": [ + 20200818, + 241 + ], + "commit": "796021c2964a5bfbba7abf7f339f970bbedc3aab", + "sha256": "1yv85ik2slaibnajsfns1icliw0qyqw871jxdklav918lic9fia0" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "6785b487aaa6bbab3cffcf74e9f596c0058c1b18", + "sha256": "1qdjbbr6mq2ib8aan5hb47vdj2s50yxfidmjyfyyms28qpi3524g" + } + }, { "ename": "temporary-persistent", "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d", @@ -94990,14 +96934,14 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20180513, - 833 + 20200617, + 714 ], "deps": [ "cl-lib" ], - "commit": "bc7f3477133df0142d3e49e6eb8eaf4468b57865", - "sha256": "1i0pz5lfhgqzcqwi9wkiq8skj3hf00xn9vya890g1i9ix3bclq35" + "commit": "d8b95302abe6e4a8a91a4526441a1c5d51b886a6", + "sha256": "0b05arm8b95dkzj6m2kx7wb37z00y0bdsj3z34sjny75srph3c0c" }, "stable": { "version": [ @@ -95044,8 +96988,8 @@ "cl-lib", "json" ], - "commit": "a295a80a502771cc07dc061961e0eb85343c2925", - "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw" + "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f", + "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9" }, "stable": { "version": [ @@ -95077,8 +97021,8 @@ "cl-lib", "tern" ], - "commit": "a295a80a502771cc07dc061961e0eb85343c2925", - "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw" + "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f", + "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9" }, "stable": { "version": [ @@ -95135,11 +97079,20 @@ "repo": "TxGVNN/terraform-doc", "unstable": { "version": [ - 20190813, - 1254 + 20200803, + 1545 ], - "commit": "2ec10ea7bef5a75edfffeb515dd268e19c1f8c9c", - "sha256": "0r70fc7vv2rjnwnsg7myc1c15f3ql6hp6zrf5msmf8r2iz32jnpp" + "commit": "d609290021ea7f2d10caadffc9131663838f8ad4", + "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "d609290021ea7f2d10caadffc9131663838f8ad4", + "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v" } }, { @@ -95247,14 +97200,14 @@ "repo": "rocky/emacs-test-simple", "unstable": { "version": [ - 20170527, - 1532 + 20200722, + 1121 ], "deps": [ "cl-lib" ], - "commit": "cfd383d36dc6853917acb753fdfa0eebf33856f3", - "sha256": "0rn3x0v92v3a2g58armazhg97bl72d90j5gwf1zdak75hzimmah2" + "commit": "ce6de04636e8d19ec84a475c03c0142b20a63de0", + "sha256": "1knpzibhwm8f604fklq35d2w5rlx26fq3fzzybdm2xb65mifqnar" }, "stable": { "version": [ @@ -95288,14 +97241,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20200424, - 205 + 20200716, + 1331 ], "deps": [ "auctex" ], - "commit": "48118c4e38836117efb4eede927ab85d9a0d2013", - "sha256": "1dpvf9limh9b0sg0x41gyw9w5nf5nvkd7zzlyysswhinm6jba4iz" + "commit": "a5f59e0c5f43578f139a2943bd08e5b3140f4c2b", + "sha256": "11xissn0xpfx2xxcm5qj2smkxa5frcswvhpfv6m34j12z0nww7pw" }, "stable": { "version": [ @@ -95372,10 +97325,10 @@ }, { "ename": "textx-mode", - "commit": "dada0378af342e0798c418032a8dcc7dfd80d600", - "sha256": "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0004z2ym3rmbqr42ysziqja7y5fl2fnmhbsqclk0mvr247gmb4vf", "fetcher": "github", - "repo": "novakboskov/textx-mode", + "repo": "textX/textx-mode", "unstable": { "version": [ 20170516, @@ -95602,18 +97555,18 @@ 20200212, 1903 ], - "commit": "81d2abd9097fc3497f77d830ebf8d8386beb7127", - "sha256": "0k9yr3dx12cl07dlz0zmaaf4zfr4zh54w5ix74b0kj1ny299f9q6" + "commit": "32b109977cbde37bf719c2955ff7dd1e657a6c70", + "sha256": "0ww3k4yd5bk40r3v1a96mgzhaayqgb0v2kjvxzn10wcybqxf1zqb" }, "stable": { "version": [ 2020, - 5, - 11, + 8, + 17, 0 ], - "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", - "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" + "commit": "b733bf19c3c68c0aa6d5e0bb7db4321fe13b47a2", + "sha256": "11kpja52drs4xsja6gyg37rq1681pfgv71cc3lksh2dn6jrn8nbq" } }, { @@ -95663,26 +97616,26 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20191210, - 1647 + 20200523, + 833 ], "deps": [ "haskell-mode" ], - "commit": "f68e58cd7f8c483307573a96307f1f872a1921a0", - "sha256": "1rwc1vk0gl1sjnvzvwz4x25m6c61r8ghf6wrjclgifrm8zf1na5d" + "commit": "137192a2ef6c4f457ddba38a0397570266333854", + "sha256": "1wwmgzlqih3j8slggmi79xiy811qzlrwjqpd7y37lj508w96qppi" }, "stable": { "version": [ 1, - 4, - 9 + 6, + 1 ], "deps": [ "haskell-mode" ], - "commit": "252e3be53eb1bf6bfcd1b3c52af982506c84a89e", - "sha256": "19chvk24csg5w38q6yh1wky4nk4z8361p1q5q118427njqkl5ql3" + "commit": "7377b6c8ddc23d197018af203456063864df1457", + "sha256": "0vj55135h0mw093b9rlnq8hka9sj4kmhnv8xj46z2kcqj0qcq7q8" } }, { @@ -95693,8 +97646,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20200504, - 832 + 20200811, + 2114 ], "deps": [ "cl-lib", @@ -95703,8 +97656,8 @@ "s", "typescript-mode" ], - "commit": "8a7c1fc5dcc9b3321c10c71f21d1436b0a62ac07", - "sha256": "14i618dbhi66z19szyjznfnb56k9w64m00732g20r8izbhjsg4nm" + "commit": "f0b6dac4829c3daecf02bf445a5b41b4c68f2911", + "sha256": "0533kxxl68vsx99b5nwdhy885nl2ad8wc6my38kardmklshjpvj1" }, "stable": { "version": [ @@ -95723,6 +97676,21 @@ "sha256": "0ipri5jxx73vrra6dikbv0y2ws96wfi7bjh2v6pshiw3b1x2isav" } }, + { + "ename": "tikz", + "commit": "fe4080be1b98c4016360113741a9bb6b3764e872", + "sha256": "07wbl8aih7p9gzjnljymryrrakq9ffwzd2l73h08hjvrr8ff92m9", + "fetcher": "github", + "repo": "emiliotorres/tikz", + "unstable": { + "version": [ + 20200728, + 913 + ], + "commit": "f1495516657da6dc2296ffb6c38a3bb4acf118ad", + "sha256": "0w9xff7y6zhb28b1cfbbam9gy7dp11i96yb4rn4lj8h2yry89293" + } + }, { "ename": "tile", "commit": "424cfd28378ef328721bb0dc3651808e64c01306", @@ -96032,15 +98000,15 @@ "repo": "laishulu/emacs-tmux-pane", "unstable": { "version": [ - 20200419, - 1331 + 20200730, + 520 ], "deps": [ "names", "s" ], - "commit": "6e8d0584b0bbd412c5d29c87add7364299b3d2a0", - "sha256": "054qncg530paiv1vs27hs94m2y2fzvr4iind1rr16m8v8qf7zia6" + "commit": "923524efe8e6e5e0d269de6bb253b45e02d9a663", + "sha256": "0bhck6vrb48zxfh5id637mq57k7jv4f2ax0lrhyvr0nw8m0ndqmx" } }, { @@ -96075,16 +98043,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20200227, - 1510 + 20200517, + 1825 ], "deps": [ "dash", "org", "transient" ], - "commit": "b1fba9f3600e6cfe129efae304b96a7f6dc66e1a", - "sha256": "0391m19ws4ajqfbbwd1q1z8p1l6ai94xzf2rqg5zdvlnmc06kl76" + "commit": "b3f003603111b7e31b94c354cf4c83c8208c01c3", + "sha256": "0srk3chc45fl6zjwymzqwmxm22w9pcjxg7968c7fkvbqr21wk6p7" } }, { @@ -96095,11 +98063,11 @@ "repo": "rpdillon/todotxt.el", "unstable": { "version": [ - 20180626, - 2230 + 20200530, + 2337 ], - "commit": "f13e404304c9d26c105de872f96b4601441b3875", - "sha256": "1yvy2pl2ncgkz1xz598qjvp2v3g66m57wz7nra2vira7m4kq4671" + "commit": "b51f7fa1357d2cbc1b72b10d15f8c6f009ce5a46", + "sha256": "1asf33na834mc4ppvfyjxa70v4r80dnq641si5kd86gjfzjjjfmi" } }, { @@ -96149,8 +98117,8 @@ "deps": [ "cl-lib" ], - "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", - "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" + "commit": "fc9ec563430e3beaefc00b26da179f4b4ca9855b", + "sha256": "1m4v56yy73gvycsvpc36h7yh6yhn3fgp90rk5m248hz89gjf9kxv" } }, { @@ -96479,8 +98447,8 @@ 20171210, 2102 ], - "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4", - "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw" + "commit": "89aac22259e5d09ae1183e0df163338fe491e9e7", + "sha256": "16hfahyhl1vv3r0amyvc514sw6x9x56b319lkp7bwcy8mxicc3cy" }, "stable": { "version": [ @@ -96559,20 +98527,20 @@ }, { "ename": "transfer-sh", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "0xc6dkmayk935grmy8883l4cyv4zrq3fb77fj16knfj4yw8w6c9j", - "fetcher": "github", - "repo": "SRoskamp/transfer-sh.el", + "commit": "55dc23a82be3e85b46cfdee18697b1b096573924", + "sha256": "1pzsjibqbzkvfb4c5i271yb5jjadsclb383jfhi6jikpnm3vkf5g", + "fetcher": "gitlab", + "repo": "tuedachu/transfer-sh.el", "unstable": { "version": [ - 20180603, - 1431 + 20200601, + 1708 ], "deps": [ "async" ], - "commit": "55da85f963d347255a2b46568954923679331798", - "sha256": "0yv4i4ps379kz1q9qmjh4q3pk5ik77xw86faxmwpjx4yzp1wsz9v" + "commit": "0621a66d00ec91a209a542c10b158095088bd44d", + "sha256": "1dnh8ws788if32wqnhzqjm38zjhpm9l3sq74245djnn1mx5bm56m" } }, { @@ -96583,11 +98551,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20200508, - 1911 + 20200819, + 1133 ], - "commit": "d49f85a8c1172b9f21d2fd4a54d1f802b53948fc", - "sha256": "01rnd67mc9avm4d39vqr074shfmqjsilynivb3s32dqyk13fsz8r" + "commit": "f5d81ef0ed24be935f3c0192b746a1738d903d37", + "sha256": "0kyrf0nh9l9x1jwfca1921qc0w2ii1xp4ya4mv2jmanm3apbihb9" }, "stable": { "version": [ @@ -96607,14 +98575,14 @@ "repo": "conao3/transient-dwim.el", "unstable": { "version": [ - 20200508, - 617 + 20200812, + 1033 ], "deps": [ "transient" ], - "commit": "e075bda369bbd0df2ac5e5d5626664f4a0062676", - "sha256": "052pj4b4jgr9vk0nrap57kpy0fsplssc7b9w7lkdmpxrbdld7n6h" + "commit": "de03d875dd89b1d838be67b0c44d9786adf96717", + "sha256": "0gb4k3758bv25vdw30rq0vbs94vdyss0xsiyaxnmvpfnj0v9k2cq" } }, { @@ -96625,14 +98593,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20200506, - 2144 + 20200620, + 402 ], "deps": [ "let-alist" ], - "commit": "b2c35b6f4c503976581573a4512c50e8081f9038", - "sha256": "1b0d2xq22121f64hls28gb44m284g1b6xiw3mi7x6g1fil8b3wb2" + "commit": "7ed254437c1f95ce7f59e87e90d6ec5e4d91c01d", + "sha256": "15qim9dfir08hkqf0ynwf1953cq60726rkjyc32l8hkpjlgw23ar" }, "stable": { "version": [ @@ -96686,6 +98654,30 @@ "sha256": "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x" } }, + { + "ename": "transwin", + "commit": "4b6dc821c99edd8ee6faa5289b0ecbdbb28f5f08", + "sha256": "0vrzf3xhwincsl4gg0fghczvwzicci0gjsvpfpjzcqz3m7ab6frb", + "fetcher": "github", + "repo": "jcs-elpa/transwin", + "unstable": { + "version": [ + 20200704, + 356 + ], + "commit": "df814cb578b0a4c01ed68f1da262df17d2a0a694", + "sha256": "0kfq7br70cn9jpjnc7lxgimqcw9cpp4yf95dkjalbk5l8w8gzlm2" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "commit": "df814cb578b0a4c01ed68f1da262df17d2a0a694", + "sha256": "0kfq7br70cn9jpjnc7lxgimqcw9cpp4yf95dkjalbk5l8w8gzlm2" + } + }, { "ename": "trashed", "commit": "0a0609353c8ef01ca5da44b6239e1d4756da3a92", @@ -96694,20 +98686,20 @@ "repo": "shingo256/trashed", "unstable": { "version": [ - 20200508, - 734 + 20200523, + 231 ], - "commit": "075749debcaf867bf151d83a59d7845dea71a4b9", - "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci" + "commit": "23e782f78d9adf6b5479a01bfac90b2cfbf729fe", + "sha256": "0lfza55nbb62nmr27cwpcz2ad1vm95piq4nfd8zvkwqbn6klwmm6" }, "stable": { "version": [ 2, 1, - 1 + 2 ], - "commit": "075749debcaf867bf151d83a59d7845dea71a4b9", - "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci" + "commit": "23e782f78d9adf6b5479a01bfac90b2cfbf729fe", + "sha256": "0lfza55nbb62nmr27cwpcz2ad1vm95piq4nfd8zvkwqbn6klwmm6" } }, { @@ -96805,8 +98797,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200516, - 1204 + 20200816, + 939 ], "deps": [ "ace-window", @@ -96818,8 +98810,8 @@ "pfuture", "s" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96840,6 +98832,25 @@ "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, + { + "ename": "treemacs-all-the-icons", + "commit": "7e6c70295787573cbe4dcf761cc8147eee1b9e04", + "sha256": "0zkvpkfjs4lf2a6g5qlg0pr9alqmr8rvy02qh8pgqgismaz8c5s1", + "fetcher": "github", + "repo": "Alexander-Miller/treemacs", + "unstable": { + "version": [ + 20200801, + 920 + ], + "deps": [ + "all-the-icons", + "treemacs" + ], + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" + } + }, { "ename": "treemacs-evil", "commit": "37cca017cf529a0553ba73bcb824a945ec8b1137", @@ -96848,15 +98859,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200302, - 558 + 20200716, + 2041 ], "deps": [ "evil", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96879,15 +98890,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200510, - 2001 + 20200530, + 2129 ], "deps": [ - "cl-lib", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96918,8 +98928,8 @@ "pfuture", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96943,16 +98953,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200421, - 1426 + 20200530, + 2129 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96976,15 +98986,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200114, - 1715 + 20200530, + 2129 ], "deps": [ "projectile", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -97010,17 +99020,17 @@ 20191108, 2217 ], - "commit": "306f7031d26e4ebfc9ff36614acdc6993f3e23c3", - "sha256": "09k95b846mzak62acyzrmqvc7kwkni14w8d74079kr7lnar9g6zq" + "commit": "3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3", + "sha256": "0pmrpij80m5kgcr8bw36r8wllgppasw08vn3ghwvis9srpaq75cn" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d", - "sha256": "04zwm6gx9pxfvgfkizx6pvb1ql8pqxjyzqp8flz0432x0gq5nlxk" + "commit": "3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3", + "sha256": "0pmrpij80m5kgcr8bw36r8wllgppasw08vn3ghwvis9srpaq75cn" } }, { @@ -97067,6 +99077,30 @@ "sha256": "0a1437hkcx2ba3jvvrn7f0x0gca36wagnhbq4ll2mlkmvdkac6is" } }, + { + "ename": "tron-legacy-theme", + "commit": "975e93e060f50a1fd00a6ba1566a9386271bdfd6", + "sha256": "08cfhnkb62121h6dksw9c0d38vxm38dfbfww7c8kj491is0w63f4", + "fetcher": "github", + "repo": "ianpan870102/tron-legacy-emacs-theme", + "unstable": { + "version": [ + 20200601, + 533 + ], + "commit": "af17842821400a6fd466bb2769d13606e98550c0", + "sha256": "19pabaiza0lrvqa8yi0p83rffm9g44n6789m395iayfcxq49lylq" + }, + "stable": { + "version": [ + 2, + 5, + 0 + ], + "commit": "cdc052b044448654109bfb7d9b3d8bbfcf49042d", + "sha256": "0q1i2q6pkld8rz938yj9g68a55041d9vnps05nn4v1l8rx1x8jif" + } + }, { "ename": "trr", "commit": "56fa3c0b65e4e300f01804df7779ba6f1cb18cec", @@ -97258,14 +99292,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20191220, - 2314 + 20200518, + 1820 ], "deps": [ "caml" ], - "commit": "c12061eb80c1487a1963af7cdae268d709a70ca9", - "sha256": "0x85yy20caqb24n7qx3h8nw259p6593y5dx43jl5iapy2n9za1gy" + "commit": "ccde45bbc292123ec20617f1af7f7e19f7481545", + "sha256": "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac" }, "stable": { "version": [ @@ -97327,30 +99361,6 @@ "sha256": "1gns60yj1ylm87456gzwr0gy0kivp5bd290rg6d8xbc86jdcls19" } }, - { - "ename": "tup-mode", - "commit": "bda3260dad1c766c5b6ae9124f966bf441e24f2f", - "sha256": "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l", - "fetcher": "github", - "repo": "ejmr/tup-mode", - "unstable": { - "version": [ - 20140410, - 1614 - ], - "commit": "bcc100c6485f1c81fdcd1215dfc6c41a81c215c8", - "sha256": "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm" - }, - "stable": { - "version": [ - 1, - 3, - 1 - ], - "commit": "945af9c8e6c402e10cd3bf8e28a9591174023d6d", - "sha256": "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y" - } - }, { "ename": "turing-machine", "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", @@ -97510,11 +99520,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20200430, - 1232 + 20200817, + 817 ], - "commit": "0fc729787007b5111f3584034af0f3ef2389098f", - "sha256": "0h4k5gxjx55bg7dx8ixl87qdbxrmdzym6bvg2apasjs3kz9ggan5" + "commit": "42a60e5c881082db2ec2c541a5c154308c4863e6", + "sha256": "14hn0v5gcbzj6y2xs30qyh8wba4l073x5281xd7xs05f9yv7dv5j" }, "stable": { "version": [ @@ -97570,8 +99580,8 @@ "f", "mmt" ], - "commit": "231cb7df43253b84323520b8ed70f128d37003af", - "sha256": "1savrxs7xl92ifyxpxkkzv2didr7lb405h0dwz1bs1wldr5fb53f" + "commit": "f567867a0a519e17ad3552837b48d3d45fb73aa5", + "sha256": "0a5xds0mhfnq6kyc13s385vf4x4cqqpk2jiw1in7qg382fl8w2p0" }, "stable": { "version": [ @@ -97595,11 +99605,11 @@ "repo": "jorgenschaefer/typoel", "unstable": { "version": [ - 20200212, - 919 + 20200706, + 1714 ], - "commit": "505b4b1ead337b773863ea54066f867d07735f9e", - "sha256": "0n8xh6bp757fjqa68slphw04kb4g0489g66r6f4n4v8bpbbi3bbl" + "commit": "173ebe4fc7ac38f344b16e6eaf41f79e38f20d57", + "sha256": "09835zlfzxby5lpz9njl705nqc2n2h2f7a4vpcyx89f5rb9qhy68" }, "stable": { "version": [ @@ -97610,6 +99620,38 @@ "sha256": "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2" } }, + { + "ename": "typo-suggest", + "commit": "d2dc0688a0e8371b5d74e16b6e73bc91d6a835ea", + "sha256": "0hp55apmm5z0zjz81ll746m9733rp7z0ylrl49a1vxzfpwx2fw47", + "fetcher": "github", + "repo": "kadircancetin/typo-suggest", + "unstable": { + "version": [ + 20200801, + 1000 + ], + "deps": [ + "company", + "helm" + ], + "commit": "ac48f2e59daee15983a5fd13009f751e0d928ab1", + "sha256": "0kjyjav2bwrr2kwvdm3dx7mi966ji49n9hcw9dxx458bl72giwqf" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "deps": [ + "company", + "helm" + ], + "commit": "ac48f2e59daee15983a5fd13009f751e0d928ab1", + "sha256": "0kjyjav2bwrr2kwvdm3dx7mi966ji49n9hcw9dxx458bl72giwqf" + } + }, { "ename": "typoscript-mode", "commit": "701de09cb97cbfa49a3a81aaeb9577817566efa2", @@ -97685,6 +99727,21 @@ "sha256": "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m" } }, + { + "ename": "udev-mode", + "commit": "38ea66665abd85da45aa005ba0fc03891fbbee63", + "sha256": "1gwp1hays9afl09vqv5zyq9s8k5w28jwc7aya0j7h6fbw3hrxnfn", + "fetcher": "github", + "repo": "benley/emacs-udev-mode", + "unstable": { + "version": [ + 20200702, + 1536 + ], + "commit": "5ca236980662141518603672ebdbdf863756da5a", + "sha256": "15nspdkjwbvxbqxlhmpsbhdf1zij9zd2z2xxhkmvdyjy89w0hyzp" + } + }, { "ename": "uimage", "commit": "346cb25abdfdd539d121a9f34bce75b2fc5a16be", @@ -97765,10 +99822,10 @@ }, { "ename": "undercover", - "commit": "d58ad9eb863494f609114e3c6af8c14c891b83a5", - "sha256": "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "09wfgskilv001mlvkiyw6yichkxd1wpz4j70r5mlzqgv7xfy7p1l", "fetcher": "github", - "repo": "sviridov/undercover.el", + "repo": "undercover-el/undercover.el", "unstable": { "version": [ 20191122, @@ -97819,6 +99876,29 @@ "sha256": "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla" } }, + { + "ename": "undersea-theme", + "commit": "0ee426fc0dcf1d8a4519ea9f953a8e20f1505f05", + "sha256": "1f2lkm4nv0sah2674wkfd50qx3mjg57618kcjvwam1q6qz2k1q41", + "fetcher": "github", + "repo": "jcs-elpa/undersea-theme", + "unstable": { + "version": [ + 20200719, + 618 + ], + "commit": "d4edb2cc110f1679ebc82cb52a4242cbc74636db", + "sha256": "0agn2j0qd516kxqx1bh6ajpandi8vz7zas966nw88yhv8m8hlzb2" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "952d0c14258b0fd2d2e4642c6576708dac35c2f8", + "sha256": "005m1qzhqg25ymmh17mmp3g8ism5k8mz430ri689g26zzw4m76mh" + } + }, { "ename": "underwater-theme", "commit": "e7dccc77d082181629b8f0c45404ac5d8bd97590", @@ -97851,11 +99931,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200512, - 19 + 20200701, + 1435 ], - "commit": "2b1e53285a55ce50ca6fd60b050f2171e235d8f9", - "sha256": "0x7i7aj9fh8j0944xbym3hijr33mc0kfadl7v657k0d8nx00x3zh" + "commit": "c0806c1903c5a0e4c69b6615cdc3366470a9b8ca", + "sha256": "1n594aakmcgyl7qbda86v4wsx8clm62ypiv3h559xz3x72h7mr3j" } }, { @@ -97866,11 +99946,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20200510, - 434 + 20200517, + 949 ], - "commit": "0400f15f2a0cfcedb69c06c3ff62f3f8814b62fb", - "sha256": "0f3f4svgsl5338bbglxscvk6mrscjbpcxqc2f84w2np7iyap4ls9" + "commit": "e2043f8350970e1a9ef06a94956a733826cdf32b", + "sha256": "14qlrdal1z64cqqssa34cw1yzsppslgwwy23060sxgjz2vvwwwfb" } }, { @@ -97929,8 +100009,8 @@ 20200304, 2218 ], - "commit": "02c36a04364bcb586477ab79d2b5e0d4e6ae6d47", - "sha256": "0pp9ywxkvvfay2pblbqcknf2c3q5izig552r5zksmxbac1rlsvcm" + "commit": "6a3f9e929489ebac5aa26862363410144d84409e", + "sha256": "0jdk2r6jlynswjz047zz2v3dyfq94inf1zbsriq1b8fmia018gah" }, "stable": { "version": [ @@ -98032,8 +100112,8 @@ "repo": "rolandwalker/unicode-fonts", "unstable": { "version": [ - 20181001, - 1509 + 20200803, + 1335 ], "deps": [ "font-utils", @@ -98042,8 +100122,8 @@ "persistent-soft", "ucs-utils" ], - "commit": "7b88ae84e589f6c8b9386b2fb5a02ff4ccb91169", - "sha256": "07wzcfj92jiadgd6nj5rmxky2aiaxs89j7zywp877xdp4vv0v512" + "commit": "e3942fe40b418bfb2dc4e73633e09195437fef01", + "sha256": "1vyldpmbi92yqzj0v7wbxma86f3cla0jhxbmq8jzl94pqy6q98jc" }, "stable": { "version": [ @@ -98062,21 +100142,6 @@ "sha256": "07wzcfj92jiadgd6nj5rmxky2aiaxs89j7zywp877xdp4vv0v512" } }, - { - "ename": "unicode-input", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8", - "fetcher": "bitbucket", - "repo": "m00nlight/unicode-input", - "unstable": { - "version": [ - 20141219, - 720 - ], - "commit": "e76ccb549e6a2a66c373da927eb65d69353e07db", - "sha256": "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l" - } - }, { "ename": "unicode-math-input", "commit": "e0d39bc129500e55b99c11b3d27e042619777414", @@ -98192,6 +100257,21 @@ "sha256": "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn" } }, + { + "ename": "unifdef", + "commit": "805d7ed87c68f45aa878a19816c21c1122501c01", + "sha256": "0d0k7h7bsgfmbnx697jc87mdhjqiw8wg6r8k4ay8cxfp2bxqnwkg", + "fetcher": "github", + "repo": "Lindydancer/unifdef", + "unstable": { + "version": [ + 20200517, + 514 + ], + "commit": "7a4b76f664c4375e3d98e8af0a29270752c13701", + "sha256": "0xx954cyvzndj7fy6k203nlnhaxi6d0pn3xrvy287dh9ydklng0m" + } + }, { "ename": "unify-opening", "commit": "0a2faab13744262ef4d12750f70b300b3afd2835", @@ -98261,6 +100341,30 @@ "sha256": "1snbvhvx2csw1f314dbdwny8yvfq834plpkzx0vl4k3wddmr3a66" } }, + { + "ename": "unisonlang-mode", + "commit": "5811216040e25a78c8eef9f9d90176173229eb4e", + "sha256": "0pckg82iawswaljp6yk9vd6piwjsfky3zzdf3gyj1b2phhr9zz3x", + "fetcher": "github", + "repo": "dariooddenino/unison-mode-emacs", + "unstable": { + "version": [ + 20200803, + 808 + ], + "commit": "2b794adbe0b2a4edd40f350173a32b80bd2c5896", + "sha256": "0zy3la6n51kgybjxibcsj13m6381p6klsq98h1sym8mxm2k2s78y" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "f793430068ade1b0a2d744aaa45f569c9dec9085", + "sha256": "129xk966kkhwn0ym80739r23kwds09qjiavd01ddnb3pfhbjfbrk" + } + }, { "ename": "universal-emotions-emoticons", "commit": "57f913112c98db2248cf69e44deb69fd09cee042", @@ -98325,10 +100429,10 @@ }, { "ename": "untitled-new-buffer", - "commit": "de62e48115e1e5f9506e6d47a3b23c0420c1205b", - "sha256": "1hpv7k7jhpif9csdrd2gpz71s3fp4svsvrd1nh8hbx7avjl66pjf", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0fqnwas6917338a896yi6y1fnp2yhpmkpk001wrw7fmybfqzw05y", "fetcher": "github", - "repo": "zonuexe/untitled-new-buffer.el", + "repo": "emacs-jp/untitled-new-buffer.el", "unstable": { "version": [ 20161212, @@ -98465,14 +100569,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20200322, - 2110 + 20200721, + 2156 ], "deps": [ "bind-key" ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -98503,8 +100607,8 @@ "key-chord", "use-package" ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -98565,8 +100669,8 @@ "system-packages", "use-package" ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -98618,26 +100722,26 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20190823, - 939 + 20200720, + 957 ], "deps": [ "s" ], - "commit": "edfc3f4b50aec2234792c0cc894774e4916ce26a", - "sha256": "0xy522czbxva2dpfbfjqf0xm6wi7cc98pz6ha7glgylsmcvhlvar" + "commit": "e09f7d08b462984da6bf53b523b4fcd6826a6a5d", + "sha256": "1vli40rz0c27y3sl7b3rzmssgzrmawg0hdd5fvf8x8mjl9d61sia" }, "stable": { "version": [ 0, 0, - 5 + 6 ], "deps": [ "s" ], - "commit": "8c7f50a2b6f5bd55cdd92e351371386ff4b6edce", - "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q" + "commit": "e09f7d08b462984da6bf53b523b4fcd6826a6a5d", + "sha256": "1vli40rz0c27y3sl7b3rzmssgzrmawg0hdd5fvf8x8mjl9d61sia" } }, { @@ -98651,17 +100755,17 @@ 20190715, 1836 ], - "commit": "952f97a46062bb3315d3ae20ecbfd58747019c25", - "sha256": "0bfi325y5yzjbwnmdww0l5bpf4h9ynwz4mwg60k8q3p3f82pkrrm" + "commit": "7bc5117d3449fc19f5c706a6decfdb2a30984507", + "sha256": "0fg1amarrwyfq76mv0w5z78qxs1x9vsvmzf7qzvnwh92n7lv6snb" }, "stable": { "version": [ 2, - 5, + 6, 0 ], - "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9", - "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9" + "commit": "df2447a63de2fea0f56d8c63d35b0bf39e11c0f2", + "sha256": "1g0s46p8c5kbv1kxvvj838g8hghqbkykv94q6zwy0d7q8ai1kqrq" } }, { @@ -98687,11 +100791,11 @@ "repo": "kanru/uuidgen-el", "unstable": { "version": [ - 20200223, - 509 + 20200816, + 1308 ], - "commit": "f096f35a6e1f27d2bc9e9093cd61dd97bc33f502", - "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01" + "commit": "b50e6fef2de4199a8f207b46588c2cb3890ddd85", + "sha256": "08m74kj7h70kna3pifk3sgsy7mck11p32vi48h9wzqnafyq3n55d" }, "stable": { "version": [ @@ -98702,6 +100806,25 @@ "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01" } }, + { + "ename": "v-mode", + "commit": "247cab604cf0ef6078f5b0f5887526bcbbcefb70", + "sha256": "0jky9y06fqj06m4mg95h8k3h5fihf9j9qj4w3n836qg5lnb4ywga", + "fetcher": "github", + "repo": "damon-kwok/v-mode", + "unstable": { + "version": [ + 20200812, + 956 + ], + "deps": [ + "dash", + "hydra" + ], + "commit": "15a73b304e624d9b07fd8f23670569678d6cd9c3", + "sha256": "1arbd9wwaqlhc1hl4hgpfjn4ncyrirjmpq8sgnhffgw7vkzl99pv" + } + }, { "ename": "v2ex-mode", "commit": "b27b7d777415aa350c8c30822e239b9a4c02e77d", @@ -98927,19 +101050,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20200507, - 2139 + 20200615, + 1823 ], - "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7", - "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds" + "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d", + "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1" }, "stable": { "version": [ 1, - 11 + 12 ], - "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7", - "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds" + "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d", + "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1" } }, { @@ -99043,11 +101166,11 @@ "repo": "plapadoo/vdf-mode", "unstable": { "version": [ - 20191122, - 823 + 20200713, + 1838 ], - "commit": "35f5c3531b256b6578b9878ac2ce1ed79b3c8511", - "sha256": "16650xwq85rp98z4nljd5s7f14fg4rr90nr7ipfshj1i6zvbk229" + "commit": "8fbf6157440345879a0543bcab233e790a7b60ee", + "sha256": "1m237py9jcxkm6z3wgsxzhikc3lidd28gfflcmr0wm588sdx48sl" }, "stable": { "version": [ @@ -99271,15 +101394,15 @@ "repo": "applied-science/emacs-vega-view", "unstable": { "version": [ - 20200510, - 726 + 20200520, + 1202 ], "deps": [ "cider", "parseedn" ], - "commit": "c869defa3c0d9931e8eb4050dbaedb781160410b", - "sha256": "1l57w79ljihhfs4n60ak3hc3hdzv24wxkxafv51llb4zv2b85b5k" + "commit": "b0160c883f53ce069c0b4498880474c158ac7245", + "sha256": "1msc6s90a048lk4i8gqkhgnm1k52k40m62q9n1s0dwgmq1yj3zyl" } }, { @@ -99290,20 +101413,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200515, - 1734 + 20200801, + 2217 ], - "commit": "af1f250fd34d53ecdf31be1756c8693b4182d452", - "sha256": "0zk52ddlf11rwsd1f70i6jjc9z81jddqapfr2dv1d4ghn6j382x5" + "commit": "f8755213c8fadea92b7a2313fb38c0ee37b8a2cc", + "sha256": "0f59rw78hfc7hkgd9ja2hzyb6gaf400aa6375zcl3zxh2ljnvbvb" }, "stable": { "version": [ 2, - 10, + 12, 0 ], - "commit": "ee83e62490bec3b6d99281748a2e894c2bdc9e24", - "sha256": "1zd7vkd3i3x5cr04sp3jpfd79cp0p30615c9605z1rq01jjxgm3m" + "commit": "08ddce1306ad1b8707300fee33848b7a48897fd3", + "sha256": "1azwmqhlasir5fhy2r3yd861xvk6lxrzq60svvyjss3kdlqp1irj" } }, { @@ -99343,6 +101466,25 @@ "sha256": "1y6vjw5qzaxr37spg5d4nxffmhiipzsrd7mvh8bs3jcfrsg3080n" } }, + { + "ename": "verona-mode", + "commit": "342867cf256c6e6c242387b6d8c439a7a90f17dc", + "sha256": "1w94hs8mkd6qfklgm7hxb8j7ykvif25czpha0yq7ghbfc0vb3595", + "fetcher": "github", + "repo": "damon-kwok/verona-mode", + "unstable": { + "version": [ + 20200812, + 807 + ], + "deps": [ + "dash", + "hydra" + ], + "commit": "3519f83e68af163a6b01753ad7bb4cecf26c24b2", + "sha256": "1ck3x1w0nyn31s3fdks6wms5ic5n56jcxg49r56j3dwnifpk87mm" + } + }, { "ename": "versuri", "commit": "056daa8d5563dd6ffb9c93630f9b357f73c1e58a", @@ -99596,21 +101738,21 @@ }, { "ename": "vimish-fold", - "commit": "b4862b0a3d43f073e645803cbbf11d973a4b51d5", - "sha256": "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1ld9sab9r82wr74rscxcmsmd07jgkmkysbcn5aswzyrf1gn62gr9", "fetcher": "github", - "repo": "mrkkrp/vimish-fold", + "repo": "seregaxvm/vimish-fold", "unstable": { "version": [ - 20200329, - 1242 + 20200524, + 1729 ], "deps": [ "cl-lib", "f" ], - "commit": "63685239655a151181b9152e45478dad587f86f2", - "sha256": "1l6zca08diq3ppmg1pllihbfj0pcaqvbnisryr92mvbblhk44wxs" + "commit": "9d12e39f01da517565666e09a2e32e01aed24a90", + "sha256": "0xdk95hiamnim0bn1w5g0lccb9wc0sxbczrb95q3ndaw3cxxjaa2" }, "stable": { "version": [ @@ -99756,8 +101898,8 @@ 20200428, 816 ], - "commit": "982606896e018c951917b73d2af6334df554cf9d", - "sha256": "19ks9wjfjyfk4s53wvhdqjnjc6847v43nh3ir0yvr66mflqxgg54" + "commit": "64d38bc1c00953be05c193c01332a633be67aac2", + "sha256": "1gkl2bg0ax16d3b17n7s3j5ng261jxfl6q3bi5bff03jph900x1p" }, "stable": { "version": [ @@ -99875,11 +102017,11 @@ "repo": "blak3mill3r/vmd-mode", "unstable": { "version": [ - 20190929, - 735 + 20200727, + 701 ], - "commit": "aa9b753601ee1ed31b4f717629179ce7a2cacba5", - "sha256": "0gc1c5q1krqlbaq0lb7p29biwpl32lgv4c6527c322a21in6a5pb" + "commit": "31655a41caf006c3dd64d6e57f6c4488098f8bce", + "sha256": "1pnx977pm305kr0zakwy1wkdfpk09rilwx8rmai4459lyz0sa8j9" } }, { @@ -99940,11 +102082,11 @@ "repo": "dbrock/volume.el", "unstable": { "version": [ - 20150718, - 2009 + 20200523, + 1246 ], - "commit": "ecc1550b3c8b501d37e0f0116b54b535d15f90f6", - "sha256": "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7" + "commit": "bd0ca8430098164740f111ac2bd2582d7f628b79", + "sha256": "0v8x9d0qq8gjlf6ydri580wix6hisf6x9pywg5px6cqj53r8g6rc" } }, { @@ -99958,8 +102100,8 @@ 20191209, 1600 ], - "commit": "d1f954a3879ec3f93c8dea9177772bf4d5bd0ecb", - "sha256": "13kfwp129wrlbbpvl9n4h7ybnycph68x214dx5v6v7ap6gnv0lr6" + "commit": "aea1ca9932df2c19a19e47f7971b7bc6b821181f", + "sha256": "0nk0vsxww46rrm1ijfpq58bn3zai7qmj2iqg1k8g14w7fc2si8mi" }, "stable": { "version": [ @@ -99981,8 +102123,8 @@ 20191209, 1600 ], - "commit": "764f478f5866140b121b1e43857487b7a66afa72", - "sha256": "0s8fh7n8qhsfdk8l7r81ifscaazgmpls4n3pginaqb5cszdy4063" + "commit": "5c11a73bfc5f3873490ed0ba88eed44e4707e455", + "sha256": "1ifwm4dwmv4f97p1byv3l5k26gyb97zp60wjhrzrdj2g49fg716g" }, "stable": { "version": [ @@ -100008,6 +102150,30 @@ "sha256": "01p5ys23m4zk5hniri55bcn8j7v6pd6ryi41qx20w29mramwzxl9" } }, + { + "ename": "vscode-dark-plus-theme", + "commit": "0e7e489ea5cee3b1d2b6b5295cf95f3e1d9d6c60", + "sha256": "001xhi87dsh75sd0vg26v4w78rf1p8bhj1zhn3w7j255817xvcgd", + "fetcher": "github", + "repo": "ianpan870102/vscode-dark-plus-emacs-theme", + "unstable": { + "version": [ + 20200818, + 341 + ], + "commit": "a33ef7fd5d9249bbb59fcb822c032e28bb3bf792", + "sha256": "0wm54jy09hsg3vbw4qc5k4nzznsn3mqcn0al8mwh2522q6kb6l8j" + }, + "stable": { + "version": [ + 1, + 5, + 0 + ], + "commit": "c64d5f7088f1295df0bd8f1dc87a532e00647fbe", + "sha256": "09a6plb2dqayj4m456ldh43a654jbkg8zjiky7bkj5m0kpdc5426" + } + }, { "ename": "vscode-icon", "commit": "90a07c96a9223a9ad477cbea895ba522523c5be4", @@ -100031,11 +102197,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200515, - 1412 + 20200813, + 1748 ], - "commit": "8337e77520bcdb136eebb74837dc71ac8ec67601", - "sha256": "1wf8w8w0690mkih7c9xkk11i9f7r47abvfpyw4y576ansxlr5g1f" + "commit": "797357bf65952337627f2d0c594c2fef600aafae", + "sha256": "0lqlx97kb1mpw17lmrx2xa407ixn3wl2cv9rdwrvlrlvg8kcpjmn" } }, { @@ -100046,14 +102212,15 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20200516, - 1117 + 20200614, + 1452 ], "deps": [ + "projectile", "vterm" ], - "commit": "fd55be72e8ad19e2284c8f73d5707c033dbde46d", - "sha256": "0q3459vpj5fp2i7nbk67mfd0nf78mpkgz771nhdj4a7xwghk6xgq" + "commit": "7f762d216fc7311bac4182f650e0207574c29357", + "sha256": "0nz3qcd2jmjfky0xn62fkhnxchf9nap3li5blis0jgi6igj47ykq" } }, { @@ -100122,8 +102289,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20200424, - 1400 + 20200616, + 1136 ], "deps": [ "bind-key", @@ -100132,8 +102299,8 @@ "s", "versuri" ], - "commit": "5da06a8acebcaf84a3581610ff24aae1b46f786b", - "sha256": "16yfnqpdzi3bih16d7dzbqmd30m7w8rkjylnsg9m951vc0lysk3p" + "commit": "3dab1ea2253d5bc2974a1a064d2b1af3bd6b24f6", + "sha256": "1q1rcnsda1392kqh944hdj30d79300ycl46ck1bzx4szx3m3p801" }, "stable": { "version": [ @@ -100196,11 +102363,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20200325, - 2226 + 20200818, + 141 ], - "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", - "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" + "commit": "7dcbab77334c5adf8309c7a93512c9f95a2c64e4", + "sha256": "0in8ir99b33d83nfxsnpj2dgyv4f558yrid77bp7f9k0qpgpj4zk" } }, { @@ -100273,11 +102440,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20180920, - 702 + 20200730, + 240 ], - "commit": "2531cb58287770883ba534d20b3288955c4d6ef3", - "sha256": "12wa845lwvwg38801mk880izfhjs50ssy5alj1743c2bz7ig5grk" + "commit": "7626678315918bdbb81ede68149f20a7d97a928f", + "sha256": "0dlhj32mkylji1d55pc593d3gn8babcs6s4c0c5sfm6jfz14m9j0" } }, { @@ -100674,11 +102841,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20200501, - 1939 + 20200612, + 1038 ], - "commit": "186a7c21049c50ecfd4109eb06c91196404f8bc5", - "sha256": "1si8i21ysqwnkq38wr0r4liz3j8v8sj66y46yl6bpw77116fngx9" + "commit": "60ffd878c4371644bd964f00fea38054645e3e47", + "sha256": "0la14k422jqcny1bxgvv8yidanl3pv5kkdfbiwq8skxsd6m2xfq5" }, "stable": { "version": [ @@ -100856,8 +103023,8 @@ "deps": [ "cl-lib" ], - "commit": "078f83902c0846c00ed8e3b6c5add7ff9b98d8f9", - "sha256": "11nacz0vvhaa8582r0ylx5w886y2qysbvrh9s064g979vjyfh9rg" + "commit": "5aaf9d12068f98fb4efa772a3e5f4bb350b79a99", + "sha256": "13qwvjid9d67kk4ggvc2hvm6j4wy1jassd02krp8as91h5hr0y36" }, "stable": { "version": [ @@ -100966,6 +103133,21 @@ "sha256": "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv" } }, + { + "ename": "weyland-yutani-theme", + "commit": "87fd30180367eaf64fe145d78e50febdfd79772b", + "sha256": "184vc3r34j2pv0a2a2bldbzpvv8d39c20znv6l9fmnqmr48fzvnq", + "fetcher": "github", + "repo": "jstaursky/weyland-yutani-theme", + "unstable": { + "version": [ + 20200818, + 2225 + ], + "commit": "d17297aee3a15b326e813d6c12831b587f6267fd", + "sha256": "0brixf1j1hdmj0wvd3qzlmr844fvd61nxgc5adczpy0qivc1c1c9" + } + }, { "ename": "wgrep", "commit": "9648e3df896fcd97b3757a727108bc78261973cc", @@ -101133,11 +103315,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20200216, - 1350 + 20200817, + 2358 ], - "commit": "8b49ae978cceca65967f3544c236f32964ddbed0", - "sha256": "15ydzqv23m1w6g27il57fmzs6pjcasdb7drml3msjpq2l8kr4ard" + "commit": "e48e190a75a0c176e1deac218b891e77792d6921", + "sha256": "1wr5lqjc5si0s0rn266jxfwln93l7aw79885w66gbjcynfy8rji3" }, "stable": { "version": [ @@ -101251,8 +103433,8 @@ 20200304, 2227 ], - "commit": "5fac49636cd72a0043e2473c9a09a788cfd68d5f", - "sha256": "0myx8vayakmhb5hbrskk58rkb1f0jdw7kinvk8fvv73g050yk28d" + "commit": "c344cfd78df23980ee48fb85fbc16989b7d4cffe", + "sha256": "1jwz89j6v8mmdim8knnwjz2ip0cwn5lq6x8nz78xns1ba5fg293b" }, "stable": { "version": [ @@ -101295,19 +103477,19 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20200409, - 1538 + 20200715, + 1715 ], - "commit": "907abd9538c4a1e088853b816af883e5040fc430", - "sha256": "1qfkppciijyyg76idqqzjy351rki8y4pffwicprnrhv1qixfhdvv" + "commit": "11d01c483ab3ba78b6ea1e195bda65b5e35f2d4c", + "sha256": "14w1cchij7i8a9m9z71dsz76aphidmvp8lbai4gaxxi4qiyvkcn3" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "b4cdab4d25225c6e834727a7d85cdb0d493da152", - "sha256": "058wym1iwgz5n5yd508xdc05ncdyqbs53a5c9mq0s6gs06h5xfyw" + "commit": "7cc7e2734ec823bed6eb923387b3b33a1cde0c86", + "sha256": "0d8q8as85fjn2v65i25xv9bzg03mlk4jhxrbqrcg5ywjiv5i2ljg" } }, { @@ -101321,8 +103503,8 @@ 20200305, 221 ], - "commit": "71f84725e2643b2ee74f27c60c4fd8b79c9c3c97", - "sha256": "1rs446cwbp6i79wi7srzaxg9hdahagcjkjill34j70hdy1r4xjas" + "commit": "9791ae59f8bd8b9375d2dede92de8eba5f0d89fb", + "sha256": "0fk2nhcjkwrni8np8788z9aanrj1hxchg37a1j1z9ds42f0ghj6h" }, "stable": { "version": [ @@ -101389,8 +103571,8 @@ "makey", "s" ], - "commit": "1de068d49a6b5faf8754d217bdaa2cbfc903a9fc", - "sha256": "04gfhjpn4q8d4y6177gdffwjbqq627083pff2ckw79pbvlj9f2mm" + "commit": "a0d8456b9f71fcb40a28ec9235132df506aa6ecc", + "sha256": "1bndpdzscb917sp32khmifk7vdkj4psh7c8rf4j5s5zs7033qwka" } }, { @@ -101668,6 +103850,29 @@ "sha256": "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil" } }, + { + "ename": "windswap", + "commit": "442a7394fd31e641b778ef0b218a5ef158377db0", + "sha256": "0yxh8zlqg2gv08gfima2vgcqwadqkli1qz6q11xvy5a0d3n8drxr", + "fetcher": "github", + "repo": "purcell/windswap", + "unstable": { + "version": [ + 20200722, + 411 + ], + "commit": "1a334f6543e0a30c55ea1e6071e9732d948f9e4b", + "sha256": "0q36rqy1ss1hayf698zla2m6ff57gigkji5slaffjhnijhsj3c67" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "33d59d371843d5a72a4327e318382ff27ee15674", + "sha256": "13hbpi6rr7vgyy1cbxaz947ixbrbp8x2dy6dw2l02c5hl4p65miw" + } + }, { "ename": "windwow", "commit": "12aba18872021ce0affa96c46a17353c7d073ca2", @@ -101772,21 +103977,6 @@ "sha256": "0v1qmw3svydk7dlqbcymy1g1bygkfpb2h4b97zdp12xvd8mww9ny" } }, - { - "ename": "wisp-mode", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc", - "fetcher": "bitbucket", - "repo": "ArneBab/wisp", - "unstable": { - "version": [ - 20191114, - 2340 - ], - "commit": "91ec8dc32652811861116e6f750f0fb41b21b771", - "sha256": "0nc9c1agzhmlbh4ijjrsa9yx19hvxzk06gv6p4pgrlx1yg2khnli" - } - }, { "ename": "wispjs-mode", "commit": "a628330ee8deeab2bd5c2d4b61b33f119c4549d8", @@ -101825,26 +104015,26 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20200217, - 1015 + 20200720, + 2014 ], "deps": [ "async" ], - "commit": "f25a70777d9d9c90a52249791578bd72f1b7dfd7", - "sha256": "1vb6dw07vx3zqqb1h457f9957yja8wfqcjcfcf3m78dah3l2qmr1" + "commit": "efafd482c21b90decbb0b682ed3159c86014d4f3", + "sha256": "1z3214zjf3dassb31k14gq4nbr3q8g5x87ydfah28hm4j08v0wb3" }, "stable": { "version": [ 2, 9, - 1 + 4 ], "deps": [ "async" ], - "commit": "7e0bf753709f1775d2bbbb6edf4482fca7fd286a", - "sha256": "1y4zrgsfs0504ks30qb7hl32ygd3hb6yx5x8032b30j7rh5ks29d" + "commit": "efafd482c21b90decbb0b682ed3159c86014d4f3", + "sha256": "1z3214zjf3dassb31k14gq4nbr3q8g5x87ydfah28hm4j08v0wb3" } }, { @@ -101904,26 +104094,26 @@ "repo": "p3r7/with-shell-interpreter", "unstable": { "version": [ - 20200510, - 1621 + 20200527, + 828 ], "deps": [ "cl-lib" ], - "commit": "8d78bfeffa8a7bb4973395417d6fe21e4840ee16", - "sha256": "0ygbabavrhl9xmxmqaxrjkhyf7ar5lin5v1ay94hzr1v1lyiyc9h" + "commit": "f8a01beda6260bd2eff3f9fe154ddc16da7b6504", + "sha256": "1xwmg85211s6fvc9agb8ib06klbk6cn890gpjq33bns6ldjsq41s" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "5ff0c8bc0b99b28d6c696e56cd7f44c7aa9ccaf1", - "sha256": "00dc0b0kj8215z14brwmzryb73w1j82r136a03n3pnczfh2l9z4n" + "commit": "eb2b629c885ca002b7225e20d03231835910d6be", + "sha256": "0b6z516lwcl08gnhlw99z9sdw15qxk3kanicpp0l0hcbmzann46k" } }, { @@ -102205,32 +104395,26 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20200516, - 1451 + 20200729, + 852 ], "deps": [ - "anaphora", - "cl-lib", - "dash", - "f" + "dash" ], - "commit": "239a5a3ba3b210be5d8fe527546d09241bd3185c", - "sha256": "16lzv61scc1iq1vsbfvyzla91cnxh5a7s84wx3x3kq9jggzh6hbs" + "commit": "737306531f6834227eee2f63b197a23401003d23", + "sha256": "0f16a4zz5havxbadiv4h6msa30c1yfdkfk56gic5wapz4i26z3x7" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ - "anaphora", - "cl-lib", - "dash", - "f" + "dash" ], - "commit": "928d509157ec8a4a2e343b6115dff034c3243a7a", - "sha256": "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n" + "commit": "737306531f6834227eee2f63b197a23401003d23", + "sha256": "0f16a4zz5havxbadiv4h6msa30c1yfdkfk56gic5wapz4i26z3x7" } }, { @@ -102348,14 +104532,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20200427, - 2319 + 20200519, + 37 ], "deps": [ "visual-fill-column" ], - "commit": "7f7acde5e8fc4ba74e511ca295e21f9ba7874730", - "sha256": "01rc7v2kg1h3cc06qa521mx9kvdxpw2b5hg12skh9gq1v5q1pbv9" + "commit": "8a226a31a12a9203067094774ba6fd6175793e70", + "sha256": "1wb8lkza1a6yfgpwqlc78iq7b5hamss9lak2alwmp9j9aiwys1n0" }, "stable": { "version": [ @@ -102454,20 +104638,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20200516, - 1526 + 20200710, + 932 ], - "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", - "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" + "commit": "54143769dbea06d34792687eadbc6c7a1cd89ea2", + "sha256": "1a6jy8vixc6ls6cjwxjy3ifmiw8xw3c0kfichgd1b6v20xqdvhh3" }, "stable": { "version": [ 0, - 1, - 2 + 2, + 6 ], - "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", - "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" + "commit": "54143769dbea06d34792687eadbc6c7a1cd89ea2", + "sha256": "1a6jy8vixc6ls6cjwxjy3ifmiw8xw3c0kfichgd1b6v20xqdvhh3" } }, { @@ -102578,11 +104762,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20200309, - 1750 + 20200627, + 1652 ], - "commit": "43dbab2b8c35bd6892fe80bf064b41bd731545ff", - "sha256": "0m6l2k22pfcp6s3dadm3w1mr7ar590xl64zjsr0dl9d8spc6gbz1" + "commit": "98e550db52865d6de141d5bbb85f8b4e68b56b39", + "sha256": "0km4b9praqpkv4n6sixmxjfvisp5640zyd1x85q43vkxrm39p7ah" } }, { @@ -102593,11 +104777,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20190125, - 646 + 20200719, + 1648 ], - "commit": "a09c51e450bf4b39bdc3f4063c2946baec7ae3b1", - "sha256": "0hpdm6qns2i5zpavqq6zd7dyl9lxsxyic52jzjfisqv3gjrz8zpp" + "commit": "a051862622c56b7cad2057a95d8201ab38b50752", + "sha256": "00kan9rb133mf11qq0grdkph6ghv0hgwvdx3b21890mad20zmk1w" } }, { @@ -102623,11 +104807,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20200427, - 1357 + 20200707, + 1310 ], - "commit": "17319a5e5514a61564c7314cb65b7d825ca0bb0f", - "sha256": "1y5g89kl1lbwzxmgah06z6iisj55l089q25n9dbxmwnklsxpbicw" + "commit": "8c9c4df25e1406b093a32c87da19803337e4e09c", + "sha256": "10d1xvyd2mbvhmlf1x5snqn4d22xg0p53nq601s8b4f1gws6zs59" } }, { @@ -102772,11 +104956,11 @@ "repo": "nhojb/xcode-project", "unstable": { "version": [ - 20181025, - 1244 + 20200810, + 2010 ], - "commit": "0bf9a4230fab7830350c750c39beda99ef74d72f", - "sha256": "0746f2niclmlx90skvdb1xdac0nqj8a9pd9ap8n89ckb5r6f9hbg" + "commit": "11743f0a2212c840a108e1b905b1f20afcff8156", + "sha256": "1vj1xshdsff5xrgmp6c46q2ipglq4wy25mq51rnhv57f0r1wq62n" }, "stable": { "version": [ @@ -102811,6 +104995,30 @@ "sha256": "0w2bxrnidladpzrd82z3w3gvjhajs71k5vjk2y03r09i9fwn2ykc" } }, + { + "ename": "xenops", + "commit": "605c8ca551d54c79246310bcee678cdd854548b0", + "sha256": "0l9pwjbdyfs2mkp2n9xg16pv02y063l92302fmi0h8rwra81xrvv", + "fetcher": "github", + "repo": "dandavison/xenops", + "unstable": { + "version": [ + 20200730, + 1646 + ], + "deps": [ + "aio", + "auctex", + "avy", + "dash", + "dash-functional", + "f", + "s" + ], + "commit": "78cbe16b74480ac6304865c9c3cfad36b5d49d1d", + "sha256": "1rpcckp60pw1blkxs7wlp60pvpr847b6g2rcd6p0hpf5sx9wirgv" + } + }, { "ename": "xkcd", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -102905,10 +105113,10 @@ }, { "ename": "xml-rpc", - "commit": "547d773e07d6229d2135d1b081b5401039ffad39", - "sha256": "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "08nx1a6v7b53zl1wgcypankdwqdgqcljwmzgrrd00ibi59nbfi4l", "fetcher": "github", - "repo": "hexmode/xml-rpc-el", + "repo": "xml-rpc-el/xml-rpc-el", "unstable": { "version": [ 20181002, @@ -102921,10 +105129,10 @@ "version": [ 1, 6, - 12 + 13 ], - "commit": "0ab093d60140d19e31d217c8abdc7dbdac944486", - "sha256": "0g52bmamcd54acyk6i47ar5jawad6ycvm9g656inb994wprnjin9" + "commit": "8f624f8b964e9145acb504e4457c9510e87dd93c", + "sha256": "0xa54z52rsfl3n0xgmbycj4zazp8ksgdwcq56swzs6wp72zlalmj" } }, { @@ -102958,19 +105166,19 @@ "repo": "ndw/xmlunicode", "unstable": { "version": [ - 20191124, - 2312 + 20200812, + 747 ], - "commit": "80f30becf860db4277e71e3445994fccaf35ba98", - "sha256": "0vs8l739104s3zqmqna4m0n0pkz4m04mivx6r9iqdjmg4khh6bfi" + "commit": "8ae84ded4341aaa303903b4da142ef3ea456391e", + "sha256": "0ki8i41jkkzk791dg5wvpl6nfa4py2bfcs6lf3wmw8y768vx6mbg" }, "stable": { "version": [ 1, - 21 + 22 ], - "commit": "80f30becf860db4277e71e3445994fccaf35ba98", - "sha256": "0vs8l739104s3zqmqna4m0n0pkz4m04mivx6r9iqdjmg4khh6bfi" + "commit": "852bcbd0bd014f62c41ac78648e4f6664209b40b", + "sha256": "03b18jhfpbhkaq5fj30k6drwpcpvrb6gf1l43ja1mnqyrilvni2x" } }, { @@ -103106,11 +105314,11 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20200514, - 1932 + 20200605, + 2017 ], - "commit": "3d1a24ca84d26ad4507a79260107b010a1d6886b", - "sha256": "1qppbf4jidq6q8c7gby0syp4560xqc3kzgbdgdwl1jc5k08ln3cl" + "commit": "b9b1f84fb10fff5261702e38bf15b3ae75a4b6bb", + "sha256": "0mb5a1g7sby3v4gaqgg9w3lr5albd99mj3kd2bgga7h7kbcjfp5a" }, "stable": { "version": [ @@ -103185,6 +105393,29 @@ "sha256": "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i" } }, + { + "ename": "xwidgets-reuse", + "commit": "dada661402d2f3c9c4bcea8c41ebd926f8b26748", + "sha256": "08v2377h2f8yjav7icv0372d1h1wbjqsqnb57x0rwbivxwlb0ijy", + "fetcher": "github", + "repo": "lordpretzel/xwidgets-reuse", + "unstable": { + "version": [ + 20200817, + 147 + ], + "commit": "5d56472dda53e43e0a11edcd373b44c0dbab47ce", + "sha256": "1b85x1yhgip4g3kv1sdwf3zmi91w6m5xbmm6zzl84w67wqfmnqlz" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "3f95d81bfce1b3c52f9dcf2890cd2559a5287a33", + "sha256": "1i6g4n2pnp3r0pyn4p6xryh0x44lyvazy8kc1bfrzwzf6py9wmq0" + } + }, { "ename": "xwwp", "commit": "83c34ae5023410cc31f93255275d6465b6152a10", @@ -103373,11 +105604,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20200512, - 2141 + 20200725, + 1836 ], - "commit": "0b33131664719c61f834e77ff3b91ded3de2cd3b", - "sha256": "0ig5hpk0wb46yz6gml6g7x9am0l3cay1bzxldms0g2qjh5swxrq4" + "commit": "68fecb5f0dec712a10c8655df6881392a4613617", + "sha256": "11lasdsray1cy01m4yiklin2apgfk2bac93m2ii88vjlv6b6vv04" }, "stable": { "version": [ @@ -103577,26 +105808,26 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20200224, - 1117 + 20200701, + 336 ], "deps": [ "cl-lib" ], - "commit": "b298a34ae872a45c3e83d29d33888abde59c185b", - "sha256": "1pnynyy3scrd15q4ag769af5njrxx6rw48svbsfx3xrz1n0x9snz" + "commit": "9e828920d1931da66a473a66019922b9c3b729f5", + "sha256": "0cixj0swz322p7dghghbrasziygbzmn2ikcfiyrjar6bzh1mha9b" }, "stable": { "version": [ 0, 1, - 7 + 9 ], "deps": [ "cl-lib" ], - "commit": "784ebb0ee5496b5e7762bfd4c8101166542cb90d", - "sha256": "1k9y319ny01yqkg1xsh4rh2xs3dpx5jgvhs17p4c4dvqm0g53mkm" + "commit": "9e828920d1931da66a473a66019922b9c3b729f5", + "sha256": "0cixj0swz322p7dghghbrasziygbzmn2ikcfiyrjar6bzh1mha9b" } }, { @@ -103607,14 +105838,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20200413, - 2221 + 20200604, + 246 ], "deps": [ "cl-lib" ], - "commit": "5b1217ab085fab4abeb1118dccb260691b446703", - "sha256": "0486kd8brxwmbmw9bjf0p9i99dyl17hbc5aa03z7psqqlsw713mx" + "commit": "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6", + "sha256": "1cp1sgmfc8pgcy24l77aam833710mjp2y3m8l8c90677wxqr44vl" }, "stable": { "version": [ @@ -103637,14 +105868,14 @@ "repo": "leanprover-community/yasnippet-lean", "unstable": { "version": [ - 20190922, - 2037 + 20200526, + 326 ], "deps": [ "yasnippet" ], - "commit": "9119be08a32286d3e8559138e8ae003856ae1c0a", - "sha256": "1q06c574zn0ibbb3zbgi59zxj17i7kyjkcz45sj5h7hbn9l81594" + "commit": "e0933f55d59da5425d0604bdcdbbf3cb85967563", + "sha256": "0h64h47qdv3c20g9hlys2xb4w2jby7pdfhaza52y48wayz6vhpnx" } }, { @@ -103655,25 +105886,27 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20200508, - 936 + 20200802, + 1658 ], "deps": [ + "s", "yasnippet" ], - "commit": "ab3c20483a39742d7c612bc006d09aa8ffa3186d", - "sha256": "16gzc33qlmgbp9hq5c3bbv24b136ai23h3v0b2f9rr2xy9ln3ccz" + "commit": "b83c0f2f3bd068aa93c8f4c0c07f0b0a137d9cda", + "sha256": "0j1955y6gc3ddv783pd9kx834vvicpdsj49smkkpk4rj4s7pfxkz" }, "stable": { "version": [ 0, - 22 + 23 ], "deps": [ + "s", "yasnippet" ], - "commit": "e51a259527d685fe767b6ec951ad1940b1131a69", - "sha256": "1xcmx0frialb86z5adi07b6skqks326w3v1xn49c54gxim027i5d" + "commit": "e5ebfcdb38eb79a6d6705107d07f7bab2e2b5c38", + "sha256": "18pcnjnqvcky6i49p38vy3ms5xiisn27vy47pc3vsgr3r2n87mqb" } }, { @@ -103684,14 +105917,14 @@ "repo": "mineo/yatemplate", "unstable": { "version": [ - 20200108, - 2102 + 20200625, + 1336 ], "deps": [ "yasnippet" ], - "commit": "bfee45cfc179d6b7fbc3ff06c9f79b76dc7fbf58", - "sha256": "0h2fc9vjwb94n3nklq35s3dy9i4ihrqffp2556cmsaq7gzlipb81" + "commit": "23865adaee824db44acec8a4366ce2f29dd2e978", + "sha256": "0ri0kw70yy6mm17drpw5sifscaan3f32fj3xapa0hbz5jxrs9cr9" }, "stable": { "version": [ @@ -103904,12 +106137,31 @@ "sha256": "0cd77m4zyqs74iz56l4h0k7ccxnxhis0247j4f5mf94s51fn1x7p" } }, + { + "ename": "ynab", + "commit": "20a365e48ed200afadae01c096d1ea669e9c1938", + "sha256": "0in7blx21kv01vbwkrmvcl4n07vm4wmxkbv3l78s9xrri66i3nvf", + "fetcher": "github", + "repo": "janders223/ynab.el", + "unstable": { + "version": [ + 20200607, + 2008 + ], + "deps": [ + "cl-lib", + "ts" + ], + "commit": "2c6beb4d2c4996017f6b3c62c26db52a61e5c479", + "sha256": "07bb1hlya07p6s6ymjl3vfv99xln3vrp78h4sda5va52vj1935rs" + } + }, { "ename": "yoficator", - "commit": "5156f01564978718dd99ab3a54f19b6512de5c3c", - "sha256": "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r", + "commit": "a3422f4918992343fcace1a3024be59a5d2ed8e5", + "sha256": "0v8hv2bqa9bl6cmfz8l9v72a6z1c2b3i1hjgbj38w9hdjvb2qad6", "fetcher": "gitlab", - "repo": "link2xt/yoficator", + "repo": "alx.k/yoficator", "unstable": { "version": [ 20190509, @@ -103951,8 +106203,8 @@ "repo": "xuchunyang/youdao-dictionary.el", "unstable": { "version": [ - 20200429, - 259 + 20200722, + 1705 ], "deps": [ "chinese-word-at-point", @@ -103960,8 +106212,8 @@ "popup", "pos-tip" ], - "commit": "bd839711e3cf6d3eb9c308cea5694369a440899e", - "sha256": "12r6avj1mxjj46s2p6kwhixhkinkm9krd62sy9ji7v9np2gqf7ll" + "commit": "8a4815a43565b9bfd257246e4895b8bfafb9d573", + "sha256": "0h8hgq76ja3fjrn8vsndkzvns4ar13qsydcrqjsj77jqw9kx9a43" }, "stable": { "version": [ @@ -103978,18 +106230,52 @@ } }, { - "ename": "ytel", - "commit": "ec52f03658dca774daf7301e81edb20aedf03c10", - "sha256": "0adxiw83rah9hln3k8gm6s7ks3xpqfknypjb9j51lxcabc7c1677", - "fetcher": "github", - "repo": "grastello/ytel", + "ename": "ytdl", + "commit": "3531012169cb78d00cdf89fa54a7aff684200083", + "sha256": "0s2ngslz6l4mkib09inv5r4g122jsnyiyh9ijjb27y3pr48cj23d", + "fetcher": "gitlab", + "repo": "tuedachu/ytdl", "unstable": { "version": [ - 20200510, - 1405 + 20200727, + 1824 ], - "commit": "828323f9acb654d8f61ccbca510b471fb00879ee", - "sha256": "1zixqicpdywzdc2pkx9h08y3kphmn9zcx44bj2rqg3h8xsmjayk5" + "deps": [ + "async", + "dash", + "transient" + ], + "commit": "2d617ed1cc0be35158411f897e4156c20ff6565f", + "sha256": "1fhbg0l6xrayqssl1xqjdgymdggpsvig73pwl4k9pjifaria2fbm" + }, + "stable": { + "version": [ + 1, + 3, + 4 + ], + "deps": [ + "async", + "dash", + "transient" + ], + "commit": "2d617ed1cc0be35158411f897e4156c20ff6565f", + "sha256": "1fhbg0l6xrayqssl1xqjdgymdggpsvig73pwl4k9pjifaria2fbm" + } + }, + { + "ename": "ytel", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0xafyxqps4dp44b4jmm69fa5d24df3fkyim7wa9ddgxkcqfl3mpx", + "fetcher": "github", + "repo": "gRastello/ytel", + "unstable": { + "version": [ + 20200725, + 1056 + ], + "commit": "d80c7964ec66589d5580fc13773e94f1834ab76f", + "sha256": "124pvj39lcv3dfz2m42qyydyab0xk6c5da54ffhrqbg8vri34w9w" } }, { @@ -104078,11 +106364,20 @@ "repo": "zenlang/zen-mode", "unstable": { "version": [ - 20191224, - 706 + 20200609, + 822 ], - "commit": "3d34bce20c1d7d35b99916672ea0dd67a96c7716", - "sha256": "1ykc58imkrhk4ib8mdgs7q7qrjbj84bm0rgfpgqk0dkfy16daj2q" + "commit": "c1b1806358f3cce6c04b30699987d82dc7d42559", + "sha256": "1ikny9lxvg8whcl2x0gmr31fdv93vwf53niqr11cx93bfsvs4a9z" + }, + "stable": { + "version": [ + 0, + 8, + 20200609 + ], + "commit": "c1b1806358f3cce6c04b30699987d82dc7d42559", + "sha256": "1ikny9lxvg8whcl2x0gmr31fdv93vwf53niqr11cx93bfsvs4a9z" } }, { @@ -104093,11 +106388,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20200305, - 737 + 20200701, + 1333 ], - "commit": "7dd796840376342426f60018a6cf209228452f3e", - "sha256": "0zzg95sifg6ybh3ava67z688fycklqragkr3baxlhl2jfnwsps2l" + "commit": "c09dbd9a36bbc0062b90be182f2b4cac64128cee", + "sha256": "0lr73kghsi1f5awhgsbvh4snkbdkkpjn5bwf6s6ypbybmjf6kjxd" }, "stable": { "version": [ @@ -104246,20 +106541,21 @@ }, { "ename": "zetteldeft", - "commit": "c643adaf73e8324092874887636cdf0365c481ee", - "sha256": "1vd70mrwn9cfalmiv97ja79hbdmyl5bm9cqsz5c276gk6v6pzvpc", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "05l2ljip5n9pcpcc1qm4m6ii86xs3dk94an1cigiw5is4qi8rhpl", "fetcher": "github", - "repo": "efls/zetteldeft", + "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20200516, - 1108 + 20200812, + 2159 ], "deps": [ + "ace-window", "deft" ], - "commit": "f3503ec8fde88d733b7bbbd4431e85de396a3fe8", - "sha256": "0843k0i6szjvc7f51q0pm7vmxpfz68911d75m75rg54k1jbynazq" + "commit": "2c4ddbf3e30e2f3ae6e877e08fd824b325fa7a62", + "sha256": "029fh32d2vilxlqs5jl3wc907ykxdkv36jjfzappyghd1qkp0iyi" }, "stable": { "version": [ @@ -104273,6 +106569,38 @@ "sha256": "0y709x03har1sm30vbja3k3vw4p1nfck5zii7cigl4vg0scpcri6" } }, + { + "ename": "zetz-mode", + "commit": "ad2add185cf31a92ca1fcd3a9efcbcdb0aa9e583", + "sha256": "0k30c0f2h96vvb8yacpg710gi64swwslm1gljpzcwxni5kdpqkzm", + "fetcher": "github", + "repo": "damon-kwok/zetz-mode", + "unstable": { + "version": [ + 20200812, + 957 + ], + "deps": [ + "dash", + "hydra" + ], + "commit": "3bd2cdb4f6c6e8400d58fa1001d0513e39ce38bb", + "sha256": "0v1aa0hr607afxd03p44m1abx2c8a5k91i047q7nv8sv0cd65ack" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "dash", + "hydra" + ], + "commit": "03a566b213e52da540818559f1b7bbb8400abb88", + "sha256": "1lv1psprhn2fr5knnapa11dc8dz5zh699s8k3ldkgm6a6adkms7n" + } + }, { "ename": "zig-mode", "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", @@ -104281,11 +106609,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20200322, - 131 + 20200713, + 407 ], - "commit": "fc7fde327f45533bb73be643e7bda1eda10394b6", - "sha256": "1ld34xs25bysxw9ialrlm6pnp5qbzx94zbb3594ghc2ggz5ph5d5" + "commit": "d88580913586b8749ed0ac3ae228e825a68f9412", + "sha256": "0r3cn6yxs013080il91x9b6fyx84bx3vzv7vkyr8npc2cz46klxs" } }, { @@ -104310,6 +106638,24 @@ "sha256": "14dmda7ahnflv0db9yzssz7bidz3zsdnxxwnby0y48vcjv94nnl5" } }, + { + "ename": "zimports", + "commit": "c19dd3c0cb18bb429a0aaf834555869b98fda349", + "sha256": "19rhl9v4k0nxy8lsc1imjar2ib0g6slma5crzxjbminjjqnp5c3s", + "fetcher": "github", + "repo": "schmir/zimports.el", + "unstable": { + "version": [ + 20200606, + 1700 + ], + "deps": [ + "projectile" + ], + "commit": "a96e9b993c9aaccf1fd07c8fddfc247c4e07618c", + "sha256": "1bzfdwyc4aybvnh20q7ypghpi3zrhhs0v8488lksjl26j23mhrwk" + } + }, { "ename": "zlc", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", @@ -104506,20 +106852,20 @@ "repo": "cyrus-and/zoom", "unstable": { "version": [ - 20200106, - 1204 + 20200708, + 1105 ], - "commit": "a54324344eca49cfb11626446e1ebe239cba6557", - "sha256": "01ycz8496ywb2d980hxpvlnzxw5012mrj8kh8d97vdclhdbkx0y1" + "commit": "a373e7eed59ad93315e5ae88c816ca70404d2d34", + "sha256": "0dmpin0rlwib659s3g7qp48qmma50amj7zdk281b4j0bl6p3zkyc" }, "stable": { "version": [ 0, 2, - 2 + 3 ], - "commit": "578295532fb1c4ad2a2e95894e65cce02f812b54", - "sha256": "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp" + "commit": "85694c9baa99bcf247528a6743383a3a1e5323fe", + "sha256": "1xckqfkrx95b2bfdczz90y0b23bghlqkp2k5ml59ai2drb96l17h" } }, { @@ -104574,24 +106920,6 @@ "sha256": "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf" } }, - { - "ename": "zossima", - "commit": "b7566fe6fffc38981ea33582d783c58f3842fe28", - "sha256": "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb", - "fetcher": "github", - "repo": "technomancy/zossima", - "unstable": { - "version": [ - 20121124, - 35 - ], - "deps": [ - "inf-ruby" - ], - "commit": "991676635c374d2a12714dcf48c1ce2d6f97a375", - "sha256": "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39" - } - }, { "ename": "zotelo", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -104717,11 +107045,11 @@ "repo": "pesterhazy/zprint-mode.el", "unstable": { "version": [ - 20191130, - 1829 + 20200731, + 1238 ], - "commit": "4d0dd23b40155618181d9d1e4c82849e0d73b659", - "sha256": "0im63h7ang7zypzbf45k5pxz11svyyk8pab9d4qg9jsb7bz9v7k0" + "commit": "b9b72b4918156f2f44aa544be9e19ea391937c2a", + "sha256": "1jvk8g8qc83y6pmklk403mikl6q3s6gls60fyw07p8f3kvhgfxzi" } }, { @@ -104796,8 +107124,8 @@ "avy", "cl-lib" ], - "commit": "09613d53e1e6e7c58102fb8812bbef2121d57026", - "sha256": "1rfi7gp5z2lm71qrf9akkn8iiiv297i1mqkvwyv7vlhx5vk21r4s" + "commit": "b0a50b8cb6925c3184405f81be9ef9be9da69f09", + "sha256": "003rg7x1vfv946j1m6yalzsgr88wvm3443pqf9yqwnzl2a3djq0g" }, "stable": { "version": [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix index 518ee67e45..b5de993eaa 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let + emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/25.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/25.nix deleted file mode 100644 index 5bc29a046b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/25.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, fetchpatch -, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO -, withX ? !stdenv.isDarwin -, withGTK2 ? false, gtk2 ? null -, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null -, withXwidgets ? false, webkitgtk, wrapGAppsHook ? null, glib-networking ? null -, withCsrc ? true -, autoconf ? null, automake ? null, texinfo ? null -}: - -assert (libXft != null) -> libpng != null; # probably a bug -assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise -assert withGTK2 -> withX || stdenv.isDarwin; -assert withGTK3 -> withX || stdenv.isDarwin; -assert withGTK2 -> !withGTK3 && gtk2 != null; -assert withGTK3 -> !withGTK2 && gtk3 != null; -assert withXwidgets -> withGTK3 && webkitgtk != null; - -let - toolkit = - if withGTK2 then "gtk2" - else if withGTK3 then "gtk3" - else "lucid"; -in -stdenv.mkDerivation rec { - name = "emacs-${version}${versionModifier}"; - version = "25.3"; - versionModifier = ""; - - src = fetchurl { - url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; - }; - - enableParallelBuilding = true; - - patches = lib.optionals stdenv.isDarwin [ - ./at-fdcwd.patch - - # Backport of the fix to - # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html - # Should be removed when switching to Emacs 26.1 - (fetchurl { - url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch"; - sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj"; - }) - ] ++ [ - # Backport patches so we can use webkitgtk with xwidgets. - (fetchpatch { - name = "0001-Omit-unnecessary-includes-from-xwidget-c.patch"; - url = "https://github.com/emacs-mirror/emacs/commit/a36ed9b5e95afea5716256bac24d883263aefbaf.patch"; - sha256 = "1j34c0vkj87il87xy1px23yk6bw73adpr7wqa79ncj89i4lc8qkb"; - }) - (fetchpatch { - name = "0002-xwidget-Use-WebKit2-API.patch"; - url = "https://github.com/emacs-mirror/emacs/commit/d781662873f228b110a128f7a2b6583a4d5e0a3a.patch"; - sha256 = "1lld56zi4cw2hmjxhhdcc0f07k8lbj32h10wcq4ml3asdwa31ryr"; - }) - ]; - - nativeBuildInputs = [ pkgconfig autoconf automake texinfo ] - ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; - - buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] - ++ lib.optionals stdenv.isLinux [ dbus libselinux ] - ++ lib.optionals withX - [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf ] - ++ lib.optional (withX && withGTK2) gtk2 - ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] - ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] - ++ lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; - - hardeningDisable = [ "format" ]; - - configureFlags = [ "--with-modules" ] ++ - (if stdenv.isDarwin - then [ "--with-ns" "--disable-ns-self-contained" ] - else if withX - then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] - else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" - "--with-gif=no" "--with-tiff=no" ]) - ++ lib.optional withXwidgets "--with-xwidgets"; - - preConfigure = '' - ./autogen.sh - '' + '' - substituteInPlace lisp/international/mule-cmds.el \ - --replace /usr/share/locale ${gettext}/share/locale - - for makefile_in in $(find . -name Makefile.in -print); do - substituteInPlace $makefile_in --replace /bin/pwd pwd - done - ''; - - installTargets = [ "tags" "install" ]; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp - cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el - $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el - - rm -rf $out/var - rm -rf $out/share/emacs/${version}/site-lisp - '' + lib.optionalString withCsrc '' - for srcdir in src lisp lwlib ; do - dstdir=$out/share/emacs/${version}/$srcdir - mkdir -p $dstdir - find $srcdir -name "*.[chm]" -exec cp {} $dstdir \; - cp $srcdir/TAGS $dstdir - echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el - done - '' + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/Applications - mv nextstep/Emacs.app $out/Applications - ''; - - meta = with stdenv.lib; { - description = "The extensible, customizable GNU text editor"; - homepage = "https://www.gnu.org/software/emacs/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti jwiegley ]; - platforms = platforms.all; - - longDescription = '' - GNU Emacs is an extensible, customizable text editor—and more. At its - core is an interpreter for Emacs Lisp, a dialect of the Lisp - programming language with extensions to support text editing. - - The features of GNU Emacs include: content-sensitive editing modes, - including syntax coloring, for a wide variety of file types including - plain text, source code, and HTML; complete built-in documentation, - including a tutorial for new users; full Unicode support for nearly all - human languages and their scripts; highly customizable, using Emacs - Lisp code or a graphical interface; a large number of extensions that - add other functionality, including a project planner, mail and news - reader, debugger interface, calendar, and more. Many of these - extensions are distributed with GNU Emacs; others are available - separately. - ''; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/26.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/26.nix new file mode 100644 index 0000000000..a151006a99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/26.nix @@ -0,0 +1,8 @@ +import ./generic.nix (rec { + version = "26.3"; + sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; + patches = [ + ./clean-env-26.patch + ./tramp-detect-wrapped-gvfsd-26.patch + ]; +}) diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/27.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/27.nix new file mode 100644 index 0000000000..1037c0cd91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/27.nix @@ -0,0 +1,8 @@ +import ./generic.nix (rec { + version = "27.1"; + sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; + patches = [ + ./clean-env.patch + ./tramp-detect-wrapped-gvfsd.patch + ]; +}) diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch b/third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch new file mode 100644 index 0000000000..88befda899 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch @@ -0,0 +1,15 @@ +Dump temacs in an empty environment to prevent -dev paths from ending +up in the dumped image. + +diff --git a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes) + ln -f temacs$(EXEEXT) $@ + else + unset EMACS_HEAP_EXEC; \ +- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump + ifneq ($(PAXCTL_dumped),) + $(PAXCTL_dumped) $@ + endif diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix similarity index 85% rename from third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix index dfa917ac57..71bb472d09 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -1,9 +1,17 @@ +{ + version + , sha256 + , versionModifier ? "" + , pname ? "emacs" + , name ? "emacs-${version}${versionModifier}" + , patches ? [ ] +}: { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz -, libgccjit, targetPlatform, binutils, binutils-unwrapped, makeWrapper # native-comp params +, libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null , withX ? !stdenv.isDarwin , withNS ? stdenv.isDarwin @@ -32,25 +40,17 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; let - version = "27.1"; - versionModifier = ""; - name = "emacs-${version}${versionModifier}"; in stdenv.mkDerivation { - inherit name version; + inherit pname version patches; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; + inherit sha256; }; enableParallelBuilding = true; - patches = [ - ./clean-env.patch - ./tramp-detect-wrapped-gvfsd.patch - ]; - postPatch = lib.concatStringsSep "\n" [ (lib.optionalString srcRepo '' rm -fr .git @@ -67,18 +67,23 @@ in stdenv.mkDerivation { # Make native compilation work both inside and outside of nix build (lib.optionalString nativeComp (let - libPath = lib.concatStringsSep ":" [ - "${lib.getLib libgccjit}/lib/gcc/${targetPlatform.config}/${libgccjit.version}" - "${lib.getLib stdenv.cc.cc}/lib" - "${lib.getLib stdenv.glibc}/lib" - ]; + backendPath = (lib.concatStringsSep " " + (builtins.map (x: ''\"-B${x}\"'') [ + # Paths necessary so the JIT compiler finds its libraries: + "${lib.getLib libgccjit}/lib" + "${lib.getLib libgccjit}/lib/gcc" + "${lib.getLib stdenv.cc.libc}/lib" + + # Executable paths necessary for compilation (ld, as): + "${lib.getBin stdenv.cc.cc}" + "${lib.getBin stdenv.cc.bintools}" + "${lib.getBin stdenv.cc.bintools.bintools}" + ])); in '' substituteInPlace lisp/emacs-lisp/comp.el --replace \ - "(defcustom comp-async-env-modifier-form nil" \ - "(defcustom comp-async-env-modifier-form '((setenv \"LIBRARY_PATH\" (string-join (seq-filter (lambda (v) (null (eq v nil))) (list (getenv \"LIBRARY_PATH\") \"${libPath}\")) \":\")))" - + "(defcustom comp-native-driver-options nil" \ + "(defcustom comp-native-driver-options '(${backendPath})" '')) - "" ]; @@ -156,11 +161,6 @@ in stdenv.mkDerivation { "$out/bin/emacs" patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" '') - - (lib.optionalString nativeComp '' - wrapProgram $out/bin/emacs-* --prefix PATH : "${lib.makeBinPath [ binutils binutils-unwrapped ]}" - '') - ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix index 3a573504c4..f991fe7ea6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf automake ]; - buildInputs = [ ncurses libxml2 gnutls texinfo gettext + buildInputs = [ ncurses libxml2 gnutls texinfo gettext jansson AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO # may be optional ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch b/third_party/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch new file mode 100644 index 0000000000..5d16194fd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch @@ -0,0 +1,14 @@ +diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el +index f370abba31..f2806263a9 100644 +--- a/lisp/net/tramp-gvfs.el ++++ b/lisp/net/tramp-gvfs.el +@@ -164,7 +164,8 @@ tramp-gvfs-enabled + (and (featurep 'dbusbind) + (tramp-compat-funcall 'dbus-get-unique-name :system) + (tramp-compat-funcall 'dbus-get-unique-name :session) +- (or (tramp-compat-process-running-p "gvfs-fuse-daemon") ++ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") ++ (tramp-compat-process-running-p "gvfs-fuse-daemon") + (tramp-compat-process-running-p "gvfsd-fuse")))) + "Non-nil when GVFS is available.") + diff --git a/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix b/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix index c6089fd530..8343472fa7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix @@ -1,18 +1,18 @@ -{ stdenv, pkgconfig, qt5, fetchFromGitHub }: - -with qt5; - -stdenv.mkDerivation rec { - version = "0.10.0"; +{ stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +mkDerivation rec { pname = "featherpad"; + version = "0.10.0"; + src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p"; }; + nativeBuildInputs = [ qmake pkgconfig qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; + meta = with stdenv.lib; { description = "Lightweight Qt5 Plain-Text Editor for Linux"; homepage = "https://github.com/tsujan/FeatherPad"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix new file mode 100644 index 0000000000..e48ee4dd13 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gophernotes"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "gopherdata"; + repo = "gophernotes"; + rev = "v${version}"; + sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27"; + }; + + vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs"; + + meta = with lib; { + description = "Go kernel for Jupyter notebooks"; + homepage = "https://github.com/gopherdata/gophernotes"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix index 178494b049..18fe236983 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix @@ -44,12 +44,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop - patch package-files/linux/jedit << EOF - 5a6,8 - > # specify the correct JAVA_HOME - > JAVA_HOME=${jdk.jre.home}/jre - > - EOF + # specify the correct JAVA_HOME + sed -i '1a JAVA_HOME=${jdk}' package-files/linux/jedit sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit mkdir -p $out/bin cp package-files/linux/jedit $out/bin/jedit diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 10569afec9..2747176e01 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -220,9 +220,6 @@ let }; }) (attrs: { patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' - # Patch built-in mono for ReSharperHost to start successfully - interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) - patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen rm -rf lib/ReSharperHost/linux-x64/dotnet mkdir -p lib/ReSharperHost/linux-x64/dotnet/ ln -s ${dotnet-sdk_3}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet @@ -271,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.3"; /* 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 = "1j80k6r4nbr8abwkpx78sy3jzq3jsywn2k6g4mjx6h0adwxswymm"; /* updated by script */ + sha256 = "1kdlmdsfxmwks3rk2dzm5q30vwzpxcwzpyjsir122k36xnqvaqxq"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -284,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.3"; /* 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 = "0d0m6v4lr6qhi79csdpcyiyd2hnhlsan9lpnjmhkdxd84i1dl15a"; /* updated by script */ + sha256 = "0iv1zmdpbqk8f4cjd6dhgj9mrvxli4dg83jzkhv566sy8wrrx7kb"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -297,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.3"; /* 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 = "15jd2yn4g3lya54ppcp8b0bvf2pp2khdvqba2g1aml16d5z8mkq6"; /* updated by script */ + sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -310,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.2"; /* 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 = "0rymyyhgm42i487dhlxh78shyvq4hd56frgz7wrqf85hg2j5ha0y"; /* updated by script */ + sha256 = "0kbn9q7fvhrzb1w6l8i2nv4cx8qrj74jp7fidj9yk8vkv9lfijg6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -323,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.2"; /* 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-jbr.tar.gz"; - sha256 = "00mbf8asxjdnfciz6bl8b83kqknqdnars5w5w5w38rmza53pzxsi"; /* updated by script */ + sha256 = "1196zrcbgrr9271kjrzd2mzvhvxd7hkr1d2a4ij4h8f97qmsd6r6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -336,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz"; - sha256 = "1ncvq834vn47pmh3q875hgqi4m7h3inljp89w3jwwhjn3g985ysz"; /* updated by script */ + url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz"; + sha256 = "06c0yv9vvz0y5njh1sghn7ijpn1d81mxsyk5xjpj29bvvg511pjs"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -349,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* 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 = "1zxhb2w7nivnx8habcf5vii6bwzaihs5x8smy0zf8ngv3xwr6vjc"; /* updated by script */ + sha256 = "14hz6w5lgn8ddscicm4s9xhi07j5adsq0bmyr8amzmj5q6jgw4p9"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -362,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "12pp3xp74dzgjrv2nz83dnqycb250kkgqlb3skjkdx9pabmfxck0"; /* updated by script */ + sha256 = "1a1vhlc2q5n3dxli0x6ppxx3mgary4gpakcxdp9nylmixjzjph6v"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -375,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0xq0nba31yc7cm1lbgkmgfbr5kp5fq5k7j2n6kampm2hyx5fa0ak"; /* updated by script */ + sha256 = "0v64f5sbv1639d6fjg0shfgdy40f1xc2zbn0jqfrx6xmkg7wgsz9"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -388,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.1.4"; /* updated by script */ + version = "2020.2.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 = "0vicgwgsbllfw6fz4l82x4vbka3agf541576ix9akyvsskwbaxj9"; /* updated by script */ + sha256 = "1v3n4mg8b55ni72bdgsgiwyqcvp9zhqlkqshscwfjggv0iai9r6p"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -401,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1caxd5qcxwwrdy3ma87gnywr5czg3lam1n2gwbnc7hdxgfnvn3qz"; /* updated by script */ + sha256 = "11v26hpf891nq5vj8i0ad4shhzpy8b7rvyrkr3l29dwfnd83lgpz"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -414,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.2"; /* 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 = "100j2q9hz0a50n3x3khk7hap7b496g6sx0y6q7n7vy2zayh5ibm5"; /* updated by script */ + sha256 = "1w17cf0qj0vyizkzj1frcmi52q5qxbf31msg8df38wy2l8r0b928"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix index 16bc3c22cb..eec14f286b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; - version = "2020.08.04"; + version = "2020.09.01"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "1cgkis8bywy5k8k6j4i3prikpmhh1p6zyklliyxbc89mj64kvx4s"; + sha256 = "091qzk0qs7hql0q51hix99srgma35mhdnjfd5ncfba1bmc1h8x5i"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix new file mode 100644 index 0000000000..20df287262 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab }: + +stdenv.mkDerivation { + name = "case.kak"; + version = "unstable-2020-04-06"; + + src = fetchFromGitLab { + owner = "FlyingWombat"; + repo = "case.kak"; + rev = "6f1511820aa3abfa118e0f856118adc8113e2185"; + sha256 = "002njrlwgakqgp74wivbppr9qyn57dn4n5bxkr6k6nglk9qndwdp"; + }; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins + cp -r rc/case.kak $out/share/kak/autoload/plugins + ''; + + meta = with stdenv.lib; { + description = "Ease navigation between opened buffers in Kakoune"; + homepage = "https://gitlab.com/FlyingWombat/case.kak"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platform = platforms.all; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix index 915a5a9ec9..3926973f7e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix @@ -3,6 +3,7 @@ { inherit parinfer-rust; + case-kak = pkgs.callPackage ./case.kak.nix { }; kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { }; kak-buffers = pkgs.callPackage ./kak-buffers.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix new file mode 100644 index 0000000000..85ad49a01d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "kibi"; + version = "0.2.0"; + + cargoSha256 = "0zyqzb3k4ak7h58zjbg9b32hz1vgbbn9i9l85j4vd4aw8mhsz0n9"; + + src = fetchFromGitHub { + owner = "ilai-deutel"; + repo = "kibi"; + rev = "v${version}"; + sha256 = "1cqnzw6gpsmrqcz82zn1x5i6najcr3i7shj0wnqzpwppff9a6yac"; + }; + + meta = with stdenv.lib; { + description = "A text editor in ≤1024 lines of code, written in Rust"; + homepage = "https://github.com/ilai-deutel/kibi"; + license = licenses.mit; + maintainers = with maintainers; [ robertodr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/lighttable/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lighttable/default.nix index 26c5ee4215..abf55b42c5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lighttable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lighttable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem +{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify }: @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { mv $out/share/LightTable/light $out/bin/light - ln -sf ${systemd.lib}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 + ln -sf ${lib.getLib systemd}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 substituteInPlace $out/bin/light \ - --replace "/usr/lib/x86_64-linux-gnu" "${systemd.lib}/lib" \ + --replace "/usr/lib/x86_64-linux-gnu" "${lib.getLib systemd}/lib" \ --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \ --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable" diff --git a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix index 4a8c176f57..ffef5d5fdd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "micro"; - version = "2.0.5"; + version = "2.0.7"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "12fyyax1mr0n82s5yhmk90iyyzbh32rppkkpj37c25pal73czdhc"; + sha256 = "07ck1a9arklic3p0z50wcg608cvpba1kljvlfb4fljr6jhv5cmkb"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/micro/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/micro/deps.nix index c274ce80ad..d1cb91c295 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/micro/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/micro/deps.nix @@ -189,6 +189,15 @@ sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; }; } + { + goPackagePath = "github.com/xo/terminfo"; + fetch = { + type = "git"; + url = "https://github.com/xo/terminfo"; + rev = "454e5b68f9e8"; + sha256 = "0xvjb09nwbanp7ja4560pwb6b2xr9h0axyr7f5clgncca2k4f1pd"; + }; + } { goPackagePath = "github.com/yuin/gopher-lua"; fetch = { @@ -203,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/clipboard"; - rev = "7c45b8673834"; - sha256 = "0ag36wd3830d4s6fvpj05v6f662c5rymgdydsj2gq8aaqplfb0v4"; + rev = "v1.0.3"; + sha256 = "134vnx0r51f08b37yaymlxlfl14qv6r8yzgqz7dxxn1zw9197b3q"; }; } { @@ -257,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/tcell"; - rev = "v1.4.7"; - sha256 = "1ddaznp0haz35mxfjjh2fmamdrlk1igqg65fz22l5r6vvhcdsfxa"; + rev = "v2.0.2"; + sha256 = "0fr7zm6zcir2bjll5ycdxy9m98gjr3ins7mzmqpd46b3njzbl75z"; }; } { diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix index 13a0e797ad..244649f866 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.0"; + version = "5.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0dmagj4p1llb1a2w0iwdrqbd9cgp0bda4s18vwh6y1ndd6z983bw"; + sha256 = "1qd7pn9g5dgzbfg4fb3nqxqgi2iqq0g6x33x8d1mx6mfw51xmhij"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix index 8fe93d37c7..b04c575dde 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix @@ -38,6 +38,7 @@ let meta = with stdenv.lib; { description = "Neovim client library and GUI, in Qt5"; + homepage = "https://github.com/equalsraf/neovim-qt"; license = licenses.isc; maintainers = with maintainers; [ peterhoeg ]; inherit (neovim.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix index 7a5630bb9b..718b1b8dcb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.0"; + version = "12.1"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4"; + sha512 = "ad4bb5b191c784ed144b0b4831a8b95e0707c362917833c279d3f6fad11d7b3fb1f004f30121a941b694fc2ce323974b15072aa31cb5449111bc5d33d0d77103"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix index 5a0ef754db..46dc413971 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.2.8"; + version = "0.3.2"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "1llxxjj038nd2p857bjdyyhzskn56826qi259v47vaqlv9hkifil"; + sha256 = "1c7jrq20m53y2k8lmh37zldgc3bndldxipx4xq0lz3qq2fv1gg07"; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 94837023ca..7f92c4d492 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "2.12.22"; + version = "3.0.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "037jvsfln8wav17qj9anxz2a7p51v7ky85wmhdj2hgwp40al651g"; + sha256 = "18ad85y4hrsvp7gs50dfg08cz40vbakb9hs8gw4cvi7r17vds5ar"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix b/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix index 049ba45f7a..3c55cffdcf 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , makeWrapper -, electron_8 +, electron_9 , dpkg , gtk3 , glib @@ -13,15 +13,15 @@ }: let - electron = electron_8; + electron = electron_9; in stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.89"; + version = "0.9.95"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "0gk8j13z1ymad34zzcy4vqwyjgd5khgyw5xjj9rbzm5v537kqmx6"; + sha256 = "0kgzk7z707vlbjrvykrnw2h6wscmc3h5hxycyz1z1j2cz26fns4p"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix index 5be7078173..4ae7600f4a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.1123"; + version = "8.2.1522"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "01fgfm5pnmbq12z84d7g3x0iq5gj1irdyihx41c4r2bww55v5q0c"; + sha256 = "0dah3392cq06pagik5y7kcq61mslqvfsh7vqldv3kvhr5ilqb8qy"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/qvim.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/qvim.nix deleted file mode 100644 index 0e3a4a1505..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/qvim.nix +++ /dev/null @@ -1,113 +0,0 @@ -args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext -, lib, config, python, perl, tcl, ruby, qt4 -, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu -, libICE -, lua -, features -, luaSupport ? config.vim.lua or true -, perlSupport ? config.vim.perl or false # Perl interpreter -, pythonSupport ? config.vim.python or true -, rubySupport ? config.vim.ruby or true -, nlsSupport ? config.vim.nls or false -, tclSupport ? config.vim.tcl or false -, multibyteSupport ? config.vim.multibyte or false -, cscopeSupport ? config.vim.cscope or false -, netbeansSupport ? config.netbeans or true # eg envim is using it - -# by default, compile with darwin support if we're compiling on darwin, but -# allow this to be disabled by setting config.vim.darwin to false -, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) - -# add .nix filetype detection and minimal syntax highlighting support -, ftNixSupport ? config.vim.ftNix or true - -, ... }: with args; - -let tag = "20140827"; - sha256 = "0ncgbcm23z25naicxqkblz0mcl1zar2qwgi37y5ar8q8884w9ml2"; -in { - - name = "qvim-7.4." + tag; - - enableParallelBuilding = true; # test this - - src = fetchgit { - url = "https://bitbucket.org/equalsraf/vim-qt.git"; - rev = "refs/tags/package-" + tag; - inherit sha256; - }; - - # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux - # to meta.platforms.unix - preConfigure = assert (! stdenv.isDarwin); ""; - - configureFlags = [ - "--with-vim-name=qvim" - "--enable-gui=qt" - "--with-features=${features}" - "--disable-xsmp" - "--disable-xsmp_interact" - "--disable-workshop" # Sun Visual Workshop support - "--disable-sniff" # Sniff interface - "--disable-hangulinput" # Hangul input support - "--disable-fontset" # X fontset output support - "--disable-acl" # ACL support - "--disable-gpm" # GPM (Linux mouse daemon) - "--disable-mzscheme" - ] - ++ stdenv.lib.optionals luaSupport [ - "--with-lua-prefix=${lua}" - "--enable-luainterp" - ] - ++ stdenv.lib.optional pythonSupport "--enable-pythoninterp" - ++ stdenv.lib.optional (pythonSupport && stdenv.isDarwin) "--with-python-config-dir=${python}/lib" - ++ stdenv.lib.optional nlsSupport "--enable-nls" - ++ stdenv.lib.optional perlSupport "--enable-perlinterp" - ++ stdenv.lib.optional rubySupport "--enable-rubyinterp" - ++ stdenv.lib.optional tclSupport "--enable-tcl" - ++ stdenv.lib.optional multibyteSupport "--enable-multibyte" - ++ stdenv.lib.optional darwinSupport "--enable-darwin" - ++ stdenv.lib.optional cscopeSupport "--enable-cscope"; - - nativeBuildInputs = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw - libXau libXmu libICE qt4 - ] - ++ stdenv.lib.optional nlsSupport gettext - ++ stdenv.lib.optional perlSupport perl - ++ stdenv.lib.optional pythonSupport python - ++ stdenv.lib.optional tclSupport tcl - ++ stdenv.lib.optional rubySupport ruby - ++ stdenv.lib.optional luaSupport lua - ; - - postPatch = '' - '' + stdenv.lib.optionalString ftNixSupport '' - # because we cd to src in the main patch phase, we can't just add this - # patch to the list, we have to apply it manually - cd runtime - patch -p2 < ${./ft-nix-support.patch} - cd .. - ''; - - postInstall = stdenv.lib.optionalString stdenv.isLinux '' - rpath=`patchelf --print-rpath $out/bin/qvim`; - for i in $nativeBuildInputs; do - echo adding $i/lib - rpath=$rpath:$i/lib - done - echo $nativeBuildInputs - echo $rpath - patchelf --set-rpath $rpath $out/bin/qvim - ''; - - dontStrip = 1; - - meta = with stdenv.lib; { - description = "The most popular clone of the VI editor (Qt GUI fork)"; - homepage = "https://bitbucket.org/equalsraf/vim-qt/wiki/Home"; - license = licenses.vim; - maintainers = with maintainers; [ smironov ttuegel ]; - platforms = platforms.linux; - }; -} - diff --git a/third_party/nixpkgs/pkgs/applications/editors/viw/default.nix b/third_party/nixpkgs/pkgs/applications/editors/viw/default.nix new file mode 100644 index 0000000000..4025bf252b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/viw/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + pname = "viw"; + version = "unstable-20171029"; + + src = fetchFromGitHub { + owner = "lpan"; + repo = pname; + rev = "2cf317f6d82a6fa58f284074400297b6dc0f44c2"; + sha256 = "0bnkh57v01zay6ggk0rbddaf75i48h8z06xsv33wfbjldclaljp1"; + }; + + buildInputs = [ ncurses ]; + + makeFlags = [ "CC=cc" ]; + checkFlags = [ "test-command" "test-buffer" "test-state" ]; + + installPhase = '' + install -Dm 755 -t $out/bin viw + install -Dm 644 -t $out/share/doc/${pname} README.md + ''; + + meta = with stdenv.lib; { + description = "VI Worsened, a fun and light clone of VI"; + homepage = "https://github.com/lpan/viw"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 38d695bd74..57bd73d601 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -62,7 +62,7 @@ in else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) ++ [ libsecret libXScrnSaver ]; - runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ]; + runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib ]; nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/update.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/update.sh index d573fdf04a..c030e38a70 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/update.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/update.sh @@ -1,6 +1,8 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused gawk +set -eou pipefail + ROOT="$(dirname "$(readlink -f "$0")")" if [ ! -f "$ROOT/vscode.nix" ]; then echo "ERROR: cannot find vscode.nix in $ROOT" @@ -36,4 +38,4 @@ sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\" VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) -sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" \ No newline at end of file +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 25d9eaabef..a99cba67d3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0rrs2v97xhlxyjvipss5dmk88j7b03kyszwyhy46755954nzm85j"; - x86_64-darwin = "1vmr78wf6cpib6j0f5gxs8683n27jk96lm4mwg6ji1np6b00m8nx"; + x86_64-linux = "1kgvwcwkdvywsiyg86srfzcq6jcas6hyi9ds4qvndsnd64j0fgkn"; + x86_64-darwin = "03jci05psxkknpjrrgjpdxsii2xyf5cfpkhrp5nnfafb5acfvs1x"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.0"; + version = "1.49.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index aa63bce7b5..d311e644a2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1zf2z6rbm18cib4crnn8r6ggx3cc2irwqjhbka2zmq38z7l3qv6c"; - x86_64-darwin = "1rgbr1q35q0q64kzap6g72nyvcp5wjmyzi8701536az7mxjfvjz4"; + x86_64-linux = "10v13j1zg1bpgmr99vqhs1gwcipvnbkln0w6yphwn9440fw9fyp4"; + x86_64-darwin = "1mgi2awrqsm11l1yb8rgmfrxvjfn9z3qvp5np76vgbaibq2ihh0k"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.0"; + version = "1.49.1"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/xxe-pe/default.nix b/third_party/nixpkgs/pkgs/applications/editors/xxe-pe/default.nix new file mode 100644 index 0000000000..e7cfe6284e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/xxe-pe/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, fetchurl +, lib +, unzip +, makeWrapper +, openjdk11 +, makeDesktopItem +, icoutils +, config +, acceptLicense ? config.xxe-pe.acceptLicense or false +}: + +let + pkg_path = "$out/lib/xxe"; + + desktopItem = makeDesktopItem { + name = "XMLmind XML Editor Personal Edition"; + exec = "xxe"; + icon = "xxe"; + desktopName = "xxe"; + genericName = "XML Editor"; + categories = "Development;IDE;TextEditor;Java"; + }; +in +stdenv.mkDerivation rec { + pname = "xxe-pe"; + version = "9.4.0"; + + src = + assert !acceptLicense -> throw '' + You must accept the XMLmind XML Editor Personal Edition License at + https://www.xmlmind.com/xmleditor/license_xxe_perso.html + by setting nixpkgs config option `xxe-pe.acceptLicense = true;` + or by using `xxe-pe.override { acceptLicense = true; }` package. + ''; + fetchurl { + url = "https://www.xmlmind.com/xmleditor/_download/xxe-perso-${builtins.replaceStrings [ "." ] [ "_" ] version}.zip"; + sha256 = "FKPdf9cOpgm/WG2i8bFnR6MmEifpiq5ykw2zHA8HnT8="; + }; + + nativeBuildInputs = [ + unzip + makeWrapper + icoutils + ]; + + dontStrip = true; + + installPhase = '' + mkdir -p "${pkg_path}" + mkdir -p "${pkg_path}" "$out/share/applications" + cp -a * "${pkg_path}" + ln -s ${desktopItem}/share/applications/* $out/share/applications + + icotool -x "${pkg_path}/bin/icon/xxe.ico" + ls + for f in xxe_*.png; do + res=$(basename "$f" ".png" | cut -d"_" -f3 | cut -d"x" -f1-2) + mkdir -pv "$out/share/icons/hicolor/$res/apps" + mv "$f" "$out/share/icons/hicolor/$res/apps/xxe.png" + done; + ''; + + postFixup = '' + mkdir -p "$out/bin" + makeWrapper "${pkg_path}/bin/xxe" "$out/bin/xxe" \ + --prefix PATH : ${lib.makeBinPath [ openjdk11 ]} + ''; + + meta = with lib; { + description = "Strictly validating, near WYSIWYG, XML editor with DocBook support"; + homepage = "https://www.xmlmind.com/xmleditor/"; + license = licenses.unfree; + maintainers = [ maintainers.jtojnar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix b/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix new file mode 100644 index 0000000000..58390e8929 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "dcw-gmt"; + version = "1.1.4"; + src = fetchurl { + url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; + sha256 = "8d47402abcd7f54a0f711365cd022e4eaea7da324edac83611ca035ea443aad3"; + }; + + installPhase = '' + mkdir -p $out/share/dcw-gmt + cp -rv ./* $out/share/dcw-gmt + ''; + + meta = with stdenv.lib; { + homepage = "https://www.soest.hawaii.edu/pwessel/dcw/"; + description = "Vector basemap of the world, for use with GMT"; + longDescription = '' + DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap + of the world, available from the Princeton University Digital Map and + Geospatial Information Center. It contains more state boundaries (the + largest 8 countries are now represented) than the original data + source. Information about DCW can be found on Wikipedia + (https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is + for use by GMT, the Generic Mapping Tools. + ''; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ tviti ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix b/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix new file mode 100644 index 0000000000..f045ec067f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/gis/gmt/default.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo +, fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt +, gshhg-gmt }: + +/* The onus is on the user to also install: + - ffmpeg for webm or mp4 output + - graphicsmagick for gif output +*/ + +stdenv.mkDerivation rec { + pname = "gmt"; + version = "6.1.1"; + src = fetchurl { + url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; + sha256 = "04mdxxcild56jhg9ax522xh78v1wl1x8iqv2f6wv32x9b2lgy1lp"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ curl gdal netcdf pcre dcw-gmt gshhg-gmt ] + ++ (if stdenv.isDarwin then [ + Accelerate + CoreGraphics + CoreVideo + ] else [ + glibc + fftwSinglePrec + blas + lapack + ]); + + propagatedBuildInputs = [ ghostscript ]; + + cmakeFlags = [ + "-DGMT_DOCDIR=share/doc/gmt" + "-DGMT_MANDIR=share/man" + "-DGMT_LIBDIR=lib" + "-DCOPY_GSHHG:BOOL=FALSE" + "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" + "-DCOPY_DCW:BOOL=FALSE" + "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" + "-DGDAL_ROOT=${gdal.out}" + "-DNETCDF_ROOT=${netcdf.out}" + "-DPCRE_ROOT=${pcre.out}" + "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" + "-DGMT_ENABLE_OPENMP:BOOL=TRUE" + "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" + "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid + ] ++ (with stdenv; + lib.optional (!isDarwin) [ + "-DFFTW3_ROOT=${fftwSinglePrec.dev}" + "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" + "-DBLAS_LIBRARY=${blas}/lib/libblas.so" + ]); + + meta = with stdenv.lib; { + homepage = "https://www.generic-mapping-tools.org"; + description = "Tools for manipulating geographic and cartesian data sets"; + longDescription = '' + GMT is an open-source collection of command-line tools for manipulating + geographic and Cartesian data sets (including filtering, trend fitting, + gridding, projecting, etc.) and producing high-quality illustrations + ranging from simple x–y plots via contour maps to artificially illuminated + surfaces and 3D perspective views. It supports many map projections and + transformations and includes supporting data such as coastlines, rivers, + and political boundaries and optionally country polygons. + ''; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ tviti ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/applications/gis/gmt/gshhg.nix b/third_party/nixpkgs/pkgs/applications/gis/gmt/gshhg.nix new file mode 100644 index 0000000000..0f22f87c89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/gis/gmt/gshhg.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "gshhg-gmt"; + version = "2.3.7"; + src = fetchurl { + url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${version}.tar.gz"; + sha256 = "9bb1a956fca0718c083bef842e625797535a00ce81f175df08b042c2a92cfe7f"; + }; + + installPhase = '' + mkdir -p $out/share/gshhg-gmt + cp -rv ./* $out/share/gshhg-gmt + ''; + + meta = with stdenv.lib; { + homepage = "https://www.soest.hawaii.edu/pwessel/gshhg/"; + description = "High-resolution shoreline data set, for use with GMT"; + longDescription = '' + GSHHG is a high-resolution shoreline data set amalgamated from two + databases: Global Self-consistent Hierarchical High-resolution Shorelines + (GSHHS) and CIA World Data Bank II (WDBII). GSHHG contains vector + descriptions at five different resolutions of land outlines, lakes, + rivers, and political boundaries. This data is for use by GMT, the Generic + Mapping Tools. + ''; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ tviti ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix b/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix index 39f8694dd1..540fa27189 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -56,8 +56,6 @@ mkDerivation rec { "-DLICENSING_PROVIDER:BOOL=OFF" "-DMapper_MANUAL_QTHELP:BOOL=OFF" ] ++ stdenv.lib.optionals stdenv.isDarwin [ - # Usually enabled on Darwin - "-DCMAKE_FIND_FRAMEWORK=never" # FindGDAL is broken and always finds /Library/Framework unless this is # specified "-DGDAL_INCLUDE_DIR=${gdal}/include" diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 72e8462025..130c0af6ee 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.7"; + version = "3.10.9"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf"; + sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix index 716972342e..aa41814820 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix @@ -6,7 +6,7 @@ # not native , gdal , wxGTK31-gtk3 -, proj_5 +, proj , dxflib , curl , libiodbc @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { hdf5 gdal wxGTK31-gtk3 - proj_5 + proj libharu opencv vigra diff --git a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix index 262c7b11f9..4038d653a3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "akira"; - version = "2020-05-01"; + version = "0.0.13"; src = fetchFromGitHub { owner = "akiraux"; repo = "Akira"; - rev = "87c495fa0a686b1e9b84aff7d9c0a9553da2c466"; - sha256 = "0ikz6dyx0z2wqskas628hbrbhx3z5gy7i4acrvspfhhg6rk88aqd"; + rev = "v${version}"; + sha256 = "1i20q78jagy8xky68nmd0n7mqvh88r98kp626rnlgyzvlc3c22cm"; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Native Linux Design application built in Vala and GTK"; homepage = "https://github.com/akiraux/Akira"; license = licenses.gpl3; - maintainers = with maintainers; [ filalex77 ] ++ pantheon.maintainers; + maintainers = with maintainers; [ filalex77 neonfuz ] ++ pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix index b2a0396560..2c0dbd5f3f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix @@ -26,7 +26,6 @@ , exiv2 , ffmpeg , flex -, jasper ? null, withJpeg2k ? false # disable JPEG2000 support, jasper has unfixed CVE , lcms2 , lensfun , libgphoto2 @@ -98,8 +97,7 @@ mkDerivation rec { marble oxygen threadweaver - ] - ++ lib.optionals withJpeg2k [ jasper ]; + ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index a8dbff6ca8..5d037bba5b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - systemd.lib + (lib.getLib systemd) ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index 0ffcb5cdb4..e210d03406 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -1,7 +1,8 @@ -{ lib +{ stdenv +, lib , mkDerivation -, fetchurl -, cmake +, fetchFromGitHub +, fetchpatch , extra-cmake-modules # common deps @@ -9,9 +10,11 @@ # client deps , qtbase +, qtkeychain , qtmultimedia , qtsvg , qttools +, libsecret # optional client deps , giflib @@ -23,6 +26,8 @@ # optional server deps , libmicrohttpd , libsodium +, withSystemd ? stdenv.isLinux +, systemd ? null # options , buildClient ? true @@ -35,54 +40,70 @@ with lib; let - commonDeps = [ - karchive - ]; clientDeps = [ qtbase + qtkeychain qtmultimedia qtsvg qttools + libsecret # optional: giflib # gif animation export support kdnssd # local server discovery with Zeroconf libvpx # WebM video export miniupnpc # automatic port forwarding ]; + serverDeps = [ # optional: libmicrohttpd # HTTP admin api libsodium # ext-auth support - ]; + ] ++ optional withSystemd systemd; + kisDeps = [ qtx11extras ]; + boolToFlag = bool: + if bool then "ON" else "OFF"; + in mkDerivation rec { pname = "drawpile"; version = "2.1.17"; - src = fetchurl { - url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "11lhn1mymhqk9g5sh384xhj3qw8h9lv88pr768y9q6kg3sl7nzzf"; + src = fetchFromGitHub { + owner = "drawpile"; + repo = "drawpile"; + rev = "${version}"; + sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM="; }; - nativeBuildInputs = [ - cmake - extra-cmake-modules + patches = [ + # fix for libmicrohttpd 0.9.71 + (fetchpatch { + url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff"; + sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA="; + name = "mhdfix.patch"; }) ]; - buildInputs = - commonDeps ++ - optionals buildClient clientDeps ++ - optionals buildServer serverDeps ++ - optionals enableKisTablet kisDeps ; - cmakeFlags = - optional (!buildClient ) "-DCLIENT=off" ++ - optional (!buildServer ) "-DSERVER=off" ++ - optional (!buildServerGui ) "-DSERVERGUI=off" ++ - optional ( buildExtraTools) "-DTOOLS=on" ++ - optional ( enableKisTablet) "-DKIS_TABLET=on"; + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ + karchive + ] + ++ optionals buildClient clientDeps + ++ optionals buildServer serverDeps + ++ optionals enableKisTablet kisDeps; + + cmakeFlags = [ + "-Wno-dev" + "-DINITSYS=systemd" + "-DCLIENT=${boolToFlag buildClient}" + "-DSERVER=${boolToFlag buildServer}" + "-DSERVERGUI=${boolToFlag buildServerGui}" + "-DTOOLS=${boolToFlag buildExtraTools}" + "-DKIS_TABLET=${boolToFlag enableKisTablet}" + ]; meta = { description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index 4782d92014..82128f8135 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.4.1"; + version = "3.5"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q"; + sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq"; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix index 99ca119b3b..3c67b11844 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 }: +{ lib, mkDerivation, fetchpatch, fetchFromGitHub, cmake, qttools, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "fontmatrix"; - version = "0.6.0"; + version = "0.6.0-qt5"; src = fetchFromGitHub { - owner = "fontmatrix"; + owner = "fcoiffie"; repo = "fontmatrix"; - rev = "v${version}"; - sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05"; + rev = "1ff8382d8c85c18d9962918f461341ff4fe21993"; + sha256 = "0yx1gbsjj9ddq1kiqplif1w5x5saw250zbmhmd4phqmaqzr60w0h"; }; - buildInputs = [ qt4 ]; + # Add missing QAction include + patches = [ (fetchpatch { + url = "https://github.com/fcoiffie/fontmatrix/commit/dc6de8c414ae21516b72daead79c8db88309b102.patch"; + sha256 = "092860fdyf5gq67jqfxnlgwzjgpizi6j0njjv3m62aiznrhig7c8"; + })]; + + buildInputs = [ qttools qtwebkit ]; nativeBuildInputs = [ cmake ]; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; homepage = "https://github.com/fontmatrix/fontmatrix"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix index 1c1c6ba08e..2962825e49 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix @@ -1,31 +1,40 @@ -{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook -, fetchpatch }: +{ stdenv +, fetchFromGitLab +, meson +, ninja +, gettext +, pkg-config +, libxml2 +, gtk3 +, libportal +, wrapGAppsHook +}: -let - version = "2.3.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gcolor3"; - inherit version; + version = "2.4.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gcolor3"; rev = "v${version}"; - sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7"; + sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU="; }; - patches = [ - # Remove useage of deprecrated G_PARAM_PRIVATE - (fetchpatch { - url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch"; - sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9"; - }) + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + libxml2 # xml-stripblanks preprocessing of GResource + wrapGAppsHook ]; - nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; - - buildInputs = [ gtk3 hicolor-icon-theme ]; + buildInputs = [ + gtk3 + libportal + ]; postPatch = '' chmod +x meson_install.sh # patchShebangs requires executable file @@ -34,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple color chooser written in GTK3"; - homepage = "https://www.hjdskes.nl/projects/gcolor3/"; + homepage = "https://gitlab.gnome.org/World/gcolor3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/0.x.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/0.x.nix deleted file mode 100644 index 880ecfb9f0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/0.x.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ stdenv -, boehmgc -, boost -, cairo -, cmake -, fetchpatch -, fetchurl -, gettext -, glib -, glibmm -, gsl -, gtkmm2 -, gtkspell2 -, imagemagick -, lcms -, libcdr -, libexif -, libpng -, librevenge -, librsvg -, libsigcxx -, libvisio -, libwpg -, libXft -, libxml2 -, libxslt -, makeWrapper -, perlPackages -, pkg-config -, poppler -, popt -, potrace -, python3 -, wrapGAppsHook -, zlib -}: -let - python3Env = python3.withPackages - (ps: with ps; [ - numpy - lxml - scour - ]); -in -stdenv.mkDerivation rec { - pname = "inkscape_0"; - version = "0.92.5"; - - src = fetchurl { - url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.bz2"; - sha256 = "ge5/aeK9ZKlzQ9g5Wkp6eQWyG4YVZu1eXZF5F41Rmgs="; - }; - - # 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; - - postPatch = '' - patchShebangs share/extensions - patchShebangs fix-roff-punct - - # Python is used at run-time to execute scripts, e.g., those from - # the "Effects" menu. - substituteInPlace src/extension/implementation/script.cpp \ - --replace '"python-interpreter", "python"' '"python-interpreter", "${python3Env}/bin/python"' - ''; - - nativeBuildInputs = [ - pkg-config - cmake - makeWrapper - python3Env - wrapGAppsHook - ] ++ (with perlPackages; [ - perl - XMLParser - ]); - - buildInputs = [ - boehmgc - boost - gettext - glib - glibmm - gsl - gtkmm2 - imagemagick - lcms - libcdr - libexif - libpng - librevenge - librsvg # for loading icons - libsigcxx - libvisio - libwpg - libXft - libxml2 - libxslt - perlPackages.perl - poppler - popt - potrace - python3Env - zlib - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ - gtkspell2 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - cairo - ]; - - # Make sure PyXML modules can be found at run-time. - postInstall = 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 - ''; - - meta = with stdenv.lib; { - description = "Legacy version of vector graphics editor"; - homepage = "https://www.inkscape.org"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.jtojnar ]; - platforms = platforms.all; - longDescription = '' - Inkscape is a feature-rich vector graphics editor that edits - files in the W3C SVG (Scalable Vector Graphics) file format. - - If you want to import .eps files install ps2edit. - ''; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 3f8b306acf..810b19ba90 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9"; + sha256 = "1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng"; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix new file mode 100644 index 0000000000..66a758f9fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +}: + +{ + hexmap = stdenv.mkDerivation { + name = "hexmap"; + version = "2020-06-06"; + + src = fetchFromGitHub { + owner = "lifelike"; + repo = "hexmapextension"; + rev = "11401e23889318bdefb72df6980393050299d8cc"; + sha256 = "1a4jhva624mbljj2k43wzi6hrxacjz4626jfk9y2fg4r4sga22mm"; + }; + + preferLocalBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/inkscape/extensions" + cp -p *.inx *.py "$out/share/inkscape/extensions/" + find "$out/share/inkscape/extensions/" -name "*.py" -exec chmod +x {} \; + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "This is an extension for creating hex grids in Inkscape. It can also be used to make brick patterns of staggered rectangles"; + homepage = "https://github.com/lifelike/hexmapextension"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.raboof ]; + platforms = platforms.all; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix new file mode 100644 index 0000000000..cca7b1fc3a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix @@ -0,0 +1,21 @@ +{ lib +, inkscape +, symlinkJoin +, makeWrapper +, inkscapeExtensions ? [] +}: + +symlinkJoin { + name = "inkscape-with-extensions-${lib.getVersion inkscape}"; + + paths = [ inkscape ] ++ inkscapeExtensions; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + rm -f $out/bin/inkscape + makeWrapper "${inkscape}/bin/inkscape" "$out/bin/inkscape" --set INKSCAPE_DATADIR "$out/share" + ''; + + inherit (inkscape) meta; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ktikz/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ktikz/default.nix index 4ddc2074f2..f817a33216 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ktikz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ktikz/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch , pkgconfig, wrapQtAppsHook -, poppler, qt5, gnuplot +, poppler, gnuplot +, qmake, qtbase, qttools }: # This package only builds ktikz without KDE integration because KDE4 is @@ -36,10 +37,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig qt5.qttools qt5.qmake wrapQtAppsHook ]; - QT_PLUGIN_PATH = "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"; + nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ]; + QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; - buildInputs = [ qt5.qtbase poppler ]; + buildInputs = [ qtbase poppler ]; enableParallelBuilding = true; qmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix new file mode 100644 index 0000000000..7fcec93446 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -0,0 +1,49 @@ +{ stdenv, patchelf, fetchurl, p7zip +, nss, nspr, libusb1 +, qtbase, qtmultimedia, qtserialport +, autoPatchelfHook, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "lightburn"; + version = "0.9.16"; + + nativeBuildInputs = [ + p7zip + autoPatchelfHook + wrapQtAppsHook + ]; + + src = fetchurl { + url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; + sha256 = "0xmpglfzff3jpxbr304czsa24fbp497b69yd8kjkjdp2cd0l70qc"; + }; + + buildInputs = [ + nss nspr libusb1 + qtbase qtmultimedia qtserialport + ]; + + # We nuke the vendored Qt5 libraries that LightBurn ships and instead use our + # own. + unpackPhase = '' + 7z x $src + rm -rf LightBurn/lib LightBurn/plugins + ''; + + installPhase = '' + mkdir -p $out/share $out/bin + cp -ar LightBurn $out/share/LightBurn + ln -s $out/share/LightBurn/LightBurn $out/bin + + wrapQtApp $out/bin/LightBurn + ''; + + meta = { + description = "LightBurn is layout, editing, and control software for your laser cutter."; + homepage = "https://lightburnsoftware.com/"; + license = stdenv.lib.licenses.unfree; + maintainers = with stdenv.lib.maintainers; [ q3k ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix index 8e8032a1f3..bde8999eb4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix @@ -1,4 +1,6 @@ -{ mkDerivation, lib, fetchFromGitHub +{ mkDerivation +, lib +, fetchFromGitHub , fetchpatch , libGLU , qtbase @@ -17,13 +19,13 @@ mkDerivation rec { pname = "meshlab"; - version = "2020.03"; + version = "2020.07"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "meshlab"; - rev = "f3568e75c9aed6da8bb105a1c8ac7ebbe00e4536"; - sha256 = "17g9icgy1w67afxiljzxk94dyhj4f336gjxn0bhppd58xfqh8w4g"; + rev = "Meshlab-${version}"; + sha256 = "0vj849b57zk3k6lx35zzcjhr9gdy4hxqnnkb8chwy7hw262cm3ri"; fetchSubmodules = true; # for vcglib }; @@ -44,12 +46,13 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - patches = [ ./no-build-date.patch ]; - - # MeshLab computes the version based on the build date, remove when https://github.com/cnr-isti-vclab/meshlab/issues/622 is fixed. - postPatch = '' - substituteAll ${./fix-version.patch} /dev/stdout | patch -p1 --binary - ''; + patches = [ + # Make cmake use the system qhull. The next meshlab will not need this patch because it is already in master. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/cnr-isti-vclab/meshlab/pull/747.patch"; + sha256 = "0wx9f6zn458xz3lsqcgvsbwh1pgi3g0lah93nlbsb0sagng7n565"; + }) + ]; preConfigure = '' substituteAll ${./meshlab.desktop} install/linux/resources/meshlab.desktop @@ -62,7 +65,7 @@ mkDerivation rec { "-DALLOW_BUNDLED_LIB3DS=OFF" "-DALLOW_BUNDLED_MUPARSER=OFF" "-DALLOW_BUNDLED_QHULL=OFF" - # disable when available in nixpkgs + # disable when available in nixpkgs "-DALLOW_BUNDLED_OPENCTM=ON" "-DALLOW_BUNDLED_SSYNTH=ON" # some plugins are disabled unless these are on @@ -70,6 +73,11 @@ mkDerivation rec { "-DALLOW_BUNDLED_LEVMAR=ON" ]; + postFixup = '' + patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped + patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlabserver-wrapped + ''; + # Meshlab is not format-security clean; without disabling hardening, we get: # src/common/GLLogStream.h:61:37: error: format not a string literal and no format arguments [-Werror=format-security] # 61 | int chars_written = snprintf(buf, buf_size, f, std::forward(ts)...); @@ -82,7 +90,7 @@ mkDerivation rec { description = "A system for processing and editing 3D triangular meshes."; homepage = "http://www.meshlab.net/"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/fix-version.patch b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/fix-version.patch deleted file mode 100644 index 5184dfcba2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/fix-version.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/src/common/mlapplication.h -+++ b/src/common/mlapplication.h -@@ -23 +23 @@ public: -- return QString::number(compileTimeYear()) + "." + (compileTimeMonth() < 10 ? "0" + QString::number(compileTimeMonth()) : QString::number(compileTimeMonth())); -+ return "@version@"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/meshlab.desktop b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/meshlab.desktop index a9c7ef7978..aa8de18644 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/meshlab.desktop +++ b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/meshlab.desktop @@ -10,6 +10,5 @@ Exec=@out@/bin/meshlab %U TryExec=@out@/bin/meshlab Icon=@out@/share/icons/hicolor/meshlab.png Terminal=false -MimeType=model/mesh;application/x-3ds;image/x-3ds;application/sla; +MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf; Categories=Graphics;3DGraphics;Viewer;Qt; -END_DESKTOP \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/no-build-date.patch b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/no-build-date.patch deleted file mode 100644 index 9588596e5b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/no-build-date.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/meshlab/mainwindow_RunTime.cpp -+++ b/src/meshlab/mainwindow_RunTime.cpp -@@ -3312 +3312 @@ void MainWindow::about() -- temp.labelMLName->setText(MeshLabApplication::completeName(MeshLabApplication::HW_ARCHITECTURE(QSysInfo::WordSize))+" (built on "+__DATE__+")"); -+ temp.labelMLName->setText(MeshLabApplication::completeName(MeshLabApplication::HW_ARCHITECTURE(QSysInfo::WordSize))); ---- a/src/meshlabplugins/filter_plymc/plymc_main.cpp -+++ b/src/meshlabplugins/filter_plymc/plymc_main.cpp -@@ -121 +121 @@ int main(int argc, char *argv[]) -- printf( "\n PlyMC "_PLYMC_VER" ("__DATE__")\n" -+ printf( "\n PlyMC "_PLYMC_VER"\n" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix index b4dd86c372..7267e84016 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix @@ -8,6 +8,7 @@ , librsvg , gobject-introspection , libmypaint +, hicolor-icon-theme , mypaint-brushes , gdk-pixbuf , pkgconfig @@ -36,7 +37,9 @@ in buildPythonApplication rec { swig wrapGAppsHook gobject-introspection # for setup hook + hicolor-icon-theme # fór setup hook ]; + buildInputs = [ gtk3 gdk-pixbuf @@ -48,6 +51,9 @@ in buildPythonApplication rec { librsvg pycairo pygobject3 + + # Mypaint checks for a presence of this theme scaffold and crashes when not present. + hicolor-icon-theme ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix index f1bd85bae0..d23c02dbbd 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "nomacs"; - version = "3.17.2045"; + version = "3.17.2206"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "1lchdmmw2sg0xbpcnsk3sxh120xpcv1lh2khf4h5zzdlccbklq7l"; + sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/odafileconverter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/odafileconverter/default.nix new file mode 100644 index 0000000000..0378c4db13 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/odafileconverter/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, mkDerivation, dpkg, fetchurl, qtbase }: + +let + # To obtain the version you will need to run the following command: + # + # dpkg-deb -I ${odafileconverter.src} | grep Version + version = "21.7.0.0"; + rpath = "$ORIGIN:${lib.makeLibraryPath [ stdenv.cc.cc qtbase ]}"; + +in mkDerivation { + pname = "oda-file-converter"; + inherit version; + nativeBuildInputs = [ dpkg ]; + + src = fetchurl { + # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time) + url = "https://download.opendesign.com/guestfiles/ODAFileConverter/ODAFileConverter_QT5_lnxX64_7.2dll.deb"; + sha256 = "0sa21nnwzqb6g7gl0z43smqgcd9h3xipj3cq2cl7ybfh3cvcxfi9"; + }; + + unpackPhase = '' + dpkg -x $src oda_unpacked + sourceRoot=$PWD/oda_unpacked + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -vr $sourceRoot/usr/bin/ODAFileConverter_${version} $out/libexec + cp -vr $sourceRoot/usr/share $out/share + ''; + + dontWrapQtApps = true; + fixupPhase = '' + echo "setting interpreter" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/libexec/ODAFileConverter + patchelf --set-rpath '${rpath}' $out/libexec/ODAFileConverter + wrapQtApp $out/libexec/ODAFileConverter + mv $out/libexec/ODAFileConverter $out/bin + + find $out/libexec -type f -executable | while read file; do + echo "patching $file" + patchelf --set-rpath '${rpath}' $file + done + ''; + + meta = with stdenv.lib; { + description = "For converting between different versions of .dwg and .dxf"; + homepage = "https://www.opendesign.com/guestfiles/oda_file_converter"; + license = licenses.unfree; + maintainers = with maintainers; [ nagisa ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix new file mode 100644 index 0000000000..6883069969 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix @@ -0,0 +1,51 @@ +{ boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint +, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkgconfig, qtbase +, qtmultimedia, qtscript, stdenv, superlu, wrapQtAppsHook, }: +let source = import ./source.nix { inherit fetchFromGitHub; }; +in stdenv.mkDerivation rec { + inherit (source) src; + + pname = "opentoonz"; + version = source.versions.opentoonz; + + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + + buildInputs = [ + boost + freeglut + freetype + glew + libjpeg + libmypaint + libpng + libtiff + libusb1 + lz4 + lzma + lzo + openblas + qtbase + qtmultimedia + qtscript + superlu + ]; + + postUnpack = "sourceRoot=$sourceRoot/toonz"; + + cmakeDir = "../sources"; + cmakeFlags = [ + "-DTIFF_INCLUDE_DIR=${libtiff.dev}/include" + "-DTIFF_LIBRARY=${libtiff.out}/lib/libtiff.so" + ]; + + postInstall = '' + sed -i '/cp -r .*stuff/a\ chmod -R u+w $HOME/.config/OpenToonz/stuff' $out/bin/opentoonz + ''; + + meta = { + description = "Full-featured 2D animation creation software"; + homepage = "https://opentoonz.github.io/"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ chkno ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix new file mode 100644 index 0000000000..6663c47553 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix @@ -0,0 +1,21 @@ +# Per https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md , +# opentoonz requires its own modified version of libtiff. We still build it as +# a separate package +# 1. For visibility for tools like vulnix, and +# 2. To avoid a diamond-dependency problem with qt linking the normal libtiff +# and opentoonz linking qt and this modified libtiff, we build a qt against +# this modified libtiff as well. + +{ fetchFromGitHub, libtiff }: +let source = import ./source.nix { inherit fetchFromGitHub; }; +in libtiff.overrideAttrs (old: { + inherit (source) src; + version = source.versions.libtiff + "-opentoonz"; + postUnpack = (old.postUnpack or "") + '' + sourceRoot="$sourceRoot/thirdparty/tiff-${source.versions.libtiff}" + ''; + # opentoonz uses internal libtiff headers + postInstall = (old.postInstall or "") + '' + cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix new file mode 100644 index 0000000000..7378d2f5f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix @@ -0,0 +1,16 @@ +# opentoonz's source archive contains both opentoonz's source and a modified +# version of libtiff that opentoonz requires. + +{ fetchFromGitHub, }: rec { + versions = { + opentoonz = "1.4.0"; + libtiff = "4.0.3"; + }; + + src = fetchFromGitHub { + owner = "opentoonz"; + repo = "opentoonz"; + rev = "v${versions.opentoonz}"; + sha256 = "0vgclx2yydsm5i2smff3fj8m750nhf35wfhva37kywgws01s189b"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index a1c354b2ac..08dc87f668 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,17 +2,18 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "00c4psgfh4hia144zsdhrq83bw3fqda1ancv2gkn5ymxkbpnpyrn"; + sha256 = "0fb7l1h4dhn100y2ydq50cgj63fbr4p11x8h803rv6x3xwmviwcg"; }; - vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7"; + vendorSha256 = "06xlwygqw3kzbjqlx09rs9hl4pfsmay5pj4c5hvkrj5z123ldvyw"; + # No tests doCheck = false; subPackages = [ "cmd/pdfcpu" ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pencil/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pencil/default.nix index edd923822e..19e8121ac0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pencil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pencil/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { $out/opt/pencil/pencil # fix missing libudev - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1 + ln -s ${lib.getLib systemd}/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/third_party/nixpkgs/pkgs/applications/graphics/qosmic/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qosmic/default.nix new file mode 100644 index 0000000000..96823441b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/qosmic/default.nix @@ -0,0 +1,70 @@ +{ mkDerivation +, fetchFromGitHub +, fetchpatch +, qmake +, wrapQtAppsHook +, qtbase +, pkg-config +, lua +, flam3 +, libxml2 +, libpng +, libjpeg +, lib +}: + +mkDerivation rec { + pname = "qosmic"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "bitsed"; + repo = "qosmic"; + rev = "v${version}"; + sha256 = "13nw1mkdib14430r21mj352v62vi546vf184vyhxm7yjjygyra1w"; + }; + + patches = [ + # Allow overriding PREFIX (to install to $out, + # written while creating this derivation) + # https://github.com/bitsed/qosmic/pull/39 + (fetchpatch { + name = "allow-overriding-PREFIX.patch"; + url = "https://github.com/bitsed/qosmic/commit/77fb3a577b0710efae2a1d9ed97c26ae16f3a5ba.patch"; + sha256 = "0v9hj9s78cb6bg8ca0wjkbr3c7ml1n51n8h4a70zpzzgzz7rli5b"; + }) + # Fix QButtonGroup include errors with Qt 5.11: + # Will be part of the next post-1.6.0 release + (fetchpatch { + name = "fix-class-QButtonGroup-include-errors-with-Qt-5.11.patch"; + url = "https://github.com/bitsed/qosmic/commit/3f6e1ea8d384a124dbc2d568171a4da798480752.patch"; + sha256 = "0bp6b759plkqs32nvfpkfvf3qqzc9716k3ycwnjvwabbvpg1xwbl"; + }) + ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; + + buildInputs = [ + qtbase + lua + flam3 + libxml2 + libpng + libjpeg + ]; + + qmakeFlags = [ + # Use pkg-config to correctly locate library paths + "-config" "link_pkgconfig" + ]; + + meta = with lib; { + description = "A cosmic recursive flame fractal editor"; + homepage = "https://github.com/bitsed/qosmic"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.raboof ]; + # It might be possible to make it work on OSX, + # but this has not been tested. + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/runwayml/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/runwayml/default.nix index eb8ecc34b8..9366276ebf 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/runwayml/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/runwayml/default.nix @@ -6,20 +6,19 @@ let pname = "runwayml"; - version = "0.10.20"; + version = "0.14.3"; name = "${pname}-${version}"; src = fetchurl { - url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage"; - sha256 = "1wi94xi8nrwfc4v2j1crlmwr0nxg95ffp5h4hxd84crvya8ibxgz"; - name="${pname}-${version}.AppImage"; + url = "https://runway-releases.s3.amazonaws.com/Runway-${version}.AppImage"; + sha256 = "1bx8j39wd2z6f32hdvmk9z77bivnizzdhn296kin2nnqgq6v6y93"; }; binary = appimageTools.wrapType2 { name = pname; inherit src; }; - # we only use this to extract the icon + # we only use this to extract the icon and desktop file appimage-contents = appimageTools.extractType2 { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix index bd4a5ac9ad..3cce81ef8a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng +{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng, gnutls , sane-backends, meson, ninja }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.8"; + version = "0.99.16"; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ avahi libsoup libjpeg libpng sane-backends ]; + buildInputs = [ avahi libsoup libjpeg libpng gnutls sane-backends ]; src = fetchFromGitHub { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "0sdlnbzhnfn4i5mkqhc8zmjywbbjqkbnsiz2gpqhy6fypshryahz"; + sha256 = "00lgcdbpns0shwlpkvrpfm4z05s7v5q3al4kcw6ii7xnkzmv1721"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index 3549a16e27..c041d2dde8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.1"; + version = "0.31.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mbgrad4d4snffw2z3rkhwqq1bkxdgy52pblx99vjadvpgspb034"; + sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ufraw/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ufraw/default.nix index 9e05a41e84..e1a0cfa952 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ufraw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ufraw/default.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/sergiomb2/ufraw"; + broken = true; # https://github.com/NixOS/nixpkgs/issues/97946 + description = "Utility to read and manipulate raw images from digital cameras"; longDescription = diff --git a/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix index 41463a7627..1addb2d7bd 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix @@ -1,24 +1,38 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { pname = "viewnior"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { - owner = "xsisqox"; + owner = "hellosiyan"; repo = "Viewnior"; rev = "${pname}-${version}"; - sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p"; + sha256 = "0y4hk3vq8psba5k615w18qj0kbdfp5w0lm98nv5apy6hmcpwfyig"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = - [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext - shared-mime-info glib gdk-pixbuf perl - ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + desktop-file-utils + intltool + gettext + ]; - meta = { + buildInputs = [ + gtk2 + libpng + exiv2 + lcms + shared-mime-info + glib + gdk-pixbuf + perl + ]; + + meta = with stdenv.lib; { description = "Fast and simple image viewer"; longDescription = '' Viewnior is insipred by big projects like Eye of Gnome, because of it's @@ -27,13 +41,9 @@ stdenv.mkDerivation rec { with the quality of it's functions. The program is made with better integration in mind (follows Gnome HIG2). ''; - - license = stdenv.lib.licenses.gpl3; - + license = licenses.gpl3; homepage = "http://siyanpanayotov.com/project/viewnior/"; - - maintainers = [ stdenv.lib.maintainers.smironov ]; - - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = with maintainers; [ smironov artturin ]; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix index 380f70c7c9..8396ce72e5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix @@ -1,29 +1,22 @@ { mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }: let - # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon - # license: Free for commercial use - desktopIcon = fetchurl { - url = "https://www.iconfinder.com/icons/50835/download/png/256"; - sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8"; + desktopItem = makeDesktopItem { + name = "Write"; + exec = "Write"; + comment = "A word processor for handwriting"; + icon = "write_stylus"; + desktopName = "Write"; + genericName = "Write"; + categories = "Office;Graphics"; }; in mkDerivation rec { pname = "write_stylus"; version = "300"; - desktopItem = makeDesktopItem { - name = "Write"; - exec = "Write"; - comment = "A word processor for handwriting"; - icon = desktopIcon; - desktopName = "Write"; - genericName = "Write"; - categories = "Office;Graphics"; - }; - src = fetchurl { url = "http://www.styluslabs.com/write/write${version}.tar.gz"; - sha256 = "1kg4qqxgg7iyxl13hkbl3j27dykra56dj67hbv0392mwdcgavihq"; + sha256 = "0h1wf3af7jzp3f3l8mlnshi83d7a4v4y8nfqfai4lmskyicqlz7c"; }; sourceRoot = "."; @@ -36,8 +29,11 @@ mkDerivation rec { # symlink the binary to bin/ ln -s $out/Write/Write $out/bin/Write + # Create desktop item mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ + mkdir -p $out/share/icons + ln -s $out/Write/Write144x144.png $out/share/icons/write_stylus.png ''; preFixup = let libPath = lib.makeLibraryPath [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix index 5c7b4c22a3..08ef0cd7b5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libX11, libXft}: stdenv.mkDerivation rec { pname = "xfractint"; - version = "20.04p15"; + version = "20.04p16"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz"; - sha256 = "1wv2hgyjvrjxzqxb55vz65ra80p24j8sd34llykk2qlx73x8f3nk"; + sha256 = "1ba77jifxv8jql044mdydh4p4ms4w5vw3qrqmcfzlvqfxk7h2m2f"; }; buildInputs = [libX11 libXft]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix index 9472f93124..f92e910eac 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.20"; + version = "3.20.1"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "08j8lpn2nd41gavgrj03rlrxl04wcamq1y02f1x1569ykbhycb3m"; + sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix index 2c163445d5..7bb4e92179 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, shared-mime-info, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, diff --git a/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix b/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix index 485397ec4a..1537bd25d5 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs, + akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs, kholidays, kidentitymanagement, kmime, pimcommon, qttools, }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools + akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools ]; propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/default.nix b/third_party/nixpkgs/pkgs/applications/kde/default.nix index 4767ff3c84..9622404c45 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/default.nix @@ -92,15 +92,20 @@ let kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; + kalzium = callPackage ./kalzium.nix {}; + kapman = callPackage ./kapman.nix {}; kapptemplate = callPackage ./kapptemplate.nix { }; kate = callPackage ./kate.nix {}; + katomic = callPackage ./katomic.nix {}; + kblackbox = callPackage ./kblackbox.nix {}; + kblocks = callPackage ./kblocks.nix {}; + kbounce = callPackage ./kbounce.nix {}; kbreakout = callPackage ./kbreakout.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; kcalc = callPackage ./kcalc.nix {}; kcalutils = callPackage ./kcalutils.nix {}; kcharselect = callPackage ./kcharselect.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; - kdav = callPackage ./kdav.nix {}; kdebugsettings = callPackage ./kdebugsettings.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; @@ -111,6 +116,7 @@ let kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; + kdiamond = callPackage ./kdiamond.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; kfind = callPackage ./kfind.nix {}; kfloppy = callPackage ./kfloppy.nix {}; @@ -120,22 +126,32 @@ let khelpcenter = callPackage ./khelpcenter.nix {}; kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; + kigo = callPackage ./kigo.nix {}; + killbots = callPackage ./killbots.nix {}; kimap = callPackage ./kimap.nix {}; kipi-plugins = callPackage ./kipi-plugins.nix {}; kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; + klettres = callPackage ./klettres.nix {}; + klines = callPackage ./klines.nix {}; + kmag = callPackage ./kmag.nix {}; kmahjongg = callPackage ./kmahjongg.nix {}; kmail = callPackage ./kmail.nix {}; kmail-account-wizard = callPackage ./kmail-account-wizard.nix {}; kmailtransport = callPackage ./kmailtransport.nix {}; kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; + kmines = callPackage ./kmines.nix {}; kmix = callPackage ./kmix.nix {}; kmplot = callPackage ./kmplot.nix {}; + knavalbattle = callPackage ./knavalbattle.nix {}; + knetwalk = callPackage ./knetwalk.nix {}; + knights = callPackage ./knights.nix {}; knotes = callPackage ./knotes.nix {}; kolf = callPackage ./kolf.nix {}; + kollision = callPackage ./kollision.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; @@ -147,17 +163,24 @@ let kpat = callPackage ./kpat.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; ksmtp = callPackage ./ksmtp {}; + ksquares = callPackage ./ksquares.nix {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; kpkpass = callPackage ./kpkpass.nix {}; + kreversi = callPackage ./kreversi.nix {}; krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; + kshisen = callPackage ./kshisen.nix {}; kspaceduel = callPackage ./kspaceduel.nix {}; ksudoku = callPackage ./ksudoku.nix {}; ksystemlog = callPackage ./ksystemlog.nix {}; + kteatime = callPackage ./kteatime.nix {}; + ktimer = callPackage ./ktimer.nix {}; ktnef = callPackage ./ktnef.nix {}; ktouch = callPackage ./ktouch.nix {}; + kturtle = callPackage ./kturtle.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; + kwave = callPackage ./kwave.nix {}; libgravatar = callPackage ./libgravatar.nix {}; libkcddb = callPackage ./libkcddb.nix {}; libkdcraw = callPackage ./libkdcraw.nix {}; diff --git a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh index 3d63227186..90e1cf43f6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.3/src) +WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.1/src) diff --git a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix b/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix index bb8a97e834..6204919a32 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase, }: @@ -11,7 +11,6 @@ mkDerivation { maintainers = kdepimTeam; }; output = [ "out" "dev" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase diff --git a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch deleted file mode 100644 index ebb8124847..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp -index 27d5bc8..8d43140 100644 ---- a/src/grantleetheme.cpp -+++ b/src/grantleetheme.cpp -@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other) - , description(other.description) - , name(other.name) - , dirName(other.dirName) -- , absolutePath(other.absolutePath) -+ , absolutePaths(other.absolutePaths) - , author(other.author) - , email(other.email) - , loader(other.loader) -@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine() - - void ThemePrivate::setupLoader() - { -- // Get the parent dir with themes, we set the theme directory separately -- QDir dir(absolutePath); -- dir.cdUp(); -+ QStringList templateDirs; -+ for (const QString& path : absolutePaths) { -+ QDir dir(path); -+ dir.cdUp(); -+ templateDirs << dir.absolutePath(); -+ } - - loader = QSharedPointer::create(); -- loader->setTemplateDirs({ dir.absolutePath() }); -+ loader->setTemplateDirs(templateDirs); - loader->setTheme(dirName); - - if (!sEngine) { -@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de - KConfigGroup group(&config, QStringLiteral("Desktop Entry")); - if (group.isValid()) { - d->dirName = dirName; -- d->absolutePath = themePath; -+ d->absolutePaths = QStringList(themePath); - d->name = group.readEntry("Name", QString()); - d->description = group.readEntry("Description", QString()); - d->themeFileName = group.readEntry("FileName", QString()); -@@ -140,7 +143,7 @@ Theme::~Theme() - - bool Theme::operator==(const Theme &other) const - { -- return isValid() && other.isValid() && d->absolutePath == other.absolutePath(); -+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths(); - } - - Theme &Theme::operator=(const Theme &other) -@@ -184,7 +187,12 @@ QString Theme::dirName() const - - QString Theme::absolutePath() const - { -- return d->absolutePath; -+ return d->absolutePaths.first(); -+} -+ -+QStringList Theme::absolutePaths() const -+{ -+ return d->absolutePaths; - } - - QString Theme::author() const -@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con - return result; - } - -+void Theme::addThemeDir(const QString& path) -+{ -+ QDir dir(path); -+ dir.cdUp(); -+ d->absolutePaths << dir.absolutePath(); -+} -+ - void Theme::addPluginPath(const QString &path) - { - if (!ThemePrivate::sEngine) { -diff --git a/src/grantleetheme.h b/src/grantleetheme.h -index a25c27b..be38299 100644 ---- a/src/grantleetheme.h -+++ b/src/grantleetheme.h -@@ -48,11 +48,14 @@ public: - Q_REQUIRED_RESULT QStringList displayExtraVariables() const; - Q_REQUIRED_RESULT QString dirName() const; - Q_REQUIRED_RESULT QString absolutePath() const; -+ Q_REQUIRED_RESULT QStringList absolutePaths() const; - Q_REQUIRED_RESULT QString author() const; - Q_REQUIRED_RESULT QString authorEmail() const; - - Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); - -+ void addThemeDir(const QString&); -+ - static void addPluginPath(const QString &path); - - private: -diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h -index eb73dcb..00510e9 100644 ---- a/src/grantleetheme_p.h -+++ b/src/grantleetheme_p.h -@@ -43,7 +43,7 @@ public: - QString description; - QString name; - QString dirName; -- QString absolutePath; -+ QStringList absolutePaths; - QString author; - QString email; - -diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp -index 606d717..dc99041 100644 ---- a/src/grantleethememanager.cpp -+++ b/src/grantleethememanager.cpp -@@ -125,25 +125,18 @@ public: - - for (const QString &directory : qAsConst(themesDirectories)) { - QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); -- QStringList alreadyLoadedThemeName; - while (dirIt.hasNext()) { - dirIt.next(); - const QString dirName = dirIt.fileName(); - GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - QString themeName = theme.name(); -- if (alreadyLoadedThemeName.contains(themeName)) { -- int i = 2; -- const QString originalName(theme.name()); -- while (alreadyLoadedThemeName.contains(themeName)) { -- themeName = originalName + QStringLiteral(" (%1)").arg(i); -- ++i; -- } -- theme.d->name = themeName; -+ QMap::iterator i = themes.find(dirName); -+ if (i != themes.end()) { -+ i.value().addThemeDir(dirIt.filePath()); -+ } else { -+ themes.insert(dirName, theme); - } -- alreadyLoadedThemeName << themeName; -- themes.insert(dirName, theme); -- //qDebug()<<" theme.name()"<addDir(directory); -@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS - GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - if (dirName == themeName) { -- return theme.absolutePath(); -+ return theme.absolutePaths().first(); - } - } - } diff --git a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/series b/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/series deleted file mode 100644 index 9095599ea5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/series +++ /dev/null @@ -1 +0,0 @@ -grantlee-merge-theme-dirs.patch diff --git a/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix b/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix index 8224b98253..30955d1c27 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs, - kdiagram, kldap, kmime, qtbase, + kdiagram, kldap, kmime, pimcommon, qtbase }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram - kldap kmime qtbase + kldap kmime pimcommon qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kalzium.nix b/third_party/nixpkgs/pkgs/applications/kde/kalzium.nix new file mode 100644 index 0000000000..5bb51a6b4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kalzium.nix @@ -0,0 +1,26 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }: + +mkDerivation { + name = "kalzium"; + meta = with lib; { + homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium"; + description = "Kalzium is a program that shows you the Periodic Table of Elements"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + qtscript + #avogadro + kdoctools + ki18n + kio + openbabel + kparts + kplotting + kunitconversion + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kapman.nix b/third_party/nixpkgs/pkgs/applications/kde/kapman.nix new file mode 100644 index 0000000000..68af796dda --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kapman.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: + +mkDerivation { + name = "kapman"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kapman"; + description = "Kapman is a clone of the well known game Pac-Man"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/katomic.nix b/third_party/nixpkgs/pkgs/applications/kde/katomic.nix new file mode 100644 index 0000000000..a1d0f12b6a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/katomic.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: + +mkDerivation { + name = "katomic"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.katomic"; + description = "KAtomic is a fun educational game built around molecular geometry"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + knewstuff + libkdegames + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kblackbox.nix b/third_party/nixpkgs/pkgs/applications/kde/kblackbox.nix new file mode 100644 index 0000000000..669c089df8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kblackbox.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: + +mkDerivation { + name = "kblackbox"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kblackbox"; + description = "KBlackbox is a game of hide and seek played on a grid of boxes"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kblocks.nix b/third_party/nixpkgs/pkgs/applications/kde/kblocks.nix new file mode 100644 index 0000000000..1dedabb2a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kblocks.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: + +mkDerivation { + name = "kblocks"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kblocks"; + description = "KBlocks is the classic falling blocks game"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kbounce.nix b/third_party/nixpkgs/pkgs/applications/kde/kbounce.nix new file mode 100644 index 0000000000..a24d215518 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kbounce.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kio, ki18n }: + +mkDerivation { + name = "kbounce"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kbounce"; + description = "KBounce is a single player arcade game with the elements of puzzle"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kconfig + kcrash + kio + ki18n + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix b/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix index 6189e8706d..57c02ea4e8 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison, @@ -11,7 +11,6 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch deleted file mode 100644 index 02c369cc4e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp -=================================================================== ---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp -+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp -@@ -50,9 +50,9 @@ public: - mTemplateLoader.clear(); - } - -- void changeGrantleePath(const QString &path) -+ void changeGrantleePath(const QStringList &paths) - { -- mTemplateLoader->setTemplateDirs(QStringList() << path); -+ mTemplateLoader->setTemplateDirs(paths); - mEngine->addTemplateLoader(mTemplateLoader); - - mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html")); -@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee - - void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path) - { -- d->changeGrantleePath(path); -+ d->changeGrantleePath(QStringList(path)); - } - - void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) - { -- d->changeGrantleePath(theme.absolutePath()); -+ d->changeGrantleePath(theme.absolutePaths()); - } - - inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value) -Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp -=================================================================== ---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp -+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp -@@ -74,9 +74,9 @@ public: - mTemplateLoader.clear(); - } - -- void changeGrantleePath(const QString &path) -+ void changeGrantleePath(const QStringList &paths) - { -- mTemplateLoader->setTemplateDirs(QStringList() << path); -+ mTemplateLoader->setTemplateDirs(paths); - mEngine->addTemplateLoader(mTemplateLoader); - - mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html")); -@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta - - void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path) - { -- d->changeGrantleePath(path); -+ d->changeGrantleePath(QStringList(path)); - } - - void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) - { -- d->changeGrantleePath(theme.absolutePath()); -+ d->changeGrantleePath(theme.absolutePaths()); - } - - void GrantleeContactFormatter::setForceDisableQRCode(bool b) diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/series b/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/series deleted file mode 100644 index 1e8a52b55e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/series +++ /dev/null @@ -1 +0,0 @@ -kdepim-apps-libs-grantlee-merge-theme-dirs.patch diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix b/third_party/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix index 65719514f9..e0a5d43e65 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix @@ -1,11 +1,11 @@ { - mkDerivation, copyPathsToStore, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, - kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns, + kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, + pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns, }: mkDerivation { @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap - kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns + kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine + pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdiamond.nix b/third_party/nixpkgs/pkgs/applications/kde/kdiamond.nix new file mode 100644 index 0000000000..26cd731bea --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kdiamond.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kconfig, knotifyconfig }: + +mkDerivation { + name = "kdiamond"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kdiamond"; + description = "KDiamond is a single player puzzle game"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + knotifyconfig + kconfig + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kigo.nix b/third_party/nixpkgs/pkgs/applications/kde/kigo.nix new file mode 100644 index 0000000000..6585f943f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kigo.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: + +mkDerivation { + name = "kigo"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kigo"; + description = "An open-source implementation of the popular Go game"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + knewstuff + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/killbots.nix b/third_party/nixpkgs/pkgs/applications/kde/killbots.nix new file mode 100644 index 0000000000..ec9b6de82c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/killbots.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: + +mkDerivation { + name = "killbots"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.killbots"; + description = "A game where you avoid robots"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/klettres.nix b/third_party/nixpkgs/pkgs/applications/kde/klettres.nix new file mode 100644 index 0000000000..e8e0a0aa59 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/klettres.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, phonon, knewstuff }: + +mkDerivation { + name = "klettres"; + meta = with lib; { + homepage = "https://kde.org/applications/en/utilities/org.kde.klettres"; + description = "KLettres is an application specially designed to help the user to learn an alphabet"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + phonon + knewstuff + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/klines.nix b/third_party/nixpkgs/pkgs/applications/kde/klines.nix new file mode 100644 index 0000000000..c6ad883dd6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/klines.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: + +mkDerivation { + name = "klines"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.klines"; + description = "KLines is a simple but highly addictive one player game"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmag.nix b/third_party/nixpkgs/pkgs/applications/kde/kmag.nix new file mode 100644 index 0000000000..701d8dbf13 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kmag.nix @@ -0,0 +1,20 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }: + +mkDerivation { + name = "kmag"; + meta = with lib; { + homepage = "https://kde.org/applications/en/utilities/org.kde.kmag"; + description = "KMag is a small utility for Linux to magnify a part of the screen"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmail.nix b/third_party/nixpkgs/pkgs/applications/kde/kmail.nix index 6b8941e578..d225eba822 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kmail.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kmail.nix @@ -27,5 +27,4 @@ mkDerivation { kdepim-addons ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ]; - patches = [ ./kmail.patch ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmail.patch b/third_party/nixpkgs/pkgs/applications/kde/kmail.patch deleted file mode 100644 index 71a23be2d8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/kmail.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt -index 48ed076..9c56896 100644 ---- a/agents/archivemailagent/CMakeLists.txt -+++ b/agents/archivemailagent/CMakeLists.txt -@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui ) - add_library(archivemailagent STATIC ${libarchivemailagent_SRCS}) - target_link_libraries(archivemailagent - KF5::MailCommon -+ KF5::Libkdepim - KF5::I18n - KF5::Notifications - KF5::IconThemes -diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt -index a56b730..83604cf 100644 ---- a/agents/followupreminderagent/CMakeLists.txt -+++ b/agents/followupreminderagent/CMakeLists.txt -@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent - KF5::AkonadiMime - KF5::AkonadiAgentBase - KF5::DBusAddons -+ KF5::FollowupReminder - KF5::XmlGui - KF5::KIOWidgets - KF5::Notifications diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmines.nix b/third_party/nixpkgs/pkgs/applications/kde/kmines.nix new file mode 100644 index 0000000000..9314cca4a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kmines.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kdoctools, ki18n, kio }: + +mkDerivation { + name = "kmines"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kmines"; + description = "KMines is a classic Minesweeper game"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kconfig + kcrash + kio + kdoctools + ki18n + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/knavalbattle.nix b/third_party/nixpkgs/pkgs/applications/kde/knavalbattle.nix new file mode 100644 index 0000000000..669f9961a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/knavalbattle.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kdnssd }: + +mkDerivation { + name = "knavalbattle"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle"; + description = "Naval Battle is a ship sinking game"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kdoctools + ki18n + kio + kdnssd + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/knetwalk.nix b/third_party/nixpkgs/pkgs/applications/kde/knetwalk.nix new file mode 100644 index 0000000000..88d08b56bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/knetwalk.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: + +mkDerivation { + name = "knetwalk"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.knetwalk"; + description = "KNetWalk is a single player logic game"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/knights.nix b/third_party/nixpkgs/pkgs/applications/kde/knights.nix new file mode 100644 index 0000000000..ee5c37e2e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/knights.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, kplotting, plasma-framework, libkdegames }: + +mkDerivation { + name = "knights"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.knights"; + description = "KNights is a chess game"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + plasma-framework + kplotting + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kollision.nix b/third_party/nixpkgs/pkgs/applications/kde/kollision.nix new file mode 100644 index 0000000000..3c0c814cd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kollision.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: + +mkDerivation { + name = "kollision"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kollision"; + description = "Kollision is a casual game"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kontact.nix b/third_party/nixpkgs/pkgs/applications/kde/kontact.nix index 978baa925e..eb28458392 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kontact.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kontact.nix @@ -4,7 +4,7 @@ qtwebengine, kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem, akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit, - mailcommon, libkdepim + mailcommon, libkdepim, pimcommon }: mkDerivation { @@ -18,6 +18,6 @@ mkDerivation { qtwebengine kcmutils kcrash kdbusaddons kparts kwindowsystem akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit - mailcommon libkdepim + mailcommon libkdepim pimcommon ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kreversi.nix b/third_party/nixpkgs/pkgs/applications/kde/kreversi.nix new file mode 100644 index 0000000000..77ac4f05c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kreversi.nix @@ -0,0 +1,19 @@ +{ mkDerivation, lib, extra-cmake-modules, libkdegames, kdeclarative }: + +mkDerivation { + name = "kreversi"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kreversi"; + description = "KReversi is a simple one player strategy game played against the computer"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdeclarative + libkdegames + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kshisen.nix b/third_party/nixpkgs/pkgs/applications/kde/kshisen.nix new file mode 100644 index 0000000000..7909ed8b2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kshisen.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, libkmahjongg }: + +mkDerivation { + name = "kshisen"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.kshisen"; + description = "KShisen is a solitaire-like game played using the standard set of Mahjong tiles"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libkdegames + libkmahjongg + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/ksquares.nix b/third_party/nixpkgs/pkgs/applications/kde/ksquares.nix new file mode 100644 index 0000000000..94a639a0d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/ksquares.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, libkdegames, kconfig, kcrash, kxmlgui }: + +mkDerivation { + name = "ksquares"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.ksquares"; + description = "KSquares is a game of Dots and Boxes"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdoctools + libkdegames + kconfig + kcrash + kxmlgui + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kteatime.nix b/third_party/nixpkgs/pkgs/applications/kde/kteatime.nix new file mode 100644 index 0000000000..a69cb991ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kteatime.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kconfig, kcrash, kiconthemes, knotifyconfig }: + +mkDerivation { + name = "kteatime"; + meta = with lib; { + homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime"; + description = "KTeaTime is a handy timer for steeping tea"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdoctools + ki18n + kconfig + kcrash + kiconthemes + knotifyconfig + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/ktimer.nix b/third_party/nixpkgs/pkgs/applications/kde/ktimer.nix new file mode 100644 index 0000000000..aa755f35ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/ktimer.nix @@ -0,0 +1,20 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }: + +mkDerivation { + name = "ktimer"; + meta = with lib; { + homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer"; + description = "KTimer is a little tool to execute programs after some time"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdoctools + ki18n + kio + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kturtle.nix b/third_party/nixpkgs/pkgs/applications/kde/kturtle.nix new file mode 100644 index 0000000000..e16c86dc13 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kturtle.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, knewstuff }: + +mkDerivation { + name = "kturtle"; + meta = with lib; { + homepage = "https://kde.org/applications/en/utilities/org.kde.kturtle"; + description = "KTurtle is an educational programming environment for learning how to program"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdoctools + ki18n + kio + knewstuff + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kwave.nix b/third_party/nixpkgs/pkgs/applications/kde/kwave.nix new file mode 100644 index 0000000000..349787d000 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kwave.nix @@ -0,0 +1,37 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig, kcrash, kiconthemes, kio, audiofile, libsamplerate +, alsaLib, libpulseaudio, flac, id3lib, libogg, libmad, libopus, libvorbis, fftw, librsvg }: + +mkDerivation { + name = "kwave"; + meta = with lib; { + homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave"; + description = "KWave is a simple media player"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + alsaLib + audiofile + kcrash + kdoctools + qtmultimedia + kcompletion + kconfig + kiconthemes + kio + libpulseaudio + libsamplerate + flac + fftw + id3lib + libogg + libmad + libopus + libvorbis + librsvg + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/mailimporter.nix b/third_party/nixpkgs/pkgs/applications/kde/mailimporter.nix index f002ff0f34..5de5865877 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/mailimporter.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/mailimporter.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n, - kmime, kxmlgui, libkdepim + kmime, kxmlgui, libkdepim, pimcommon }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime - kxmlgui libkdepim + kxmlgui libkdepim pimcommon ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/pimcommon.nix b/third_party/nixpkgs/pkgs/applications/kde/pimcommon.nix index cd9ff2528f..2e74f528ae 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/pimcommon.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/pimcommon.nix @@ -1,9 +1,9 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, + akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs, kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, - kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, + kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit, kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine }: @@ -15,12 +15,12 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets - kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit + akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets + kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit kpurpose kwallet kwindowsystem libkdepim qtwebengine ]; propagatedBuildInputs = [ - akonadi akonadi-contacts kconfig kcontacts kimap + akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap ]; outputs = [ "out" "dev" ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix index 12a84991ad..5bcb48acc1 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix @@ -4,1739 +4,1731 @@ { akonadi = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-20.04.3.tar.xz"; - sha256 = "c91cc53afd2f81fbeed55700cd86010ee865de2594948769410167e6992bdb32"; - name = "akonadi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-20.08.1.tar.xz"; + sha256 = "f930de5fae376f138e87c6d67357ab799a3397d865b55c50f771b4427d85f495"; + name = "akonadi-20.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-20.04.3.tar.xz"; - sha256 = "ff8732b0d09b87ce0760b7df02ee390d3c0c064780076ed4c6ed05c52ca634bb"; - name = "akonadi-calendar-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-20.08.1.tar.xz"; + sha256 = "896ec2523203022bf70e23897d59b64c8bfffad4ead5b6756555ab34a4047ef5"; + name = "akonadi-calendar-20.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-tools-20.04.3.tar.xz"; - sha256 = "654fec93158e6623a8a81a371fa85d0a18b9f486f6c29926d97a8105a2d65ed2"; - name = "akonadi-calendar-tools-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-tools-20.08.1.tar.xz"; + sha256 = "21ccc2e1090eeda1eba0c29ab51c3bae1e8f57aedead569c4ed7995f5ad6cffc"; + name = "akonadi-calendar-tools-20.08.1.tar.xz"; }; }; akonadiconsole = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadiconsole-20.04.3.tar.xz"; - sha256 = "acd6d63a30af49ec66ff30c3ecdd4e53c4f4a15c4d1e41ffd988366b5106447c"; - name = "akonadiconsole-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadiconsole-20.08.1.tar.xz"; + sha256 = "077ee646babbc4ca4075505d3dd830f4f5b8b1253617228e96f565fe23bcaad9"; + name = "akonadiconsole-20.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-contacts-20.04.3.tar.xz"; - sha256 = "5bcd7acc70631e844ed77e127ff895efb573b62ef79062a6065e24b8826af39d"; - name = "akonadi-contacts-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-contacts-20.08.1.tar.xz"; + sha256 = "eee775960345ec0ca13b0550bb56fb6875867921fa7b9412a2c4b0dfb8ab4366"; + name = "akonadi-contacts-20.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-import-wizard-20.04.3.tar.xz"; - sha256 = "225615f9d64166ce33718817dfda7aadada5876204c939edc1455ae01b7bf1b2"; - name = "akonadi-import-wizard-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-import-wizard-20.08.1.tar.xz"; + sha256 = "d895c866a05f0a55ca8f2d852ed0ae3fdc13aa160cbcbaf9f1017443458d9526"; + name = "akonadi-import-wizard-20.08.1.tar.xz"; }; }; akonadi-mime = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-mime-20.04.3.tar.xz"; - sha256 = "92e9bab71f87c0de8e3437dd4779054332826fe2522c36a7c038c789b207f7ac"; - name = "akonadi-mime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-mime-20.08.1.tar.xz"; + sha256 = "3c7a57f798a7db1e1aebc3162c20f58a0fb9ed9e703078344ef1de215c73ff0b"; + name = "akonadi-mime-20.08.1.tar.xz"; }; }; akonadi-notes = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-notes-20.04.3.tar.xz"; - sha256 = "e1b4b6d2347038774589a9a8a935e4697d248008dfd2b5b496e6555974c96a55"; - name = "akonadi-notes-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-notes-20.08.1.tar.xz"; + sha256 = "afc0cdba349f0b2edece44221a7c3c532d07251ec51f05994e83a1d79c4f50fc"; + name = "akonadi-notes-20.08.1.tar.xz"; }; }; akonadi-search = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-search-20.04.3.tar.xz"; - sha256 = "21ca09d39d6e550ca01e80f1a112557f00387e014763b1f47824d53d41cb5bdf"; - name = "akonadi-search-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akonadi-search-20.08.1.tar.xz"; + sha256 = "db305bfc55535d8812d84a119e4dcf04e7b87c345e7ac3a884469cbf55abca83"; + name = "akonadi-search-20.08.1.tar.xz"; }; }; akregator = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akregator-20.04.3.tar.xz"; - sha256 = "e175a1b60270ad76afaf16e8e5630d237cdc068c06d0ae93591494b18ad4584c"; - name = "akregator-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/akregator-20.08.1.tar.xz"; + sha256 = "21751a5a14b188649caeeb19cbcef877dd00548a29c073f8694e227d951c7a00"; + name = "akregator-20.08.1.tar.xz"; }; }; analitza = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/analitza-20.04.3.tar.xz"; - sha256 = "f9d1873c6190dc1eaeb6fad97d4197256342e0b729f7e8199e15bfb495f854b7"; - name = "analitza-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/analitza-20.08.1.tar.xz"; + sha256 = "91c691df8be52255db9387549c6392ad2c5358c12e805f3a96520e2aa0c147de"; + name = "analitza-20.08.1.tar.xz"; }; }; ark = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz"; - sha256 = "e7251b0b6f12291ffbaa328bf7f8e101ebeef6fd110dabbcf76d8ad7cfd305bc"; - name = "ark-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ark-20.08.1.tar.xz"; + sha256 = "32e8546b186b88efc9d4688e02def0b6225d921f9b92cfcd328417f09ec0f725"; + name = "ark-20.08.1.tar.xz"; }; }; artikulate = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/artikulate-20.04.3.tar.xz"; - sha256 = "394e93df2b370ba1e6621b2bcf871be42efde6fa2189de29d4c8198e387767ea"; - name = "artikulate-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/artikulate-20.08.1.tar.xz"; + sha256 = "b626a6a38f6eb50d64607032d5b100351c4242e40a4a13cdce4769e188ee361a"; + name = "artikulate-20.08.1.tar.xz"; }; }; audiocd-kio = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/audiocd-kio-20.04.3.tar.xz"; - sha256 = "af8782771a5d48fb2e3ba9703f8b8e542f5fddd418ca293d23a6eb83ebe86929"; - name = "audiocd-kio-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/audiocd-kio-20.08.1.tar.xz"; + sha256 = "7662849929c96d1745ce4ac7ddc931be2eff5e3cc755f2cd959b4d3f4b20b9b0"; + name = "audiocd-kio-20.08.1.tar.xz"; }; }; baloo-widgets = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/baloo-widgets-20.04.3.tar.xz"; - sha256 = "29394f9d47407074a5ec0f85ceade5dcc8c03f0d9a83c1e339310f19f7711ae3"; - name = "baloo-widgets-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/baloo-widgets-20.08.1.tar.xz"; + sha256 = "9f48cb2f1b45e46828b1656abaeb60e836650015c07277ec52bea053d0058958"; + name = "baloo-widgets-20.08.1.tar.xz"; }; }; blinken = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/blinken-20.04.3.tar.xz"; - sha256 = "d6901fe40768ba8319609bfd143b2d1c585b04a148aedcb4b358b041db7f1afb"; - name = "blinken-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/blinken-20.08.1.tar.xz"; + sha256 = "53b30435ea0d83f713ecb53219173aa55c0d11194830972734a4acc9a5a28c5a"; + name = "blinken-20.08.1.tar.xz"; }; }; bomber = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/bomber-20.04.3.tar.xz"; - sha256 = "b292c11ebfb4311420ce6b9a4b132a437d061946e8eb08556fec89bb84c23428"; - name = "bomber-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/bomber-20.08.1.tar.xz"; + sha256 = "a4b2f5dcce7e125da30bef6bcc9746b67f8451d2040696714686dd618d80a96c"; + name = "bomber-20.08.1.tar.xz"; }; }; bovo = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/bovo-20.04.3.tar.xz"; - sha256 = "5365c0fd5a57814f224585e4331be129414d1f5d51d2b90bac8421df4ae5f300"; - name = "bovo-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/bovo-20.08.1.tar.xz"; + sha256 = "5d5ee817a73de0deef6b7c35a798bda02c6d15e9dd0e7379a13c23c0832fe0d1"; + name = "bovo-20.08.1.tar.xz"; }; }; calendarsupport = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/calendarsupport-20.04.3.tar.xz"; - sha256 = "40b069e1561fac49f46dd0504af0ac459010ac98f30748b8f15a50ca1fd35b5b"; - name = "calendarsupport-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/calendarsupport-20.08.1.tar.xz"; + sha256 = "38d6e695725c8484e1492d431144a0ecd1b66535bc07ac77e1f0eb1499d8fc32"; + name = "calendarsupport-20.08.1.tar.xz"; }; }; cantor = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/cantor-20.04.3.tar.xz"; - sha256 = "ff589ccb48016fd784de9883fe19ee0c2c450e3993e9cc5f7dc499448db0c6a4"; - name = "cantor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/cantor-20.08.1.tar.xz"; + sha256 = "c44b96ac861302589923d144bf7b5d529b6eb2f91cea2d014944a0516de31a05"; + name = "cantor-20.08.1.tar.xz"; }; }; cervisia = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/cervisia-20.04.3.tar.xz"; - sha256 = "3e2aac0a08c01d9ea5c5814e739f082ec5a510cd8f0f6bce37cfff9130b0f078"; - name = "cervisia-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/cervisia-20.08.1.tar.xz"; + sha256 = "eedd3b3f00b97d513437fdbd2eeaa28cd6db29512983b82196bdededd8b701f2"; + name = "cervisia-20.08.1.tar.xz"; }; }; dolphin = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/dolphin-20.04.3.tar.xz"; - sha256 = "5e493e898e02005780b59474f506904742625b50e4669c113906d4f30daa863e"; - name = "dolphin-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/dolphin-20.08.1.tar.xz"; + sha256 = "7d6ef04b866366a0ff3b199aac082ade41b3748b225ef7675ea42ccf48cbdc24"; + name = "dolphin-20.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz"; - sha256 = "f0dad66e7302711e136b0253fb73dbf16bc9facdbb4ad617207fb818fc84130a"; - name = "dolphin-plugins-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz"; + sha256 = "a00cab6b30c9b5a4c0164704c9eab2cbb661928e775f83acb3691af77bf17427"; + name = "dolphin-plugins-20.08.1.tar.xz"; }; }; dragon = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/dragon-20.04.3.tar.xz"; - sha256 = "2b0d6414f2cea9f2a0b2ebddeffa7e5342db96fac34b2a00439fca5784f6131f"; - name = "dragon-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/dragon-20.08.1.tar.xz"; + sha256 = "691bc338ca25e70e9a43cbcdf50f2e0aa92643bdad0329bdc3e09373ac287040"; + name = "dragon-20.08.1.tar.xz"; }; }; elisa = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/elisa-20.04.3.tar.xz"; - sha256 = "d99dc2eb80d4219d08c72e612ac07cbb6c91c2eff365b49da69cbc3c1e70885b"; - name = "elisa-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/elisa-20.08.1.tar.xz"; + sha256 = "1a0234a074a70bfcd4b2ccc14664b2cc7f88d2ccfd33c1716d35c27a31e258c0"; + name = "elisa-20.08.1.tar.xz"; }; }; eventviews = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/eventviews-20.04.3.tar.xz"; - sha256 = "f10d43f57e62d68b6d0b41e9e3442baee8b68664e085f6e4347ac6adc1af32ff"; - name = "eventviews-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/eventviews-20.08.1.tar.xz"; + sha256 = "b46e6ad32a503ce1dc1e5ade71e79f44011362fe569836ca1f2cd11c560a5a73"; + name = "eventviews-20.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ffmpegthumbs-20.04.3.tar.xz"; - sha256 = "089305a75d32cf8bf1b9279623b524912af78aa538379dcccf998ca1ab165164"; - name = "ffmpegthumbs-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ffmpegthumbs-20.08.1.tar.xz"; + sha256 = "8b7cd6bd27b29977d0406b08c2cf33988c651a2f59392be47f076e49eea5673b"; + name = "ffmpegthumbs-20.08.1.tar.xz"; }; }; filelight = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/filelight-20.04.3.tar.xz"; - sha256 = "d0939d0a04424978c06b675ac784c6a1ecbccbb67a31f5af661c6716bf38f0a4"; - name = "filelight-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/filelight-20.08.1.tar.xz"; + sha256 = "9677038781a1d66238da0e54f967c9c97cb44d593dbe164b8e26f38d0ac75330"; + name = "filelight-20.08.1.tar.xz"; }; }; granatier = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/granatier-20.04.3.tar.xz"; - sha256 = "9d06047f613a03b32d603e90bd14ca2873be9da9b4b17b98a65242e9855a7aaf"; - name = "granatier-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/granatier-20.08.1.tar.xz"; + sha256 = "7b0d53fd50fdb56270f8fd53d45478c0f1be10bb67b901db08b0f413c4baeb3e"; + name = "granatier-20.08.1.tar.xz"; }; }; grantlee-editor = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/grantlee-editor-20.04.3.tar.xz"; - sha256 = "1a3e4ece1a37e11735291bbec99314bc0ede0714377db916ed1266ec19325ef5"; - name = "grantlee-editor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/grantlee-editor-20.08.1.tar.xz"; + sha256 = "edeb994eab7001bcf8462834a61ae1a045e9122ae104d31bdeed2ac7497b6306"; + name = "grantlee-editor-20.08.1.tar.xz"; }; }; grantleetheme = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/grantleetheme-20.04.3.tar.xz"; - sha256 = "c5b2e4b1d5e14b39d2e66d160ba0b86c16f86e921abf578640bf1576a5f25eb3"; - name = "grantleetheme-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/grantleetheme-20.08.1.tar.xz"; + sha256 = "9a8f91ce63a3b143d47d8e3fbd1378732639cd3daf5b5789989164d8225fe54f"; + name = "grantleetheme-20.08.1.tar.xz"; }; }; gwenview = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/gwenview-20.04.3.tar.xz"; - sha256 = "d176021d6784e33cb0aaa6fa2517e81f9eac237079d2a06d6b55b8f4b04e8bd9"; - name = "gwenview-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/gwenview-20.08.1.tar.xz"; + sha256 = "df1c45317aff9aece8b023cd87aab62c9cd222520795922564e89fdc9df48995"; + name = "gwenview-20.08.1.tar.xz"; }; }; incidenceeditor = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/incidenceeditor-20.04.3.tar.xz"; - sha256 = "b3c70c926acab7a0585bf2bf7575ebe4d04c439fc49af073d0cb599f3b9e57c2"; - name = "incidenceeditor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/incidenceeditor-20.08.1.tar.xz"; + sha256 = "eecc51eb405c473eb20449842dcdb3dac96712bbcf7aeedaa06614e1da3e0bbe"; + name = "incidenceeditor-20.08.1.tar.xz"; }; }; juk = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/juk-20.04.3.tar.xz"; - sha256 = "2566257f83db74d69b95e109146a82e1e03966b3592c891b48e81cf2a13d812b"; - name = "juk-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/juk-20.08.1.tar.xz"; + sha256 = "aa9a93a0befacf401cf41d8358b4987d8b370b4c153f3b66e05e922472e004a8"; + name = "juk-20.08.1.tar.xz"; }; }; k3b = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/k3b-20.04.3.tar.xz"; - sha256 = "562dc91be0a992ef0f139310bfd941202e4ae273e11b754d02a8cf6f85f20420"; - name = "k3b-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/k3b-20.08.1.tar.xz"; + sha256 = "66fad59f4e35c24dc8868c46ff45ffa66048501e0a6ac0c23a8b9e957033e50f"; + name = "k3b-20.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-integration-20.04.3.tar.xz"; - sha256 = "57661418d6fe58f9c3d308ba8804e5bc83312bba0967e13bf144b1a7dba9b36d"; - name = "kaccounts-integration-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-integration-20.08.1.tar.xz"; + sha256 = "b65ec11be0c2b612222de382d24345f19be0cd264243f0d954da8a81b80034bc"; + name = "kaccounts-integration-20.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-providers-20.04.3.tar.xz"; - sha256 = "ffeeac1283c453a4bbd4249cbe314eb7f9800a9cbedce192fdb1f12f30670e3e"; - name = "kaccounts-providers-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-providers-20.08.1.tar.xz"; + sha256 = "481a2e2708773197b63937233ade6380c0b64e13a1610f27aa2751b6ee3624a4"; + name = "kaccounts-providers-20.08.1.tar.xz"; }; }; kaddressbook = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kaddressbook-20.04.3.tar.xz"; - sha256 = "d1c8f6af88572548a90756963921a8555df239467858432079a37788f4980b58"; - name = "kaddressbook-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kaddressbook-20.08.1.tar.xz"; + sha256 = "f7fb72cbff43ae6dfb222e5b1c49947602086412b97634484eb3cc86ab773aa2"; + name = "kaddressbook-20.08.1.tar.xz"; }; }; kajongg = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kajongg-20.04.3.tar.xz"; - sha256 = "0175fb44b4f092fa318113a576f41e0a29dc1f5d7dfbf0ca7877a5c46a095d00"; - name = "kajongg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kajongg-20.08.1.tar.xz"; + sha256 = "801c0cc63767809ea4909ceb66dbbbb3e8ad400db7a24c80dc6ae8f3f5c9a6b9"; + name = "kajongg-20.08.1.tar.xz"; }; }; kalarm = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalarm-20.04.3.tar.xz"; - sha256 = "71f94af998495c759b9c2e7bf2092887748301c993f76dbf36f6ac9e4bb2a1f5"; - name = "kalarm-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kalarm-20.08.1.tar.xz"; + sha256 = "22fea5be32c8db6b0903f216307f20dafc2ac69c620d9b4512e1034c0294c207"; + name = "kalarm-20.08.1.tar.xz"; }; }; kalarmcal = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalarmcal-20.04.3.tar.xz"; - sha256 = "19c9aab451f95f7689d8b18059e84f189b11cf15bb7f60fe55402b944512692e"; - name = "kalarmcal-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kalarmcal-20.08.1.tar.xz"; + sha256 = "745515662c23154480e73f4a8d6e9ec760d01770383c1dd7f31d3f1463be7602"; + name = "kalarmcal-20.08.1.tar.xz"; }; }; kalgebra = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalgebra-20.04.3.tar.xz"; - sha256 = "988ae02433e961a84da35498aa6ff88fbcc36f8f12d55457116935740d3f1475"; - name = "kalgebra-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kalgebra-20.08.1.tar.xz"; + sha256 = "a5ab916eba3bfd7535408768e6530e993bc1097ef1a2a0af5aa804aa1f713caf"; + name = "kalgebra-20.08.1.tar.xz"; }; }; kalzium = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalzium-20.04.3.tar.xz"; - sha256 = "b884fc8c13c3618a73e3ecfd265660e7045245059a951aff32c12ee5981902ca"; - name = "kalzium-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kalzium-20.08.1.tar.xz"; + sha256 = "c2c4a823525ab5927c39f29e2150f34fc03947fb852aea1bdb73390c5a709188"; + name = "kalzium-20.08.1.tar.xz"; }; }; kamera = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kamera-20.04.3.tar.xz"; - sha256 = "dcac50db634fccb3e602abb575322342d50c56832a61731546cf1fec552d5b3e"; - name = "kamera-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kamera-20.08.1.tar.xz"; + sha256 = "f5b04ca46313de1bb0a57253650d1d1578f45796035888b759ad224b5866ee96"; + name = "kamera-20.08.1.tar.xz"; }; }; kamoso = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kamoso-20.04.3.tar.xz"; - sha256 = "9b6410f75bd47901cdd787ea5a7a7bc93da16837f955f27de9e609d9e7b4b896"; - name = "kamoso-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kamoso-20.08.1.tar.xz"; + sha256 = "ed8fa6a6127a8bea5294534aa2552526af101f981de58512fbb9f7dfd78e8984"; + name = "kamoso-20.08.1.tar.xz"; }; }; kanagram = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kanagram-20.04.3.tar.xz"; - sha256 = "7fe8fde45d54b09118238f4a7a63aa2f6fc24ae14c49739ffe71cffc44bc5a95"; - name = "kanagram-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kanagram-20.08.1.tar.xz"; + sha256 = "c810db58884e80d95baef149b8ced8fff7c5e48d6057478e81a5c8895ae67b42"; + name = "kanagram-20.08.1.tar.xz"; }; }; kapman = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kapman-20.04.3.tar.xz"; - sha256 = "e3c34e94a204e6d9a4ebb35c415b8c5707313fba746867f2984fd0e95926d529"; - name = "kapman-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kapman-20.08.1.tar.xz"; + sha256 = "934da85c5d9c99a0ed658fe4d99df258246716e04e13ceb3e18b11cc035c4f4c"; + name = "kapman-20.08.1.tar.xz"; }; }; kapptemplate = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kapptemplate-20.04.3.tar.xz"; - sha256 = "72ce76b66ae503591a60081f334c2d2a0e9338a125b64de413e1e4ab81c29013"; - name = "kapptemplate-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kapptemplate-20.08.1.tar.xz"; + sha256 = "7b350467e14bc310a695ffa3481afa7857de2f6ec714915ee2d8a25a6511909b"; + name = "kapptemplate-20.08.1.tar.xz"; }; }; kate = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kate-20.04.3.tar.xz"; - sha256 = "38d92f2b95032cd20bd5b78ada2ee25fc9c06593047d063c28419df0839bc334"; - name = "kate-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kate-20.08.1.tar.xz"; + sha256 = "44607f6a1d5ca8bb7173bedbeabef65bb98dde0fd009987bd8139fbb53959146"; + name = "kate-20.08.1.tar.xz"; }; }; katomic = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/katomic-20.04.3.tar.xz"; - sha256 = "9ced288f46af528aa31931a0ab1a1b2d346d63ce6729e508163bf3370dbd261f"; - name = "katomic-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/katomic-20.08.1.tar.xz"; + sha256 = "1aa655857bb1708880b6fbf4e54acdfe1cb7f47a9494249978251d870b86f13a"; + name = "katomic-20.08.1.tar.xz"; }; }; kbackup = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbackup-20.04.3.tar.xz"; - sha256 = "0360f5b5d512a48975e09e5c1d2f035b7c2e1ead00b9b9f76059b76eb4499f92"; - name = "kbackup-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kbackup-20.08.1.tar.xz"; + sha256 = "08b0c43fca2dba65e1173841343daf8e6e37e11101be7315011e8345ba9b1e72"; + name = "kbackup-20.08.1.tar.xz"; }; }; kblackbox = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kblackbox-20.04.3.tar.xz"; - sha256 = "8bf24ceaf33fabd3ec3030b42565dcbb2d8b282553a3222d741b0b43d70d3a38"; - name = "kblackbox-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kblackbox-20.08.1.tar.xz"; + sha256 = "3f09d483fa3a3013e685df9efd9cee8d9d1b9f0e017cc97d92636bae89fc469c"; + name = "kblackbox-20.08.1.tar.xz"; }; }; kblocks = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kblocks-20.04.3.tar.xz"; - sha256 = "128cbd7751883cc46d3bc0fcf3c2fc40d8d87631ad54c90459727da209237609"; - name = "kblocks-20.04.3.tar.xz"; - }; - }; - kblog = { - version = "20.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kblog-20.04.3.tar.xz"; - sha256 = "5932a8ba3ec33f13aec201252abb6d0712740f52af03747e9eb0f6c0764cb9b4"; - name = "kblog-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kblocks-20.08.1.tar.xz"; + sha256 = "e2b6e5b0727ca45d6b0f0e8b9f0aa029a0acb9bdebeac5bfd849455e560977ed"; + name = "kblocks-20.08.1.tar.xz"; }; }; kbounce = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbounce-20.04.3.tar.xz"; - sha256 = "21977895752b7a33484463cf3fe47ff6f4d5ad4bb8ee824b92b309c5c0ee3837"; - name = "kbounce-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kbounce-20.08.1.tar.xz"; + sha256 = "99af3bd297fcbecb9eaa4222bbb5122144beff9cb999420bf45339d61375f2a4"; + name = "kbounce-20.08.1.tar.xz"; }; }; kbreakout = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbreakout-20.04.3.tar.xz"; - sha256 = "4e9bd79060d826d99573e3db364005b32d70643b0fe0d7c5e427fb1c8a34896b"; - name = "kbreakout-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kbreakout-20.08.1.tar.xz"; + sha256 = "0d57c105f2778b68c0b5ff8cb3e02d5c7ea2956b90d48d126ff1118b94d5f2fa"; + name = "kbreakout-20.08.1.tar.xz"; }; }; kbruch = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbruch-20.04.3.tar.xz"; - sha256 = "7381df5deb97580a0d60881d591b3d18715c8ad5692a580aebe82a836f1bb8df"; - name = "kbruch-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kbruch-20.08.1.tar.xz"; + sha256 = "f04bf902a31b68d18c69afff511a591817a35f5ad866de4f84aa1b664b35a41e"; + name = "kbruch-20.08.1.tar.xz"; }; }; kcachegrind = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcachegrind-20.04.3.tar.xz"; - sha256 = "ef6e782540c254eada9e75049eb02919afd7adc9940ace79aa20dcad26240770"; - name = "kcachegrind-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcachegrind-20.08.1.tar.xz"; + sha256 = "59c43296aaa7d8a5dbf782ba9248ee8bb6308e7bd7bdfc0b99e1c912529337f2"; + name = "kcachegrind-20.08.1.tar.xz"; }; }; kcalc = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcalc-20.04.3.tar.xz"; - sha256 = "1ec38e3bf0c17df25a3367d4f3d5f7ef32b9a6fb5f081c20ad0091a968a2cf4a"; - name = "kcalc-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcalc-20.08.1.tar.xz"; + sha256 = "46702fe8eca8b604e15f3f2eb4d1f17b8601b6ad0b03bb9cd0a0dd7ed7a13c49"; + name = "kcalc-20.08.1.tar.xz"; }; }; kcalutils = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcalutils-20.04.3.tar.xz"; - sha256 = "6604e0377c8955be7963853691aeaf689c00e2f78caab6b3472ffb4c822e07a3"; - name = "kcalutils-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcalutils-20.08.1.tar.xz"; + sha256 = "ae6a8ca02722f8f593a8d248ab3d043cc68be23d18f820e150af000a902601c2"; + name = "kcalutils-20.08.1.tar.xz"; }; }; kcharselect = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcharselect-20.04.3.tar.xz"; - sha256 = "0da77b66efeab1ba7c17335853f3c3feab9b53b4c37cfa6a9f983327d13080f4"; - name = "kcharselect-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcharselect-20.08.1.tar.xz"; + sha256 = "36575e9fd0a93fb3ddaf6a75a213786351bdd3ab8c167dc1a3e2824a23a6655b"; + name = "kcharselect-20.08.1.tar.xz"; }; }; kcolorchooser = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcolorchooser-20.04.3.tar.xz"; - sha256 = "276cee46f92eeb5b47ec09366498b117c657fb2e618fc9fe34c797d4384549fd"; - name = "kcolorchooser-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcolorchooser-20.08.1.tar.xz"; + sha256 = "20cae01bd5e8c824f8e7900badd0d66464c363a749a1ce9fe6fe3a1e31c99ade"; + name = "kcolorchooser-20.08.1.tar.xz"; }; }; kcron = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcron-20.04.3.tar.xz"; - sha256 = "b1d7d36e5b9efe4fd5c5fedf0b9e267fd2aaf6423e6a18bb64112a0c8257e4fa"; - name = "kcron-20.04.3.tar.xz"; - }; - }; - kdav = { - version = "20.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdav-20.04.3.tar.xz"; - sha256 = "b645d5d17c967fd09c3d7abdfc262740a95870dd66bd3e5f4c0382da097d8510"; - name = "kdav-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kcron-20.08.1.tar.xz"; + sha256 = "24ee9aee48bef951d6ac1fff32271417c4eb2239f0ec1de8388f2bae55ce83f5"; + name = "kcron-20.08.1.tar.xz"; }; }; kdebugsettings = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdebugsettings-20.04.3.tar.xz"; - sha256 = "5f42891c0990216780fbe005521e423d922007c7ddeac97a05c3c99b6fe30344"; - name = "kdebugsettings-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdebugsettings-20.08.1.tar.xz"; + sha256 = "cac50d34c8a31805924aa75755475a754109fc643e95fe50188477522d113a55"; + name = "kdebugsettings-20.08.1.tar.xz"; }; }; kdeconnect-kde = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdeconnect-kde-20.04.3.tar.xz"; - sha256 = "412940a35dcd9f1491a54e4f9fd5ffdadc890bb9a45cfe2a0f8cb1ee7dc1ccbb"; - name = "kdeconnect-kde-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdeconnect-kde-20.08.1.tar.xz"; + sha256 = "8ebfe36b4d08b36881082a3748f63a7c645b51e8f3b094607512817e9f6ce668"; + name = "kdeconnect-kde-20.08.1.tar.xz"; }; }; kde-dev-scripts = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-scripts-20.04.3.tar.xz"; - sha256 = "0b321954ea79e829d81c9be0170babae87e5eab22c8d42b296746d5a0160fbae"; - name = "kde-dev-scripts-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-scripts-20.08.1.tar.xz"; + sha256 = "f7f99a199fea69019738e6d2147e5f6e4419835aa2c39e6d60f4d2e5d629ba96"; + name = "kde-dev-scripts-20.08.1.tar.xz"; }; }; kde-dev-utils = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-utils-20.04.3.tar.xz"; - sha256 = "8f004e47bbd5ee032d711673b3320e59663087c636c9c51d031dc563b5391c83"; - name = "kde-dev-utils-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-utils-20.08.1.tar.xz"; + sha256 = "8105a5b911643dca1f0c476c9247282f80e4ea17bae06dcca63ba9638bf5d21d"; + name = "kde-dev-utils-20.08.1.tar.xz"; }; }; kdeedu-data = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdeedu-data-20.04.3.tar.xz"; - sha256 = "e717f82a1b4729f0a6df65221e9c2b01df17acf3d4eb8c2340cea23b6b65d969"; - name = "kdeedu-data-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdeedu-data-20.08.1.tar.xz"; + sha256 = "d9c10c849f94b8cff7f79747a0594b8050f19d5477799b03f803c4241a9d12b6"; + name = "kdeedu-data-20.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-mobipocket-20.04.3.tar.xz"; - sha256 = "24ce0c1565b8bc922ea08c3d6bb625ff4bba2e656545e09e410a0ff3bc84c80f"; - name = "kdegraphics-mobipocket-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-mobipocket-20.08.1.tar.xz"; + sha256 = "9974c36d90fc23d9a3a7172cf1526dc3671bf90f01f608effe92f64fce53c372"; + name = "kdegraphics-mobipocket-20.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-thumbnailers-20.04.3.tar.xz"; - sha256 = "b72bdd67738391a10672cd20667555168382285a764bd9e712e1485e7860441f"; - name = "kdegraphics-thumbnailers-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-thumbnailers-20.08.1.tar.xz"; + sha256 = "8303231f2fc44c071b3f6a477ae5335f2657dbfaba52362529aaba20973a5995"; + name = "kdegraphics-thumbnailers-20.08.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdenetwork-filesharing-20.04.3.tar.xz"; - sha256 = "8cdbe70cd4263e8be6fdc0de987cb9255efae9b747018bc5098c0882a3d69c4d"; - name = "kdenetwork-filesharing-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdenetwork-filesharing-20.08.1.tar.xz"; + sha256 = "e88f4a2f6d7b8a61ebd491eb112f51d50f9949d729022fab01223d6ea36b8a01"; + name = "kdenetwork-filesharing-20.08.1.tar.xz"; }; }; kdenlive = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdenlive-20.04.3.tar.xz"; - sha256 = "29e5fa37f4680683cc6e244cee4d0b3a0e3e3290f15c0e0b6015ae4784d7315e"; - name = "kdenlive-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdenlive-20.08.1.tar.xz"; + sha256 = "f99e3f22c3d5e41a3ca251299d010ac2bc44933091c25d360104d562a1090873"; + name = "kdenlive-20.08.1.tar.xz"; }; }; kdepim-addons = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdepim-addons-20.04.3.tar.xz"; - sha256 = "db0c70df94891bd6f90db533287269909e3442bfd0f546fa3f951d71f6268e9d"; - name = "kdepim-addons-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdepim-addons-20.08.1.tar.xz"; + sha256 = "a0bddcbe8f8f6d8c878a6b5634578522a8d485e424cf37d35bc17df9a1ffc7c2"; + name = "kdepim-addons-20.08.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdepim-apps-libs-20.04.3.tar.xz"; - sha256 = "7d69ac9cecfe0035e4806f0ff43fd41ac3755d788fffea9fd51427e1bc7027e3"; - name = "kdepim-apps-libs-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdepim-apps-libs-20.08.1.tar.xz"; + sha256 = "a0664933b3b5ff20747bf2adec9fbbecf22935129349208430d53e8c9bf5b5bb"; + name = "kdepim-apps-libs-20.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdepim-runtime-20.04.3.tar.xz"; - sha256 = "1e4cffed12098baf29d8acfc4e4e12848d36ad8f55bf75d8c089a57e6f906494"; - name = "kdepim-runtime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdepim-runtime-20.08.1.tar.xz"; + sha256 = "27a4c04dcf2eac4108a43acbdd57e3a8aa1da92443a3e7977329d0218da05c24"; + name = "kdepim-runtime-20.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-kioslaves-20.04.3.tar.xz"; - sha256 = "7d55121100d048bdab5f045126261eaad55ed58a2de97b211ad6acf03e22344b"; - name = "kdesdk-kioslaves-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-kioslaves-20.08.1.tar.xz"; + sha256 = "528cce0ea4c7c9fd53a604591eae4a70d39421ebbe62ed59bcbc80072f95c19f"; + name = "kdesdk-kioslaves-20.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-thumbnailers-20.04.3.tar.xz"; - sha256 = "e526cbad484807e11e03d85e5fc706df118e8f3327846f396e8df024b770c566"; - name = "kdesdk-thumbnailers-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-thumbnailers-20.08.1.tar.xz"; + sha256 = "5b189182f2a734f82e67e23d3293e694c51f97c0a9acd1ec5498442a3d2a3804"; + name = "kdesdk-thumbnailers-20.08.1.tar.xz"; }; }; kdf = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdf-20.04.3.tar.xz"; - sha256 = "f52e34c36cd924ae6f8fa1291d548abbf5e0bcf0c82d69a583f01dfe128332a8"; - name = "kdf-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdf-20.08.1.tar.xz"; + sha256 = "c100c87e9dbfcf7c12ce78d743f4ce3a2ec2bf3c1b0d969af1285255071195a5"; + name = "kdf-20.08.1.tar.xz"; }; }; kdialog = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdialog-20.04.3.tar.xz"; - sha256 = "75b8214980f5043d23b0226827f049815147e1206ffd64c1fe9e091e63c27a62"; - name = "kdialog-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdialog-20.08.1.tar.xz"; + sha256 = "089e8a8e85a9021b830e9b8a19ecb1999781915a716c9c2b3c99894a5d1c8dcf"; + name = "kdialog-20.08.1.tar.xz"; }; }; kdiamond = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdiamond-20.04.3.tar.xz"; - sha256 = "f1bd1c5471224d4ab2269637bd89e11e5903bf4f15f1b2a3ae01c252adad7096"; - name = "kdiamond-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kdiamond-20.08.1.tar.xz"; + sha256 = "1629dc6f70873b42081bd75dbf858da56d380c32925ddd49bd2110d458cb4b23"; + name = "kdiamond-20.08.1.tar.xz"; }; }; keditbookmarks = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/keditbookmarks-20.04.3.tar.xz"; - sha256 = "ec25b40d0ab85e3f72eb334ea7d658d6fe19ae08d626d9fbf0ad71d57594ad88"; - name = "keditbookmarks-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/keditbookmarks-20.08.1.tar.xz"; + sha256 = "8bfedffae0332dbfb611d25f3178ab7babe374155cce7c44e1aaa841934c3123"; + name = "keditbookmarks-20.08.1.tar.xz"; }; }; kfind = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kfind-20.04.3.tar.xz"; - sha256 = "ff0d412dcd4b5812eb781618c4bf52d33f4691af2b9def4ba56644b5a668ef6e"; - name = "kfind-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kfind-20.08.1.tar.xz"; + sha256 = "e49412d0eae6f77369b96ee7fa5902252294d03da1e8782460d4bba5be6bb149"; + name = "kfind-20.08.1.tar.xz"; }; }; kfloppy = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kfloppy-20.04.3.tar.xz"; - sha256 = "4e0d392471eddd23847129b5538846edd1a834f02119d312aed3698e6bfd9e1c"; - name = "kfloppy-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kfloppy-20.08.1.tar.xz"; + sha256 = "cfbe396c252acc23a929d05fe1a71099bc19ee3ab55f4f40e47780cf871852c5"; + name = "kfloppy-20.08.1.tar.xz"; }; }; kfourinline = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kfourinline-20.04.3.tar.xz"; - sha256 = "c339009355dea086c28baa454aac1c15d601e15685ba8006100f50475518875f"; - name = "kfourinline-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kfourinline-20.08.1.tar.xz"; + sha256 = "2c65dcc685d7e46da73e53ac3ab250ef4d1738bb85aa6f1b09160ff2ece364a2"; + name = "kfourinline-20.08.1.tar.xz"; }; }; kgeography = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kgeography-20.04.3.tar.xz"; - sha256 = "69b4b06cfb1f6abb5c12bb0bf9334f178af2018288ee507678efe594e0392887"; - name = "kgeography-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kgeography-20.08.1.tar.xz"; + sha256 = "f7ce4c6a00f18558aa04f4af0b71e45efc10c67f0b3454c5f0b2527a43133d30"; + name = "kgeography-20.08.1.tar.xz"; }; }; kget = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kget-20.04.3.tar.xz"; - sha256 = "930b7ed50d19e41bfead8e6d71d8ec4024d688907489c17fb9274a73e4c7c0c2"; - name = "kget-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kget-20.08.1.tar.xz"; + sha256 = "efbfc08a5a4ed3974bbdab20c5eae07cdb70f7f42e9de1c75651a57511d7e576"; + name = "kget-20.08.1.tar.xz"; }; }; kgoldrunner = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kgoldrunner-20.04.3.tar.xz"; - sha256 = "ab535067a8991a94bd7cd5a990a6120538206d241c8e8149c7b774cbdd1d0941"; - name = "kgoldrunner-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kgoldrunner-20.08.1.tar.xz"; + sha256 = "40380c0d3b65e06cdb9d9ca3791c10e0d2d300856cc49a7b3da0145b7651274b"; + name = "kgoldrunner-20.08.1.tar.xz"; }; }; kgpg = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kgpg-20.04.3.tar.xz"; - sha256 = "bcd3211ab8112f070215e8e6451021859fefc57b813bdad1b421a1f129e17cbb"; - name = "kgpg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kgpg-20.08.1.tar.xz"; + sha256 = "6b926c2adf896c3f68402ec10faf8db1e5f7c7b9fa8c1c26f9021d1fb0c975b0"; + name = "kgpg-20.08.1.tar.xz"; }; }; khangman = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/khangman-20.04.3.tar.xz"; - sha256 = "db827d20ce5f0522675d75c18fd4c804047cc2e5a2ca2f7a7421b5fc91952831"; - name = "khangman-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/khangman-20.08.1.tar.xz"; + sha256 = "fe94116ea833295a46c59a7420676925bb1038e7da86f6369d452087add40868"; + name = "khangman-20.08.1.tar.xz"; }; }; khelpcenter = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/khelpcenter-20.04.3.tar.xz"; - sha256 = "3930c321388f27925a63add5f11fe65eb34b7301fb22d78f16f5f3de8467a9ed"; - name = "khelpcenter-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/khelpcenter-20.08.1.tar.xz"; + sha256 = "217b433c1a5da966ad5dab1e89e2e719632f1e035ab92cce094c5f0848bb6e39"; + name = "khelpcenter-20.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kidentitymanagement-20.04.3.tar.xz"; - sha256 = "09e63cdb07bb38ba8c82d796212b1bd9d218dbe8adde215bff9c689c93b90917"; - name = "kidentitymanagement-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kidentitymanagement-20.08.1.tar.xz"; + sha256 = "3b34e029e99647d6742825633682ab8a5eecbe102e34ea2472cb53afb853840d"; + name = "kidentitymanagement-20.08.1.tar.xz"; }; }; kig = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kig-20.04.3.tar.xz"; - sha256 = "ccbc8f10e79f420d8a97aa00616fc29ed771721bfe22eb74b160464ac6cc3023"; - name = "kig-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kig-20.08.1.tar.xz"; + sha256 = "f318d346cd152e62ae892ade31a784f0b7b823c56fdfd64e05a330072ad95745"; + name = "kig-20.08.1.tar.xz"; }; }; kigo = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kigo-20.04.3.tar.xz"; - sha256 = "ccc4f9638bfd3e1bf7f25621e10907f08cd0354858f9a174ab8f5c51c77e8a77"; - name = "kigo-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kigo-20.08.1.tar.xz"; + sha256 = "58fa166a487c855d300c8a33758928131fc4db80cbda19a08e3de918335d2bdb"; + name = "kigo-20.08.1.tar.xz"; }; }; killbots = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/killbots-20.04.3.tar.xz"; - sha256 = "66c48ddeb49118ea8139422c0370256f88a4e3104dbe664bc25d2c63edfdf326"; - name = "killbots-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/killbots-20.08.1.tar.xz"; + sha256 = "252636f4df2af0e087f4d604f76c5d8702c38392d821281a0f6283be4e429af9"; + name = "killbots-20.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kimagemapeditor-20.04.3.tar.xz"; - sha256 = "d86f8a9e0a1aba71236f7af844076758774ab1c10b4b2fa1d244c9b5d24adf33"; - name = "kimagemapeditor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kimagemapeditor-20.08.1.tar.xz"; + sha256 = "bf391d0812e0f2dce6a11481972cf9d04f14d0bf92cad7210fa35a1fa0edf230"; + name = "kimagemapeditor-20.08.1.tar.xz"; }; }; kimap = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kimap-20.04.3.tar.xz"; - sha256 = "870d22a4f07080453ade2e1224acb563232211fe48e1beabe8c58d27730b4bfa"; - name = "kimap-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kimap-20.08.1.tar.xz"; + sha256 = "eae645ae2535c2612556e8938011cc478054c032126bb55683b95127d1b94741"; + name = "kimap-20.08.1.tar.xz"; }; }; kio-extras = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kio-extras-20.04.3.tar.xz"; - sha256 = "ff0edabe83ee4958ce7559e935f6b7ae3f76aee43ee5774543368ca334b21090"; - name = "kio-extras-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kio-extras-20.08.1.tar.xz"; + sha256 = "1122635926052f34fd35d8aeef9c3c1d892690d8372f2b7d902e6449cdab988a"; + name = "kio-extras-20.08.1.tar.xz"; + }; + }; + kio-gdrive = { + version = "20.08.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.08.1/src/kio-gdrive-20.08.1.tar.xz"; + sha256 = "5104136948ee60cd527109bb9e8830e6a12f6062a29f34bc995b2625b0280825"; + name = "kio-gdrive-20.08.1.tar.xz"; }; }; kipi-plugins = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kipi-plugins-20.04.3.tar.xz"; - sha256 = "e128ba8a2194bb0ce6a5eac97d56479003f08c1d740a56a6c8d976df1a71632a"; - name = "kipi-plugins-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kipi-plugins-20.08.1.tar.xz"; + sha256 = "b7d8f1aa087006a48d9bd7ec036ab4779e898e3b02692c91342439747cad6c5c"; + name = "kipi-plugins-20.08.1.tar.xz"; }; }; kirigami-gallery = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kirigami-gallery-20.04.3.tar.xz"; - sha256 = "1868c4782c8a9c7a80eb6b465a27cb7fc46dc9a8e47d2530559ba3b2f1131461"; - name = "kirigami-gallery-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kirigami-gallery-20.08.1.tar.xz"; + sha256 = "497886cc5a8483f068a642ce19df19f69fd105a4fb583f1a9898c885659c9df5"; + name = "kirigami-gallery-20.08.1.tar.xz"; }; }; kiriki = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kiriki-20.04.3.tar.xz"; - sha256 = "1df78a7b9e91f20841411fc2561d077dcd897211e5c20f1f526670c9f3b7a97d"; - name = "kiriki-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kiriki-20.08.1.tar.xz"; + sha256 = "51e77cbbf6a0c60487d72b03b28c08409d0b6134c983d9e420fbc4d7f73223e8"; + name = "kiriki-20.08.1.tar.xz"; }; }; kiten = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kiten-20.04.3.tar.xz"; - sha256 = "3b0bdd2b711ee67bbc194b301da3ed99d4ee75bb6ff18ab50c0a1b4c1c4ef162"; - name = "kiten-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kiten-20.08.1.tar.xz"; + sha256 = "f3764d090db8027746e83c326e833680fd669dca66dd6af095ba120e66de2901"; + name = "kiten-20.08.1.tar.xz"; }; }; kitinerary = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kitinerary-20.04.3.tar.xz"; - sha256 = "8c7dab2e28891af268d22884ecbb9cd7031c4b34352ed3b576dbb6dcb5977c7e"; - name = "kitinerary-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kitinerary-20.08.1.tar.xz"; + sha256 = "d3e0b6130b5c603bc1494404fa91ed1995e9142d66e4c3ddd5d2c79fdea856e4"; + name = "kitinerary-20.08.1.tar.xz"; }; }; kjumpingcube = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kjumpingcube-20.04.3.tar.xz"; - sha256 = "1716e1de95e8610dc80d991c4518beedbdf6d4c40a07f71a1dba0971e0a6cb9b"; - name = "kjumpingcube-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kjumpingcube-20.08.1.tar.xz"; + sha256 = "226424cd21f75c499eedd15460a466988b179312467ed16437df87be494d9fbc"; + name = "kjumpingcube-20.08.1.tar.xz"; }; }; kldap = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kldap-20.04.3.tar.xz"; - sha256 = "ab32ef61da11f1401f9d648f6831a946dd6964ffd4f35f6c84ad9ca19dd422f1"; - name = "kldap-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kldap-20.08.1.tar.xz"; + sha256 = "098fb07b280ef25dcf04b18f627223014257f6c0874b2959f2a8e68cacdb74a7"; + name = "kldap-20.08.1.tar.xz"; }; }; kleopatra = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kleopatra-20.04.3.tar.xz"; - sha256 = "59c6eb6b626b502f6b194ac4bbde8ed95e613d6b6fd54818c0206dd84575a34d"; - name = "kleopatra-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kleopatra-20.08.1.tar.xz"; + sha256 = "e7bc3ce03ad5431e4289360ba6b701e38d53b60de58fd1ed358480cec48657a6"; + name = "kleopatra-20.08.1.tar.xz"; }; }; klettres = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/klettres-20.04.3.tar.xz"; - sha256 = "ed943bce624a599f7759487d0ff3b16c340f2beadbad25dab30b6607dbd2695e"; - name = "klettres-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/klettres-20.08.1.tar.xz"; + sha256 = "f29d6df1de3562731f246a892caaa493b9bccc9d1317a948e03ad12cb8c80c06"; + name = "klettres-20.08.1.tar.xz"; }; }; klickety = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/klickety-20.04.3.tar.xz"; - sha256 = "703158b1c1cafc16368fa09c4c58ea6d10942b90af693a851f9b5ec84add691d"; - name = "klickety-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/klickety-20.08.1.tar.xz"; + sha256 = "a9b63b3e944faba25498e981c06981dc354f9acd34b77f46fe2bebef388bf2cb"; + name = "klickety-20.08.1.tar.xz"; }; }; klines = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/klines-20.04.3.tar.xz"; - sha256 = "83bebb2dbb7da8e325a378da3903246ff562c56dcf9ea4991dedb5b253c81f7d"; - name = "klines-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/klines-20.08.1.tar.xz"; + sha256 = "d16650d7d44f48f47700dcb8fe97519dd28fe7213052636363d281c24f46a2b9"; + name = "klines-20.08.1.tar.xz"; }; }; kmag = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmag-20.04.3.tar.xz"; - sha256 = "f006b2e3b685accc343cdfc8b90d915e7c2647d983b66c2d38565d669ed6d464"; - name = "kmag-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmag-20.08.1.tar.xz"; + sha256 = "0aaaf19af2c943ae460dbcc1984bae167b79be287802e8a6faa6aaaed11718f3"; + name = "kmag-20.08.1.tar.xz"; }; }; kmahjongg = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmahjongg-20.04.3.tar.xz"; - sha256 = "1f4fce58163323c23aa37f849e556ee4ed7fe33fb36e21754116e1d0e2c33673"; - name = "kmahjongg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmahjongg-20.08.1.tar.xz"; + sha256 = "842b3d2e9c60b6a8e6bb6d09f26db49d988889ec3962ac40aea0e79434c2eb43"; + name = "kmahjongg-20.08.1.tar.xz"; }; }; kmail = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmail-20.04.3.tar.xz"; - sha256 = "5b653c680097a7be4ff53bc902bc3fcda9edac99f699a63a1375a1df81240d03"; - name = "kmail-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmail-20.08.1.tar.xz"; + sha256 = "7ba5854e36e2ed752baa3a1ac15d1a6227699da6f5bdca3c250f22226b4d902b"; + name = "kmail-20.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmail-account-wizard-20.04.3.tar.xz"; - sha256 = "ba789c679664a390480808431510d7d6ee1591a5f7be3dfceb5951347e3cc9b1"; - name = "kmail-account-wizard-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmail-account-wizard-20.08.1.tar.xz"; + sha256 = "7a1dc9ad542c0e54b80e955a162888c7d4b6bababcf02681d54af4480c03bd8d"; + name = "kmail-account-wizard-20.08.1.tar.xz"; }; }; kmailtransport = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmailtransport-20.04.3.tar.xz"; - sha256 = "45685bf61f24c9c7070a9f5b982d48005a7bf0ef04f391df2959772b17857cc2"; - name = "kmailtransport-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmailtransport-20.08.1.tar.xz"; + sha256 = "4cabad74e141891546b0f47f44030eeb59fb63257a5c0d1c12124815ebf710c1"; + name = "kmailtransport-20.08.1.tar.xz"; }; }; kmbox = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmbox-20.04.3.tar.xz"; - sha256 = "50b2a8ba98cf24117ba66ddb9b51d1db575998b36ad1aa15fec0135446cc7561"; - name = "kmbox-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmbox-20.08.1.tar.xz"; + sha256 = "df77b2bf448d1ce21ff4a816f1164297519b48cd60200cea0edae6e72a81a19b"; + name = "kmbox-20.08.1.tar.xz"; }; }; kmime = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmime-20.04.3.tar.xz"; - sha256 = "a416e16f61a2dd4274b1abc54af71ffe73b01c93137bc1fa462642bb947d150c"; - name = "kmime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmime-20.08.1.tar.xz"; + sha256 = "cd0beaa46040d571b505d07853be76f099289e22d99ce4884695d4d645dfbe8c"; + name = "kmime-20.08.1.tar.xz"; }; }; kmines = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmines-20.04.3.tar.xz"; - sha256 = "8a729ffd6406d7d6173fbd050e40a566b5ce4e7b960f3971fff82fef9c18c4d3"; - name = "kmines-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmines-20.08.1.tar.xz"; + sha256 = "eeb58941c94330f3ffdca60c0ca84d8ebcc9c6c355737217b521c54e50c650cd"; + name = "kmines-20.08.1.tar.xz"; }; }; kmix = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmix-20.04.3.tar.xz"; - sha256 = "1830bc59d836d2155fd7a24c5afe3c7f5682a96217c159a062fd28b851414dc6"; - name = "kmix-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmix-20.08.1.tar.xz"; + sha256 = "012d14adbb200a7e66ddbc9ebc8e18c4e5082ae24dea6ab22284b6c730a1b472"; + name = "kmix-20.08.1.tar.xz"; }; }; kmousetool = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmousetool-20.04.3.tar.xz"; - sha256 = "acf710dcdc53e58d3a833345f88214b22dfbd5ab9fd26d9e26c883c18441c715"; - name = "kmousetool-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmousetool-20.08.1.tar.xz"; + sha256 = "c1d769efdd318eb1e29905122c579c72a41da74b45a076b79cf177b1800e1464"; + name = "kmousetool-20.08.1.tar.xz"; }; }; kmouth = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmouth-20.04.3.tar.xz"; - sha256 = "edc1aab8edd13f3f10f99b79a27dabaffe22ac7048868dd7b66b33a662cc46b2"; - name = "kmouth-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmouth-20.08.1.tar.xz"; + sha256 = "d87fb47fa00c54f13cdaef33d15cc74f31d7009d4a8d988902b62c698d1e2c2c"; + name = "kmouth-20.08.1.tar.xz"; }; }; kmplot = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmplot-20.04.3.tar.xz"; - sha256 = "57389abae04c204d0c2462709b70a919e0050b20867bcb23f3ab72788051e501"; - name = "kmplot-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kmplot-20.08.1.tar.xz"; + sha256 = "6d294a89f9e0fc42262ada6d71ba5abaeb756beb194e71f1852e18ae2b85456e"; + name = "kmplot-20.08.1.tar.xz"; }; }; knavalbattle = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knavalbattle-20.04.3.tar.xz"; - sha256 = "78feb74eb2e52d4738e5aa8969dc4db00307bb758623cbf34d7f245242f07279"; - name = "knavalbattle-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/knavalbattle-20.08.1.tar.xz"; + sha256 = "e0cbffc5643aac302c53cfd957eefa7f89486fdd0d9c55b74f39d733a0ac3b65"; + name = "knavalbattle-20.08.1.tar.xz"; }; }; knetwalk = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knetwalk-20.04.3.tar.xz"; - sha256 = "6bc61fb70eb0cde3f312aa672f848447ed5eb5bbc2d48d65c6a010c12e154054"; - name = "knetwalk-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/knetwalk-20.08.1.tar.xz"; + sha256 = "30cbf7bdf5f875ce172a382ef7da8e74803015017c6cd525cb6c288defac020d"; + name = "knetwalk-20.08.1.tar.xz"; }; }; knights = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knights-20.04.3.tar.xz"; - sha256 = "b695e1f141dc3fd1a5deca6179bddb0f3d4aa9103c5cc539c01a2a789adade4f"; - name = "knights-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/knights-20.08.1.tar.xz"; + sha256 = "58518d8ecce5744fdf68c18e0803f48cb912fa29c5ea93ed6ccd2d4d320f722d"; + name = "knights-20.08.1.tar.xz"; }; }; knotes = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knotes-20.04.3.tar.xz"; - sha256 = "90c47b902f738492286d9b3e0acb26e6a10504e1c933f921213cd1784309b796"; - name = "knotes-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/knotes-20.08.1.tar.xz"; + sha256 = "7d066a34d46684f258481466875d18f99a9000d66dec36f7dcab92790f6c57bb"; + name = "knotes-20.08.1.tar.xz"; }; }; kolf = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kolf-20.04.3.tar.xz"; - sha256 = "dc2fd28fbfaa21d75ad6482513adddb9bd04ac0432d2d72419f85d65140ee186"; - name = "kolf-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kolf-20.08.1.tar.xz"; + sha256 = "04d117895a6504d6138d1e3cd3157dd3318ba93eefd749182556344650f6a2f8"; + name = "kolf-20.08.1.tar.xz"; }; }; kollision = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kollision-20.04.3.tar.xz"; - sha256 = "49365efc2cfc4c9406cbedf84ad8a135df79536cba166cd77402955803a56207"; - name = "kollision-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kollision-20.08.1.tar.xz"; + sha256 = "858d69131951734181b449ce48498b3b843634eb8c069c932042b3c0f862f98c"; + name = "kollision-20.08.1.tar.xz"; }; }; kolourpaint = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kolourpaint-20.04.3.tar.xz"; - sha256 = "55ec6d42fcf10b15b80b6fdabacdf189d1cda283a19a1c04b6a4a58abb56bee8"; - name = "kolourpaint-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kolourpaint-20.08.1.tar.xz"; + sha256 = "7de98e081f13fb9f8a73932d5e8ce6f1cfd73e345fa28d03f515cad69f1b8bae"; + name = "kolourpaint-20.08.1.tar.xz"; }; }; kompare = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kompare-20.04.3.tar.xz"; - sha256 = "6c49547c3adbe96c184bae6eda47963ce42ede2808e5588ec3f8ea924853a941"; - name = "kompare-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kompare-20.08.1.tar.xz"; + sha256 = "6e9109f1b24b3d79dec3d70c75357a67d16ab35081bcf7e4b842981b84796aa2"; + name = "kompare-20.08.1.tar.xz"; }; }; konqueror = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/konqueror-20.04.3.tar.xz"; - sha256 = "d2f81f697e88eb4fe962aaa43942ef35e7a03df10f811a46ae6805a27e637e35"; - name = "konqueror-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/konqueror-20.08.1.tar.xz"; + sha256 = "e3aac062d9e431e63a861ecf5a1d577b11a154faaed5bd95ef6b69b4fc8a34e9"; + name = "konqueror-20.08.1.tar.xz"; }; }; konquest = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/konquest-20.04.3.tar.xz"; - sha256 = "004b3d8d38acecb0d5e78d037a47d137f0517d74768da461ce51fbd2a549578d"; - name = "konquest-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/konquest-20.08.1.tar.xz"; + sha256 = "cad87dd698bd1ebc0279216614f7fa7c3d3f36d545683a69f1ceafe9e279bbfe"; + name = "konquest-20.08.1.tar.xz"; }; }; konsole = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/konsole-20.04.3.tar.xz"; - sha256 = "7874b6117d31eecd9fc475536c9bfc73c78d66d57b128cffb0bb931881564f15"; - name = "konsole-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/konsole-20.08.1.tar.xz"; + sha256 = "bdd82f9104b2f76c53bdbdef613391719b70719a132d24f12e5f620e1c9313d1"; + name = "konsole-20.08.1.tar.xz"; }; }; kontact = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kontact-20.04.3.tar.xz"; - sha256 = "c35a68a0a99195d1d9b63f7c8edaadb9e4f1dd6957e3823e2e44c8225ccafde7"; - name = "kontact-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kontact-20.08.1.tar.xz"; + sha256 = "36c33eb5685c22f94257e86ff760d1aa225ae6e2d69402a2b653c54627c7cbde"; + name = "kontact-20.08.1.tar.xz"; }; }; kontactinterface = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kontactinterface-20.04.3.tar.xz"; - sha256 = "9c0587df91b9de55218d7313c445c68d13b22aeb09dc142caf8d8036574e3b09"; - name = "kontactinterface-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kontactinterface-20.08.1.tar.xz"; + sha256 = "8272d0c17423a15e56e9e6d3979ee3017fd02ed996b8b6902c47312276ffeb51"; + name = "kontactinterface-20.08.1.tar.xz"; }; }; kopete = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kopete-20.04.3.tar.xz"; - sha256 = "b37a120e3239ee4e53aedf5756c63f62a737c0774021ec27b120b054e57f886b"; - name = "kopete-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kopete-20.08.1.tar.xz"; + sha256 = "9846baae28d723963927d231716e2a8bc19795bac920958b688b48394ef5bc05"; + name = "kopete-20.08.1.tar.xz"; }; }; korganizer = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/korganizer-20.04.3.tar.xz"; - sha256 = "bf2ee5a3e50dca9ab0cde0b5b0d67dc561788527a216d4ef159144da5bf192a3"; - name = "korganizer-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/korganizer-20.08.1.tar.xz"; + sha256 = "e693d895b36575f2a73c36ceaafadf81465bbf9b03c74da27f5273a2e7e3670e"; + name = "korganizer-20.08.1.tar.xz"; }; }; kpat = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kpat-20.04.3.tar.xz"; - sha256 = "2a207c9efa1a62c99f8b33cf44782c563ee032b706ef63548239a4c303ec9a66"; - name = "kpat-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kpat-20.08.1.tar.xz"; + sha256 = "2c23ee028c03c5c210b110a2ad253aa7d91c5a0abcb101eb2b3f4c640092463c"; + name = "kpat-20.08.1.tar.xz"; }; }; kpimtextedit = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kpimtextedit-20.04.3.tar.xz"; - sha256 = "f6cc5cf0ca2e598ba0c98590f16a8fabf87e1592ad62e6832c787cf2c3616cb8"; - name = "kpimtextedit-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kpimtextedit-20.08.1.tar.xz"; + sha256 = "2664e6cbe520fa345e18db071dd5b8a5b4cf9b0fc7317eb04849005228666189"; + name = "kpimtextedit-20.08.1.tar.xz"; }; }; kpkpass = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kpkpass-20.04.3.tar.xz"; - sha256 = "1f8b9bd587c278773fb016bc9fb774b03f82bcdf3c95fdca8bfc070f9a3ff322"; - name = "kpkpass-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kpkpass-20.08.1.tar.xz"; + sha256 = "76012e5bdd4cc434313a0f311acec8f7c798542008cd8efa71fcdf04fb77e55b"; + name = "kpkpass-20.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kqtquickcharts-20.04.3.tar.xz"; - sha256 = "69ff44ceb85779f7d4f52e092a8a5d18231ea0704d67d34d15ef94acf0d668c7"; - name = "kqtquickcharts-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kqtquickcharts-20.08.1.tar.xz"; + sha256 = "ea931bfefcc04bee03bff2498b92ca1a390967bbc5366c739d1a7cde6bb75820"; + name = "kqtquickcharts-20.08.1.tar.xz"; }; }; krdc = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/krdc-20.04.3.tar.xz"; - sha256 = "4e8f60b4abd05d45e59a773a63cc185529e9fbabb295524a59c835af547d4bc8"; - name = "krdc-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/krdc-20.08.1.tar.xz"; + sha256 = "7b1fa57be31a3534099e7f203ef9afde23c86c4bbed1072a9d1164a3cf5e1e20"; + name = "krdc-20.08.1.tar.xz"; }; }; kreversi = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kreversi-20.04.3.tar.xz"; - sha256 = "b2d9220f5919361ff81473c8b597585cc4c004b16ee459691e26feeb2e0c3114"; - name = "kreversi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kreversi-20.08.1.tar.xz"; + sha256 = "5da68ddd37f5dbd4e1c94d1641c69f0e9b4e99eff3cdafcdcbac1139ca517315"; + name = "kreversi-20.08.1.tar.xz"; }; }; krfb = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/krfb-20.04.3.tar.xz"; - sha256 = "44532435ef824ff09d877d6984dbdfdcc5fd941f9e2abed65829dba89afeee0d"; - name = "krfb-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/krfb-20.08.1.tar.xz"; + sha256 = "a80b9bab47f2a7299e33b0e2a10b117605ec1cc572ca72e914c7f01dde383eda"; + name = "krfb-20.08.1.tar.xz"; }; }; kross-interpreters = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kross-interpreters-20.04.3.tar.xz"; - sha256 = "7e5d1f771477831f42dc209c0333977af17a143ec8c7f60acbab9f5390818457"; - name = "kross-interpreters-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kross-interpreters-20.08.1.tar.xz"; + sha256 = "1fb7d75d83e63d1a7147468dd25eeb6aeb06b4679f126c658a8b40ef257f9a4e"; + name = "kross-interpreters-20.08.1.tar.xz"; }; }; kruler = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kruler-20.04.3.tar.xz"; - sha256 = "66a02829d860777184e281747dd696c6bd326d874a96173d9c47759b9e7243fe"; - name = "kruler-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kruler-20.08.1.tar.xz"; + sha256 = "a9a1f3bd7b02416a393826f7bb810211ef2e14a3628706de735cb88e791d72d1"; + name = "kruler-20.08.1.tar.xz"; }; }; kshisen = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kshisen-20.04.3.tar.xz"; - sha256 = "ee91821b13dc13d54a0cdf64582eff820faf934df3654135c55bd3210b98bd52"; - name = "kshisen-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kshisen-20.08.1.tar.xz"; + sha256 = "d53af415ed2f4d202f5a6f965408e39062e39f43acf83b9550b6cf2ecc1f7641"; + name = "kshisen-20.08.1.tar.xz"; }; }; ksirk = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksirk-20.04.3.tar.xz"; - sha256 = "c3c86db84b2603a0cd11e7b0da5e3c66b81c26983ace113b836ec3579dce736a"; - name = "ksirk-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksirk-20.08.1.tar.xz"; + sha256 = "763d3a8f518365391d2a04943f6efa9c73c388b7701deff300e9e42e4efe848f"; + name = "ksirk-20.08.1.tar.xz"; }; }; ksmtp = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksmtp-20.04.3.tar.xz"; - sha256 = "107d135e9337dfec6f16095c75dd0cf81bdc86cee6eeb6d212954a08a9c2e3ce"; - name = "ksmtp-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksmtp-20.08.1.tar.xz"; + sha256 = "608d395cd1a046810ebd00f990d6f7c63d66677e7293ef06948ab9d336d2f08f"; + name = "ksmtp-20.08.1.tar.xz"; }; }; ksnakeduel = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksnakeduel-20.04.3.tar.xz"; - sha256 = "99a033313a3093489d39e7d537d064287aeebbfea05accfe8a189f0296664bf2"; - name = "ksnakeduel-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksnakeduel-20.08.1.tar.xz"; + sha256 = "25bb5cfe2ed480b8ee31d9fe2e62272d77e7b8667748eb4f2c855901f718784f"; + name = "ksnakeduel-20.08.1.tar.xz"; }; }; kspaceduel = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kspaceduel-20.04.3.tar.xz"; - sha256 = "dda32d2a89645129c7ee83aca7b21bc01d5120e0d58e8f39516c0837be531e38"; - name = "kspaceduel-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kspaceduel-20.08.1.tar.xz"; + sha256 = "382def18d1ce6a4333fb47bcd87aed6837382a2b0da2cb8b835d0b34eaed9e38"; + name = "kspaceduel-20.08.1.tar.xz"; }; }; ksquares = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksquares-20.04.3.tar.xz"; - sha256 = "eb72d929cd59b076d20483ee03548d72df3dc894b631947ce3440aff0ecad730"; - name = "ksquares-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksquares-20.08.1.tar.xz"; + sha256 = "163c5c070643e31594ada4e812433eb5f615ef425dddafd515e6c445d821f319"; + name = "ksquares-20.08.1.tar.xz"; }; }; ksudoku = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksudoku-20.04.3.tar.xz"; - sha256 = "2df6e5cf78eee919624aa71716ef35baa9215e44662cdd7b315cfbc328c6ac19"; - name = "ksudoku-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksudoku-20.08.1.tar.xz"; + sha256 = "e53b694b340f812cd3bdf5126a32a1e71efe0785897c5d15f9e28c68fd794840"; + name = "ksudoku-20.08.1.tar.xz"; }; }; ksystemlog = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksystemlog-20.04.3.tar.xz"; - sha256 = "03a6f81d1b4aa8557f7da6777ef909a02fbd811b3a39df81312dc0a70bbb8f77"; - name = "ksystemlog-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ksystemlog-20.08.1.tar.xz"; + sha256 = "e0e8bc1cf8ee229206c8a65e30979ba8b72426c8dc2f737f6fecb0dfb36ed21a"; + name = "ksystemlog-20.08.1.tar.xz"; }; }; kteatime = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kteatime-20.04.3.tar.xz"; - sha256 = "2ddc0df953a66376e5b0c11544a6a2ec9f173e4481a44a290aada20402c7d686"; - name = "kteatime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kteatime-20.08.1.tar.xz"; + sha256 = "23cc14f587e4ae4e3b56f1fb7a2093301df740328e35b25d7fca55d35f012ce5"; + name = "kteatime-20.08.1.tar.xz"; }; }; ktimer = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktimer-20.04.3.tar.xz"; - sha256 = "e9881d68ed4fbbff5900d615f81145cd73e70a08092a83b87d71705ee5904395"; - name = "ktimer-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktimer-20.08.1.tar.xz"; + sha256 = "9c7062f9ee64ff49a7c7773fe41cee0899e30f1f47368af73da067e51db6714b"; + name = "ktimer-20.08.1.tar.xz"; }; }; ktnef = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktnef-20.04.3.tar.xz"; - sha256 = "31f5f15ab27112f99ab7b2575a4f90bf612b99a3816544e6919ad4c5a2dc7145"; - name = "ktnef-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktnef-20.08.1.tar.xz"; + sha256 = "433b232a0c835e7f27c06e6d19856e4f8690c3e3b5c5d63f85172897b2448c81"; + name = "ktnef-20.08.1.tar.xz"; }; }; ktouch = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktouch-20.04.3.tar.xz"; - sha256 = "7f1c456ae758a6e7eb58e83120289fa8eb5c56c3c98cd9c9f974cea5dd156ea8"; - name = "ktouch-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktouch-20.08.1.tar.xz"; + sha256 = "e098ebbccca743f678103a9adf54fc388fa4379cc6f667e48259d0b50f56b5fb"; + name = "ktouch-20.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-accounts-kcm-20.04.3.tar.xz"; - sha256 = "d45588dbd1441ccb0576e7f76489217351bad5fd25d4636ae9da6f81654f5f4b"; - name = "ktp-accounts-kcm-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-accounts-kcm-20.08.1.tar.xz"; + sha256 = "b71f2f654c3cf48e4b4b037a0ae8f6fef5bac9c3483458c0eadf7b3253577504"; + name = "ktp-accounts-kcm-20.08.1.tar.xz"; }; }; ktp-approver = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-approver-20.04.3.tar.xz"; - sha256 = "9c91d44476151f39ef02e2eeede7dee7f24689643a07d51d44ca8d98577d24a2"; - name = "ktp-approver-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-approver-20.08.1.tar.xz"; + sha256 = "51296f4d84585ba63d4c72cdbdee6e2b436a1aff8ce6b475a8c9a81766856b39"; + name = "ktp-approver-20.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-auth-handler-20.04.3.tar.xz"; - sha256 = "6c73960c44ff42e8c0b6be54b308fc992ab8177f90954ebd960ea6d610e14568"; - name = "ktp-auth-handler-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-auth-handler-20.08.1.tar.xz"; + sha256 = "6c1c006a3381caeebdfc37886b91b598153f3778567303d8a031e84599c9d582"; + name = "ktp-auth-handler-20.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-call-ui-20.04.3.tar.xz"; - sha256 = "b997c6252c35f7e295f2389ac76c5dc12227e8a6bbfd1b42d72b622d488bcf98"; - name = "ktp-call-ui-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-call-ui-20.08.1.tar.xz"; + sha256 = "feb783be10b0792cb0c59456a00607b2d595e8bef90f0b4ec79dd070596d413c"; + name = "ktp-call-ui-20.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-common-internals-20.04.3.tar.xz"; - sha256 = "0e7a1c61869d297831615c719e5c79f2b00a6572479d2c2eaca642de6d376efd"; - name = "ktp-common-internals-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-common-internals-20.08.1.tar.xz"; + sha256 = "5750bde4950fbe26f06a306aa642c9c501d4f0e1b41b57234d9e36b189a91d1b"; + name = "ktp-common-internals-20.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-list-20.04.3.tar.xz"; - sha256 = "c909e21fb168c14c61d1d617b6854ff505eaf4693479d8d0bba746fde0ee11af"; - name = "ktp-contact-list-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-list-20.08.1.tar.xz"; + sha256 = "809db5ff05c1ec632109be408cef987532193b1b0bea69d6a9286c12ccfe19a1"; + name = "ktp-contact-list-20.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-runner-20.04.3.tar.xz"; - sha256 = "cb3313ca916a7e3fff78529ccc4a499763766957d22f65dee9663cd950c2b4a6"; - name = "ktp-contact-runner-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-runner-20.08.1.tar.xz"; + sha256 = "a9e761fd35545cfffade088e33f4358e2743416f61e9ba490f21f3b04193158f"; + name = "ktp-contact-runner-20.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-desktop-applets-20.04.3.tar.xz"; - sha256 = "40f1125d4d91e2586d06d45b59d12ac19ee93aaae8c3d4df75db196f7e91e875"; - name = "ktp-desktop-applets-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-desktop-applets-20.08.1.tar.xz"; + sha256 = "d6ffd4b29c4fb977937cb47d55d023012be1a9b3602dd1f1628eba7d8c9167cd"; + name = "ktp-desktop-applets-20.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-filetransfer-handler-20.04.3.tar.xz"; - sha256 = "74df7140bac0b87e3ff39e8ab692bb4c65a10612f328c8d60a84433ae865de52"; - name = "ktp-filetransfer-handler-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-filetransfer-handler-20.08.1.tar.xz"; + sha256 = "35495c1d18a7b65496fcf17cade4a81e4795b1603c380c036dda0a7626f66312"; + name = "ktp-filetransfer-handler-20.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-kded-module-20.04.3.tar.xz"; - sha256 = "972a4a5d7108351a07be670654b4e78dfe9fb7657336c563040e1e831134aad2"; - name = "ktp-kded-module-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-kded-module-20.08.1.tar.xz"; + sha256 = "247e4047e3955e21066ec461a5374d1b3d925bb92b42adc46d3711e542ad7e04"; + name = "ktp-kded-module-20.08.1.tar.xz"; }; }; ktp-send-file = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-send-file-20.04.3.tar.xz"; - sha256 = "fa67edd7ec516ed727d5df0d30ccf6b990cee40f8062a9966a8643d6f26c8344"; - name = "ktp-send-file-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-send-file-20.08.1.tar.xz"; + sha256 = "b3786c6e6f09ea086c2d94d2a6dd653e45bab8f984c6287c39f5e0134d6ffee1"; + name = "ktp-send-file-20.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-text-ui-20.04.3.tar.xz"; - sha256 = "be6253246134aa6513b0ff36d25a833d469e6850da1f5c8c05666a555bbfd9b2"; - name = "ktp-text-ui-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktp-text-ui-20.08.1.tar.xz"; + sha256 = "5cdb88f55b6ca1a1053b8d5b2604eff681c5f3558f0c8037034c264793de8c02"; + name = "ktp-text-ui-20.08.1.tar.xz"; }; }; ktuberling = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktuberling-20.04.3.tar.xz"; - sha256 = "0fb7ef29c5bf02de56243e608a050fce992df56586d305a157ed3ac70f002a44"; - name = "ktuberling-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/ktuberling-20.08.1.tar.xz"; + sha256 = "62d3d8db7b1db7f9d58df44acf61342ce42fb081038fc48f8f6e45d9167ceaa6"; + name = "ktuberling-20.08.1.tar.xz"; }; }; kturtle = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kturtle-20.04.3.tar.xz"; - sha256 = "e04034812c62e22be0ee7eb91d89a9e0e0c73bb5cba8e914373f407c99e8c0cb"; - name = "kturtle-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kturtle-20.08.1.tar.xz"; + sha256 = "c261fdf44b36aaa278b4b9752a0d989facec3768853606e5c0b8a86d9d01edb3"; + name = "kturtle-20.08.1.tar.xz"; }; }; kubrick = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kubrick-20.04.3.tar.xz"; - sha256 = "983310938ad0437902d886f433b0693a3a08faaca0f5553a3aa24e89e3215fb9"; - name = "kubrick-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kubrick-20.08.1.tar.xz"; + sha256 = "c0c017f6913f94224e18df7d96ba9ad92f51522a331b77f5722f2d2c953c342c"; + name = "kubrick-20.08.1.tar.xz"; }; }; kwalletmanager = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kwalletmanager-20.04.3.tar.xz"; - sha256 = "3821d17f5238bd51b9d19ef5974e063aa6426f35afcd0cffa89af109c770151e"; - name = "kwalletmanager-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kwalletmanager-20.08.1.tar.xz"; + sha256 = "b5a134db6b6bceb802c6c45915636bcd95fea5b6846cfd022917405f48cc92c5"; + name = "kwalletmanager-20.08.1.tar.xz"; }; }; kwave = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kwave-20.04.3.tar.xz"; - sha256 = "111ea78c90371f566500e88d746812b17875e154e431b3694e3d226f3f19e988"; - name = "kwave-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kwave-20.08.1.tar.xz"; + sha256 = "3791f9401271c23d3ababd14e4c1e6acfe58df2100331e31ba61453feaf9fa32"; + name = "kwave-20.08.1.tar.xz"; }; }; kwordquiz = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kwordquiz-20.04.3.tar.xz"; - sha256 = "464684309e098c4e8663d39cd98f53a640a93e1d8ac169a2a0ac3cc98d7f8e12"; - name = "kwordquiz-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/kwordquiz-20.08.1.tar.xz"; + sha256 = "77d2d30abcb37ee6a8e0b121ed1969f2fa61eb32814f49a0186043a4e8f1a71c"; + name = "kwordquiz-20.08.1.tar.xz"; }; }; libgravatar = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libgravatar-20.04.3.tar.xz"; - sha256 = "0a5eadd5c8492eb17225e0ff2d221f69231e72ca9b8a78080301639662a18acf"; - name = "libgravatar-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libgravatar-20.08.1.tar.xz"; + sha256 = "dfe95055869944b79b1f4120f013b547225b02b69c7e410fd09d52469a892263"; + name = "libgravatar-20.08.1.tar.xz"; }; }; libkcddb = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkcddb-20.04.3.tar.xz"; - sha256 = "d205d3a458c0d54d7118e36006710fe2d2993de5b417c9d8936762fa710634b4"; - name = "libkcddb-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkcddb-20.08.1.tar.xz"; + sha256 = "1519c9248b46d95d8761a8ed22b0805964a5fef5aa665710b08851c753f70590"; + name = "libkcddb-20.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkcompactdisc-20.04.3.tar.xz"; - sha256 = "5bc98eba521f66cb52645786cf875037397e4dbd3ec4c9a23687d936d1505d24"; - name = "libkcompactdisc-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkcompactdisc-20.08.1.tar.xz"; + sha256 = "f43b8129a0083686dbc939387931867d9d65e14936f2a86be0a7286e01cf1974"; + name = "libkcompactdisc-20.08.1.tar.xz"; }; }; libkdcraw = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkdcraw-20.04.3.tar.xz"; - sha256 = "e37e9210a250955d1fe63d2d96571d0630572633e567eb047af9f24db2b86cb5"; - name = "libkdcraw-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkdcraw-20.08.1.tar.xz"; + sha256 = "3431810972d886635ba6249ac86a9442a9c3a3333eb0b27533fc459e757e9eb1"; + name = "libkdcraw-20.08.1.tar.xz"; }; }; libkdegames = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkdegames-20.04.3.tar.xz"; - sha256 = "fda965e2ff166abe89cf008a5160262f061a6c3aeda4a71a834b5ed66ea6d0be"; - name = "libkdegames-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkdegames-20.08.1.tar.xz"; + sha256 = "6ab0b143dcba2d935dd0182c9154657ebbfb205c28bc86e2e13875b58e23737d"; + name = "libkdegames-20.08.1.tar.xz"; }; }; libkdepim = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkdepim-20.04.3.tar.xz"; - sha256 = "f4ecc6d33aace0a0025afe390a113f79bb052b816c567ea31996aaf08fe873ea"; - name = "libkdepim-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkdepim-20.08.1.tar.xz"; + sha256 = "a2fb769239283e7f536d4779089ad8664d1498cf7520f057589bf0285630fb4b"; + name = "libkdepim-20.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkeduvocdocument-20.04.3.tar.xz"; - sha256 = "a53e17a84420fca8f9572d8439da2c63d1241a607952454003a4020104a25558"; - name = "libkeduvocdocument-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkeduvocdocument-20.08.1.tar.xz"; + sha256 = "ecd158beb7fcc1a5d540d956669c6fdce6172f4b282755170d2791076d75ad84"; + name = "libkeduvocdocument-20.08.1.tar.xz"; }; }; libkexiv2 = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkexiv2-20.04.3.tar.xz"; - sha256 = "12fa569aca07269e880bd976a6cc37b4f585fe2aac8837d437bc29999d95f6be"; - name = "libkexiv2-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkexiv2-20.08.1.tar.xz"; + sha256 = "67310ae90d89f26d2ae98ede8fa973e27ea1ce3d15c389954d391cd058543979"; + name = "libkexiv2-20.08.1.tar.xz"; }; }; libkgapi = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkgapi-20.04.3.tar.xz"; - sha256 = "9b689d8c4a1df0b792604cf5951b30d8343e984d890f4a3fb946a449723e520d"; - name = "libkgapi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkgapi-20.08.1.tar.xz"; + sha256 = "dfa9003556a01ef19eda186973f87356d32ea8f82f8d653803b2cc935f077127"; + name = "libkgapi-20.08.1.tar.xz"; }; }; libkgeomap = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkgeomap-20.04.3.tar.xz"; - sha256 = "34e41b2505a34355a31a548bb8f94955b3dc4391c71201164574ff45b532818d"; - name = "libkgeomap-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkgeomap-20.08.1.tar.xz"; + sha256 = "a210945b6807efca3390173233269aa31f27a23b5f36670b88f66b3b28df846f"; + name = "libkgeomap-20.08.1.tar.xz"; }; }; libkipi = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkipi-20.04.3.tar.xz"; - sha256 = "4a72f0d1423a6a6f7017bf0598c99261575feb4d9af73520074f6f0b7f9e4c25"; - name = "libkipi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkipi-20.08.1.tar.xz"; + sha256 = "4722ab563c1350042920d1937b84fdd38b5779449a2d9b689328cd82241cb5d2"; + name = "libkipi-20.08.1.tar.xz"; }; }; libkleo = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkleo-20.04.3.tar.xz"; - sha256 = "ef2a37a1c8793e4c89dcf49bc330044a617b4b04472679b179992b188e412c50"; - name = "libkleo-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkleo-20.08.1.tar.xz"; + sha256 = "78c1dc2e4d7177aaf37cb1c706d9c21b08fac7d130ac1da3d3f2a6f083117ffb"; + name = "libkleo-20.08.1.tar.xz"; }; }; libkmahjongg = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkmahjongg-20.04.3.tar.xz"; - sha256 = "24fcff9d91c5143c7275c5c97c2be32e85f5c788749df3acc841fd28bee450a0"; - name = "libkmahjongg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkmahjongg-20.08.1.tar.xz"; + sha256 = "5a8674921e39b38655d1f95340831b1bc746047cbad8501706436f5dacf47fc2"; + name = "libkmahjongg-20.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkomparediff2-20.04.3.tar.xz"; - sha256 = "e27a5fd3dd80a9c7c052ec3c824acc529073464788d1c6950d4d2c407b74c0b0"; - name = "libkomparediff2-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libkomparediff2-20.08.1.tar.xz"; + sha256 = "9d109dfea1433602cdabc89ffa5f522147befc9b1d6d9760549aba7db5dbd399"; + name = "libkomparediff2-20.08.1.tar.xz"; }; }; libksane = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libksane-20.04.3.tar.xz"; - sha256 = "34827bcc5b9277292dd4434f2bf7610a28d54c86565f0410d4470c61f374c46e"; - name = "libksane-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libksane-20.08.1.tar.xz"; + sha256 = "0d8717ad004a2480aea232d9a2317b4d1cc4678d53f0176bdaeb411eedd19dbe"; + name = "libksane-20.08.1.tar.xz"; }; }; libksieve = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libksieve-20.04.3.tar.xz"; - sha256 = "8aacc0c41ac2b7bf48c8479c8fba581a325828b907053eba6b9b5ff4c63d0529"; - name = "libksieve-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/libksieve-20.08.1.tar.xz"; + sha256 = "a1defe888c6c5a3c16ef6fad39d9eb94bc784031079763f004048951820acec0"; + name = "libksieve-20.08.1.tar.xz"; }; }; lokalize = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/lokalize-20.04.3.tar.xz"; - sha256 = "fccba64af9faa5cbb5dfdb303009504993fe71282f0dbc9c748c5a28a327c379"; - name = "lokalize-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/lokalize-20.08.1.tar.xz"; + sha256 = "a4a3e5703d39ae8fe12d2ff832e99b3339ba1c8ec8d2439abeb348e687f1eae9"; + name = "lokalize-20.08.1.tar.xz"; }; }; lskat = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/lskat-20.04.3.tar.xz"; - sha256 = "b7e33cc8097ee4bf4e5182a2a5db1e142c65b119424079f5e7f179720092815b"; - name = "lskat-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/lskat-20.08.1.tar.xz"; + sha256 = "319d611468b969b3bb62731a0aa04c5672bb689c41adf5545dfa8b9742668775"; + name = "lskat-20.08.1.tar.xz"; }; }; mailcommon = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/mailcommon-20.04.3.tar.xz"; - sha256 = "80b6285c8152a64362f5f406b4a766b0937ff29acf87133b0326b6e7ce66809f"; - name = "mailcommon-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/mailcommon-20.08.1.tar.xz"; + sha256 = "d4ee996f74a749ad626ca5029821546da82dbfc1c81864ff39b5f51d6dcf1d88"; + name = "mailcommon-20.08.1.tar.xz"; }; }; mailimporter = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/mailimporter-20.04.3.tar.xz"; - sha256 = "13a95ee3d89d658222dcdc905311c72b1ba04e6b8aac863dee767a4d72d3d54e"; - name = "mailimporter-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/mailimporter-20.08.1.tar.xz"; + sha256 = "dcf2b94d4f66be2b339b31dfebef7af373e0cf59f09e4cfb664eb828e1d4f73f"; + name = "mailimporter-20.08.1.tar.xz"; }; }; marble = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/marble-20.04.3.tar.xz"; - sha256 = "9c0b6fb13d53e1748de081c43e06cc132d5b07d46e594443b207fbaf74e1f95b"; - name = "marble-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/marble-20.08.1.tar.xz"; + sha256 = "96b019a41ae4e0aaab59950b6be040bd2145f130190b8c0dea436c791e3192ed"; + name = "marble-20.08.1.tar.xz"; }; }; mbox-importer = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/mbox-importer-20.04.3.tar.xz"; - sha256 = "ce208091272052a909521cda31a74b2f4c8e8fabcb2937c24639673d1f43981d"; - name = "mbox-importer-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/mbox-importer-20.08.1.tar.xz"; + sha256 = "262c8805539b7c766099c6287d1dbf88161afe6d32c1c6821ebe63cff4fe3b71"; + name = "mbox-importer-20.08.1.tar.xz"; }; }; messagelib = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/messagelib-20.04.3.tar.xz"; - sha256 = "aa2c254f50ed4664b67df5857bba063d1400fe280f3a58658cfa59d3155b2adf"; - name = "messagelib-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/messagelib-20.08.1.tar.xz"; + sha256 = "fc41124e905456a3c5227ca6154dc3e77620e307458fbb19f5421cbfb04523b3"; + name = "messagelib-20.08.1.tar.xz"; }; }; minuet = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/minuet-20.04.3.tar.xz"; - sha256 = "9afb598280a9b90013833005299fb0c33c3c7cc02b687f65616e04dc12e21d41"; - name = "minuet-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/minuet-20.08.1.tar.xz"; + sha256 = "a640025550337f415f7bfaaad7f6ef7de667dd054131be2c313d894c3f6703ea"; + name = "minuet-20.08.1.tar.xz"; }; }; okular = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/okular-20.04.3.tar.xz"; - sha256 = "60865a5d09f41d30572b72224fb61baf9dde18cf6e246565d852e672e7bc4cfe"; - name = "okular-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/okular-20.08.1.tar.xz"; + sha256 = "77b5d8e410a2a008ea63f60a561f99053ec07d92da6ee3afaeefd977aadebd83"; + name = "okular-20.08.1.tar.xz"; }; }; palapeli = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/palapeli-20.04.3.tar.xz"; - sha256 = "8ae05cce4a1ccb5226c9895195c47825054363a127905dacd5b25fc2a4df3828"; - name = "palapeli-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/palapeli-20.08.1.tar.xz"; + sha256 = "31b847caa89b998dfa580553d96c656b05f2d85fdd88f0ba71e953762cefac90"; + name = "palapeli-20.08.1.tar.xz"; }; }; parley = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/parley-20.04.3.tar.xz"; - sha256 = "b5e74fbd458824d26c0ea7cb8ed5510e3f6e849c9dbda4bc7804b9b95a64da03"; - name = "parley-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/parley-20.08.1.tar.xz"; + sha256 = "9617a90c2d4f9ab5d928febc6bcd10c9023dcc10e9f1202bfb97b77019948f0c"; + name = "parley-20.08.1.tar.xz"; }; }; picmi = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/picmi-20.04.3.tar.xz"; - sha256 = "57406f820d58132602b3e6524bad2d7aba3466f7c1a78a623077e7df5faf6838"; - name = "picmi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/picmi-20.08.1.tar.xz"; + sha256 = "027e37a2c9dcf828684a0f8ffdcfc6451a2bd62976c10d990e471fa0f5ba97c3"; + name = "picmi-20.08.1.tar.xz"; }; }; pimcommon = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/pimcommon-20.04.3.tar.xz"; - sha256 = "a5d295f7174cafeb27bc1aed03a715525b132f9dca734a183dd705a2c7ffa40b"; - name = "pimcommon-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/pimcommon-20.08.1.tar.xz"; + sha256 = "58a33349bf932076f6be343ae64e23f146e2a6a96e3af8ce68dbd752f2c80dd9"; + name = "pimcommon-20.08.1.tar.xz"; }; }; pim-data-exporter = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/pim-data-exporter-20.04.3.tar.xz"; - sha256 = "742727f09c984ff86f0406fa756b8ab50e695d6bd8a10abd7d55950c1c2c10de"; - name = "pim-data-exporter-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/pim-data-exporter-20.08.1.tar.xz"; + sha256 = "54092763e4b951f4e90a217c876107900e0706da68ca5517184e5da258ae95ec"; + name = "pim-data-exporter-20.08.1.tar.xz"; }; }; pim-sieve-editor = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/pim-sieve-editor-20.04.3.tar.xz"; - sha256 = "e59c4eee3f7548fc724f7b79cbff2f90c10be92eb0cab7259dd57fd221f2b7dc"; - name = "pim-sieve-editor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/pim-sieve-editor-20.08.1.tar.xz"; + sha256 = "f788038796f226bfe426835fc6f186e23f2c7f9fda8316dfa6af307d6936d4ad"; + name = "pim-sieve-editor-20.08.1.tar.xz"; }; }; poxml = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/poxml-20.04.3.tar.xz"; - sha256 = "a070eb5c12e14df691648a9a3e482c021c484f59dfaac413eeacc002cdc1833a"; - name = "poxml-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/poxml-20.08.1.tar.xz"; + sha256 = "9f4bcafc664532706fe634ce8b0f410619d5e3c285526a7b61969155d75bbad2"; + name = "poxml-20.08.1.tar.xz"; }; }; print-manager = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/print-manager-20.04.3.tar.xz"; - sha256 = "9d877925cafdf7dfa0dcce5694f849b13ca8bb7c4552a800eebd26a3fc42d376"; - name = "print-manager-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/print-manager-20.08.1.tar.xz"; + sha256 = "52d41ca3ae69e6e8e1eb4ddf1d516868dc436e81779053efdea5e3819545ca5b"; + name = "print-manager-20.08.1.tar.xz"; }; }; rocs = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/rocs-20.04.3.tar.xz"; - sha256 = "1620ff8360568ab4201d526ea4489bd672f6715b6d200251d63ed139dcc58a94"; - name = "rocs-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/rocs-20.08.1.tar.xz"; + sha256 = "3c5f764f06f6f5b7c68523be4fdd37e75b2249e0b15001bc39e55051d9e271ef"; + name = "rocs-20.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/signon-kwallet-extension-20.04.3.tar.xz"; - sha256 = "a391ceff9c86f2e3d8a74a26ffb4143d0adffc8669a51a019d39f16a8e207c1c"; - name = "signon-kwallet-extension-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/signon-kwallet-extension-20.08.1.tar.xz"; + sha256 = "10a0ea806dc63cbf6c6d4794fe596c68355bccb3e08370d70ce7a8e95af448a5"; + name = "signon-kwallet-extension-20.08.1.tar.xz"; }; }; spectacle = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/spectacle-20.04.3.tar.xz"; - sha256 = "71e852aceaac1dc76cd9aa4aa8284ced1c149d7374d9e06f996f4259a72ccbd6"; - name = "spectacle-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/spectacle-20.08.1.tar.xz"; + sha256 = "4a01b5ef41901ff2e83bb517c2e96a978188b98cb62243eb541a317f57a2bd69"; + name = "spectacle-20.08.1.tar.xz"; }; }; step = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/step-20.04.3.tar.xz"; - sha256 = "89d7e29b6e5f888886022701cbfd628c322daa3da43dda4c3fd90d1a137aa29d"; - name = "step-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/step-20.08.1.tar.xz"; + sha256 = "6e04930963676b1bfa55ee095914c7491a61bf3963c45ed4157f868175ee6605"; + name = "step-20.08.1.tar.xz"; }; }; svgpart = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/svgpart-20.04.3.tar.xz"; - sha256 = "2ffb67858ac5c01f5bb5d4728526786c5b6b6a8b70d688123c52efa084fae1b4"; - name = "svgpart-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/svgpart-20.08.1.tar.xz"; + sha256 = "206c3741464f959ffbaea09bc918fc3e88f32fcf12928cd8c399ab44d4b1f228"; + name = "svgpart-20.08.1.tar.xz"; }; }; sweeper = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/sweeper-20.04.3.tar.xz"; - sha256 = "16b247b9e3f3d3497f31f9dcb91ff06725a07f0f56a934fdf1ecf1af1ab1b426"; - name = "sweeper-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/sweeper-20.08.1.tar.xz"; + sha256 = "722c25de8cc74fe7e8310d47a7e794f32e935331f89d4f5249fd045a83ce0431"; + name = "sweeper-20.08.1.tar.xz"; }; }; umbrello = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/umbrello-20.04.3.tar.xz"; - sha256 = "c34a5f6ca945dd409921903abd2e0078b6a056a0d221d59674980ce424cf1e62"; - name = "umbrello-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/umbrello-20.08.1.tar.xz"; + sha256 = "d980d67f8a878e01cd3af5499aa843df703f20cdecca8a14b59d87d13c747328"; + name = "umbrello-20.08.1.tar.xz"; }; }; yakuake = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/yakuake-20.04.3.tar.xz"; - sha256 = "62466165becc848d05461f7b12b67615a517d2919b6fccd8441dfeed9a0a04fa"; - name = "yakuake-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/yakuake-20.08.1.tar.xz"; + sha256 = "6768a360a3d79080e6e53821460ed27f6c2e47fa11077bbec3213d85385d6fac"; + name = "yakuake-20.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.04.3"; + version = "20.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/zeroconf-ioslave-20.04.3.tar.xz"; - sha256 = "3b2ac8833499a53a78547ae34be4a29a6cb79d54601a8c638b225f1c2059d9f0"; - name = "zeroconf-ioslave-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.1/src/zeroconf-ioslave-20.08.1.tar.xz"; + sha256 = "ca1685a22922057ba89510d71a11218bf47db0d0313aec2b55aca21932564866"; + name = "zeroconf-ioslave-20.08.1.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index eeaf8d5618..34b9b21f57 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "1.1.1"; + version = "1.7.0"; src = if stdenv.isLinux then fetchzip { url = { @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "1andl3ripkcg4jhwdkd4b39c9aaxqpx9wzq21pysn6rlyy4hfcb0"; - "x86_64-linux" = "0qj5v8psqyp0sra0pvzkwjpm28kx3bgg36y37wklb6zl2ngpxm5g"; + "i686-linux" = "0fvi9pfcm6pfy628q2lg62bkikrgsisynrk3kkjisb9ldcyjgabw"; + "x86_64-linux" = "1iskhls8g8w2zhk79gprz4vzrmm7r7fq87gwgd4xmj5md4nkzran"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "16inwxkrky4xwlr7vara1l8kapdgjg3kfq1l94i5855782hn4ppm"; + sha256 = "0x6s26zgjryzmcg9qxmv5s2vml06q96yqbapasjfxqc3l205lnnn"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index e5121ce6e7..38a25b3375 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.3.6"; + version = "4.2.4.0"; src = fetchurl { url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "1a8baxrb8czndxxi16md1nyl2snfx215yvrygdpcblgngkp2z2y9"; + sha256 = "1nkbyy9gnp8nkr04bbiapwvv2nspnl36fvnzjwaq4a13mj49m5zq"; }; nativeBuildInputs = [ unzip makeWrapper jq ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/adobe-reader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/adobe-reader/default.nix index b67e514ce5..25f888bbc8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/adobe-reader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/adobe-reader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib -, gdk-pixbuf }: +, gdk-pixbuf, gdk-pixbuf-xlib }: assert stdenv.hostPlatform.system == "i686-linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf ]; + [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; @@ -28,5 +28,9 @@ stdenv.mkDerivation { description = "Adobe Reader, a viewer for PDF documents"; homepage = "http://www.adobe.com/products/reader"; license = stdenv.lib.licenses.unfree; + knownVulnerabilities = [ + "Numerous unresolved vulnerabilities" + "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix index ff87857852..7d5c468ab9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , atk , cairo , desktop-file-utils @@ -17,36 +16,29 @@ , libxml2 , meson , ninja -, pkgconfig +, pkg-config +, python3 , sqlite , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "almanah"; - version = "0.12.0"; + version = "0.12.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09rxx4s4c34d1axza6ayss33v78p44r9bpx058shllh1sf5avpcb"; + sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24="; }; - patches = [ - # Fix gpgme detection - # https://gitlab.gnome.org/GNOME/almanah/merge_requests/7 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/almanah/commit/4b979c4145ef2fbceebb3849a70df1d0ceb1bb93.patch"; - sha256 = "0wwkgqr5vi597j734xq0fwgk1zpcabp8wi8b1lnb1ksnqfi3wwxb"; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext libxml2 meson ninja - pkgconfig + pkg-config + python3 wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index 1dbcdf31ed..9f157798a7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = "${version}"; - sha256 = "17ify6v4z8i8ps3s8qabnrqfkj0my4yzyqwk3q3nhrqilbnhr40x"; + sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/autospotting/default.nix b/third_party/nixpkgs/pkgs/applications/misc/autospotting/default.nix index a33261e7a5..f2e922e5b4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/autospotting/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/autospotting/default.nix @@ -12,8 +12,6 @@ buildGoPackage { sha256 = "0p48lgig9kblxvgq1kggczkn4qdbx6ciq9c8x0179i80vl4jf7v6"; }; - goDeps = ./deps.nix; - # patching path where repository used to exist postPatch = '' sed -i "s+github.com/cristim/autospotting/core+github.com/AutoSpotting/AutoSpotting/core+" autospotting.go diff --git a/third_party/nixpkgs/pkgs/applications/misc/autospotting/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/autospotting/deps.nix deleted file mode 100644 index ea744ed664..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/autospotting/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/aws/aws-lambda-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-lambda-go"; - rev = "2d482ef09017ae953b1e8d5a6ddac5b696663a3c"; - sha256 = "06v2yfvn4sn116lds0526a8mfrsng4vafrdjf1dhpalqarrbdvmz"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "9333060a8d957db41bff1c80603a802aa674fad8"; - sha256 = "0fnypw6zm6k70fzhm5a8g69ag64rxbrrpdk7l3rkfqd99slyg5kz"; - }; - } - { - goPackagePath = "github.com/cristim/ec2-instances-info"; - fetch = { - type = "git"; - url = "https://github.com/cristim/ec2-instances-info"; - rev = "73c042a5558cd6d8b61fb82502d6f7aec334e9ed"; - sha256 = "1xajrkxqqz5wlbi9w2wdhnk115rbmqxyga29f8v9psq8hzwgi0rg"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "d8f796af33cc11cb798c1aaeb27a4ebc5099927d"; - sha256 = "19z27f306fpsrjdvkzd61w1bdazcdbczjyjck177g33iklinhpvx"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "5cf292cae48347c2490ac1a58fe36735fb78df7e"; - sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/namsral/flag"; - fetch = { - type = "git"; - url = "https://github.com/namsral/flag"; - rev = "67f268f20922975c067ed799e4be6bacf152208c"; - sha256 = "1lmxq3z276zrsggpfq9b7yklzzxdyib49zr8sznb1lcqlvxqsr47"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } -] \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix index 8b17ecea3c..43362b0394 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xlibs != null && xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0"; + sha256 = "1ifq5bk7782b9m6bl111x33fn38rpppdrww7hfavqia9a9gi2sl5"; }; nativeBuildInputs = [ pkgconfig pcre ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 2e6981490c..2a28a4edc4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -9,6 +9,7 @@ , colladaSupport ? true, opencollada , makeWrapper , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, embree }: with lib; @@ -17,11 +18,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.4"; + version = "2.90.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "1y4phkzrxy17kpjbg0jbz1236nw8w8p006x1crbqmvwz8wd3dm46"; + sha256 = "08qkvgdfrqh4ljqw5m64bbki1dsfcs4xnwzq6829z3ddhiwrxw84"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { (opensubdiv.override { inherit cudaSupport; }) tbb makeWrapper + embree ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender @@ -50,8 +52,11 @@ stdenv.mkDerivation rec { ++ optional cudaSupport cudatoolkit ++ optional colladaSupport opencollada; - postPatch = - if stdenv.isDarwin then '' + postPatch = '' + # allow usage of dynamically linked embree + rm build_files/cmake/Modules/FindEmbree.cmake + '' + + (if stdenv.isDarwin then '' : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ @@ -77,7 +82,7 @@ stdenv.mkDerivation rec { 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' - ''; + ''); cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index a548177567..92a491a005 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -16,7 +16,7 @@ , hyphen , unrarSupport ? false , chmlib -, python2Packages +, pythonPackages , libusb1 , libmtp , xdg_utils @@ -24,17 +24,13 @@ , removeReferencesTo }: -let - pypkgs = python2Packages; - -in mkDerivation rec { pname = "calibre"; - version = "4.22.0"; + version = "4.23.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "0d0wmd3ijk8px1d662igal4lfmpyzynfzs6ms1bb9nf42mq2pxai"; + sha256 = "sha256-Ft5RRzzw4zb5RqVyUaHk9Pu6H4V/F9j8FKoTLn61lRg="; }; patches = [ @@ -47,7 +43,7 @@ mkDerivation rec { ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "/pyqt_sip_dir/ s:=.*:= '${pypkgs.pyqt5}/share/sip/PyQt5':" \ + sed -i "/pyqt_sip_dir/ s:=.*:= '${pythonPackages.pyqt5}/share/sip/PyQt5':" \ setup/build_environment.py # Remove unneeded files and libs @@ -61,52 +57,49 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake removeReferencesTo ]; - CALIBRE_PY3_PORT = builtins.toString pypkgs.isPy3k; + CALIBRE_PY3_PORT = builtins.toString pythonPackages.isPy3k; buildInputs = [ - poppler_utils - libpng - imagemagick - libjpeg - fontconfig - podofo - qtbase chmlib - icu + fontconfig hunspell hyphen - sqlite - libusb1 + icu + imagemagick + libjpeg libmtp + libpng + libusb1 + podofo + poppler_utils + qtbase + sqlite xdg_utils ] ++ ( - with pypkgs; [ + with pythonPackages; [ apsw - cssselect + beautifulsoup4 css-parser + cssselect dateutil dnspython feedparser + html2text html5-parser lxml markdown + mechanize + msgpack netifaces pillow - python pyqt5 - sip - regex - msgpack - beautifulsoup4 - html2text pyqtwebengine + python + regex + sip # the following are distributed with calibre, but we use upstream instead odfpy ] - ) ++ lib.optionals (!pypkgs.isPy3k) ( - with pypkgs; [ - mechanize - ] ); installPhase = '' @@ -121,18 +114,17 @@ mkDerivation rec { export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo.dev}/include/podofo export PODOFO_LIB_DIR=${podofo.lib}/lib - export SIP_BIN=${pypkgs.sip}/bin/sip + export SIP_BIN=${pythonPackages.sip}/bin/sip export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${pypkgs.python.interpreter} setup.py install --root=$out \ + ${pythonPackages.python.interpreter} setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ --staging-libdir=$out/lib \ --staging-sharedir=$out/share - PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py $out/lib/calibre/calibre/ebooks/metadata/*.py $out/lib/calibre/calibre/ebooks/rtf2xml/*.py" @@ -154,7 +146,8 @@ mkDerivation rec { # 2018-11-06) was a single string like the following: # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h preFixup = '' - remove-references-to -t ${podofo.dev} $out/lib/calibre/calibre/plugins/podofo.so + remove-references-to -t ${podofo.dev} \ + $out/lib/calibre/calibre/plugins${lib.optionalString pythonPackages.isPy3k "/3"}/podofo.so for program in $out/bin/*; do wrapProgram $program \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix index 6fa8e0cf7b..77717ff50a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.0.3"; + version = "4.1.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "1bzlbd8lvagpipyv553icv17bafhaydscrrlly8jz7kfi4d9xvkk"; + sha256 = "0x6msbbqkwxs6msqacpqw4wlw7c9ilf8n6jqmx297ij6isswgksh"; }; subPackages = [ "cmd/cheat" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix index 112341dcd4..57b3f906ca 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: +{ stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { version = "1.8"; @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { sed '1i#include ' -i src/Transformer/SpectrumCircleTransformer.cpp ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ]; buildFlags = [ "ENABLE_PULSE=1" ]; - installPhase = '' - mkdir -p $out/bin - cp build/vis $out/bin/vis + postInstall = '' # See https://github.com/dpayne/cli-visualizer/issues/62#issuecomment-330738075 wrapProgram $out/bin/vis --set TERM rxvt-256color ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix index 8d91531dd1..a74a396299 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -2,17 +2,19 @@ buildGoPackage rec { pname = "cointop"; - version = "1.4.6"; + version = "1.5.4"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; - rev = version; - sha256 = "1mkb97x73vzxnbvhnxx3msicr1z0b3sjmydx257ax3nscrmf1l5z"; + rev = "v${version}"; + sha256 = "1gkrwh5g69mywlllszy310xpahr8rz8nghjjpiamd85djf1iz43b"; }; goPackagePath = "github.com/miguelmota/cointop"; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cointop.version=${version}" ]; + meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix new file mode 100644 index 0000000000..c3efed72cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix @@ -0,0 +1,26 @@ +{ mkDerivation, fetchFromGitHub, cmake, pkg-config, lib, + qttools, fribidi, libunibreak }: + +mkDerivation rec { + pname = "coolreader"; + version = "3.2.45"; + + src = fetchFromGitHub { + owner = "buggins"; + repo = pname; + rev = "cr${version}"; + sha256 = "0nkk4d0j04yjwanjszq8h8hvx87rnwax2k6akm4bpjxwpcs4icws"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ qttools fribidi libunibreak ]; + + meta = with lib; { + homepage = "https://github.com/buggins/coolreader"; + description = "Cross platform open source e-book reader"; + license = licenses.gpl2Plus; # see https://github.com/buggins/coolreader/issues/80 + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix index fb177e8278..7cf89a74e1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.11.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1xxf8d220pa77195d9f3l3scvvyqsh1pvlrbw4cq6ydj9qbp5kf0"; + sha256 = "04jidibf0b80c5vd659pz2wibmggjyyj9yz2bw7j4g84hwraksxb"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cura/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cura/default.nix index 1b5c7c2395..c0aa0a481b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cura/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cura/default.nix @@ -2,20 +2,20 @@ mkDerivation rec { pname = "cura"; - version = "4.6.1"; + version = "4.7.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0h1r9caa579d3gfpcmch54rdbkg5df64ds2v84iqsbxwjp0rmn4n"; + sha256 = "19an168iad3cb5w8i71c0wbr79qnz5qnpxqx1j6dgh64qz6ffn2r"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "1k5c3qmixhpz3z2yi0fysxcyyf1yhcwmdlrcypkw827lhsialqp4"; + sha256 = "1w6i0dlff8b30q987x3y0zv8847fc8ppfcr9vi982msmv284c89z"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cura/plugins.nix b/third_party/nixpkgs/pkgs/applications/misc/cura/plugins.nix index 9fbe647046..9082feb38a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cura/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cura/plugins.nix @@ -6,13 +6,13 @@ let octoprint = stdenv.mkDerivation rec { pname = "Cura-OctoPrintPlugin"; - version = "3.5.12"; + version = "3.5.16"; src = fetchFromGitHub { owner = "fieldOfView"; repo = pname; - rev = "ad522c0b7ead5fbe28da686a3cc75e351274c2bc"; - sha256 = "0ln11ng32bh0smfsk54mv2j3sadh0gwf031nmm95zrvbj9cr6yc0"; + rev = "8affa8aa9796cb37129d3b7222fff03f86c936cd"; + sha256 = "0l4qfcashkdmpdm8nm3klz6hmi1f0bmbpb9b1yn4mvg0fam6c5xi"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix index 0a4ec62ca7..5cc5db3115 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.6.1"; + version = "4.7.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1fr151hmdg2lhk9pbpan1hb1pafj784nijr4pz646ljmjh12vfk2"; + sha256 = "177fk6j4gn3ssi8j1qxj8p4486f7jkz328vc75agxnh7vhd4mwsm"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 70ac55ed5a..e8a04aa2e1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.1.5"; + version = "7.2.0"; 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 = "14pdkg9xxnldr7qwpb61hp2dgsd5h9scjn59ajqsqn4f4sgcpba0"; + sha256 = "0zpxsdzhn5fsrlq04v5kvkrgf4dsj5zmpypj9awsd2mjcbp6yxd7"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix index 1616c082c0..a6ba3444dc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix @@ -1,14 +1,15 @@ -{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook, secp256k1 }: +{ lib, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook +, secp256k1 }: python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.0.14"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6"; + sha256 = "1ccfm6kkmbkvykfdzrisxvr0lx9kgq4l43ixk6v3xnvhnbfwz4s2"; }; propagatedBuildInputs = with python3Packages; [ @@ -35,6 +36,15 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; + patches = [ + # Patch a failed test, this can be removed in next version + (fetchpatch { + url = + "https://github.com/Electron-Cash/Electron-Cash/commit/1a9122d59be0c351b14c174a60880c2e927e6168.patch"; + sha256 = "0zw629ypn9jxb1y124s3dkbbf2q3wj1i97j16lzdxpjy3sk0p5hk"; + }) + ]; + postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "qdarkstyle==2.6.8" "qdarkstyle<3" @@ -43,9 +53,7 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - checkInputs = with python3Packages; [ - pytest - ]; + checkInputs = with python3Packages; [ pytest ]; checkPhase = '' unset HOME diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 4d078f3922..ad26a912e7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , wrapQtAppsHook , python3 -, python3Packages , zbar , secp256k1 , enableQt ? true @@ -20,7 +19,15 @@ }: let - version = "4.0.2"; + version = "4.0.3"; + + # electrum is not compatible with dnspython 2.0.0 yet + # use the latest 1.x release instead + py = python3.override { + packageOverrides = self: super: { + dnspython = super.dnspython_1; + }; + }; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -36,7 +43,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1xpkbard994n1gwl95b558x69k1m1m258bc220nxrajg1pywh90f"; + sha256 = "1r40i0v7nm35m3pzbd0l5z4qphl13s31l9v5njmyvpfjirdmhjbv"; extraPostFetch = '' mv $out ./all @@ -45,13 +52,13 @@ let }; in -python3Packages.buildPythonApplication { +py.pkgs.buildPythonApplication { pname = "electrum"; inherit version; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "05ibrr6ysf6fncs1pimhxvyr7d659jwj2r2a9pdd3cmn1dxzy2w1"; + sha256 = "0q891fgzxvyzjxfczynx92hvclfs8i3nr5nr9sgbvz13hsg4s6lg"; }; postUnpack = '' @@ -61,7 +68,7 @@ python3Packages.buildPythonApplication { nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with py.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -73,13 +80,11 @@ python3Packages.buildPythonApplication { matplotlib pbkdf2 protobuf - pyaes pycryptodomex pysocks qrcode requests tlslite-ng - # plugins ckcc-protocol keepkey @@ -116,7 +121,7 @@ python3Packages.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - checkInputs = with python3Packages; [ pytest ]; + checkInputs = with py.pkgs; [ pytest ]; checkPhase = '' py.test electrum/tests diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index b7c655caaa..4bcb66f48b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , python3Packages +, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { @@ -12,7 +13,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; }; - nativeBuildInputs = with python3Packages; [ pyqt5 ]; + nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; propagatedBuildInputs = with python3Packages; [ pyaes @@ -35,6 +36,10 @@ python3Packages.buildPythonApplication rec { sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; + postFixup = '' + wrapQtApp $out/bin/electrum-ltc + ''; + checkPhase = '' $out/bin/electrum-ltc help >/dev/null ''; @@ -54,4 +59,3 @@ python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ ]; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix index a27e6e4851..5e3a85c3b9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix @@ -9,6 +9,10 @@ python3Packages.buildPythonApplication rec { sha256 = "1q8h89hqi4kxphn1g5nbcia0haz5k57is9rycwaabm55mj9s9fah"; }; + postPatch = '' + substituteInPlace setup.py --replace "Radicale==" "Radicale>=" + ''; + propagatedBuildInputs = with python3Packages; [ etesync flask diff --git a/third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix b/third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix index b1e9f3ac35..87e59d4292 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { inherit (src.meta) homepage; description = "A Go based command line tool for exercism.io"; license = licenses.mit; - maintainers = [ maintainers.rbasso ]; + maintainers = [ maintainers.rbasso maintainers.nobbz ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index bed673ef8d..fab83b75e7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.8"; + version = "6.4.12"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1g893dr3982vrqzxybmflnqfmd1q6yipd9krvxn0avhlrrp97k96"; + sha256 = "11s83af63gs9nnrjb66yq58xriyvi8hzj4ykxp3kws5z3nby111b"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/foot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/foot/default.nix new file mode 100644 index 0000000000..02909ee1f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/foot/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit +, fcft, freetype, pixman, libxkbcommon, fontconfig, wayland +, meson, ninja, ncurses, scdoc, tllist, wayland-protocols, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "foot"; + version = "1.4.4"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/foot.git"; + rev = "${version}"; + sha256 = "1cr4sz075v18clh8nlvgyxlbvfkhbsg0qrqgnclip5rwa24ry1lg"; + }; + + nativeBuildInputs = [ + meson ninja ncurses scdoc tllist wayland-protocols pkg-config + ]; + buildInputs = [ + fontconfig freetype pixman wayland libxkbcommon fcft + ]; + + # recommended build flags for foot as per INSTALL.md + # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#user-content-release-build + preConfigure = '' + export CFLAGS+="-O3 -fno-plt" + ''; + + mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; + + meta = with stdenv.lib; { + homepage = "https://codeberg.org/dnkl/foot/"; + description = "A fast, lightweight and minimalistic Wayland terminal emulator"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix index cef58b353a..717d4a3aab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.4.1"; + version = "1.4.2"; src = fetchgit { url = "https://codeberg.org/dnkl/fuzzel"; rev = "${version}"; - sha256 = "18pg46xry7q4i19mpjfz942c6vkqlrj4q18p85zldzv9gdsxnm9c"; + sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ fionera ]; platforms = with platforms; linux; + changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index ef882ac9b9..db82aea2a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.14.3"; + version = "1.15.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0lyy48za81vfw4a5l7fsczsv889dk829nby941xvswp3scclpvfy"; + sha256 = "1g9hmb5637x8bhm2wzarqnxzj0i93fcdm1myvld2d97a2d32hy6m"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix index 7844a6a593..8b3ca1e2d8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jira"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-jira"; repo = "jira"; - sha256 = "0qk5ifjxkqisvgv066rw8xj2zszc9mhc0by4338xjd7ng10jkk7b"; + sha256 = "1qpimh39hsg75mb32hlvxmd7jj5b0cmhdkqz3dizfcnidllr3grd"; }; vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/googleearth/default.nix b/third_party/nixpkgs/pkgs/applications/misc/googleearth/default.nix index dff69130c1..db38810634 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/googleearth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/googleearth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 -, zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }: +, zlib, fontconfig, dpkg, libproxy, libxml2, gst_all_1, dbus }: let arch = @@ -33,7 +33,6 @@ let fontconfig libproxy libxml2 - gstreamer dbus gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -80,7 +79,7 @@ stdenv.mkDerivation rec { for a in $out/opt/google/earth/free/*.so* ; do patchelf --set-rpath "${fullPath}:\$ORIGIN" $a done - + # Add desktop config file and icons mkdir -p $out/share/{applications,icons/hicolor/{16x16,22x22,24x24,32x32,48x48,64x64,128x128,256x256}/apps,pixmaps} ln -s $out/opt/google/earth/free/google-earth.desktop $out/share/applications/google-earth.desktop diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index 63ca213c2c..828b3ca9bf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }: stdenv.mkDerivation rec { pname = "gpsprune"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk11 ]; + buildInputs = [ jdk ]; desktopItem = makeDesktopItem { name = "gpsprune"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \ + makeWrapper ${jdk}/bin/java $out/bin/gpsprune \ --add-flags "-jar $out/share/java/gpsprune.jar" mkdir -p $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications diff --git a/third_party/nixpkgs/pkgs/applications/misc/gramps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gramps/default.nix index e5a2b87f16..09717cd642 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gramps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gramps/default.nix @@ -13,14 +13,13 @@ in buildPythonApplication rec { pname = "gramps"; nativeBuildInputs = [ wrapGAppsHook gettext ]; - buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] + buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map # Graphviz support ++ stdenv.lib.optional enableGraphviz graphviz # Ghostscript support ++ stdenv.lib.optional enableGhostscript ghostscript - ; src = fetchFromGitHub { @@ -60,6 +59,5 @@ in buildPythonApplication rec { description = "Genealogy software"; homepage = "https://gramps-project.org"; license = licenses.gpl2; - maintainers = with maintainers; [ joncojonathan ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix b/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix index b1985be2c9..02544812eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix @@ -2,11 +2,11 @@ , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { - name = "grip-4.1.1"; + name = "grip-4.2.0"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "1sbjgawb7qrinixybwi0adk7mpdfb565gkffp5gxxsw8fqd068fs"; + sha256 = "1si5kidwg0i2jg0brzyvjrzw24v3km2hdgd4kda1adzq81a3p1cs"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/havoc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/havoc/default.nix index fc4cc680ca..a6d5278fc3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/havoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/havoc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "havoc"; - version = "2019-12-08"; + version = "0.3.1"; src = fetchFromGitHub { owner = "ii8"; repo = pname; - rev = "507446c92ed7bf8380a58c5ba2b14aba5cdf412c"; - sha256 = "13nfnan1gmy4cqxmqv0rc8a4mcb1g62v73d56hy7z2psv4am7a09"; + rev = version; + sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix index 1626fc440e..19034c1dc7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "16p18svfcp201gd624wzmf0gpdvywybxp8539igin6s70k6rpc97"; + sha256 = "18paabqfxz49fahdi4fs5z870aynmyfj3xw8q768qffgc26zhl3m"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix index edb8114e4a..5a03cfe23b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix @@ -13,14 +13,14 @@ buildPythonApplication rec { pname = "hovercraft"; - version = "2.6"; + version = "2.7"; disabled = ! isPy3k; src = fetchFromGitHub { owner = "regebro"; repo = "hovercraft"; rev = version; - sha256 = "150sn6kvqi2s89di1akl5i0g81fasji2ipr12zq5s4dcnhw4r5wp"; + sha256 = "0k0gjlqjz424rymcfdjpj6a71ppblfls5f8y2hd800d1as4im8az"; }; checkInputs = [ manuel ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix new file mode 100644 index 0000000000..657996d1da --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix @@ -0,0 +1,25 @@ +{ buildPythonApplication, fetchFromGitHub, nose, openjdk, lib }: + +buildPythonApplication rec { + pname = "html5validator"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "svenkreiss"; + repo = "html5validator"; + rev = "v${version}"; + sha256 = "130acqi0dsy3midg7hwslykzry6crr4ln6ia0f0avyywkz4bplsv"; + }; + + propagatedBuildInputs = [ openjdk ]; + + checkInputs = [ nose ]; + checkPhase = "PATH=$PATH:$out/bin nosetests"; + + meta = with lib; { + homepage = "https://github.com/svenkreiss/html5validator"; + description = "Command line tool that tests files for HTML5 validity"; + license = licenses.mit; + maintainers = [ maintainers.phunehehe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix b/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix new file mode 100644 index 0000000000..bb6956aaa5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, llvmPackages +, openssl +, pkg-config +, installShellFiles +, Security +, gitMinimal +, utillinuxMinimal +}: + +rustPlatform.buildRustPackage rec { + pname = "imag"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "matthiasbeyer"; + repo = pname; + rev = "v${version}"; + sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq"; + }; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + checkInputs = [ gitMinimal utillinuxMinimal ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + cargoSha256 = "0n8cw70qh8g4hfwfaxwwxbrrx5hm2z037z8kdhvdpqkxljl9189x"; + + checkPhase = '' + export HOME=$TMPDIR + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" + + # UI tests uses executables directly, so we need to build them before + # launching the tests + cargo build + '' + ( + # CLI uses the presence of a controlling TTY to check if arguments are + # passed in stdin, or in the command-line, so we use script to create + # a PTY for us. + if !stdenv.isDarwin then '' + script -qfec "cargo test --workspace" + '' else '' + script -q "cargo test --workspace" + '' + ); + + postInstall = '' + installShellCompletion target/imag.{bash,fish} --zsh target/_imag + ''; + + meta = with stdenv.lib; { + description = "Commandline personal information management suite"; + homepage = "https://imag-pim.org/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ filalex77 minijackson ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 656cc6f69b..7b99f82922 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "joplin-desktop"; - version = "1.0.233"; + version = "1.0.245"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "1fmk56b9b70ly1r471mhppr8fz1wm2gpxji1v760ynha8fqy7qg1"; + sha256 = "1xybzjixqmp95b2a97kbbygn0jwndws9115cd7mbw8czl7nshdq6"; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix index ab8448f503..72095cee1c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "16812"; + version = "17013"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ld0c87mhifbdnlrr7a9jmgn3s5xklzbpwcl1m6j1lc18ajs1awq"; + sha256 = "0dgfiqk5bcbs03llkffm6h96zcqa19azbanac883g26f6z6j9b8j"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "0vhawcgzh06k2dfqav28n3sv1ij1ziz6bgi4k7m0diix6ia7hlar"; + sha256 = "1mzaxcswmxah0gc9cifgaazwisr5cbanf4bspv1ra8xwzj5mdss6"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch new file mode 100644 index 0000000000..8f9271ac99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch @@ -0,0 +1,49 @@ +From 2629af4ed00d7ca65359178203d80fb146901cdb Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer +Date: Fri, 3 Jul 2020 21:00:45 -0700 +Subject: [PATCH 1/2] Fix CMakeLists + +--- + CMakeLists.txt | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e218279..4341de9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,6 +57,7 @@ endif(JPEG_FOUND) + include(FindJasper) + if(JASPER_FOUND) + set(HAVE_JASPER_LIB 1) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY}) + endif(JASPER_FOUND) + + # paths from willuslib/wgs.c +@@ -71,9 +72,12 @@ else() + message(STATUS "Could NOT find ghostscript executable") + endif(GHOSTSCRIPT_EXECUTABLE) + +-# willus.h +-# HAVE_GSL_LIB +- ++pkg_check_modules(GSL gsl) ++if(GSL_FOUND) ++ set(HAVE_GSL_LIB 1) ++ include_directories(SYSTEM ${GSL_INCLUDEDIR}) ++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) ++endif(GSL_FOUND) + + # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) + # MUPDF_STATIC_LDFLAGS misses mupdf-js-none, and doubles libs ... +@@ -85,7 +89,7 @@ if(MUPDF_FOUND) + include_directories(SYSTEM ${MUPDF_INCLUDEDIR}) + message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") + set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} +- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype ++ + ) + endif(MUPDF_FOUND) + +-- +2.27.0 + diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix index 8899654cc4..75e467d4cd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig -, zlib, libpng +{ stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub +, cmake, pkgconfig, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf -, enableJPEG2K ? false, jasper ? null # disabled by default, jasper has unfixed CVE , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes , enableTesseract ? true, leptonica, tesseract4 @@ -11,44 +10,132 @@ with stdenv.lib; -stdenv.mkDerivation rec { - pname = "k2pdfopt"; - version = "2.51a"; +# k2pdfopt is a pain to package. It requires modified versions of mupdf, +# leptonica, and tesseract. Instead of shipping patches for these upstream +# packages, k2pdfopt includes just the modified source files for these +# packages. The individual files from the {mupdf,leptonica,tesseract}_mod/ +# directories are intended to replace the corresponding source files in the +# upstream packages, for a particular version of that upstream package. +# +# There are a few ways we could approach packaging these modified versions of +# mupdf, leptonica, and mupdf: +# 1) Override the upstream source with a new derivation that involves copying +# the modified source files from k2pdfopt and replacing the corresponding +# source files in the upstream packages. Since the files are intended for a +# particular version of the upstream package, this would not allow us to easily +# use updates to those packages in nixpkgs. +# 2) Manually produce patches which can be applied against the upstream +# project, and have the same effect as replacing those files. This is what I +# believe k2pdfopt should do this for us anyway. The benefit of creating and +# applying patches in this way is that minor updates (esp. security fixes) to +# upstream packages might still allow these patches to apply successfully. +# 3) Automatically produce these patches inside a nix derivation. This is the +# approach taken here, using the "mkPatch" provided below. This has the +# benefit of easier review and should hopefully be simpler to update in the +# future. - src = (fetchzip { - url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51_src.zip"; - sha256 = "133l7xkvi67s6sfk8cfh7rmavbsf7ib5fyksk1ci6b6sch3z2sw9"; - }); +let + # Create a patch against src based on changes applied in patchCommands + mkPatch = { name, src, patchCommands }: runCommand "${name}-k2pdfopt.patch" { inherit src; } '' + source $stdenv/setup + unpackPhase - # Note: the v2.51a zip contains only files to be replaced in the v2.50 zip. - v251a_src = (fetchzip { - url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51a_src.zip"; - sha256 = "0vvwblii7kgdwfxw8dzk6jbmz4dv94d7rkv18i60y8wkayj6yhl6"; - }); + orig=$sourceRoot + new=$sourceRoot-modded + cp -r $orig/. $new/ - postUnpack = '' - cp -r ${v251a_src}/* $sourceRoot + pushd $new >/dev/null + ${patchCommands} + popd >/dev/null + + diff -Naur $orig $new > $out || true ''; - patches = [ ./k2pdfopt.patch ./k2pdfopt-mupdf-1.16.1.patch ]; + pname = "k2pdfopt"; + version = "2.53"; + k2pdfopt_src = fetchzip { + url = "http://www.willus.com/${pname}/src/${pname}_v${version}_src.zip"; + sha256 = "1fna8bg3pascjfc3hmc6xn0xi2yh7f1qp0d344mw9hqanbnykyy8"; + }; +in stdenv.mkDerivation rec { + inherit pname version; + src = k2pdfopt_src; - nativeBuildInputs = [ cmake pkgconfig ]; + patches = [ + ./0001-Fix-CMakeLists.patch + ]; + + postPatch = '' + substituteInPlace willuslib/bmpdjvu.c \ + --replace "" "" + ''; + + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = let - # The patches below were constructed by taking the files from k2pdfopt in - # the {mupdf,leptonica,tesseract}_mod/ directories, replacing the - # corresponding files in the respective source trees, resolving any errors - # with more recent versions of these depencencies, and running diff. - mupdf_modded = mupdf.overrideAttrs (attrs: { - patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.16.1 + # We use specific versions of these sources below to match the versions + # used in the k2pdfopt source. Note that this does _not_ need to match the + # version used elsewhere in nixpkgs, since it is only used to create the + # patch that can then be applied to the version in nixpkgs. + mupdf_patch = mkPatch { + name = "mupdf"; + src = fetchurl { + url = "https://mupdf.com/downloads/archive/mupdf-1.17.0-source.tar.gz"; + sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; + }; + patchCommands = '' + cp ${k2pdfopt_src}/mupdf_mod/{filter-basic,font,stext-device,string}.c ./source/fitz/ + cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/ + ''; + }; + mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ mupdf_patch ]; + # This function is missing in font.c, see font-win32.c + postPatch = '' + echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c + ''; }); - leptonica_modded = leptonica.overrideAttrs (attrs: { - patches = [ ./leptonica.patch ]; # Last verified with leptonica 1.78.0 + + leptonica_patch = mkPatch { + name = "leptonica"; + src = fetchurl { + url = "http://www.leptonica.org/source/leptonica-1.79.0.tar.gz"; + sha256 = "1n004gv1dj3pq1fcnfdclvvx5nang80336aa67nvs3nnqp4ncn84"; + }; + patchCommands = "cp -r ${k2pdfopt_src}/leptonica_mod/. ./src/"; + }; + leptonica_modded = leptonica.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ leptonica_patch ]; }); + + tesseract_patch = mkPatch { + name = "tesseract"; + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tesseract"; + rev = "4.1.1"; + sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn"; + }; + patchCommands = '' + cp ${k2pdfopt_src}/tesseract_mod/{baseapi,tesscapi,tesseract}.* src/api/ + cp ${k2pdfopt_src}/tesseract_mod/{tesscapi,tessedit,tesseract}.* src/ccmain/ + cp ${k2pdfopt_src}/tesseract_mod/dotproduct{avx,fma,sse}.* src/arch/ + cp ${k2pdfopt_src}/tesseract_mod/{intsimdmatrixsse,simddetect}.* src/arch/ + cp ${k2pdfopt_src}/tesseract_mod/{errcode,genericvector,mainblk,params,serialis,tessdatamanager,tess_version,tprintf,unicharset}.* src/ccutil/ + cp ${k2pdfopt_src}/tesseract_mod/{input,lstmrecognizer}.* src/lstm/ + cp ${k2pdfopt_src}/tesseract_mod/openclwrapper.* src/opencl/ + ''; + }; tesseract_modded = tesseract4.override { - tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: { - patches = [ ./tesseract.patch ]; # Last verified with tesseract 1.4 + tesseractBase = tesseract4.tesseractBase.overrideAttrs ({ patches ? [], ... }: { + patches = patches ++ [ tesseract_patch ]; + # Additional compilation fixes + postPatch = '' + echo libtesseract_api_la_SOURCES += tesscapi.cpp >> src/api/Makefile.am + substituteInPlace src/api/tesseract.h \ + --replace "#include " "//#include " + ''; }); }; in @@ -56,7 +143,6 @@ stdenv.mkDerivation rec { optional enableGSL gsl ++ optional enableGhostScript ghostscript ++ optional enableMuPDF mupdf_modded ++ - optional enableJPEG2K jasper ++ optional enableDJVU djvulibre ++ optional enableGOCR gocr ++ optionals enableTesseract [ leptonica_modded tesseract_modded ]; @@ -71,6 +157,10 @@ stdenv.mkDerivation rec { install -D -m 755 k2pdfopt $out/bin/k2pdfopt ''; + preFixup = optionalString enableTesseract '' + wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract4}/share/tessdata + ''; + meta = with stdenv.lib; { description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones"; homepage = "http://www.willus.com/k2pdfopt"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch deleted file mode 100644 index 3a9eca30e7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/willuslib/wmupdf.c b/willuslib/wmupdf.c -index 81627ef..f14a96c 100644 ---- a/willuslib/wmupdf.c -+++ b/willuslib/wmupdf.c -@@ -189,8 +189,6 @@ int wmupdf_remake_pdf(char *infile,char *outfile,WPDFPAGEINFO *pageinfo,int use_ - pdf_write_opts.do_compress=1; - pdf_write_opts.do_linear=0; - pdf_write_opts.do_garbage=1; /* 2 and 3 don't work for this. */ -- pdf_write_opts.continue_on_error=0; -- pdf_write_opts.errors=NULL; - write_failed=0; - wpdfpageinfo_sort(pageinfo); - xref=NULL; -@@ -1687,8 +1685,8 @@ WPDFOUTLINE *wpdfoutline_read_from_pdf_file(char *filename) - /* Sumatra version of MuPDF v1.4 -- use locally installed fonts */ - pdf_install_load_system_font_funcs(ctx); - fz_try(ctx) { doc=fz_open_document(ctx,filename); } -- fz_catch(ctx) -- { -+ fz_catch(ctx) -+ { - fz_drop_context(ctx); - return(NULL); - } -@@ -1890,5 +1888,5 @@ static pdf_obj *pdf_new_string_utf8(fz_context *ctx,char *string) - willus_mem_free((double **)&utfbuf,funcname); - return(pdfobj); - } -- -+ - #endif /* HAVE_MUPDF_LIB */ -diff --git a/willuslib/wmupdfinfo.c b/willuslib/wmupdfinfo.c -index 5c7f38c..9b9e6fd 100644 ---- a/willuslib/wmupdfinfo.c -+++ b/willuslib/wmupdfinfo.c -@@ -237,23 +237,22 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) - pdf_obj *robj; - - robj=pdf_resolve_indirect(ctx,obj); -- n=pdf_sprint_obj(ctx,NULL,0,robj,1); -- buf=malloc(n+2); -+ buf=pdf_sprint_obj(ctx,NULL,0,&n,robj,1,0); - if (buf==NULL) - { - fz_write_printf(ctx,out,"Info object (%d %d R):\n",pdf_to_num(ctx,obj),pdf_to_gen(ctx,obj)); -- pdf_print_obj(ctx,out,robj,1); -+ pdf_print_obj(ctx,out,robj,1,0); - } - else - { -- pdf_sprint_obj(ctx,buf,n+2,robj,1); -+ pdf_sprint_obj(ctx,buf,n+2,&n,robj,1,0); - display_pdf_field(ctx,out,buf,"Title","TITLE"); - display_pdf_field(ctx,out,buf,"CreationDate","CREATED"); - display_pdf_field(ctx,out,buf,"ModDate","LAST MODIFIED"); - display_pdf_field(ctx,out,buf,"Producer","PDF PRODUCER"); - display_pdf_field(ctx,out,buf,"Creator","CREATOR"); - display_file_size(ctx,out,filename); -- free(buf); -+ fz_free(ctx,buf); - } - } - if (glo->dims==1) -@@ -275,7 +274,7 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) - if (obj) - { - fz_write_printf(ctx,out, "\nEncryption object (%d %d R):\n", pdf_to_num(ctx,obj), pdf_to_gen(ctx,obj)); -- pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1); -+ pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1, 0); - } - } - -@@ -396,7 +395,7 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ - if (j < glo->dims) - return; - -- glo->dim = fz_resize_array(ctx, glo->dim, glo->dims+1, sizeof(struct info)); -+ glo->dim = fz_realloc_array(ctx, glo->dim, glo->dims+1, struct info); - glo->dims++; - - glo->dim[glo->dims - 1].page = page; -@@ -441,7 +440,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * - if (k < glo->fonts) - continue; - -- glo->font = fz_resize_array(ctx, glo->font, glo->fonts+1, sizeof(struct info)); -+ glo->font = fz_realloc_array(ctx, glo->font, glo->fonts+1, struct info); - glo->fonts++; - - glo->font[glo->fonts - 1].page = page; -@@ -510,7 +509,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj - if (k < glo->images) - continue; - -- glo->image = fz_resize_array(ctx, glo->image, glo->images+1, sizeof(struct info)); -+ glo->image = fz_realloc_array(ctx, glo->image, glo->images+1, struct info); - glo->images++; - - glo->image[glo->images - 1].page = page; -@@ -568,7 +567,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * - if (k < glo->forms) - continue; - -- glo->form = fz_resize_array(ctx, glo->form, glo->forms+1, sizeof(struct info)); -+ glo->form = fz_realloc_array(ctx, glo->form, glo->forms+1, struct info); - glo->forms++; - - glo->form[glo->forms - 1].page = page; -@@ -613,7 +612,7 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj - if (k < glo->psobjs) - continue; - -- glo->psobj = fz_resize_array(ctx, glo->psobj, glo->psobjs+1, sizeof(struct info)); -+ glo->psobj = fz_realloc_array(ctx, glo->psobj, glo->psobjs+1, struct info); - glo->psobjs++; - - glo->psobj[glo->psobjs - 1].page = page; -@@ -656,7 +655,7 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob - if (k < glo->shadings) - continue; - -- glo->shading = fz_resize_array(ctx, glo->shading, glo->shadings+1, sizeof(struct info)); -+ glo->shading = fz_realloc_array(ctx, glo->shading, glo->shadings+1, struct info); - glo->shadings++; - - glo->shading[glo->shadings - 1].page = page; -@@ -724,7 +723,7 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob - if (k < glo->patterns) - continue; - -- glo->pattern = fz_resize_array(ctx, glo->pattern, glo->patterns+1, sizeof(struct info)); -+ glo->pattern = fz_realloc_array(ctx, glo->pattern, glo->patterns+1, struct info); - glo->patterns++; - - glo->pattern[glo->patterns - 1].page = page; -@@ -1216,7 +1215,7 @@ void wmupdfinfo_get(char *filename,int *pagelist,char **buf) - if (fout==NULL) - return; - */ -- -+ - ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED); - if (!ctx) - { -@@ -1307,5 +1306,5 @@ static void date_convert(char *dst,char *src) - else if (src[i]!='\0') - sprintf(&dst[strlen(dst)]," %s",&src[i]); - } -- -+ - #endif /* HAVE_MUPDF_LIB */ diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch deleted file mode 100644 index cf7e4896b8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4a2378b..502c477 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,6 +52,7 @@ endif(JPEG_FOUND) - include(FindJasper) - if(JASPER_FOUND) - set(HAVE_JASPER_LIB 1) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY}) - endif(JASPER_FOUND) - - # paths from willuslib/wgs.c -@@ -66,8 +67,12 @@ else() - message(STATUS "Could NOT find ghostscript executable") - endif(GHOSTSCRIPT_EXECUTABLE) - --# willus.h --# HAVE_GSL_LIB -+pkg_check_modules(GSL gsl) -+if(GSL_FOUND) -+ set(HAVE_GSL_LIB 1) -+ include_directories(SYSTEM ${GSL_INCLUDEDIR}) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) -+endif(GSL_FOUND) - - - # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) -@@ -80,7 +85,7 @@ if(MUPDF_FOUND) - include_directories(SYSTEM ${MUPDF_INCLUDEDIR}) - message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") - set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} -- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype -+ - ) - endif(MUPDF_FOUND) - -@@ -91,9 +96,25 @@ if(DJVU_FOUND) - set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${DJVU_LDFLAGS}) - endif(DJVU_FOUND) - --# HAVE_GOCR_LIB --# HAVE_LEPTONICA_LIB --# HAVE_TESSERACT_LIB -+find_library(GOCR_LIB NAMES Pgm2asc) -+if(GOCR_LIB) -+ set(HAVE_GOCR_LIB 1) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GOCR_LIB}) -+endif(GOCR_LIB) -+ -+pkg_check_modules(LEPTONICA lept) -+if(LEPTONICA_FOUND) -+ set(HAVE_LEPTONICA_LIB 1) -+ include_directories(SYSTEM ${LEPTONICA_INCLUDEDIR}) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${LEPTONICA_LDFLAGS}) -+endif(LEPTONICA_FOUND) -+ -+pkg_check_modules(TESSERACT tesseract) -+if(TESSERACT_FOUND) -+ set(HAVE_TESSERACT_LIB 1) -+ include_directories(SYSTEM ${TESSERACT_INCLUDEDIR}) -+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${TESSERACT_LDFLAGS}) -+endif(TESSERACT_FOUND) - - # ---- Describe project - -diff --git a/willuslib/CMakeLists.txt b/willuslib/CMakeLists.txt -index 463bbc9..8043db5 100644 ---- a/willuslib/CMakeLists.txt -+++ b/willuslib/CMakeLists.txt -@@ -6,7 +6,7 @@ include_directories(..) - set(WILLUSLIB_SRC - ansi.c array.c bmp.c bmpdjvu.c bmpmupdf.c dtcompress.c filelist.c - fontdata.c fontrender.c gslpolyfit.c linux.c math.c mem.c ocr.c -- ocrjocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c -+ ocrgocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c - token.c wfile.c wgs.c wgui.c willusversion.c win.c winbmp.c - wincomdlg.c winmbox.c winshell.c wmupdf.c wmupdfinfo.c wpdf.c wsys.c - wzfile.c wleptonica.c -diff --git a/willuslib/ocrgocr.c b/willuslib/ocrgocr.c -index 6027e9a..fbe10f0 100644 ---- a/willuslib/ocrgocr.c -+++ b/willuslib/ocrgocr.c -@@ -29,6 +29,8 @@ - #ifdef HAVE_GOCR_LIB - #include - -+job_t *OCR_JOB; -+ - /* - ** bmp8 must be grayscale - ** (x1,y1) and (x2,y2) from top left of bitmap -@@ -63,6 +65,7 @@ void gocr_single_word_from_bmp8(char *text,int maxlen,WILLUSBITMAP *bmp8, - h=y2-y1+1; - dh=h+bw*2; - job=&_job; -+ OCR_JOB=job; - job_init(job); - job_init_image(job); - // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10); diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/leptonica.patch b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/leptonica.patch deleted file mode 100644 index dfab99fd01..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/leptonica.patch +++ /dev/null @@ -1,254 +0,0 @@ -From 8c11a20925686855023df90ed477957c7d7fe91e Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer -Date: Fri, 13 Sep 2019 15:54:21 -0400 -Subject: [PATCH] Willus mod for k2pdfopt - ---- - src/allheaders.h | 4 ++ - src/dewarp2.c | 106 ++++++++++++++++++++++++++++++++++++++++++----- - src/leptwin.c | 6 ++- - 3 files changed, 104 insertions(+), 12 deletions(-) - -diff --git a/src/allheaders.h b/src/allheaders.h -index e68eff1..b3cc729 100644 ---- a/src/allheaders.h -+++ b/src/allheaders.h -@@ -669,6 +669,10 @@ LEPT_DLL extern L_DEWARPA * dewarpaReadMem ( const l_uint8 *data, size_t size ); - LEPT_DLL extern l_ok dewarpaWrite ( const char *filename, L_DEWARPA *dewa ); - LEPT_DLL extern l_ok dewarpaWriteStream ( FILE *fp, L_DEWARPA *dewa ); - LEPT_DLL extern l_ok dewarpaWriteMem ( l_uint8 **pdata, size_t *psize, L_DEWARPA *dewa ); -+/* WILLUS MOD */ -+ LEPT_DLL extern l_int32 dewarpBuildPageModel_ex ( L_DEWARP *dew, const char *debugfile,l_int32 fit_order ); -+ LEPT_DLL extern l_int32 dewarpFindVertDisparity_ex ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag,l_int32 fit_order ); -+ LEPT_DLL extern l_int32 dewarpBuildLineModel_ex ( L_DEWARP *dew, l_int32 opensize, const char *debugfile,l_int32 fit_order ); - LEPT_DLL extern l_ok dewarpBuildPageModel ( L_DEWARP *dew, const char *debugfile ); - LEPT_DLL extern l_ok dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag ); - LEPT_DLL extern l_ok dewarpFindHorizDisparity ( L_DEWARP *dew, PTAA *ptaa ); -diff --git a/src/dewarp2.c b/src/dewarp2.c -index 220eec1..2e29500 100644 ---- a/src/dewarp2.c -+++ b/src/dewarp2.c -@@ -144,9 +144,17 @@ static const l_float32 L_ALLOWED_W_FRACT = 0.05; /* no bigger */ - * longest textlines. - * - */ -+/* WILLUS MOD */ - l_ok --dewarpBuildPageModel(L_DEWARP *dew, -- const char *debugfile) -+dewarpBuildPageModel(L_DEWARP *dew,const char *debugfile) -+{ -+return(dewarpBuildPageModel_ex(dew,debugfile,2)); -+} -+ -+l_ok -+dewarpBuildPageModel_ex(L_DEWARP *dew, -+ const char *debugfile, -+ l_int32 fit_order) - { - l_int32 linecount, topline, botline, ret; - PIX *pixs, *pix1, *pix2, *pix3; -@@ -225,7 +233,7 @@ PTAA *ptaa1, *ptaa2; - /* Get the sampled vertical disparity from the textline centers. - * The disparity array will push pixels vertically so that each - * textline is flat and centered at the y-position of the mid-point. */ -- if (dewarpFindVertDisparity(dew, ptaa2, 0) != 0) { -+ if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) { - L_WARNING("vertical disparity not built\n", procName); - ptaaDestroy(&ptaa2); - return 1; -@@ -290,13 +298,24 @@ PTAA *ptaa1, *ptaa2; - * a pdf. Non-pix debug output goes to /tmp. - * - */ -+/* WILLUS MOD */ - l_ok - dewarpFindVertDisparity(L_DEWARP *dew, - PTAA *ptaa, - l_int32 rotflag) - { -+return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2)); -+} -+/* WILLUS MOD -- add cubic and quartic fits and ..._ex functions */ -+l_int32 -+dewarpFindVertDisparity_ex(L_DEWARP *dew, -+ PTAA *ptaa, -+ l_int32 rotflag, -+ l_int32 fit_order) -+{ - l_int32 i, j, nlines, npts, nx, ny, sampling; --l_float32 c0, c1, c2, x, y, midy, val, medval, meddev, minval, maxval; -+/* WILLUS MOD */ -+l_float32 c0, c1, c2, c3, c4, x, y, midy, val, medval, meddev, minval, maxval; - l_float32 *famidys; - NUMA *nax, *nafit, *nacurve0, *nacurve1, *nacurves; - NUMA *namidy, *namidys, *namidysi; -@@ -304,11 +323,22 @@ PIX *pix1, *pix2, *pixcirc, *pixdb; - PTA *pta, *ptad, *ptacirc; - PTAA *ptaa0, *ptaa1, *ptaa2, *ptaa3, *ptaa4, *ptaa5, *ptaat; - FPIX *fpix; -+/* WILLUS MOD */ -+l_int32 fit_order1,fit_order2; - - PROCNAME("dewarpFindVertDisparity"); - - if (!dew) - return ERROR_INT("dew not defined", procName, 1); -+/* WILLUS MOD */ -+ if (fit_order < 10) -+ fit_order1 = fit_order2 = fit_order; -+ else -+ { -+ fit_order1=fit_order % 10; -+ fit_order2=fit_order / 10; -+ fit_order2=fit_order2 % 10; -+ } - dew->vsuccess = 0; - if (!ptaa) - return ERROR_INT("ptaa not defined", procName, 1); -@@ -331,12 +361,32 @@ FPIX *fpix; - pixdb = (rotflag) ? pixRotateOrth(dew->pixs, 1) : pixClone(dew->pixs); - for (i = 0; i < nlines; i++) { /* for each line */ - pta = ptaaGetPta(ptaa, i, L_CLONE); -- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); -- numaAddNumber(nacurve0, c2); -+/* WILLUS MOD */ -+if (fit_order1>3) -+ { -+ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); -+ numaAddNumber(nacurve0, c4); -+ } -+else if (fit_order1==3) -+ { -+ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); -+ numaAddNumber(nacurve0, c3); -+ } -+else -+ { -+ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); -+ numaAddNumber(nacurve0, c2); -+ } - ptad = ptaCreate(nx); - for (j = 0; j < nx; j++) { /* uniformly sampled in x */ - x = j * sampling; -- applyQuadraticFit(c2, c1, c0, x, &y); -+/* WILLUS MOD */ -+if (fit_order1>3) -+ applyQuarticFit(c4, c3, c2, c1, c0, x, &y); -+else if (fit_order1==3) -+ applyCubicFit(c3, c2, c1, c0, x, &y); -+else -+ applyQuadraticFit(c2, c1, c0, x, &y); - ptaAddPt(ptad, x, y); - } - ptaaAddPta(ptaa0, ptad, L_INSERT); -@@ -350,7 +400,13 @@ FPIX *fpix; - for (i = 0; i < nlines; i++) { - pta = ptaaGetPta(ptaa, i, L_CLONE); - ptaGetArrays(pta, &nax, NULL); -- ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); -+/* WILLUS MOD */ -+if (fit_order1>3) -+ptaGetQuarticLSF(pta, NULL, NULL, NULL, NULL, NULL, &nafit); -+else if (fit_order1==3) -+ptaGetCubicLSF(pta, NULL, NULL, NULL, NULL, &nafit); -+else -+ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); - ptad = ptaCreateFromNuma(nax, nafit); - ptaaAddPta(ptaat, ptad, L_INSERT); - ptaDestroy(&pta); -@@ -494,11 +550,24 @@ FPIX *fpix; - ptaa5 = ptaaCreate(nx); /* uniformly sampled across full height of image */ - for (j = 0; j < nx; j++) { /* for each column */ - pta = ptaaGetPta(ptaa4, j, L_CLONE); -- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); -+/* WILLUS MOD */ -+/* Order higher than 2 can cause a little craziness here. */ -+if (fit_order2>3) -+ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); -+else if (fit_order2==3) -+ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); -+else -+ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); - ptad = ptaCreate(ny); - for (i = 0; i < ny; i++) { /* uniformly sampled in y */ - y = i * sampling; -- applyQuadraticFit(c2, c1, c0, y, &val); -+/* WILLUS MOD */ -+if (fit_order2>3) -+ applyQuarticFit(c4, c3, c2, c1, c0, y, &val); -+else if (fit_order2==3) -+ applyCubicFit(c3, c2, c1, c0, y, &val); -+else -+ applyQuadraticFit(c2, c1, c0, y, &val); - ptaAddPt(ptad, y, val); - } - ptaaAddPta(ptaa5, ptad, L_INSERT); -@@ -1602,11 +1671,21 @@ FPIX *fpix; - * See notes there. - * - */ -+/* WILLUS MOD */ - l_ok - dewarpBuildLineModel(L_DEWARP *dew, - l_int32 opensize, - const char *debugfile) - { -+return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2)); -+} -+ -+l_int32 -+dewarpBuildLineModel_ex(L_DEWARP *dew, -+ l_int32 opensize, -+ const char *debugfile, -+ l_int32 fit_order) -+{ - char buf[64]; - l_int32 i, j, bx, by, ret, nlines; - BOXA *boxa; -@@ -1695,6 +1774,8 @@ PTAA *ptaa1, *ptaa2; - - /* Remove all lines that are not at least 0.75 times the length - * of the longest line. */ -+/* WILLUS MOD */ -+/* - ptaa2 = dewarpRemoveShortLines(pix, ptaa1, 0.75, DEBUG_SHORT_LINES); - if (debugfile) { - pix1 = pixConvertTo32(pix); -@@ -1704,6 +1785,8 @@ PTAA *ptaa1, *ptaa2; - pixDestroy(&pix1); - pixDestroy(&pix2); - } -+*/ -+ptaa2=ptaa1; - ptaaDestroy(&ptaa1); - nlines = ptaaGetCount(ptaa2); - if (nlines < dew->minlines) { -@@ -1717,7 +1800,8 @@ PTAA *ptaa1, *ptaa2; - * centers. The disparity array will push pixels vertically - * so that each line is flat and centered at the y-position - * of the mid-point. */ -- ret = dewarpFindVertDisparity(dew, ptaa2, 1 - i); -+/* WILLUS MOD */ -+ ret = dewarpFindVertDisparity_ex(dew, ptaa2, 1 - i, fit_order); - - /* If i == 0, move the result to the horizontal disparity, - * rotating it back by -90 degrees. */ -diff --git a/src/leptwin.c b/src/leptwin.c -index 72643a0..573d33e 100644 ---- a/src/leptwin.c -+++ b/src/leptwin.c -@@ -364,5 +364,9 @@ PIXCMAP *cmap; - - return hBitmap; - } -- -+#else -+/* willus mod: Avoid weird issue with OS/X library archiver when there are no symbols */ -+int leptwin_my_empty_func(void); -+int leptwin_my_empty_func(void) -+{return(0);} - #endif /* _WIN32 */ --- -2.22.0 - diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/mupdf.patch b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/mupdf.patch deleted file mode 100644 index 0c59a1d201..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/mupdf.patch +++ /dev/null @@ -1,1060 +0,0 @@ -From d8927c969e3387ca2669a616c0ba53bce918a031 Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer -Date: Fri, 13 Sep 2019 15:11:45 -0400 -Subject: [PATCH] Willus mod for k2pdfopt - ---- - source/fitz/filter-basic.c | 3 + - source/fitz/font-win32.c | 866 +++++++++++++++++++++++++++++++++++++ - source/fitz/font.c | 3 + - source/fitz/stext-device.c | 5 + - source/fitz/string.c | 5 + - source/pdf/pdf-annot.c | 14 +- - source/pdf/pdf-link.c | 3 + - source/pdf/pdf-parse.c | 5 + - source/pdf/pdf-xref.c | 9 + - 9 files changed, 912 insertions(+), 1 deletion(-) - create mode 100644 source/fitz/font-win32.c - -diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c -index 0713a62e7..b8ef4d292 100644 ---- a/source/fitz/filter-basic.c -+++ b/source/fitz/filter-basic.c -@@ -259,7 +259,10 @@ look_for_endstream: - if (!state->warned) - { - state->warned = 1; -+/* willus mod -- no warning */ -+/* - fz_warn(ctx, "PDF stream Length incorrect"); -+*/ - } - return *stm->rp++; - } -diff --git a/source/fitz/font-win32.c b/source/fitz/font-win32.c -new file mode 100644 -index 000000000..45de8cfd3 ---- /dev/null -+++ b/source/fitz/font-win32.c -@@ -0,0 +1,866 @@ -+/* -+** Routines to access MS Windows system fonts. -+** From sumatra PDF distro. -+** Modified for MuPDF v1.9a by willus.com -+*/ -+#include "mupdf/pdf.h" -+ -+/* -+ Which fonts are embedded is based on a few preprocessor definitions. -+ -+ The base 14 fonts are always embedded. -+ For CJK font substitution we embed DroidSansFallback. -+ -+ Set NOCJK to skip all CJK support (this also omits embedding the CJK CMaps) -+ Set NOCJKFONT to skip the embedded CJK font. -+ Set NOCJKFULL to embed a smaller CJK font without CJK Extension A support. -+*/ -+ -+#ifdef NOCJK -+#define NOCJKFONT -+#endif -+ -+/* SumatraPDF: also load fonts included with Windows */ -+#ifdef _WIN32 -+ -+#ifndef UNICODE -+#define UNICODE -+#endif -+#ifndef _UNICODE -+#define _UNICODE -+#endif -+ -+#include -+ -+// TODO: Use more of FreeType for TTF parsing (for performance reasons, -+// the fonts can't be parsed completely, though) -+#include -+#include FT_TRUETYPE_IDS_H -+#include FT_TRUETYPE_TAGS_H -+ -+#define TTC_VERSION1 0x00010000 -+#define TTC_VERSION2 0x00020000 -+ -+#define MAX_FACENAME 128 -+ -+// Note: the font face must be the first field so that the structure -+// can be treated like a simple string for searching -+typedef struct pdf_fontmapMS_s -+{ -+ char fontface[MAX_FACENAME]; -+ char fontpath[MAX_PATH]; -+ int index; -+} pdf_fontmapMS; -+ -+typedef struct pdf_fontlistMS_s -+{ -+ pdf_fontmapMS *fontmap; -+ int len; -+ int cap; -+} pdf_fontlistMS; -+ -+typedef struct _tagTT_OFFSET_TABLE -+{ -+ ULONG uVersion; -+ USHORT uNumOfTables; -+ USHORT uSearchRange; -+ USHORT uEntrySelector; -+ USHORT uRangeShift; -+} TT_OFFSET_TABLE; -+ -+typedef struct _tagTT_TABLE_DIRECTORY -+{ -+ ULONG uTag; //table name -+ ULONG uCheckSum; //Check sum -+ ULONG uOffset; //Offset from beginning of file -+ ULONG uLength; //length of the table in bytes -+} TT_TABLE_DIRECTORY; -+ -+typedef struct _tagTT_NAME_TABLE_HEADER -+{ -+ USHORT uFSelector; //format selector. Always 0 -+ USHORT uNRCount; //Name Records count -+ USHORT uStorageOffset; //Offset for strings storage, from start of the table -+} TT_NAME_TABLE_HEADER; -+ -+typedef struct _tagTT_NAME_RECORD -+{ -+ USHORT uPlatformID; -+ USHORT uEncodingID; -+ USHORT uLanguageID; -+ USHORT uNameID; -+ USHORT uStringLength; -+ USHORT uStringOffset; //from start of storage area -+} TT_NAME_RECORD; -+ -+typedef struct _tagFONT_COLLECTION -+{ -+ ULONG Tag; -+ ULONG Version; -+ ULONG NumFonts; -+} FONT_COLLECTION; -+ -+static struct { -+ char *name; -+ char *pattern; -+} baseSubstitutes[] = { -+ { "Courier", "CourierNewPSMT" }, -+ { "Courier-Bold", "CourierNewPS-BoldMT" }, -+ { "Courier-Oblique", "CourierNewPS-ItalicMT" }, -+ { "Courier-BoldOblique", "CourierNewPS-BoldItalicMT" }, -+ { "Helvetica", "ArialMT" }, -+ { "Helvetica-Bold", "Arial-BoldMT" }, -+ { "Helvetica-Oblique", "Arial-ItalicMT" }, -+ { "Helvetica-BoldOblique", "Arial-BoldItalicMT" }, -+ { "Times-Roman", "TimesNewRomanPSMT" }, -+ { "Times-Bold", "TimesNewRomanPS-BoldMT" }, -+ { "Times-Italic", "TimesNewRomanPS-ItalicMT" }, -+ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT" }, -+ { "Symbol", "SymbolMT" }, -+}; -+static const char *base_font_names[][10] = -+{ -+ { "Courier", "CourierNew", "CourierNewPSMT", NULL }, -+ { "Courier-Bold", "CourierNew,Bold", "Courier,Bold", -+ "CourierNewPS-BoldMT", "CourierNew-Bold", NULL }, -+ { "Courier-Oblique", "CourierNew,Italic", "Courier,Italic", -+ "CourierNewPS-ItalicMT", "CourierNew-Italic", NULL }, -+ { "Courier-BoldOblique", "CourierNew,BoldItalic", "Courier,BoldItalic", -+ "CourierNewPS-BoldItalicMT", "CourierNew-BoldItalic", NULL }, -+ { "Helvetica", "ArialMT", "Arial", NULL }, -+ { "Helvetica-Bold", "Arial-BoldMT", "Arial,Bold", "Arial-Bold", -+ "Helvetica,Bold", NULL }, -+ { "Helvetica-Oblique", "Arial-ItalicMT", "Arial,Italic", "Arial-Italic", -+ "Helvetica,Italic", "Helvetica-Italic", NULL }, -+ { "Helvetica-BoldOblique", "Arial-BoldItalicMT", -+ "Arial,BoldItalic", "Arial-BoldItalic", -+ "Helvetica,BoldItalic", "Helvetica-BoldItalic", NULL }, -+ { "Times-Roman", "TimesNewRomanPSMT", "TimesNewRoman", -+ "TimesNewRomanPS", NULL }, -+ { "Times-Bold", "TimesNewRomanPS-BoldMT", "TimesNewRoman,Bold", -+ "TimesNewRomanPS-Bold", "TimesNewRoman-Bold", NULL }, -+ { "Times-Italic", "TimesNewRomanPS-ItalicMT", "TimesNewRoman,Italic", -+ "TimesNewRomanPS-Italic", "TimesNewRoman-Italic", NULL }, -+ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT", -+ "TimesNewRoman,BoldItalic", "TimesNewRomanPS-BoldItalic", -+ "TimesNewRoman-BoldItalic", NULL }, -+ { "Symbol", "Symbol,Italic", "Symbol,Bold", "Symbol,BoldItalic", -+ "SymbolMT", "SymbolMT,Italic", "SymbolMT,Bold", "SymbolMT,BoldItalic", NULL }, -+ { "ZapfDingbats", NULL } -+}; -+ -+static pdf_fontlistMS fontlistMS = -+{ -+ NULL, -+ 0, -+ 0, -+}; -+static int strcmp_ignore_space(const char *a, const char *b); -+static const char *clean_font_name(const char *fontname); -+static const char *pdf_clean_base14_name(const char *fontname); -+ -+static inline USHORT BEtoHs(USHORT x) -+{ -+ BYTE *data = (BYTE *)&x; -+ return (data[0] << 8) | data[1]; -+} -+ -+static inline ULONG BEtoHl(ULONG x) -+{ -+ BYTE *data = (BYTE *)&x; -+ return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3]; -+} -+ -+static int strcmp_ignore_space(const char *a, const char *b) -+{ -+ while (1) -+ { -+ while (*a == ' ') -+ a++; -+ while (*b == ' ') -+ b++; -+ if (*a != *b) -+ return 1; -+ if (*a == 0) -+ return *a != *b; -+ if (*b == 0) -+ return *a != *b; -+ a++; -+ b++; -+ } -+} -+ -+/* A little bit more sophisticated name matching so that e.g. "EurostileExtended" -+ matches "EurostileExtended-Roman" or "Tahoma-Bold,Bold" matches "Tahoma-Bold" */ -+static int -+lookup_compare(const void *elem1, const void *elem2) -+{ -+ const char *val1 = elem1; -+ const char *val2 = elem2; -+ int len1 = strlen(val1); -+ int len2 = strlen(val2); -+ -+ if (len1 != len2) -+ { -+ const char *rest = len1 > len2 ? val1 + len2 : val2 + len1; -+ if (',' == *rest || !_stricmp(rest, "-roman")) -+ return _strnicmp(val1, val2, fz_mini(len1, len2)); -+ } -+ -+ return _stricmp(val1, val2); -+} -+ -+static void -+remove_spaces(char *srcDest) -+{ -+ char *dest; -+ -+ for (dest = srcDest; *srcDest; srcDest++) -+ if (*srcDest != ' ') -+ *dest++ = *srcDest; -+ *dest = '\0'; -+} -+ -+static int -+str_ends_with(const char *str, const char *end) -+{ -+ size_t len1 = strlen(str); -+ size_t len2 = strlen(end); -+ -+ return len1 >= len2 && !strcmp(str + len1 - len2, end); -+} -+ -+static pdf_fontmapMS * -+pdf_find_windows_font_path(const char *fontname) -+{ -+ return bsearch(fontname, fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), lookup_compare); -+} -+ -+/* source and dest can be same */ -+static void -+decode_unicode_BE(fz_context *ctx, char *source, int sourcelen, char *dest, int destlen) -+{ -+ WCHAR *tmp; -+ int converted, i; -+ -+ if (sourcelen % 2 != 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); -+ -+ tmp = fz_malloc_array(ctx, sourcelen / 2 + 1, sizeof(WCHAR)); -+ for (i = 0; i < sourcelen / 2; i++) -+ tmp[i] = BEtoHs(((WCHAR *)source)[i]); -+ tmp[sourcelen / 2] = '\0'; -+ -+ converted = WideCharToMultiByte(CP_UTF8, 0, tmp, -1, dest, destlen, NULL, NULL); -+ fz_free(ctx, tmp); -+ if (!converted) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); -+} -+ -+static void -+decode_platform_string(fz_context *ctx, int platform, int enctype, char *source, int sourcelen, char *dest, int destlen) -+{ -+ switch (platform) -+ { -+ case TT_PLATFORM_APPLE_UNICODE: -+ switch (enctype) -+ { -+ case TT_APPLE_ID_DEFAULT: -+ case TT_APPLE_ID_UNICODE_2_0: -+ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); -+ return; -+ } -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ case TT_PLATFORM_MACINTOSH: -+ switch (enctype) -+ { -+ case TT_MAC_ID_ROMAN: -+ if (sourcelen + 1 > destlen) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : overlong fontname: %s", source); -+ // TODO: Convert to UTF-8 from what encoding? -+ memcpy(dest, source, sourcelen); -+ dest[sourcelen] = 0; -+ return; -+ } -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ case TT_PLATFORM_MICROSOFT: -+ switch (enctype) -+ { -+ case TT_MS_ID_SYMBOL_CS: -+ case TT_MS_ID_UNICODE_CS: -+ case TT_MS_ID_UCS_4: -+ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); -+ return; -+ } -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ default: -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); -+ } -+} -+ -+static void -+grow_system_font_list(fz_context *ctx, pdf_fontlistMS *fl) -+{ -+ int newcap; -+ pdf_fontmapMS *newitems; -+ -+ if (fl->cap == 0) -+ newcap = 1024; -+ else -+ newcap = fl->cap * 2; -+ -+ // use realloc/free for the fontmap, since the list can -+ // remain in memory even with all fz_contexts destroyed -+ newitems = realloc(fl->fontmap, newcap * sizeof(pdf_fontmapMS)); -+ if (!newitems) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "OOM in grow_system_font_list"); -+ memset(newitems + fl->cap, 0, sizeof(pdf_fontmapMS) * (newcap - fl->cap)); -+ -+ fl->fontmap = newitems; -+ fl->cap = newcap; -+} -+ -+static void -+append_mapping(fz_context *ctx, pdf_fontlistMS *fl, const char *facename, const char *path, int index) -+{ -+ if (fl->len == fl->cap) -+ grow_system_font_list(ctx, fl); -+ -+ if (fl->len >= fl->cap) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : fontlist overflow"); -+ -+ fz_strlcpy(fl->fontmap[fl->len].fontface, facename, sizeof(fl->fontmap[0].fontface)); -+ fz_strlcpy(fl->fontmap[fl->len].fontpath, path, sizeof(fl->fontmap[0].fontpath)); -+ fl->fontmap[fl->len].index = index; -+ -+ ++fl->len; -+} -+ -+static void -+safe_read(fz_context *ctx, fz_stream *file, int offset, char *buf, int size) -+{ -+ int n; -+ fz_seek(ctx, file, offset, 0); -+ n = fz_read(ctx, file, (unsigned char *)buf, size); -+ if (n != size) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "safe_read: read %d, expected %d", n, size); -+} -+ -+static void -+read_ttf_string(fz_context *ctx, fz_stream *file, int offset, TT_NAME_RECORD *ttRecordBE, char *buf, int size) -+{ -+ char szTemp[MAX_FACENAME * 2]; -+ // ignore empty and overlong strings -+ int stringLength = BEtoHs(ttRecordBE->uStringLength); -+ if (stringLength == 0 || stringLength >= sizeof(szTemp)) -+ return; -+ -+ safe_read(ctx, file, offset + BEtoHs(ttRecordBE->uStringOffset), szTemp, stringLength); -+ decode_platform_string(ctx, BEtoHs(ttRecordBE->uPlatformID), -+ BEtoHs(ttRecordBE->uEncodingID), szTemp, stringLength, buf, size); -+} -+ -+static void -+makeFakePSName(char szName[MAX_FACENAME], const char *szStyle) -+{ -+ // append the font's subfamily, unless it's a Regular font -+ if (*szStyle && _stricmp(szStyle, "Regular") != 0) -+ { -+ fz_strlcat(szName, "-", MAX_FACENAME); -+ fz_strlcat(szName, szStyle, MAX_FACENAME); -+ } -+ remove_spaces(szName); -+} -+ -+static void -+parseTTF(fz_context *ctx, fz_stream *file, int offset, int index, const char *path) -+{ -+ TT_OFFSET_TABLE ttOffsetTableBE; -+ TT_TABLE_DIRECTORY tblDirBE; -+ TT_NAME_TABLE_HEADER ttNTHeaderBE; -+ TT_NAME_RECORD ttRecordBE; -+ -+ char szPSName[MAX_FACENAME] = { 0 }; -+ char szTTName[MAX_FACENAME] = { 0 }; -+ char szStyle[MAX_FACENAME] = { 0 }; -+ char szCJKName[MAX_FACENAME] = { 0 }; -+ int i, count, tblOffset; -+ -+ safe_read(ctx, file, offset, (char *)&ttOffsetTableBE, sizeof(TT_OFFSET_TABLE)); -+ -+ // check if this is a TrueType font of version 1.0 or an OpenType font -+ if (BEtoHl(ttOffsetTableBE.uVersion) != TTC_VERSION1 && -+ BEtoHl(ttOffsetTableBE.uVersion) != TTAG_OTTO) -+ { -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid font version %x", (unsigned int)BEtoHl(ttOffsetTableBE.uVersion)); -+ } -+ -+ // determine the name table's offset by iterating through the offset table -+ count = BEtoHs(ttOffsetTableBE.uNumOfTables); -+ for (i = 0; i < count; i++) -+ { -+ int entryOffset = offset + sizeof(TT_OFFSET_TABLE) + i * sizeof(TT_TABLE_DIRECTORY); -+ safe_read(ctx, file, entryOffset, (char *)&tblDirBE, sizeof(TT_TABLE_DIRECTORY)); -+ if (!BEtoHl(tblDirBE.uTag) || BEtoHl(tblDirBE.uTag) == TTAG_name) -+ break; -+ } -+ if (count == i || !BEtoHl(tblDirBE.uTag)) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : nameless font"); -+ tblOffset = BEtoHl(tblDirBE.uOffset); -+ -+ // read the 'name' table for record count and offsets -+ safe_read(ctx, file, tblOffset, (char *)&ttNTHeaderBE, sizeof(TT_NAME_TABLE_HEADER)); -+ offset = tblOffset + sizeof(TT_NAME_TABLE_HEADER); -+ tblOffset += BEtoHs(ttNTHeaderBE.uStorageOffset); -+ -+ // read through the strings for PostScript name and font family -+ count = BEtoHs(ttNTHeaderBE.uNRCount); -+ for (i = 0; i < count; i++) -+ { -+ short langId, nameId; -+ BOOL isCJKName; -+ -+ safe_read(ctx, file, offset + i * sizeof(TT_NAME_RECORD), (char *)&ttRecordBE, sizeof(TT_NAME_RECORD)); -+ -+ langId = BEtoHs(ttRecordBE.uLanguageID); -+ nameId = BEtoHs(ttRecordBE.uNameID); -+ isCJKName = TT_NAME_ID_FONT_FAMILY == nameId && LANG_CHINESE == PRIMARYLANGID(langId); -+ -+ // ignore non-English strings (except for Chinese font names) -+ if (langId && langId != TT_MS_LANGID_ENGLISH_UNITED_STATES && !isCJKName) -+ continue; -+ // ignore names other than font (sub)family and PostScript name -+ fz_try(ctx) -+ { -+ if (isCJKName) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szCJKName, sizeof(szCJKName)); -+ else if (TT_NAME_ID_FONT_FAMILY == nameId) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szTTName, sizeof(szTTName)); -+ else if (TT_NAME_ID_FONT_SUBFAMILY == nameId) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szStyle, sizeof(szStyle)); -+ else if (TT_NAME_ID_PS_NAME == nameId) -+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szPSName, sizeof(szPSName)); -+ } -+ fz_catch(ctx) -+ { -+ fz_warn(ctx, "ignoring face name decoding fonterror"); -+ } -+ } -+ -+ // try to prevent non-Arial fonts from accidentally substituting Arial -+ if (!strcmp(szPSName, "ArialMT")) -+ { -+ // cf. https://code.google.com/p/sumatrapdf/issues/detail?id=2471 -+ if (strcmp(szTTName, "Arial") != 0) -+ szPSName[0] = '\0'; -+ // TODO: is there a better way to distinguish Arial Caps from Arial proper? -+ // cf. http://code.google.com/p/sumatrapdf/issues/detail?id=1290 -+ else if (strstr(path, "caps") || strstr(path, "Caps")) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "ignore %s, as it can't be distinguished from Arial,Regular", path); -+ } -+ -+ if (szPSName[0]) -+ append_mapping(ctx, &fontlistMS, szPSName, path, index); -+ if (szTTName[0]) -+ { -+ // derive a PostScript-like name and add it, if it's different from the font's -+ // included PostScript name; cf. http://code.google.com/p/sumatrapdf/issues/detail?id=376 -+ makeFakePSName(szTTName, szStyle); -+ // compare the two names before adding this one -+ if (lookup_compare(szTTName, szPSName)) -+ append_mapping(ctx, &fontlistMS, szTTName, path, index); -+ } -+ if (szCJKName[0]) -+ { -+ makeFakePSName(szCJKName, szStyle); -+ if (lookup_compare(szCJKName, szPSName) && lookup_compare(szCJKName, szTTName)) -+ append_mapping(ctx, &fontlistMS, szCJKName, path, index); -+ } -+} -+ -+static void -+parseTTFs(fz_context *ctx, const char *path) -+{ -+ fz_stream *file = fz_open_file(ctx, path); -+ /* "fonterror : %s not found", path */ -+ fz_try(ctx) -+ { -+ parseTTF(ctx, file, 0, 0, path); -+ } -+ fz_always(ctx) -+ { -+ fz_drop_stream(ctx,file); -+ } -+ fz_catch(ctx) -+ { -+ fz_rethrow(ctx); -+ } -+} -+ -+static void -+parseTTCs(fz_context *ctx, const char *path) -+{ -+ FONT_COLLECTION fontcollectionBE; -+ ULONG i, numFonts, *offsettableBE = NULL; -+ -+ fz_stream *file = fz_open_file(ctx, path); -+ /* "fonterror : %s not found", path */ -+ -+ fz_var(offsettableBE); -+ -+ fz_try(ctx) -+ { -+ safe_read(ctx, file, 0, (char *)&fontcollectionBE, sizeof(FONT_COLLECTION)); -+ if (BEtoHl(fontcollectionBE.Tag) != TTAG_ttcf) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : wrong format %x", (unsigned int)BEtoHl(fontcollectionBE.Tag)); -+ if (BEtoHl(fontcollectionBE.Version) != TTC_VERSION1 && -+ BEtoHl(fontcollectionBE.Version) != TTC_VERSION2) -+ { -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid version %x", (unsigned int)BEtoHl(fontcollectionBE.Version)); -+ } -+ -+ numFonts = BEtoHl(fontcollectionBE.NumFonts); -+ offsettableBE = fz_malloc_array(ctx, numFonts, sizeof(ULONG)); -+ -+ safe_read(ctx, file, sizeof(FONT_COLLECTION), (char *)offsettableBE, numFonts * sizeof(ULONG)); -+ for (i = 0; i < numFonts; i++) -+ parseTTF(ctx, file, BEtoHl(offsettableBE[i]), i, path); -+ } -+ fz_always(ctx) -+ { -+ fz_free(ctx, offsettableBE); -+ fz_drop_stream(ctx,file); -+ } -+ fz_catch(ctx) -+ { -+ fz_rethrow(ctx); -+ } -+} -+ -+static void -+extend_system_font_list(fz_context *ctx, const WCHAR *path) -+{ -+ WCHAR szPath[MAX_PATH], *lpFileName; -+ WIN32_FIND_DATA FileData; -+ HANDLE hList; -+ -+ GetFullPathName(path, nelem(szPath), szPath, &lpFileName); -+ -+ hList = FindFirstFile(szPath, &FileData); -+ if (hList == INVALID_HANDLE_VALUE) -+ { -+ // Don't complain about missing directories -+ if (GetLastError() == ERROR_FILE_NOT_FOUND) -+ return; -+ fz_throw(ctx, FZ_ERROR_GENERIC, "extend_system_font_list: unknown error %d", (int)GetLastError()); -+ } -+ do -+ { -+ if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) -+ { -+ char szPathUtf8[MAX_PATH], *fileExt; -+ int res; -+ lstrcpyn(lpFileName, FileData.cFileName, szPath + MAX_PATH - lpFileName); -+ res = WideCharToMultiByte(CP_UTF8, 0, szPath, -1, szPathUtf8, sizeof(szPathUtf8), NULL, NULL); -+ if (!res) -+ { -+ fz_warn(ctx, "WideCharToMultiByte failed for %S", szPath); -+ continue; -+ } -+ fileExt = szPathUtf8 + strlen(szPathUtf8) - 4; -+ fz_try(ctx) -+ { -+ if (!_stricmp(fileExt, ".ttc")) -+ parseTTCs(ctx, szPathUtf8); -+ else if (!_stricmp(fileExt, ".ttf") || !_stricmp(fileExt, ".otf")) -+ parseTTFs(ctx, szPathUtf8); -+ } -+ fz_catch(ctx) -+ { -+ // ignore errors occurring while parsing a given font file -+ } -+ } -+ } while (FindNextFile(hList, &FileData)); -+ FindClose(hList); -+} -+ -+static void -+destroy_system_font_list(void) -+{ -+ free(fontlistMS.fontmap); -+ memset(&fontlistMS, 0, sizeof(fontlistMS)); -+} -+ -+static void -+create_system_font_list(fz_context *ctx) -+{ -+ WCHAR szFontDir[MAX_PATH]; -+ UINT cch; -+ -+ cch = GetWindowsDirectory(szFontDir, nelem(szFontDir) - 12); -+ if (0 < cch && cch < nelem(szFontDir) - 12) -+ { -+ /* willus.com edit--Win XP default MSVCRT.DLL doesn't have wcscat_s */ -+#ifdef _WIN64 -+ wcscat_s(szFontDir, MAX_PATH, L"\\Fonts\\*.?t?"); -+#else -+ wcscat(szFontDir,L"\\Fonts\\*.?t?"); -+#endif -+ extend_system_font_list(ctx, szFontDir); -+ } -+ -+ if (fontlistMS.len == 0) -+ fz_warn(ctx, "couldn't find any usable system fonts"); -+ -+#ifdef NOCJKFONT -+ { -+ // If no CJK fallback font is builtin but one has been shipped separately (in the same -+ // directory as the main executable), add it to the list of loadable system fonts -+ WCHAR szFile[MAX_PATH], *lpFileName; -+ GetModuleFileName(0, szFontDir, MAX_PATH); -+ GetFullPathName(szFontDir, MAX_PATH, szFile, &lpFileName); -+ lstrcpyn(lpFileName, L"DroidSansFallback.ttf", szFile + MAX_PATH - lpFileName); -+ extend_system_font_list(ctx, szFile); -+ } -+#endif -+ -+ // sort the font list, so that it can be searched binarily -+ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); -+ -+#ifdef DEBUG -+ // allow to overwrite system fonts for debugging purposes -+ // (either pass a full path or a search pattern such as "fonts\*.ttf") -+ cch = GetEnvironmentVariable(L"MUPDF_FONTS_PATTERN", szFontDir, nelem(szFontDir)); -+ if (0 < cch && cch < nelem(szFontDir)) -+ { -+ int i, prev_len = fontlistMS.len; -+ extend_system_font_list(ctx, szFontDir); -+ for (i = prev_len; i < fontlistMS.len; i++) -+ { -+ pdf_fontmapMS *entry = bsearch(fontlistMS.fontmap[i].fontface, fontlistMS.fontmap, prev_len, sizeof(pdf_fontmapMS), lookup_compare); -+ if (entry) -+ *entry = fontlistMS.fontmap[i]; -+ } -+ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); -+ } -+#endif -+ -+ // make sure to clean up after ourselves -+ atexit(destroy_system_font_list); -+} -+ -+static fz_font * -+pdf_load_windows_font_by_name(fz_context *ctx, const char *orig_name) -+{ -+ pdf_fontmapMS *found = NULL; -+ char *comma, *fontname; -+ fz_font *font; -+ -+ /* WILLUS MOD--not multi-threaded for k2pdfopt */ -+ /* fz_synchronize_begin(); */ -+ if (fontlistMS.len == 0) -+ { -+ fz_try(ctx) -+ { -+ create_system_font_list(ctx); -+ } -+ fz_catch(ctx) { } -+ } -+ /* WILLUS MOD--not multi-threaded for k2pdfopt */ -+ /* fz_synchronize_end(); */ -+ if (fontlistMS.len == 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror: couldn't find any fonts"); -+ -+ // work on a normalized copy of the font name -+ fontname = fz_strdup(ctx, orig_name); -+ remove_spaces(fontname); -+ -+ // first, try to find the exact font name (including appended style information) -+ comma = strchr(fontname, ','); -+ if (comma) -+ { -+ *comma = '-'; -+ found = pdf_find_windows_font_path(fontname); -+ *comma = ','; -+ } -+ // second, substitute the font name with a known PostScript name -+ else -+ { -+ int i; -+ for (i = 0; i < nelem(baseSubstitutes) && !found; i++) -+ if (!strcmp(fontname, baseSubstitutes[i].name)) -+ found = pdf_find_windows_font_path(baseSubstitutes[i].pattern); -+ } -+ // third, search for the font name without additional style information -+ if (!found) -+ found = pdf_find_windows_font_path(fontname); -+ // fourth, try to separate style from basename for prestyled fonts (e.g. "ArialBold") -+ if (!found && !comma && (str_ends_with(fontname, "Bold") || str_ends_with(fontname, "Italic"))) -+ { -+ int styleLen = str_ends_with(fontname, "Bold") ? 4 : str_ends_with(fontname, "BoldItalic") ? 10 : 6; -+ fontname = fz_resize_array(ctx, fontname, strlen(fontname) + 2, sizeof(char)); -+ comma = fontname + strlen(fontname) - styleLen; -+ memmove(comma + 1, comma, styleLen + 1); -+ *comma = '-'; -+ found = pdf_find_windows_font_path(fontname); -+ *comma = ','; -+ if (!found) -+ found = pdf_find_windows_font_path(fontname); -+ } -+ // fifth, try to convert the font name from the common Chinese codepage 936 -+ if (!found && fontname[0] < 0) -+ { -+ WCHAR cjkNameW[MAX_FACENAME]; -+ char cjkName[MAX_FACENAME]; -+ if (MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, fontname, -1, cjkNameW, nelem(cjkNameW)) && -+ WideCharToMultiByte(CP_UTF8, 0, cjkNameW, -1, cjkName, nelem(cjkName), NULL, NULL)) -+ { -+ comma = strchr(cjkName, ','); -+ if (comma) -+ { -+ *comma = '-'; -+ found = pdf_find_windows_font_path(cjkName); -+ *comma = ','; -+ } -+ if (!found) -+ found = pdf_find_windows_font_path(cjkName); -+ } -+ } -+ -+ fz_free(ctx, fontname); -+ if (!found) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "couldn't find system font '%s'", orig_name); -+ -+ /* -+ fz_warn(ctx, "loading non-embedded font '%s' from '%s'", orig_name, found->fontpath); -+ */ -+ -+ font = fz_new_font_from_file(ctx, orig_name, found->fontpath, found->index, -+ strcmp(found->fontface, "DroidSansFallback") != 0); -+ /* willus mod for MuPDF v1.10, 10-21-2016 */ -+ { -+ fz_font_flags_t *flags; -+ flags=fz_font_flags(font); -+ if (flags!=NULL) -+ flags->ft_substitute = 1; -+ } -+ return font; -+} -+ -+static fz_font * -+pdf_load_windows_font(fz_context *ctx, const char *fontname, int bold, int italic, int needs_exact_metrics) -+{ -+ if (needs_exact_metrics) -+ { -+ const char *clean_name; -+ /* WILLUS: Declare pdf_clean_base14_name() */ -+ extern const char *pdf_clean_base14_name(const char *fontname); -+ -+ /* TODO: the metrics for Times-Roman and Courier don't match -+ those of Windows' Times New Roman and Courier New; for -+ some reason, Poppler doesn't seem to have this problem */ -+ int len; -+ if (fz_lookup_builtin_font(ctx,fontname, bold, italic, &len)) -+ return NULL; -+ -+ /* cf. http://code.google.com/p/sumatrapdf/issues/detail?id=2173 */ -+ clean_name = pdf_clean_base14_name(fontname); -+ if (clean_name != fontname && !strncmp(clean_name, "Times-", 6)) -+ return NULL; -+ } -+ -+ // TODO: unset font->ft_substitute for base14/needs_exact_metrics? -+ return pdf_load_windows_font_by_name(ctx, fontname); -+} -+ -+static const char *clean_font_name(const char *fontname) -+{ -+ int i, k; -+ for (i = 0; i < nelem(base_font_names); i++) -+ for (k = 0; base_font_names[i][k]; k++) -+ if (!strcmp_ignore_space(base_font_names[i][k], fontname)) -+ return base_font_names[i][0]; -+ return fontname; -+} -+ -+ -+/* SumatraPDF: expose clean_font_name */ -+static const char * pdf_clean_base14_name(const char *fontname) -+{ -+ return clean_font_name(fontname); -+} -+ -+static fz_font * -+pdf_load_windows_cjk_font(fz_context *ctx, const char *fontname, int ros, int serif) -+{ -+ fz_font *font; -+ -+ font=NULL; /* WILLUS: Avoid compiler warning */ -+ /* try to find a matching system font before falling back to an approximate one */ -+ fz_try(ctx) -+ { -+ font = pdf_load_windows_font_by_name(ctx, fontname); -+ } -+ fz_catch(ctx) -+ { -+ font = NULL; -+ } -+ if (font) -+ return font; -+ -+ /* try to fall back to a reasonable system font */ -+ fz_try(ctx) -+ { -+ if (serif) -+ { -+ switch (ros) -+ { -+ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "MingLiU"); break; -+ case FZ_ADOBE_GB: font = pdf_load_windows_font_by_name(ctx, "SimSun"); break; -+ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Mincho"); break; -+ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Batang"); break; -+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid serif ros"); -+ } -+ } -+ else -+ { -+ switch (ros) -+ { -+ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "DFKaiShu-SB-Estd-BF"); break; -+ case FZ_ADOBE_GB: -+ fz_try(ctx) -+ { -+ font = pdf_load_windows_font_by_name(ctx, "KaiTi"); -+ } -+ fz_catch(ctx) -+ { -+ font = pdf_load_windows_font_by_name(ctx, "KaiTi_GB2312"); -+ } -+ break; -+ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Gothic"); break; -+ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Gulim"); break; -+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid sans-serif ros"); -+ } -+ } -+ } -+ fz_catch(ctx) -+ { -+#ifdef NOCJKFONT -+ /* If no CJK fallback font is builtin, maybe one has been shipped separately */ -+ font = pdf_load_windows_font_by_name(ctx, "DroidSansFallback"); -+#else -+ fz_rethrow(ctx); -+#endif -+ } -+ -+ return font; -+} -+ -+#endif -+ -+void pdf_install_load_system_font_funcs(fz_context *ctx) -+{ -+#ifdef _WIN32 -+ fz_install_load_system_font_funcs(ctx, pdf_load_windows_font, pdf_load_windows_cjk_font, NULL); -+#endif -+} -diff --git a/source/fitz/font.c b/source/fitz/font.c -index 00c6e8f99..1448b4a56 100644 ---- a/source/fitz/font.c -+++ b/source/fitz/font.c -@@ -4,8 +4,11 @@ - #include "draw-imp.h" - - #include -+/* willus mod -- remove hb includes */ -+/* - #include "hb.h" - #include "hb-ft.h" -+*/ - - #include - -diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c -index 2df90305e..b1f99e056 100644 ---- a/source/fitz/stext-device.c -+++ b/source/fitz/stext-device.c -@@ -825,6 +825,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options - dev->lastchar = ' '; - dev->curdir = 1; - dev->lasttext = NULL; -+ /* willus mod -- seems like this should be here, but not sure. */ -+ if (opts) -+ dev->flags = opts->flags; -+ else -+ dev->flags = 0; - - return (fz_device*)dev; - } -diff --git a/source/fitz/string.c b/source/fitz/string.c -index f8eedb682..7a767983d 100644 ---- a/source/fitz/string.c -+++ b/source/fitz/string.c -@@ -560,6 +560,10 @@ fz_utflen(const char *s) - */ - float fz_atof(const char *s) - { -+/* willus mod: atof(s), #if-#else-#endif */ -+#if (!defined(__SSE__)) -+ return(atof(s)); -+#else - float result; - - if (s == NULL) -@@ -572,6 +576,7 @@ float fz_atof(const char *s) - return 1; - result = fz_clamp(result, -FLT_MAX, FLT_MAX); - return result; -+#endif - } - - /* -diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c -index 4dfdf36fe..acff7d12a 100644 ---- a/source/pdf/pdf-annot.c -+++ b/source/pdf/pdf-annot.c -@@ -5,8 +5,20 @@ - #include - #include - -+/* willus mod--don't use _mkgmtime--not available in Win XP */ - #ifdef _WIN32 --#define timegm _mkgmtime -+static time_t timegm(struct tm *date); -+static time_t timegm(struct tm *date) -+ -+ { -+ time_t t,z; -+ struct tm gmz; -+ -+ z=(time_t)0; -+ gmz=(*gmtime(&z)); -+ t=mktime(date)-mktime(&gmz); -+ return(t); -+ } - #endif - - #define isdigit(c) (c >= '0' && c <= '9') -diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c -index 37444b471..613cc05b9 100644 ---- a/source/pdf/pdf-link.c -+++ b/source/pdf/pdf-link.c -@@ -345,6 +345,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp, - } - return page; - } -+/* willus mod -- be quiet */ -+/* - fz_warn(ctx, "unknown link uri '%s'", uri); -+*/ - return -1; - } -diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c -index 04a772204..9dd0cd898 100644 ---- a/source/pdf/pdf-parse.c -+++ b/source/pdf/pdf-parse.c -@@ -663,9 +663,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, - if (c == '\r') - { - c = fz_peek_byte(ctx, file); -+/* willus mod -- no warning */ -+/* - if (c != '\n') - fz_warn(ctx, "line feed missing after stream begin marker (%d %d R)", num, gen); - else -+*/ -+if (c=='\n') -+/* willus mod -- end */ - fz_read_byte(ctx, file); - } - stm_ofs = fz_tell(ctx, file); -diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c -index 8f888059b..08de7bfba 100644 ---- a/source/pdf/pdf-xref.c -+++ b/source/pdf/pdf-xref.c -@@ -710,8 +710,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b - if (!s) - fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length missing"); - len = fz_atoi(fz_strsep(&s, " ")); -+/* willus mod -- no warning */ -+/* - if (len < 0) - fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length must be positive"); -+*/ - - /* broken pdfs where the section is not on a separate line */ - if (s && *s != '\0') -@@ -1378,7 +1381,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc) - { - pdf_drop_xref_sections(ctx, doc); - fz_rethrow_if(ctx, FZ_ERROR_TRYLATER); -+/* willus mod -- be quiet */ -+/* - fz_warn(ctx, "trying to repair broken xref"); -+*/ - repaired = 1; - } - -@@ -1506,7 +1512,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc) - /* Swallow error, but continue dropping */ - } - -+/* willu smod -- no pdf_drop_js */ -+/* - pdf_drop_js(ctx, doc->js); -+*/ - - pdf_drop_xref_sections(ctx, doc); - fz_free(ctx, doc->xref_index); --- -2.22.0 - diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch deleted file mode 100644 index adfee9ae28..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/tesseract.patch +++ /dev/null @@ -1,675 +0,0 @@ -From 39aa8502eee7bb669a29d1a9b3bfe5c9595ad960 Mon Sep 17 00:00:00 2001 -From: Daniel Fullmer -Date: Fri, 13 Sep 2019 13:45:05 -0400 -Subject: [PATCH] Willus mod changes from k2pdfopt - ---- - src/api/Makefile.am | 1 + - src/api/baseapi.cpp | 87 +++++++++++ - src/api/baseapi.h | 3 + - src/api/tesscapi.cpp | 311 +++++++++++++++++++++++++++++++++++++ - src/api/tesseract.h | 29 ++++ - src/ccmain/tessedit.cpp | 5 +- - src/ccutil/ccutil.h | 7 + - src/ccutil/genericvector.h | 21 ++- - src/ccutil/mainblk.cpp | 17 +- - src/ccutil/params.cpp | 3 +- - src/ccutil/serialis.cpp | 3 + - src/ccutil/serialis.h | 2 + - src/lstm/input.cpp | 3 + - 13 files changed, 488 insertions(+), 4 deletions(-) - create mode 100644 src/api/tesscapi.cpp - create mode 100644 src/api/tesseract.h - -diff --git a/src/api/Makefile.am b/src/api/Makefile.am -index d9b76eb6..cd2dc30f 100644 ---- a/src/api/Makefile.am -+++ b/src/api/Makefile.am -@@ -39,6 +39,7 @@ libtesseract_api_la_SOURCES += lstmboxrenderer.cpp - libtesseract_api_la_SOURCES += pdfrenderer.cpp - libtesseract_api_la_SOURCES += wordstrboxrenderer.cpp - libtesseract_api_la_SOURCES += renderer.cpp -+libtesseract_api_la_SOURCES += tesscapi.cpp - - lib_LTLIBRARIES += libtesseract.la - libtesseract_la_LDFLAGS = $(LEPTONICA_LIBS) $(OPENCL_LDFLAGS) $(libarchive_LIBS) -diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp -index 9245d07c..ea964ee6 100644 ---- a/src/api/baseapi.cpp -+++ b/src/api/baseapi.cpp -@@ -215,6 +215,14 @@ TessBaseAPI::TessBaseAPI() - // Use the current locale if building debug code. - std::locale::global(std::locale("")); - #endif -+ const char *locale; -+ locale = std::setlocale(LC_ALL, nullptr); -+/* willus mod Remove assertions--taken care of in tesscapi.cpp */ -+// ASSERT_HOST(!strcmp(locale, "C")); -+ locale = std::setlocale(LC_CTYPE, nullptr); -+// ASSERT_HOST(!strcmp(locale, "C")); -+ locale = std::setlocale(LC_NUMERIC, nullptr); -+// ASSERT_HOST(!strcmp(locale, "C")); - } - - TessBaseAPI::~TessBaseAPI() { -@@ -1333,6 +1341,85 @@ static void AddBoxToTSV(const PageIterator* it, PageIteratorLevel level, - text->add_str_int("\t", bottom - top); - } - -+/* willus mod */ -+int TessBaseAPI::GetOCRWords(int **x00,int **y00,int **x11,int **y11,int **ybaseline0, -+ char **utf8words) -+ -+ { -+ int iword,nwords,totlen,it8; -+ int *x0,*y0,*x1,*y1,*ybaseline; -+ char *tutf8; -+ -+ ResultIterator *res_it = GetIterator(); -+ /* Count words */ -+ iword=0; -+ totlen=0; -+ while (!res_it->Empty(RIL_BLOCK)) -+ { -+ if (res_it->Empty(RIL_WORD)) -+ { -+ res_it->Next(RIL_WORD); -+ continue; -+ } -+ iword++; -+ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get(); -+ totlen+=strlen(textstr.string())+1; -+ res_it->Next(RIL_WORD); -+ } -+ nwords=iword; -+/* -+printf("\nnwords=%d, totlen=%d\n",nwords,totlen); -+*/ -+ x0=(*x00)=(int *)malloc(sizeof(int)*5*nwords); -+ y0=(*y00)=&x0[nwords]; -+ x1=(*x11)=&y0[nwords]; -+ y1=(*y11)=&x1[nwords]; -+ ybaseline=(*ybaseline0)=&y1[nwords]; -+ tutf8=(*utf8words)=(char *)malloc(totlen); -+ iword=0; -+ it8=0; -+ res_it->Begin(); -+ while (!res_it->Empty(RIL_BLOCK)) -+ { -+ if (res_it->Empty(RIL_WORD)) -+ { -+ res_it->Next(RIL_WORD); -+ continue; -+ } -+ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get(); -+ strcpy(&tutf8[it8],textstr.string()); -+ it8 += strlen(&tutf8[it8])+1; -+ /* -+ STRING textstr(""); -+ textstr += std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get(); -+ */ -+/* -+printf("Word %d: '%s'\n",iword,textstr.string()); -+*/ -+ int left, top, right, bottom; -+ int u1,v1,u2,v2; -+ res_it->BoundingBox(RIL_WORD, &left, &top, &right, &bottom); -+ res_it->Baseline(RIL_WORD, &u1, &v1, &u2, &v2); -+ x0[iword]=left; -+ x1[iword]=right; -+ y0[iword]=top; -+ y1[iword]=bottom; -+ ybaseline[iword]=(v1+v2)/2; -+ iword++; -+/* -+printf("BB: (%d,%d)-(%d,%d) BL: (%d,%d)-(%d,%d)\n",left,bottom,right,top,x1,y1,x2,y2); -+*/ -+ res_it->Next(RIL_WORD); -+ } -+/* -+printf("iword=%d\n",iword); -+*/ -+ return(iword); -+ } -+ -+/* willus mod */ -+int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); -+ - /** - * Make a TSV-formatted string from the internal data structures. - * page_number is 0-based but will appear in the output as 1-based. -diff --git a/src/api/baseapi.h b/src/api/baseapi.h -index 3724dd92..23be5920 100644 ---- a/src/api/baseapi.h -+++ b/src/api/baseapi.h -@@ -575,6 +575,9 @@ class TESS_API TessBaseAPI { - */ - char* GetHOCRText(ETEXT_DESC* monitor, int page_number); - -+/* willus mod */ -+int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); -+ - /** - * Make a HTML-formatted string with hOCR markup from the internal - * data structures. -diff --git a/src/api/tesscapi.cpp b/src/api/tesscapi.cpp -new file mode 100644 -index 00000000..1752fafe ---- /dev/null -+++ b/src/api/tesscapi.cpp -@@ -0,0 +1,311 @@ -+/* -+** tesscapi.cpp willus.com attempt at C wrapper for tesseract. -+** (Butchered from tesseractmain.cpp) -+** Last udpated 9-1-12 -+** -+** Copyright (C) 2012 http://willus.com -+** -+** This program is free software: you can redistribute it and/or modify -+** it under the terms of the GNU Affero General Public License as -+** published by the Free Software Foundation, either version 3 of the -+** License, or (at your option) any later version. -+** -+** This program is distributed in the hope that it will be useful, -+** but WITHOUT ANY WARRANTY; without even the implied warranty of -+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+** GNU Affero General Public License for more details. -+** -+** You should have received a copy of the GNU Affero General Public License -+** along with this program. If not, see . -+** -+*/ -+ -+/* -+#include "mfcpch.h" -+*/ -+// #define USE_VLD //Uncomment for Visual Leak Detector. -+#if (defined _MSC_VER && defined USE_VLD) -+#include -+#endif -+ -+// Include automatically generated configuration file if running autoconf -+#ifdef HAVE_CONFIG_H -+#include "config_auto.h" -+#endif -+#include -+#ifdef USING_GETTEXT -+#include -+#define _(x) gettext(x) -+#else -+#define _(x) (x) -+#endif -+ -+#include "allheaders.h" -+#include "baseapi.h" -+#include "strngs.h" -+#include "params.h" -+#include "blobs.h" -+#include "simddetect.h" -+#include "tesseractclass.h" -+/* -+#include "notdll.h" -+*/ -+ -+/* C Wrappers */ -+#include "tesseract.h" -+ -+// static tesseract::TessBaseAPI api[4]; -+ -+/* -+** ocr_type=0: OEM_DEFAULT -+** ocr_type=1: OEM_TESSERACT_ONLY -+** ocr_type=2: OEM_LSTM_ONLY -+** ocr_type=3: OEM_TESSERACT_LSTM_COMBINED -+*/ -+void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, -+ char *initstr,int maxlen,int *status) -+ -+ { -+ char original_locale[256]; -+ tesseract::TessBaseAPI *api = new tesseract::TessBaseAPI; -+/* -+printf("@tess_capi_init\n"); -+printf(" datapath='%s'\n",datapath); -+printf(" language='%s'\n",language); -+printf(" ocr_type=%d\n",ocr_type); -+*/ -+#ifdef USE_NLS -+ setlocale (LC_ALL, ""); -+ bindtextdomain (PACKAGE, LOCALEDIR); -+ textdomain (PACKAGE); -+#endif -+ /* willus mod, 11-24-16 */ -+ /* Tesseract needs "C" locale to correctly parse all data .traineddata files. */ -+/* -+printf("locale='%s'\n",setlocale(LC_ALL,NULL)); -+printf("ctype='%s'\n",setlocale(LC_CTYPE,NULL)); -+printf("numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); -+*/ -+ strncpy(original_locale,setlocale(LC_ALL,NULL),255); -+ original_locale[255]='\0'; -+/* -+printf("original_locale='%s'\n",original_locale); -+*/ -+ setlocale(LC_ALL,"C"); -+/* -+printf("new locale='%s'\n",setlocale(LC_ALL,NULL)); -+printf("new ctype='%s'\n",setlocale(LC_CTYPE,NULL)); -+printf("new numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); -+*/ -+ // fprintf(stderr, "tesseract %s\n", tesseract::TessBaseAPI::Version()); -+ // Make the order of args a bit more forgiving than it used to be. -+ const char* lang = "eng"; -+ tesseract::PageSegMode pagesegmode = tesseract::PSM_SINGLE_BLOCK; -+ if (language!=NULL && language[0]!='\0') -+ lang = language; -+ /* -+ if (output == NULL) -+ { -+ fprintf(stderr, _("Usage:%s imagename outputbase [-l lang] " -+ "[-psm pagesegmode] [configfile...]\n"), argv[0]); -+ fprintf(stderr, -+ _("pagesegmode values are:\n" -+ "0 = Orientation and script detection (OSD) only.\n" -+ "1 = Automatic page segmentation with OSD.\n" -+ "2 = Automatic page segmentation, but no OSD, or OCR\n" -+ "3 = Fully automatic page segmentation, but no OSD. (Default)\n" -+ "4 = Assume a single column of text of variable sizes.\n" -+ "5 = Assume a single uniform block of vertically aligned text.\n" -+ "6 = Assume a single uniform block of text.\n" -+ "7 = Treat the image as a single text line.\n" -+ "8 = Treat the image as a single word.\n" -+ "9 = Treat the image as a single word in a circle.\n" -+ "10 = Treat the image as a single character.\n")); -+ fprintf(stderr, _("-l lang and/or -psm pagesegmode must occur before any" -+ "configfile.\n")); -+ exit(1); -+ } -+ */ -+/* -+printf("SSE = %s\n",SIMDDetect::IsSSEAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); -+printf("AVX = %s\n",SIMDDetect::IsAVXAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); -+*/ -+/* -+v4.00 loads either TESSERACT enginer, LSTM engine, or both. No CUBE. -+*/ -+ ocr_type=0; /* Ignore specified and use default */ -+ api->SetOutputName(NULL); -+ (*status)=api->Init(datapath,lang, -+ ocr_type==0 ? tesseract::OEM_DEFAULT : -+ (ocr_type==1 ? tesseract::OEM_TESSERACT_ONLY : -+ (ocr_type==2 ? tesseract::OEM_LSTM_ONLY : -+ (tesseract::OEM_TESSERACT_LSTM_COMBINED)))); -+ if ((*status)!=0) -+ { -+ /* willus mod, 11-24-16 */ -+ setlocale(LC_ALL,original_locale); -+ api->End(); -+ delete api; -+ return(NULL); -+ } -+ /* -+ api.Init("tesscapi",lang,tesseract::OEM_DEFAULT, -+ &(argv[arg]), argc - arg, NULL, NULL, false); -+ */ -+ // We have 2 possible sources of pagesegmode: a config file and -+ // the command line. For backwards compatability reasons, the -+ // default in tesseract is tesseract::PSM_SINGLE_BLOCK, but the -+ // default for this program is tesseract::PSM_AUTO. We will let -+ // the config file take priority, so the command-line default -+ // can take priority over the tesseract default, so we use the -+ // value from the command line only if the retrieved mode -+ // is still tesseract::PSM_SINGLE_BLOCK, indicating no change -+ // in any config file. Therefore the only way to force -+ // tesseract::PSM_SINGLE_BLOCK is from the command line. -+ // It would be simpler if we could set the value before Init, -+ // but that doesn't work. -+ if (api->GetPageSegMode() == tesseract::PSM_SINGLE_BLOCK) -+ api->SetPageSegMode(pagesegmode); -+ -+ /* -+ ** Initialization message -+ */ -+ { -+ char istr[1024]; -+ int sse,avx; -+ -+// printf("tessedit_ocr_engine_mode = %d\n",tessedit_ocr_engine_mode); -+ sprintf(istr,"%s",api->Version()); -+ sse=tesseract::SIMDDetect::IsSSEAvailable(); -+ avx=tesseract::SIMDDetect::IsAVXAvailable(); -+ if (sse || avx) -+ sprintf(&istr[strlen(istr)]," [%s]",sse&&avx?"SSE+AVX":(sse?"SSE":"AVX")); -+ sprintf(&istr[strlen(istr)],"\n Tesseract data folder = '%s'",datapath==NULL?getenv("TESSDATA_PREFIX"):datapath); -+ strcat(istr,"\n Tesseract languages: "); -+ GenericVector languages; -+ api->GetLoadedLanguagesAsVector(&languages); -+/* -+printf("OEM=%d\n",api->oem()); -+printf("Langs='%s'\n",api->GetInitLanguagesAsString()); -+printf("AnyTessLang()=%d\n",(int)api->tesseract()->AnyTessLang()); -+printf("AnyLSTMLang()=%d\n",(int)api->tesseract()->AnyLSTMLang()); -+printf("num_sub_langs()=%d\n",api->tesseract()->num_sub_langs()); -+printf("languages.size()=%d\n",(int)languages.size()); -+*/ -+ -+ for (int i=0;i<=api->tesseract()->num_sub_langs();i++) -+ { -+ tesseract::Tesseract *lang1; -+ int eng; -+ lang1 = i==0 ? api->tesseract() : api->tesseract()->get_sub_lang(i-1); -+ eng=(int)lang1->tessedit_ocr_engine_mode; -+ sprintf(&istr[strlen(istr)],"%s%s [%s]",i==0?"":", ",lang1->lang.string(), -+ eng==2?"LSTM+Tess":(eng==1?"LSTM":"Tess")); -+ } -+/* -+printf("%d. '%s'\n",i+1,languages[i].string()); -+printf(" sublang[%d].oem_engine = %d\n",i+1,(int)api->tesseract()->get_sub_lang(i)->tessedit_ocr_engine_mode); -+*/ -+ -+ /* -+ if (ocr_type==0 || ocr_type==3) -+ sprintf(&istr[strlen(istr)],"[LSTM+] (lang="); -+ else if (ocr_type==2) -+ sprintf(&istr[strlen(istr)],"[LSTM] (lang="); -+ strncpy(&istr[strlen(istr)],language,253-strlen(istr)); -+ istr[253]='\0'; -+ strcat(istr,")"); -+ */ -+ if (out!=NULL) -+ fprintf(out,"%s\n",istr); -+ if (initstr!=NULL) -+ { -+ strncpy(initstr,istr,maxlen-1); -+ initstr[maxlen-1]='\0'; -+ } -+ } -+ -+ -+ /* Turn off LSTM debugging output */ -+ api->SetVariable("lstm_debug_level","0"); -+#if (WILLUSDEBUG & 1) -+ api->SetVariable("lstm_debug_level","9"); -+ api->SetVariable("paragraph_debug_level","9"); -+ api->SetVariable("tessdata_manager_debug_level","9"); -+ api->SetVariable("tosp_debug_level","9"); -+ api->SetVariable("wordrec_debug_level","9"); -+ api->SetVariable("segsearch_debug_level","9"); -+#endif -+ /* willus mod, 11-24-16 */ -+ setlocale(LC_ALL,original_locale); -+ return((void *)api); -+ } -+ -+ -+int tess_capi_get_ocr(void *vapi,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out) -+ -+ { -+ tesseract::TessBaseAPI *api; -+ static int old_segmode=-1; -+ -+ api=(tesseract::TessBaseAPI *)vapi; -+ if (old_segmode != segmode) -+ { -+ old_segmode=segmode; -+ api->SetPageSegMode((tesseract::PageSegMode)segmode); -+ } -+ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) -+ { -+ /* pixDestroy(&pix); */ -+ if (out!=NULL) -+ fprintf(out,"tesscapi: Error during bitmap processing.\n"); -+ api->Clear(); -+ return(-1); -+ } -+ strncpy(outstr,api->GetUTF8Text(),maxlen-1); -+ outstr[maxlen-1]='\0'; -+ api->Clear(); -+ return(0); -+ } -+ -+ -+int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, -+ int **left,int **top,int **right,int **bottom, -+ int **ybase,char **text,int *nw, -+ FILE *out) -+ -+ { -+ tesseract::TessBaseAPI *api; -+ static int old_segmode=-1; -+ -+ api=(tesseract::TessBaseAPI *)vapi; -+ if (old_segmode != segmode) -+ { -+ old_segmode=segmode; -+ api->SetPageSegMode((tesseract::PageSegMode)segmode); -+ } -+ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) -+ { -+ if (out!=NULL) -+ fprintf(out,"tesscapi: Error during bitmap processing.\n"); -+ api->Clear(); -+ (*nw)=0; -+ return(-1); -+ } -+ (*nw)=api->GetOCRWords(left,top,right,bottom,ybase,text); -+ api->Clear(); -+ return(0); -+ } -+ -+ -+void tess_capi_end(void *vapi) -+ -+ { -+ tesseract::TessBaseAPI *api; -+ -+ if (vapi==NULL) -+ return; -+ api=(tesseract::TessBaseAPI *)vapi; -+ api->End(); -+ delete api; -+ } -diff --git a/src/api/tesseract.h b/src/api/tesseract.h -new file mode 100644 -index 00000000..575948cc ---- /dev/null -+++ b/src/api/tesseract.h -@@ -0,0 +1,29 @@ -+/* -+** Willus.com's Tesseract C Wrappers -+** -+** 6-8-12 -+** -+*/ -+ -+#ifndef _TESSERACT_H_ -+#define _TESSERACT_H_ -+ -+//#include -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, -+ char *initstr,int maxlen,int *status); -+int tess_capi_get_ocr(void *api,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out); -+int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, -+ int **left,int **top,int **right,int **bottom, -+ int **ybase,char **text,int *nw, -+ FILE *out); -+void tess_capi_end(void *api); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp -index 17f0951b..7af94ee2 100644 ---- a/src/ccmain/tessedit.cpp -+++ b/src/ccmain/tessedit.cpp -@@ -101,6 +101,10 @@ bool Tesseract::init_tesseract_lang_data( - " to your \"tessdata\" directory.\n"); - return false; - } -+ /* willus mod */ -+ TFile fp; -+ strncpy(fp.tfile_filename,tessdata_path.string(),511); -+ fp.tfile_filename[511]='\0'; - #ifndef DISABLED_LEGACY_ENGINE - if (oem == OEM_DEFAULT) { - // Set the engine mode from availability, which can then be overridden by -@@ -116,7 +120,6 @@ bool Tesseract::init_tesseract_lang_data( - #endif // ndef DISABLED_LEGACY_ENGINE - - // If a language specific config file (lang.config) exists, load it in. -- TFile fp; - if (mgr->GetComponent(TESSDATA_LANG_CONFIG, &fp)) { - ParamUtils::ReadParamsFromFp(SET_PARAM_CONSTRAINT_NONE, &fp, - this->params()); -diff --git a/src/ccutil/ccutil.h b/src/ccutil/ccutil.h -index 71e89c60..bdeccc14 100644 ---- a/src/ccutil/ccutil.h -+++ b/src/ccutil/ccutil.h -@@ -80,6 +80,13 @@ class CCUtil { - // Member parameters. - // These have to be declared and initialized after params_ member, since - // params_ should be initialized before parameters are added to it. -+/* willus mod */ -+/* -+ #ifdef _WIN32 -+ STRING_VAR_H(tessedit_module_name, WINDLLNAME, -+ "Module colocated with tessdata dir"); -+ #endif -+*/ - INT_VAR_H(ambigs_debug_level, 0, "Debug level for unichar ambiguities"); - BOOL_VAR_H(use_definite_ambigs_for_classifier, false, - "Use definite ambiguities when running character classifier"); -diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h -index 3556d153..3a5e8662 100644 ---- a/src/ccutil/genericvector.h -+++ b/src/ccutil/genericvector.h -@@ -382,7 +382,26 @@ inline bool LoadDataFromFile(const char* filename, GenericVector* data) { - // reserve an extra byte in case caller wants to append a '\0' character - data->reserve(size + 1); - data->resize_no_init(size); -- result = static_cast(fread(&(*data)[0], 1, size, fp)) == size; -+ /* willus mod Dec 2018--weird issue with Win XP and MinGW gcc 7.3.0 */ -+ /* Can't read entire file at once -- need to break up into smaller blocksize reads */ -+ { -+ int frs,n; -+ int blocksize; -+ blocksize=1024*1024; -+ for (n=0;1;) -+ { -+ int bs; -+ bs= size-n > blocksize ? blocksize : size-n; -+ frs=(int)fread(&(*data)[n],1,bs,fp); -+ n+=frs; -+ if (frs=size) -+ break; -+ } -+ result = static_cast((long)n==size); -+ } -+ /* -+ result = static_cast(fread(&(*data)[0], 1, size, fp)) == size; -+ */ - } - fclose(fp); - } -diff --git a/src/ccutil/mainblk.cpp b/src/ccutil/mainblk.cpp -index 52b04b04..80b26044 100644 ---- a/src/ccutil/mainblk.cpp -+++ b/src/ccutil/mainblk.cpp -@@ -55,8 +55,22 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { - #if defined(_WIN32) - } else if (datadir == nullptr || _access(datadir.string(), 0) != 0) { - /* Look for tessdata in directory of executable. */ -+ /* -+ char drive[_MAX_DRIVE]; -+ char dir[_MAX_DIR]; -+ */ - char path[_MAX_PATH]; -- DWORD length = GetModuleFileName(nullptr, path, sizeof(path)); -+ int i; -+ /* DWORD length = */ GetModuleFileName(nullptr, path, sizeof(path)); -+ /* willus mod--avoid _splitpath_s -- not in XP */ -+ for (i=strlen(path)-1;i>=0 && path[i]!='/' && path[i]!='\\';i--); -+ if (i>=0) -+ { -+ path[i]='\0'; -+ datadir=path; -+ datadir += "/tessdata"; -+ } -+ /* - if (length > 0 && length < sizeof(path)) { - char* separator = std::strrchr(path, '\\'); - if (separator != nullptr) { -@@ -65,6 +79,7 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { - datadir += "/tessdata"; - } - } -+ */ - #endif /* _WIN32 */ - #if defined(TESSDATA_PREFIX) - } else { -diff --git a/src/ccutil/params.cpp b/src/ccutil/params.cpp -index 00bf2563..486c5ce0 100644 ---- a/src/ccutil/params.cpp -+++ b/src/ccutil/params.cpp -@@ -82,7 +82,8 @@ bool ParamUtils::ReadParamsFromFp(SetParamConstraint constraint, TFile *fp, - - if (!foundit) { - anyerr = true; // had an error -- tprintf("Warning: Parameter not found: %s\n", line); -+ /* willus mod */ -+ tprintf("Tesseract warning: Parameter %s not found in file %s.\n",line,fp->tfile_filename); - } - } - } -diff --git a/src/ccutil/serialis.cpp b/src/ccutil/serialis.cpp -index 7def011f..6107a494 100644 ---- a/src/ccutil/serialis.cpp -+++ b/src/ccutil/serialis.cpp -@@ -201,6 +201,9 @@ bool TFile::Open(const STRING& filename, FileReader reader) { - offset_ = 0; - is_writing_ = false; - swap_ = false; -+ /* willus mod */ -+ strncpy(tfile_filename,filename.string(),511); -+ tfile_filename[511]='\0'; - if (reader == nullptr) - return LoadDataFromFile(filename, data_); - else -diff --git a/src/ccutil/serialis.h b/src/ccutil/serialis.h -index 095b9227..4cc8251e 100644 ---- a/src/ccutil/serialis.h -+++ b/src/ccutil/serialis.h -@@ -77,6 +77,8 @@ class TFile { - public: - TFile(); - ~TFile(); -+ /* willus mod */ -+ char tfile_filename[512]; - - // All the Open methods load the whole file into memory for reading. - // Opens a file with a supplied reader, or nullptr to use the default. -diff --git a/src/lstm/input.cpp b/src/lstm/input.cpp -index 73b584b3..0b0b54c3 100644 ---- a/src/lstm/input.cpp -+++ b/src/lstm/input.cpp -@@ -93,8 +93,11 @@ Pix* Input::PrepareLSTMInputs(const ImageData& image_data, - return nullptr; - } - if (width < min_width || height < min_width) { -+ /* willus mod -- no warning */ -+ /* - tprintf("Image too small to scale!! (%dx%d vs min width of %d)\n", width, - height, min_width); -+ */ - pixDestroy(&pix); - return nullptr; - } --- -2.22.0 - diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix index ea579ce411..23f80eaa9c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -87,7 +87,7 @@ with builtins; buildDotnetPackage rec { dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ]; - postInstall = + postInstall = let extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh; in @@ -111,7 +111,7 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; homepage = "http://www.keepass.info/"; - maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ]; + maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix index 86ea1d6d50..f0131712b2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -40,13 +40,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "0yi6kxnsrqirjn6hxhwym2krzf86qxf3kc6bfpkmiaggnd2kqpkp"; + sha256 = "0wgn0glmcxaa670bpxh7n7abjlxcx4h1rl1169cmah0ddxnxnxpq"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix b/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix index 816b352460..578c56a748 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix @@ -23,6 +23,8 @@ in mkDerivation rec { propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; + NIX_LDFLAGS = "-ltag"; + meta = with lib; { description = "A powerful batch renamer for KDE"; homepage = "https://kde.org/applications/utilities/krename/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix index 99e24eea15..b3a68cffef 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -8,7 +8,6 @@ , gobject-introspection , gst_all_1 , gtk3 -, libgnome-keyring , libnotify , pango , webkitgtk @@ -22,6 +21,7 @@ , pygobject3 , pyyaml , requests +, keyring # commands that lutris needs , xrandr @@ -71,13 +71,13 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.6"; + version = "0.5.7.1"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "1f78qhyy8xqdg0rhxcwkap1bmg5mfxhb8qw1vbpxr6g62ajpwksa"; + sha256 = "12ispwkbbm5aq263n3bdjmjfkpwplizacnqs2c0wnag4zj4kpm29"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -88,14 +88,13 @@ in buildPythonApplication rec { gnome-desktop gobject-introspection gtk3 - libgnome-keyring libnotify pango webkitgtk ] ++ gstDeps; propagatedBuildInputs = [ - evdev distro pyyaml pygobject3 requests pillow dbus-python + evdev distro pyyaml pygobject3 requests pillow dbus-python keyring ]; # avoid double wrapping diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index 6fad8b23d3..2b656775ab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -97,7 +97,7 @@ in buildFHSUserEnv { libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd + vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd harfbuzz # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index d38113981a..96833bb25d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "20.03"; + version = "20.08"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1f1shnycf0f1fwka9k9s250l228xjkg0k4k73h8bpld8msighgnw"; + sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix index 52db4d0c6c..14b9ebfe4c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "1823nl9hgsa9l04ra1drj3c7r8s5ybx6c06d9ijpwqz191sz2jg2"; + sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mlterm/default.nix index f58fb13e61..7c7906fc84 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mlterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mlterm/default.nix @@ -3,6 +3,8 @@ , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding , openssl, libssh2 #build-in ssh +, fcitx, ibus, uim #IME +, wrapGAppsHook #color picker in mlconfig }: stdenv.mkDerivation rec { @@ -14,10 +16,11 @@ stdenv.mkDerivation rec { sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ]; buildInputs = [ libX11 gdk-pixbuf.dev cairo libXft gtk3 vte harfbuzz fribidi m17n_lib openssl libssh2 + fcitx ibus uim ]; #bad configure.ac and Makefile.in everywhere diff --git a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix index efd9cc4c02..c815a74e01 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.43.19"; + version = "0.44.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1rpkiyhy7z5zq0rmn0kj2kva57bnhkhvaplrlhfczv99h1kwsixg"; + sha256 = "1xlbhx6f1ysx8gka8g67271whzhkzsnkavpq3x58hdxr8v88khby"; }; outputs = [ "out" "udev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix index e403ccea0d..1965a8ad5e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix @@ -1,22 +1,24 @@ -{ rustPlatform, fetchFromGitHub, lib, fzf, makeWrapper }: +{ fetchFromGitHub, fzf, lib, makeWrapper, rustPlatform, wget }: rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.7.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "12p9l41k7isaapr0xbsm7brkjrv7i8826y029i12psz92nsynk29"; + sha256 = "0izmf4flwwn2h1wwpsnghb6rd494lj63hhsky1v9v6l1l641had4"; }; - cargoSha256 = "11dc3gc7fyikbbgacmljhysr2sl7lmq6w3bsfcf2cqny39r25yp0"; + cargoSha256 = "19xv9kbmxbp84lj8ycifsdr7sw9vhwgla7cdmrvlhayiq5r04xd7"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $out/bin/navi --prefix PATH : ${lib.makeBinPath [ fzf ]} + wrapProgram $out/bin/navi \ + --prefix PATH : "$out/bin" \ + --prefix PATH : ${lib.makeBinPath [ fzf wget ]} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/nimmm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nimmm/default.nix index 16400d76f6..383057ca65 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nimmm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nimmm/default.nix @@ -36,8 +36,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ nim ]; buildInputs = [ termbox pcre ]; - NIX_LDFLAGS = "-lpcre"; - buildPhase = '' export HOME=$TMPDIR; nim -p:${noise} -p:${nimbox} -p:${lscolors}/src c -d:release src/nimmm.nim diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix index 833a458441..fc8cf3ee02 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.2.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "1mlym0mpg6njwgwniwlk95fk6wfwlzq8nwmkb5mkjlm2nqv5bdv1"; + sha256 = "1p1bwsn7l4vp7y183735pgsfbh7dssdfn0wjzacl4s87arjdcgvb"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix index bb85c84f7e..dc03b9b4f9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , libxkbcommon , systemd @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/opt/obinskit/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}" + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 98eb76d9be..44bd043d34 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -1,32 +1,74 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3}: +{ stdenv, fetchurl, lib, makeWrapper, electron, makeDesktopItem, graphicsmagick +, writeScript }: let - pname = "obsidian"; - version = "0.8.2"; -in - -appimageTools.wrapType2 rec { - - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.AppImage"; - sha256 = "04jgsd97ivdm84diiafwqxzc9vvga1gsr7xicmqhdq05ns3xsfyz"; + icon = fetchurl { + url = + "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; + sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; }; - profile = '' - export LC_ALL=C.UTF-8 - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + desktopItem = makeDesktopItem { + name = "obsidian"; + desktopName = "Obsidian"; + comment = "Knowledge base"; + icon = "obsidian"; + exec = "obsidian"; + categories = "Office"; + }; + + updateScript = writeScript "obsidian-updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + + set -eu -o pipefail + + latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" + + update-source-version obsidian "$latestVersion" ''; - # Strip version from binary name. - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; +in stdenv.mkDerivation rec { + pname = "obsidian"; + version = "0.8.12"; + + src = fetchurl { + url = + "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; + sha256 = "1rvdxdxrfhw0ldslbnmx26znlvznb1iqpk95c0rh12hlzh4nlgxm"; + }; + + nativeBuildInputs = [ makeWrapper graphicsmagick ]; + + unpackPhase = '' + gzip -dc $src > obsidian.asar + ''; + + installPhase = '' + mkdir -p $out/bin + + makeWrapper ${electron}/bin/electron $out/bin/obsidian \ + --add-flags $out/share/electron/obsidian.asar + + install -m 444 -D obsidian.asar $out/share/electron/obsidian.asar + + install -m 444 -D "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + + for size in 16 24 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png + done + ''; + + passthru.updateScript = updateScript; meta = with lib; { - description = "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files."; + description = + "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; license = licenses.obsidian; - maintainers = with maintainers; [ conradmearns ]; + maintainers = with maintainers; [ conradmearns zaninime ]; platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index 793ea927a0..82cdf18b48 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -1,114 +1,172 @@ -{ pkgs, stdenv, lib, fetchFromGitHub, python3 -# To include additional plugins, pass them here as an overlay. +{ pkgs +, stdenv +, lib +, fetchFromGitHub +, python3 + # To include additional plugins, pass them here as an overlay. , packageOverrides ? self: super: {} }: let mkOverride = attrname: version: sha256: - self: super: { - ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + self: super: { + ${attrname} = super.${attrname}.overridePythonAttrs ( + oldAttrs: { inherit version; src = oldAttrs.src.override { inherit version sha256; }; - }); - }; + } + ); + }; py = python3.override { self = py; - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") - (mkOverride "flask_assets" "0.12" "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0") - (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") - (mkOverride "flask_login" "0.4.1" "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8") - (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") - (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") - (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") - (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn") - (mkOverride "werkzeug" "0.16.1" "010zmhyfbp4d56c1rgalwi188imjlkv9g7rm25jrvify6xnqalxk") - (mkOverride "websocket_client" "0.56.0" "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z") - (mkOverride "wrapt" "1.11.2" "1q81762dgsgrd12f8qc39zk8s5wll3m5xc32jdmlf6cls4gh4njn") + packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) ( + [ + # the following dependencies are non trivial to update since later versions introduce backwards incompatible + # changes that might affect plugins, or due to other observed problems + (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b") + (mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487") + (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") + (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409") + (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051") + (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s") - # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. - # This old version does not have updated test config for pytest 4, - # and pypi tarball doesn't contain tests dir anyways. - (self: super: { - jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { - version = "2.8.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; - }; - doCheck = false; - }); + # Built-in dependency + ( + self: super: { + octoprint-filecheck = self.buildPythonPackage rec { + pname = "OctoPrint-FileCheck"; + version = "2020.08.07"; - httpretty = super.httpretty.overridePythonAttrs (oldAttrs: rec { - doCheck = false; - }); + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-FileCheck"; + rev = version; + sha256 = "05ys05l5x7d2bkg3yqrga6m65v3g5fcnnzbfab7j9w2pzjdapx5b"; + }; + doCheck = false; + }; + } + ) - celery = super.celery.overridePythonAttrs (oldAttrs: rec { - doCheck = false; - }); - }) - (self: super: { - octoprint = self.buildPythonPackage rec { - pname = "OctoPrint"; - version = "1.4.0"; + # Built-in dependency + ( + self: super: { + octoprint-firmwarecheck = self.buildPythonPackage rec { + pname = "OctoPrint-FirmwareCheck"; + version = "2020.06.22"; - src = fetchFromGitHub { - owner = "foosel"; - repo = "OctoPrint"; - rev = version; - sha256 = "0387228544v28d69dcdg2zr5gp6qavkfr6dydpjgj5awxv3w25d5"; - }; + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-FirmwareCheck"; + rev = version; + sha256 = "19y7hrgg9z8hl7cwqkvg8nc8bk0wwrsfvjd1wawy33wn60psqv1h"; + }; + doCheck = false; + }; + } + ) - propagatedBuildInputs = with super; [ - awesome-slugify flask flask_assets rsa requests pkginfo watchdog - semantic-version werkzeug flaskbabel tornado - psutil pyserial flask_login netaddr markdown - pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future wrapt monotonic emoji jinja2 - frozendict cachelib sentry-sdk filetype markupsafe - ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; + ( + self: super: { + octoprint = self.buildPythonPackage rec { + pname = "OctoPrint"; + version = "1.4.2"; - checkInputs = with super; [ pytestCheckHook mock ddt ]; + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint"; + rev = version; + sha256 = "1bblrjwkccy1ifw7lf55g3k9lq1sqzwd49vj8bfzj2w07a7qda62"; + }; - postPatch = let - ignoreVersionConstraints = [ - "sentry-sdk" - ]; - in '' - sed -r -i \ - ${lib.concatStringsSep "\n" (map (e: - ''-e 's@${e}[<>=]+.*@${e}",@g' \'' - ) ignoreVersionConstraints)} - setup.py - ''; + propagatedBuildInputs = with super; [ + octoprint-firmwarecheck + octoprint-filecheck + markupsafe + tornado + markdown + rsa + regex + flask + jinja2 + flask_login + flask-babel + flask_assets + werkzeug + itsdangerous + cachelib + pyyaml + pyserial + netaddr + watchdog + sarge + netifaces + pylru + pkginfo + requests + semantic-version + psutil + click + feedparser + future + websocket_client + wrapt + emoji + frozendict + sentry-sdk + filetype + unidecode + blinker + ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; - dontUseSetuptoolsCheck = true; + checkInputs = with super; [ pytestCheckHook mock ddt ]; - preCheck = '' - export HOME=$(mktemp -d) - rm pytest.ini - ''; + postPatch = let + ignoreVersionConstraints = [ + "sentry-sdk" + ]; + in + '' + sed -r -i \ + ${lib.concatStringsSep "\n" ( + map ( + e: + ''-e 's@${e}[<>=]+.*@${e}",@g' \'' + ) ignoreVersionConstraints + )} + setup.py + ''; - disabledTests = [ - "test_check_setup" # Why should it be able to call pip? - ] ++ lib.optionals stdenv.isDarwin [ - "test_set_external_modification" - ]; + dontUseSetuptoolsCheck = true; - passthru.python = self.python; + preCheck = '' + export HOME=$(mktemp -d) + rm pytest.ini + ''; - meta = with stdenv.lib; { - homepage = "https://octoprint.org/"; - description = "The snappy web interface for your 3D printer"; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; - }; - }; - }) - (import ./plugins.nix {inherit pkgs;}) - packageOverrides - ]); + disabledTests = [ + "test_check_setup" # Why should it be able to call pip? + ] ++ lib.optionals stdenv.isDarwin [ + "test_set_external_modification" + ]; + + passthru.python = self.python; + + meta = with stdenv.lib; { + homepage = "https://octoprint.org/"; + description = "The snappy web interface for your 3D printer"; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; + }; + }; + } + ) + (import ./plugins.nix { inherit pkgs; }) + packageOverrides + ] + ); }; -in with py.pkgs; toPythonApplication octoprint +in + with py.pkgs; toPythonApplication octoprint diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix index b5d52f5e5f..ddf68b6f7c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix @@ -252,4 +252,42 @@ in { maintainers = with maintainers; [ WhittlesJr ]; }; }; + + displaylayerprogress = buildPlugin rec { + pname = "OctoPrint-DisplayLayerProgress"; + version = "1.23.2"; + + src = fetchFromGitHub { + owner = "OllisGit"; + repo = pname; + rev = version; + sha256 = "0yv8gy5dq0rl7zxkvqa98az391aiixl8wbzkyvbmpjar9r6whdzm"; + }; + + meta = with stdenv.lib; { + description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; + homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; + license = licenses.agpl3; + maintainers = with maintainers; [ j0hax ]; + }; + }; + + octoprint-dashboard = buildPlugin rec { + pname = "OctoPrint-Dashboard"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "StefanCohen"; + repo = pname; + rev = version; + sha256 = "1879l05gkkryvhxkmhr3xvd10d4m7i0cr3jk1gdcv47xwyr6q9pf"; + }; + + meta = with stdenv.lib; { + description = "A dashboard for Octoprint"; + homepage = "https://github.com/StefanCohen/OctoPrint-Dashboard"; + license = licenses.agpl3; + maintainers = with maintainers; [ j0hax ]; + }; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/openambit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openambit/default.nix new file mode 100644 index 0000000000..5ef6d4ae84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/openambit/default.nix @@ -0,0 +1,48 @@ +{ cmake +, fetchFromGitHub +, lib +, libusb1 +, mkDerivation +, python3 +, qtbase +, qttools +, udev +, zlib +}: + +mkDerivation rec { + pname = "openambit"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "openambitproject"; + repo = pname; + rev = version; + sha256 = "1074kvkamwnlkwdajsw1799wddcfkjh2ay6l842r0s4cvrxrai85"; + }; + + nativeBuildInputs = [ cmake qttools ]; + buildInputs = [ libusb1 python3 qtbase udev zlib ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d" ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/openambit --version + ''; + + postInstall = '' + install -m755 -D $src/tools/openambit2gpx.py $out/bin/openambit2gpx + + mv -v $out/lib/udev/rules.d/libambit.rules \ + $out/lib/udev/rules.d/20-libambit.rules + ''; + + meta = with lib; { + description = "Helps fetch data from Suunto Ambit GPS watches"; + homepage = "https://github.com/openambitproject/openambit/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ rycee ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix index 89a1656828..09a09811ab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix @@ -1,19 +1,27 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi, pkg-config }: +{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi, pkg-config, fetchpatch }: mkDerivation rec { pname = "openrgb"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "1931aisdahjr99d4qqk824ib4x19mvhqgqmkm3j6fc5zd2hnw87m"; + sha256 = "sha256-tHrRG2Zx7NYqn+WPiRpAlWA/QmxuAYidENanTkC1XVw"; }; nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ libusb1 hidapi ]; + patches = [ + # Make build SOURCE_DATE_EPOCH aware, merged in master + (fetchpatch { + url = "https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/f1b7b8ba900db58a1119d8d3e21c1c79de5666aa.patch"; + sha256 = "17m1hn1kjxfcmd4p3zjhmr5ar9ng0zfbllq78qxrfcq1a0xrkybx"; + }) + ]; + installPhase = '' mkdir -p $out/bin cp OpenRGB $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix index 77c1f67ecf..ccb7f3e47c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.4"; + version = "3.36.5"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1s6qrmbn3pywidwwfa24ly21c1cz6fnnsipi9vlp3sxswbdcwiwz"; + sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix new file mode 100644 index 0000000000..e2ef645e70 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -0,0 +1,50 @@ +{ + stdenv, lib, fetchFromGitHub, makeDesktopItem, prusa-slicer +}: +let + appname = "SuperSlicer"; + version = "2.2.53.1"; + pname = "super-slicer"; + description = "PrusaSlicer fork with more features and faster development cycle"; + override = super: { + inherit version pname; + + src = fetchFromGitHub { + owner = "supermerill"; + repo = "SuperSlicer"; + sha256 = "sha256-CAhwmQ63N/XJYToTnIV84lNnjDGNbkmYPzNKNL/wVxs="; + rev = version; + }; + + # See https://github.com/supermerill/SuperSlicer/issues/432 + cmakeFlags = super.cmakeFlags ++ [ + "-DSLIC3R_BUILD_TESTS=0" + ]; + + postInstall = '' + mkdir -p "$out/share/pixmaps/" + # Change slic3r++ to SuperSlicer at the next release! + ln -s "$out/share/slic3r++/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" + mkdir -p "$out/share/applications" + cp "$desktopItem"/share/applications/* "$out/share/applications/" + ''; + + desktopItem = makeDesktopItem { + name = appname; + exec = "superslicer"; + icon = appname; + comment = description; + desktopName = appname; + genericName = "3D printer tool"; + categories = "Development;"; + }; + + meta = with stdenv.lib; { + inherit description; + homepage = "https://github.com/supermerili/SuperSlicer"; + license = licenses.agpl3; + maintainers = with maintainers; [ cab404 moredread ]; + }; + + }; +in prusa-slicer.overrideAttrs override diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/application-dir.patch b/third_party/nixpkgs/pkgs/applications/misc/qcad/application-dir.patch index 84782e1e71..0b8a29319e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/application-dir.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/application-dir.patch @@ -33,3 +33,16 @@ index c6c31cbf5..c51b59ce6 100644 } int RSettings::getSnapRange() { +diff --git a/qcad.desktop b/qcad.desktop +index 93c5e9720..2d0e6bf32 100644 +--- a/qcad.desktop ++++ b/qcad.desktop +@@ -48,7 +48,7 @@ Comment[sv]=2D CAD-system + Comment[sl]=Sistem 2D CAD + Comment[uk]=2D САПР + Comment[tr]=2D CAD Sistemi +-Exec=qcad %F ++Exec=qcad-bin %F + X-MultipleArgs=true + Icon=qcad_icon + Terminal=false diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index 0079cd220b..a0d370c00a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -1,23 +1,27 @@ { boost , fetchFromGitHub +, libGLU , mkDerivationWith , muparser , pkgconfig +, qtbase , qmake -, qt5 +, qtscript +, qtsvg +, qtxmlpatterns +, qttools , stdenv -, libGLU }: mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.24.3.10"; + version = "3.25.2.0"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "0izyn4y1ffq1mgxs5dymkrqih6n6v9ifrcpyk1z2vyhbm5xx4qsa"; + sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz"; }; patches = [ @@ -25,11 +29,13 @@ mkDerivationWith stdenv.mkDerivation rec { ]; postPatch = '' - mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} - cp \ - src/3rdparty/qt-labs-qtscriptgenerator-5.12.3/qt-labs-qtscriptgenerator-5.12.3.pro \ - src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro - ''; + if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} ]; then + mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} + cp \ + src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \ + src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro + fi + ''; qmakeFlags = [ "MUPARSER_DIR=${muparser}" @@ -59,6 +65,10 @@ mkDerivationWith stdenv.mkDerivation rec { cp -r plugins $out/lib/plugins cp -r patterns $out/lib/patterns + # workaround to fix the library browser: + rm -r $out/lib/plugins/sqldrivers + ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers + install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg runHook postInstall @@ -68,16 +78,16 @@ mkDerivationWith stdenv.mkDerivation rec { boost muparser libGLU - qt5.qtbase - qt5.qtscript - qt5.qtsvg - qt5.qtxmlpatterns + qtbase + qtscript + qtsvg + qtxmlpatterns ]; nativeBuildInputs = [ pkgconfig - qt5.qmake - qt5.qttools + qmake + qttools ]; enableParallelBuilding = true; @@ -87,6 +97,6 @@ mkDerivationWith stdenv.mkDerivation rec { homepage = "https://qcad.org"; license = licenses.gpl3; maintainers = with maintainers; [ yvesf ]; - platforms = qt5.qtbase.meta.platforms; + platforms = qtbase.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix index c57153fe0e..e9f049159b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix @@ -3,17 +3,19 @@ , makeWrapper, perlPackages, mkDerivation }: let - version = "1.6.1"; -in mkDerivation rec { pname = "qdirstat"; - inherit version; + version = "1.7"; src = fetchFromGitHub { owner = "shundhammer"; - repo = "qdirstat"; + repo = pname; rev = version; - sha256 = "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb"; + sha256 = "163x3fxra0l3vvrzm25mh7jvcwjbmwsqlpppkxx76mkz9a1769fy"; }; +in + +mkDerivation { + inherit pname version src; nativeBuildInputs = [ qmake makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix index a95e5226f9..86c787df62 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix @@ -24,11 +24,6 @@ let ./575.patch ]; - postPatch = stdenv.lib.optionalString (pname == "gammastep") '' - substituteInPlace configure.ac \ - --replace "[gammastep], [2.0]" "[gammastep], [${version}]" - ''; - nativeBuildInputs = [ autoconf automake @@ -132,13 +127,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "1ky4h892sg2mfbwwq5xv0vnjflsl2x3nsy5q456r1kyk1gwkj0rg"; + sha256 = "09wqlz3yya955galhs20014qfwm2yk0lxhyqdsw8gwddvcpyprzg"; }; meta = redshift.meta // { diff --git a/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix index 837e30ee8f..3b989a75c9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix @@ -1,19 +1,21 @@ { stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }: let + version = "2.16.4.2"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; - url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "157yg4n5ppgnrd5wrz06qfx391vggp3wifla39rvcaaysvvisl8v"; + url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb"; + sha256 = "0zyal9n3rfj8i13v1q25inq6qyil7897483cdhqvwpb8wskrij4c"; } else fetchurl { name = "rescuetime-installer.deb"; - url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "17gjiwf0qbh1zbrxxsilnpg0qxy5kdpqxlnl28namp671rv0aic8"; + url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb"; + sha256 = "03bmnkxhip1wilnfqs8akmy1hppahxrmnm8gasnmw5s922vn06cv"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.16.2.1"; + inherit version; + pname = "rescuetime"; inherit src; nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix index d8e600f601..d565e1874c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "1g1170zmh5v7slnm1sm2d08jgz6icikf8rm17apm1bjzzyw1lhk7"; + sha256 = "sha256-BS/ypMS/MfaiUizWVov8yYgGJjgwMWvz0PiH3sYYn50="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix index 997786fc10..d220047a0a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sdcv"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "Dushistov"; repo = "sdcv"; rev = "v${version}"; - sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0"; + sha256 = "144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600"; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix index 6c55c3157f..883b3eec03 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.10.2"; + version = "0.10.11"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "1vfxn4gx5b138gj6nk4w3jlp2l56cqpb8hq2kn5mrf4dhjii8n88"; + sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix index 6c66987ddb..05cf15b8ac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix @@ -4,6 +4,7 @@ , fetchurl , makeDesktopItem , makeWrapper +, lib , stdenv , udev , wrapGAppsHook @@ -16,10 +17,10 @@ let pname = "simplenote"; - version = "1.21.0"; + version = "1.21.1"; sha256 = { - x86_64-linux = "073dg4agqgimsgs3ia7g0pjv4vxkh24bj7vpmssiysdxhm4li1j1"; + x86_64-linux = "00qx82d17yrrg2mxwhm40av0mpf5hy14j338i5ijhwp79yc8fk8x"; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -82,7 +83,7 @@ let ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix new file mode 100644 index 0000000000..720ee5f679 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchurl +, rpmextract +, patchelf +, makeWrapper +, openssl +}: + +stdenv.mkDerivation rec { + pname = "snowsql"; + majorVersion = "1.2"; + version = "${majorVersion}.9"; + + src = fetchurl { + url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm"; + sha256 = "1k9dyr4vyqivpg054kbvs0jdwhbqbmlp9lsyxgazdsviw8ch70c8"; + }; + + nativeBuildInputs = [ rpmextract makeWrapper ]; + + libPath = stdenv.lib.makeLibraryPath [ openssl ]; + + buildCommand = '' + mkdir -p $out/bin/ + cd $out + rpmextract $src + rm -R usr/bin + mv usr/* $out + rmdir usr + + ${patchelf}/bin/patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + lib64/snowflake/snowsql/snowsql + + makeWrapper $out/lib64/snowflake/snowsql/snowsql $out/bin/snowsql \ + --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \ + ''; + + meta = with stdenv.lib; { + description = "Command line client for the Snowflake database"; + homepage = "https://www.snowflake.com"; + license = licenses.unfree; + maintainers = with maintainers; [ andehen ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/super_user_spark/default.nix b/third_party/nixpkgs/pkgs/applications/misc/super_user_spark/default.nix deleted file mode 100644 index dd1218282d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/super_user_spark/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, fetchgit, aeson, aeson-pretty, base, bytestring, directory -, filepath, hspec, hspec-core, HUnit, mtl, optparse-applicative -, parsec, process, pureMD5, QuickCheck, shelly, stdenv, text -, transformers, unix -}: -mkDerivation { - pname = "super-user-spark"; - version = "0.3.2.0-dev"; - src = fetchgit { - url = "https://github.com/NorfairKing/super-user-spark"; - sha256 = "0akyc51bghzkk8j75n0i8v8rrsklidwvljhx3aibxfbkqp33372g"; - rev = "ab8635682d67842b9e6d909cf3c618014e4157f2"; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath mtl - optparse-applicative parsec process pureMD5 shelly text - transformers unix - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - hspec-core HUnit mtl optparse-applicative parsec process pureMD5 - QuickCheck shelly text transformers unix - ]; - jailbreak = true; - description = "Configure your dotfile deployment with a DSL"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/NorfairKing/super-user-spark"; - maintainers = [ stdenv.lib.maintainers.badi ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/systembus-notify/default.nix b/third_party/nixpkgs/pkgs/applications/misc/systembus-notify/default.nix index 28c1be4219..374adc6c89 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/systembus-notify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/systembus-notify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "systembus-notify"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = "systembus-notify"; rev = "v${version}"; - sha256 = "11zq84qfmbyl51d3r6294l2bjhlgwa9bx7d263g9fkqrwsg0si0y"; + sha256 = "1pdn45rfpwhrf20hs87qmk2j8sr7ab8161f81019wnypnb1q2fsv"; }; buildInputs = [ systemd ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskell/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskell/default.nix deleted file mode 100644 index c8974c5c27..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/taskell/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, haskellPackages, fetchFromGitHub }: - -let - version = "1.10.0"; - sha256 = "102iwn6011rypdlx07fzbdll3r5cd204qf96lzwkadvjb7h8clil"; - -in (haskellPackages.mkDerivation { - pname = "taskell"; - inherit version; - - src = fetchFromGitHub { - owner = "smallhadroncollider"; - repo = "taskell"; - rev = version; - inherit sha256; - }; - - postPatch = ''${haskellPackages.hpack}/bin/hpack''; - - # basically justStaticExecutables; TODO: use justStaticExecutables - enableSharedExecutables = false; - enableLibraryProfiling = false; - isExecutable = true; - doHaddock = false; - postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - - # copied from packages.yaml - libraryHaskellDepends = with haskellPackages; [ - classy-prelude - # base <=5 - aeson - brick - # bytestring - config-ini - # containers - # directory - file-embed - fold-debounce - http-conduit - http-client - http-types - lens - raw-strings-qq - # mtl - # template-haskell - # text - time - vty - tz - ]; - - executableHaskellDepends = []; - - testHaskellDepends = with haskellPackages; [ - tasty - tasty-discover - tasty-expected-failure - tasty-hunit - ]; - - description = "Command-line Kanban board/task manager with support for Trello boards and GitHub projects"; - homepage = "https://taskell.app"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ matthiasbeyer ]; - platforms = [ "x86_64-linux" ]; -}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix b/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix index 25cd3a5367..7b1d3c302b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.3.0"; + version = "1.4.2"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "1aijh1ad7gpa61cn7b57w24vy7fyjj0zx5k9z8d6m1ldzbw589cl"; + sha256 = "0qvhpva0hmhybn0c2aajndw5vnxar1jw4pjjajd2k2cr6vax29dw"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix index 4782b90b4a..689c5aa3a9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tipp10"; - version = "3.2.0"; + version = "unstable-20200616"; src = fetchFromGitLab { owner = "tipp10"; - repo = pname; - rev = "v${version}"; - sha256 = "0fav5jlw6lw78iqrj7a65b8vd50hhyyaqyzmfrvyxirpsqhjk1v7"; + repo = "tipp10"; + rev = "2dd6d45c8a91cff7075675d8875721456cdd5f1b"; + sha256 = "16x51rv4r6cz5vsmrfbakqzbfxy456h82ibzacknp35f41cjdqq4"; }; nativeBuildInputs = [ cmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix index c85192603c..455876a772 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tippecanoe"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "mapbox"; repo = pname; rev = version; - sha256 = "0v5ycc3gsqnl9pps3m45yrnb1gvw5pk6jdyr0q6516b4ac6x67m5"; + sha256 = "0lbmhly4ivnqc6qk1k3sdqvsg6x3nfd8gnjx846bhqj4wag3f88m"; }; buildInputs = [ sqlite zlib ]; @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; platforms = with platforms; linux ++ darwin; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix index eb3894c7b4..6db651ff39 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix @@ -22,7 +22,14 @@ buildPythonApplication rec { watchdog ]; - checkInputs = [ mock freezegun coverage green pylint ]; + checkInputs = [ mock freezegun pylint ]; + + # Skip test that has been reported multiple times upstream without result: + # bram85/topydo#271, bram85/topydo#274. + checkPhase = '' + substituteInPlace test/test_revert_command.py --replace 'test_revert_ls' 'dont_test_revert_ls' + python -m unittest discover + ''; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix new file mode 100644 index 0000000000..00e6efb713 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + pname = "tty-solitaire"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "mpereira"; + repo = pname; + rev = "v${version}"; + sha256 = "0kix7wfy2bda8cw5kfm7bm5acd5fqmdl9g52ms9bza4kf2jnb754"; + }; + + buildInputs = [ ncurses ]; + + patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile"; + + makeFlags = [ "CC=cc" "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "Klondike Solitaire in your ncurses terminal"; + license = licenses.mit; + homepage = "https://github.com/mpereira/tty-solitaire"; + platforms = ncurses.meta.platforms; + maintainers = [ maintainers.AndersonTorres ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix b/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix index 9b6289d708..7894bc2f5e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix @@ -1,41 +1,48 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages, installShellFiles }: stdenv.mkDerivation rec { - version = "2.4"; - pname = "weather"; + version = "2.4.1"; + pname = "weather"; - src = fetchurl { - url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; - sha256 = "084f0am0s1h6y71wgja9acaaxp0mq6k74b6ad4b5wpk2znwv0rzz"; - }; + src = fetchurl { + url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; + sha256 = "0nf680dl7a2vlgavdhj6ljq8a7lkhvr6zghkpzad53vmilxsndys"; + }; - nativeBuildInputs = [ pythonPackages.wrapPython ]; + nativeBuildInputs = [ + installShellFiles + pythonPackages.wrapPython + ]; - buildInputs = [ pythonPackages.python ]; + dontConfigure = true; + dontBuild = true; - phases = [ "unpackPhase" "installPhase" ]; + # Upstream doesn't provide a setup.py or alike, so we follow: + # http://fungi.yuggoth.org/weather/doc/install.rst#id3 + installPhase = '' + site_packages=$out/${pythonPackages.python.sitePackages} + install -Dt $out/bin -m 755 weather + install -Dt $site_packages weather.py + install -Dt $out/share/weather-util \ + airports overrides.{conf,log} places slist stations \ + zctas zlist zones + install -Dt $out/etc weatherrc - installPhase = '' - site_packages=$out/${pythonPackages.python.sitePackages} - mkdir -p $out/{share/{man,weather-util},bin,etc} $site_packages - cp weather $out/bin/ - cp weather.py $site_packages/ - chmod +x $out/bin/weather - cp airports overrides.{conf,log} places slist stations zctas zlist zones $out/share/weather-util/ - cp weatherrc $out/etc - cp weather.1 weatherrc.5 $out/share/man/ - sed -i \ - -e "s|/etc|$out/etc|g" \ - -e "s|else: default_setpath = \".:~/.weather|&:$out/share/weather-util|" \ - $site_packages/weather.py - wrapPythonPrograms - ''; + sed -i \ + -e "s|/etc|$out/etc|g" \ + -e "s|else: default_setpath = \".:~/.weather|&:$out/share/weather-util|" \ + $site_packages/weather.py - meta = { - homepage = "http://fungi.yuggoth.org/weather"; - description = "Quick access to current weather conditions and forecasts"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; # my only platform - }; + wrapPythonPrograms + + installManPage weather.1 weatherrc.5 + ''; + + meta = with stdenv.lib; { + homepage = "http://fungi.yuggoth.org/weather"; + description = "Quick access to current weather conditions and forecasts"; + license = licenses.isc; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.unix; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix index 69ec8fffaa..4aeff6c9ec 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; buildInputs = [ wayland gtk3 ]; + patches = [ + # https://todo.sr.ht/~scoopta/wofi/121 + ./do_not_follow_symlinks.patch + ]; + postInstall = '' installManPage man/wofi* ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch b/third_party/nixpkgs/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch new file mode 100644 index 0000000000..f917c4c168 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch @@ -0,0 +1,39 @@ +diff -r 3414ab984249 modes/run.c +--- a/modes/run.c Tue Aug 11 19:07:49 2020 -0700 ++++ b/modes/run.c Sat Aug 22 13:39:52 2020 +0200 +@@ -91,23 +91,10 @@ + + char* path = strdup(getenv("PATH")); + +- struct map* paths = map_init(); +- + char* save_ptr; + char* str = strtok_r(path, ":", &save_ptr); + do { + +- str = realpath(str, NULL); +- if(str == NULL) { +- continue; +- } +- if(map_contains(paths, str)) { +- free(str); +- continue; +- } +- +- map_put(paths, str, "true"); +- + DIR* dir = opendir(str); + if(dir == NULL) { + continue; +@@ -132,11 +119,9 @@ + } + free(full_path); + } +- free(str); + closedir(dir); + } while((str = strtok_r(NULL, ":", &save_ptr)) != NULL); + free(path); +- map_free(paths); + map_free(cached); + map_free(entries); + } diff --git a/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix index 9e3022457a..b19b1b86cf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "1k2svpzq01n1h9365nhi7r2k7dmsviczxi9m6fb80ccccdz7i530"; + sha256 = "02xrdg1v784p4gfqjm1mlxqwi40qlbzhp68p5ksj96cjv6av5b5s"; }; buildInputs = [ libX11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xbattbar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xbattbar/default.nix new file mode 100644 index 0000000000..0864e24f8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/xbattbar/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchgit, libX11, perl, ... }: + +stdenv.mkDerivation rec { + pname = "xbattbar"; + version = "1.4.9"; + + # The current active upstream of xbattbar seems to be the Debian source + # repository. + src = fetchgit { + url = "https://salsa.debian.org/debian/xbattbar.git"; + rev = "upstream/${version}"; + sha256 = "10w7gs0l4hzhdn38yqyr3az7n4ncmfnd6hhhly6lk5dg7k441ck6"; + }; + + buildInputs = [ libX11 ]; + + # The following patches are applied: + # - sys-by-default: remove the APM checker binary, make the sys checker + # script the default. Rationale: checking battery status by /proc/apm is + # extremely oldschool and does not work on NixOS, while the sysfs script + # does. + # - perl shebang patches for acpi/sys scripts + # - unhardcode path to checker scripts + patchPhase = '' + patch -p1 < ${./sys-by-default.patch} + sed -i -e "s,/usr/lib/xbattbar/,$out/libexec/," xbattbar.c + sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-acpi + sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-sys + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/libexec + install -m 0755 xbattbar $out/bin/ + install -m 0755 xbattbar-check-acpi $out/libexec/ + install -m 0755 xbattbar-check-sys $out/libexec/ + ''; + + meta = with stdenv.lib; { + description = "Display battery status in X11"; + homepage = "https://salsa.debian.org/debian/xbattbar"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.q3k ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/xbattbar/sys-by-default.patch b/third_party/nixpkgs/pkgs/applications/misc/xbattbar/sys-by-default.patch new file mode 100644 index 0000000000..367f7217ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/xbattbar/sys-by-default.patch @@ -0,0 +1,26 @@ +diff --git a/xbattbar.c b/xbattbar.c +index 1e26019..cb3eab5 100644 +--- a/xbattbar.c ++++ b/xbattbar.c +@@ -75,9 +75,8 @@ char *ONOUT_C = "olive drab"; + char *OFFIN_C = "blue"; + char *OFFOUT_C = "red"; + +-char *EXTERNAL_CHECK = "/usr/lib/xbattbar/xbattbar-check-apm"; ++char *EXTERNAL_CHECK = "/usr/lib/xbattbar/xbattbar-check-sys"; + char *EXTERNAL_CHECK_ACPI = "/usr/lib/xbattbar/xbattbar-check-acpi"; +-char *EXTERNAL_CHECK_SYS = "/usr/lib/xbattbar/xbattbar-check-sys"; + + int alwaysontop = False; + +@@ -245,10 +244,6 @@ main(int argc, char **argv) + EXTERNAL_CHECK = EXTERNAL_CHECK_ACPI; + break; + +- case 'r': +- EXTERNAL_CHECK = EXTERNAL_CHECK_SYS; +- break; +- + case 's': + EXTERNAL_CHECK = optarg; + break; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xdragon/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xdragon/default.nix new file mode 100644 index 0000000000..74f1f755ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/xdragon/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkg-config, gtk3 }: + +stdenv.mkDerivation rec { + pname = "xdragon"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "mwh"; + repo = "dragon"; + rev = "v${version}"; + sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; + + installFlags = [ "PREFIX=${placeholder "out"}/bin" ]; + postInstall = '' + ln -s $out/bin/dragon $out/bin/xdragon + ''; + + meta = with stdenv.lib; { + description = "Simple drag-and-drop source/sink for X (called dragon in upstream)"; + homepage = "https://github.com/mwh/dragon"; + license = licenses.gpl3; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix new file mode 100644 index 0000000000..0904d1d048 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/xmenu/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, imlib2, libX11, libXft, libXinerama }: + +stdenv.mkDerivation rec { + pname = "xmenu"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "xmenu"; + rev = "v${version}"; + sha256 = "0m97w1nwak5drcxxlyisqb73fxkapy2rlph9mg531kbx3k2h30r1"; + }; + + buildInputs = [ imlib2 libX11 libXft libXinerama ]; + + postPatch = "sed -i \"s:/usr/local:$out:\" config.mk"; + + meta = with stdenv.lib; { + description = "XMenu is a menu utility for X"; + homepage = "https://github.com/phillbush/xmenu"; + license = licenses.publicDomain; + maintainers = with maintainers; [ neonfuz ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix index 5d37b5190d..7cd52e0c74 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix @@ -1,21 +1,16 @@ { symlinkJoin, lib, makeWrapper, zathura_core, file, plugins ? [] }: - -let - pluginsPath = lib.makeSearchPath "lib/zathura" plugins; - -in symlinkJoin { +symlinkJoin { name = "zathura-with-plugins-${zathura_core.version}"; - paths = with zathura_core; [ man dev out ]; + paths = with zathura_core; [ man dev out ] ++ plugins; - inherit plugins; buildInputs = [ makeWrapper ]; postBuild = '' makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ - --add-flags --plugins-dir=${pluginsPath} + --add-flags --plugins-dir="$out/lib/zathura" ''; meta = with lib; { @@ -29,6 +24,6 @@ in symlinkJoin { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ smironov globin ]; + maintainers = with maintainers; [ smironov globin TethysSvensson ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix new file mode 100644 index 0000000000..3d762d9ab2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix @@ -0,0 +1,38 @@ +{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas}: + +# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. +let + pname = "zettlr"; + version = "1.7.5"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; + sha256 = "040lx01ywdpla34d4abkmh51kchr11s17la6fk6yq77y8zb87xzi"; + }; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src; + + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/zettlr.desktop $out/share/applications/zettlr.desktop + install -m 444 -D ${appimageContents}/zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png + substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A markdown editor for writing academic texts and taking notes"; + homepage = "https://www.zettlr.com"; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl3; + maintainers = with maintainers; [ tfmoraes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix index 710d824df1..5c4df9880d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, CoreServices }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices }: rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "137ak9gzcn3689fmcb90wa4szw43rh2m51mf26l77a5gksn5y6cn"; + sha256 = "119ikgall6bv1r6h1pqcmc6nxkxld2lch04gk860zzk54jragbrp"; }; - cargoSha256 = "0v40bcqh48dlhdc0kz7wm3q9r3i1m6j9s74bfiv237dqx5dymmsg"; + cargoSha256 = "1jx5bgfmbv0wljps1yv6yir2pjlb0vwzzba4i2sv32awv9y0q3v6"; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl ] + buildInputs = [ openssl oniguruma ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + RUSTONIG_SYSTEM_LIBONIG = true; + postInstall = '' install -D -m 444 completions/zola.bash \ -t $out/share/bash-completion/completions diff --git a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix index 0796e11731..1ab7a0da5d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.8.2"; + version = "2.8.4"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256:0figpfm5cgbryq6v26k9gj42zgbk335bsa3bzyxpvz2slq8rzb2y"; + hash = "sha256-2s4ezyszNZD9YBj69f62aqtJWwFeida6G/fOA1exu2M="; }; profile = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix index a06489f190..2772cb6d98 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "amfora"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "1z4r1yqy5nkfa7yqcsqpqfdcghw8idryzb3s6d6ibca47r0qlcvw"; + sha256 = "011h5xzwiafh3fdp9wil8n618p45ph9swa66lw6s82ijpiizz79s"; }; - vendorSha256 = "0xj2s14dq10fwqqxjn4d8x6zljd5d15gjbja2gb75rfv09s4fdgv"; + vendorSha256 = "10f3bh3r3jc1185r8r1ihg8rprdpl8qwg5b6wqwsda96ydkbpi2b"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix deleted file mode 100644 index 88ad2c609b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook }: - -stdenv.mkDerivation rec { - pname = "arora"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "Arora"; - repo = "arora"; - rev = version; - sha256 = "0wmivgx3mw51rghi6q8fgivpkqc98z2mqmllf7c98ln0wd8rkf3c"; - }; - - buildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - platforms = qt4.meta.platforms; - maintainers = [ maintainers.phreedom ]; - description = "A cross-platform Qt4 Webkit browser"; - homepage = "https://github.com/Arora/arora"; - license = with licenses; [ gpl2 gpl3 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix index 2da44bd4ed..c9ad213cf1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { postInstall = "make PREFIX=$out copy-data"; # Sometimes tests fail when run in parallel - checkFlags = [ "--test-threads=1" ]; + cargoParallelTestThreads = false; meta = with stdenv.lib; { description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; @@ -48,4 +48,3 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ fgaz ]; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index 51e3fb032f..7c0609730c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -90,6 +90,5 @@ mkChromiumDerivation (base: rec { platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours - broken = channel == "dev"; # Requires LLVM 11 }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index e538fb66bf..a79a48fffc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,7 +1,7 @@ -{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar +{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl # default dependencies -, bzip2, flac, speex, libopus +, gnutar, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libcap , xdg_utils, yasm, nasm, minizip, libwebp @@ -17,7 +17,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg_3, libxslt, libxml2, at-spi2-core -, jre +, jre8 , pipewire_0_2 # optional dependencies @@ -39,6 +39,7 @@ , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null +, channel , upstream-info }: @@ -49,6 +50,8 @@ with stdenv.lib; # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html let + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; @@ -108,7 +111,7 @@ let versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (import ./upstream-info.nix).stable.version; + stable-version = (importJSON ./upstream-info.json).stable.version; in if versionAtLeast stable-version upto-version then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." result @@ -116,10 +119,13 @@ let base = rec { name = "${packageName}-unwrapped-${version}"; - inherit (upstream-info) channel version; - inherit packageName buildType buildPath; + inherit (upstream-info) version; + inherit channel packageName buildType buildPath; - src = upstream-info.main; + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; + inherit (upstream-info) sha256; + }; nativeBuildInputs = [ ninja which python2Packages.python perl pkgconfig @@ -144,8 +150,9 @@ let ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; - patches = [ + patches = optionals (versionRange "68" "86") [ ./patches/nix_plugin_paths_68.patch + ] ++ [ ./patches/remove-webp-include-69.patch ./patches/no-build-timestamps.patch ./patches/widevine-79.patch @@ -159,12 +166,18 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) [ # Improvements for the VA-API build: + ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build: ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) ]; - postPatch = '' + postPatch = optionalString (!versionRange "0" "86") '' + # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): + substituteInPlace native_client/SConstruct \ + --replace "#! -*- python -*-" "" + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" + '' + '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ --replace \ @@ -190,7 +203,7 @@ let sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ @@ -337,9 +350,11 @@ let origRpath="$(patchelf --print-rpath "$chromiumBinary")" patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" ''; + + passthru.updateScript = ./update.py; }; # Remove some extraAttrs we supplied to the base attributes already. in stdenv.mkDerivation (base // removeAttrs extraAttrs [ "name" "gnFlags" "buildTargets" -]) +] // { passthru = base.passthru // (extraAttrs.passthru or {}); }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 2429baba4b..7f5378e2b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ -{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 -, makeWrapper, ed, gnugrep, coreutils +{ newScope, config, stdenv, fetchurl, makeWrapper +, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 @@ -28,23 +28,15 @@ let callPackage = newScope chromium; - chromium = { + chromium = rec { inherit stdenv llvmPackages; - upstream-info = (callPackage ./update.nix {}).getChannel channel; + upstream-info = (lib.importJSON ./upstream-info.json).${channel}; mkChromiumDerivation = callPackage ./common.nix ({ - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; + inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs + cupsSupport pulseSupport useOzone; # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): - gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-03-23"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; - sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; - }; - }); - } // lib.optionalAttrs (channel == "beta") { gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-05-19"; src = fetchgit { @@ -53,7 +45,8 @@ let sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; }; }); - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { + llvmPackages = llvmPackages_11; gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-07-20"; src = fetchgit { @@ -62,6 +55,17 @@ let sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q"; }; }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { + llvmPackages = llvmPackages_11; + useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-08-17"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "6f13aaac55a977e1948910942675c69f2b4f7a94"; + sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251"; + }; + }); }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; @@ -71,22 +75,33 @@ let }; }; + pkgSuffix = if channel == "dev" then "unstable" else channel; + pkgName = "google-chrome-${pkgSuffix}"; + chromeSrc = fetchurl { + urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ + "https://dl.google.com/linux/chrome/deb/pool/main/g" + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + sha256 = chromium.upstream-info.sha256bin64; + }; + mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; - widevineCdm = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { + widevineCdm = stdenv.mkDerivation { name = "chrome-widevine-cdm"; - # The .deb file for Google Chrome - src = upstream-info.binary; + src = chromeSrc; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let widevineCdmPath = - if upstream-info.channel == "stable" then + if channel == "stable" then "./opt/google/chrome/WidevineCdm" - else if upstream-info.channel == "beta" then + else if channel == "beta" then "./opt/google/chrome-beta/WidevineCdm" - else if upstream-info.channel == "dev" then + else if channel == "dev" then "./opt/google/chrome-unstable/WidevineCdm" else throw "Unknown chromium channel."; @@ -200,6 +215,9 @@ in stdenv.mkDerivation { export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + # Mainly for xdg-open but also other xdg-* tools: + export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH" + . w EOF @@ -219,6 +237,7 @@ in stdenv.mkDerivation { passthru = { inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; - inherit sandboxExecutableName; + inherit chromeSrc sandboxExecutableName; + updateScript = ./update.py; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix index 239a6282a6..530a4c8a4a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk"; + sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx"; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix deleted file mode 100644 index 6dff17c69d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix +++ /dev/null @@ -1,271 +0,0 @@ -let maybePkgs = import ../../../../../. {}; in - -{ stdenv ? maybePkgs.stdenv -, runCommand ? maybePkgs.runCommand -, fetchurl ? maybePkgs.fetchurl -, writeText ? maybePkgs.writeText -, curl ? maybePkgs.curl -, cacert ? maybePkgs.cacert -, nix ? maybePkgs.nix -}: - -let - inherit (stdenv) lib; - - sources = if builtins.pathExists ./upstream-info.nix - then import ./upstream-info.nix - else {}; - - bucketURL = "https://commondatastorage.googleapis.com/" - + "chromium-browser-official"; - - mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz"; - - debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g"; - - getDebURL = channelName: version: arch: mirror: let - packageSuffix = if channelName == "dev" then "unstable" else channelName; - packageName = "google-chrome-${packageSuffix}"; - in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb"; - - # Untrusted mirrors, don't try to update from them! - debMirrors = [ - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - -in { - getChannel = channel: let - chanAttrs = builtins.getAttr channel sources; - in { - inherit channel; - inherit (chanAttrs) version; - - main = fetchurl { - url = mkVerURL chanAttrs.version; - inherit (chanAttrs) sha256; - }; - - binary = fetchurl (let - mkUrls = arch: let - mkURLForMirror = getDebURL channel chanAttrs.version arch; - in map mkURLForMirror ([ debURL ] ++ debMirrors); - in if stdenv.is64bit && chanAttrs ? sha256bin64 then { - urls = mkUrls "amd64"; - sha256 = chanAttrs.sha256bin64; - } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then { - urls = mkUrls "i386"; - sha256 = chanAttrs.sha256bin32; - } else throw "No Chrome plugins are available for your architecture."); - }; - - update = let - csv2nix = name: src: import (runCommand "${name}.nix" { - src = builtins.fetchurl src; - } '' - esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs " - IFS=, read -r -a headings <<< "$(head -n1 "$src")" - echo "[" > "$out" - tail -n +2 "$src" | while IFS=, read -r -a line; do - echo " {" - for idx in "''${!headings[@]}"; do - echo " $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});" - done - echo " }" - done >> "$out" - echo "]" >> "$out" - ''); - - channels = lib.fold lib.recursiveUpdate {} (map (attrs: { - ${attrs.os}.${attrs.channel} = attrs // { - history = let - drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info"; - history = csv2nix drvName "http://omahaproxy.appspot.com/history"; - cond = h: attrs.os == h.os && attrs.channel == h.channel - && lib.versionOlder h.version attrs.current_version; - # Note that this is a *reverse* sort! - sorter = a: b: lib.versionOlder b.version a.version; - sorted = builtins.sort sorter (lib.filter cond history); - in map (lib.flip removeAttrs ["os" "channel"]) sorted; - version = attrs.current_version; - }; - }) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1")); - - /* - XXX: This is essentially the same as: - - builtins.tryEval (builtins.fetchurl url) - - ... except that tryEval on fetchurl isn't working and doesn't catch - errors for fetchurl, so we go for a different approach. - - We only have fixed-output derivations that can have networking access, so - we abuse SHA1 and its weaknesses to forge a fixed-output derivation which - is not so fixed, because it emits different contents that have the same - SHA1 hash. - - Using this method, we can distinguish whether the URL is available or - whether it's not based on the actual content. - - So let's use tryEval as soon as it's working with fetchurl in Nix. - */ - tryFetch = url: let - # SHA1 hash collisions from https://shattered.io/static/shattered.pdf: - collisions = runCommand "sha1-collisions" { - outputs = [ "out" "good" "bad" ]; - base64 = '' - QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4 - Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0 - MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk - 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN - GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp - o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ - qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH - MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B - mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0 - S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC - Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc - upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu - renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ - yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL - StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8 - wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE - JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW - lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU - pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6 - rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE - sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P - i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl - 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen - r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ - YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw - l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM - sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp - V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh - t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt - Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1 - i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p - y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW - 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k - NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA== - ''; - } '' - echo "$base64" | base64 -d | tar xj - mv good.pdf "$good" - mv bad.pdf "$bad" - touch "$out" - ''; - - cacheVal = let - urlHash = builtins.hashString "sha256" url; - timeSlice = builtins.currentTime / 600; - in "${urlHash}-${toString timeSlice}"; - - in { - success = import (runCommand "check-success" { - result = stdenv.mkDerivation { - name = "tryfetch-${cacheVal}"; - inherit url; - - outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a"; - outputHashMode = "flat"; - outputHashAlgo = "sha1"; - - nativeBuildInputs = [ curl ]; - preferLocalBuild = true; - - inherit (collisions) good bad; - - buildCommand = '' - if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \ - curl -s -L -f -I "$url" > /dev/null; then - cp "$good" "$out" - else - cp "$bad" "$out" - fi - ''; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - }; - inherit (collisions) good; - } '' - if cmp -s "$result" "$good"; then - echo true > "$out" - else - echo false > "$out" - fi - ''); - value = builtins.fetchurl url; - }; - - fetchLatest = channel: let - result = tryFetch (mkVerURL channel.version); - in if result.success then result.value else fetchLatest (channel // { - version = if channel.history != [] - then (lib.head channel.history).version - else throw "Unfortunately there's no older version than " + - "${channel.version} available for channel " + - "${channel.channel} on ${channel.os}."; - history = lib.tail channel.history; - }); - - getHash = path: import (runCommand "gethash.nix" { - inherit path; - nativeBuildInputs = [ nix ]; - } '' - sha256="$(nix-hash --flat --base32 --type sha256 "$path")" - echo "\"$sha256\"" > "$out" - ''); - - isLatest = channel: version: let - ourVersion = sources.${channel}.version or null; - in if ourVersion == null then false - else lib.versionOlder version sources.${channel}.version - || version == sources.${channel}.version; - - # We only support GNU/Linux right now. - linuxChannels = let - genLatest = channelName: channel: let - newUpstream = { - inherit (channel) version; - sha256 = getHash (fetchLatest channel); - }; - keepOld = let - oldChannel = sources.${channelName}; - in { - inherit (oldChannel) version sha256; - } // lib.optionalAttrs (oldChannel ? sha256bin32) { - inherit (oldChannel) sha256bin32; - } // lib.optionalAttrs (oldChannel ? sha256bin64) { - inherit (oldChannel) sha256bin64; - }; - in if isLatest channelName channel.version then keepOld else newUpstream; - in lib.mapAttrs genLatest channels.linux; - - getLinuxFlash = channelName: channel: let - inherit (channel) version; - fetchArch = arch: tryFetch (getDebURL channelName version arch debURL); - packages = lib.genAttrs ["i386" "amd64"] fetchArch; - isNew = arch: attr: !(builtins.hasAttr attr channel) - && packages.${arch}.success; - in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") { - sha256bin32 = getHash (packages.i386.value); - } // lib.optionalAttrs (isNew "amd64" "sha256bin64") { - sha256bin64 = getHash (packages.amd64.value); - }; - - newChannels = lib.mapAttrs getLinuxFlash linuxChannels; - - dumpAttrs = indent: attrs: let - mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val - else "\"${lib.escape ["$" "\\" "\""] (toString val)}\""; - mkIndent = level: lib.concatStrings (builtins.genList (_: " ") level); - mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n"; - attrLines = lib.mapAttrsToList mkAttr attrs; - in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}"; - in writeText "chromium-new-upstream-info.nix" '' - # This file is autogenerated from update.sh in the same directory. - ${dumpAttrs 0 newChannels} - ''; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py new file mode 100755 index 0000000000..bfc7f0d247 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py @@ -0,0 +1,77 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python -p python3 nix + +import csv +import json +import subprocess +import sys + +from codecs import iterdecode +from collections import OrderedDict +from os.path import abspath, dirname +from urllib.request import urlopen + +HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' +DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' +BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' + +JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' + +def load_json(path): + with open(path, 'r') as f: + return json.load(f) + +def nix_prefetch_url(url, algo='sha256'): + print(f'nix-prefetch-url {url}') + out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) + return out.decode('utf-8').rstrip() + +channels = {} +last_channels = load_json(JSON_PATH) + +print(f'GET {HISTORY_URL}', file=sys.stderr) +with urlopen(HISTORY_URL) as resp: + builds = csv.DictReader(iterdecode(resp, 'utf-8')) + for build in builds: + channel_name = build['channel'] + + # If we've already found a newer build for this channel, we're + # no longer interested in it. + if channel_name in channels: + continue + + # If we're back at the last build we used, we don't need to + # keep going -- there's no new version available, and we can + # just reuse the info from last time. + if build['version'] == last_channels[channel_name]['version']: + channels[channel_name] = last_channels[channel_name] + continue + + channel = {'version': build['version']} + suffix = 'unstable' if channel_name == 'dev' else channel_name + + try: + channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz') + channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb') + except subprocess.CalledProcessError: + # This build isn't actually available yet. Continue to + # the next one. + continue + + channels[channel_name] = channel + +with open(JSON_PATH, 'w') as out: + def get_channel_key(item): + channel_name = item[0] + if channel_name == 'stable': + return 0 + elif channel_name == 'beta': + return 1 + elif channel_name == 'dev': + return 2 + else: + print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) + sys.exit(1) + sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) + json.dump(sorted_channels, out, indent=2) + out.write('\n') diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.sh b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.sh deleted file mode 100755 index ea67a62c10..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e -cd "$(dirname "$0")" -sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)" -cat "$sp" > upstream-info.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json new file mode 100644 index 0000000000..ec8fc3407d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -0,0 +1,17 @@ +{ + "stable": { + "version": "85.0.4183.121", + "sha256": "0a1xn39kmvyfpal6pgnylpy30z0322p3v7sx6vxi0r2naiz58670", + "sha256bin64": "08vqf1v91703aik47344bl409rsl4myar9bsd2lsvzqncncwsaca" + }, + "beta": { + "version": "86.0.4240.42", + "sha256": "06cfhiym9xmz2q86v6b6xcicrrp2pmr7karavylzz4fqvwd2v6fa", + "sha256bin64": "1z5zmdc2i31iimps7p5z43vv4qi83c8ljb7x68zc1rvf8x62p7xj" + }, + "dev": { + "version": "87.0.4263.3", + "sha256": "1ybfrlm4417lpbg5qcwhq5p6nnxrw68wzyy5zvb1sg1ma8s9hhkk", + "sha256bin64": "1f7a272kalglmdwmrrzb4iw3crvvpv3mhxca5jh75qpldn4gby6m" + } +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix deleted file mode 100644 index 14e9f306bf..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file is autogenerated from update.sh in the same directory. -{ - beta = { - sha256 = "0i7vd0w1swvxw46wiy1xrni02xa7yvccw4cp9v2dc2lm5r43dw5q"; - sha256bin64 = "0by3fgmd54zj5q5znazrl3vf42ik3rhirwy5815i7isqiq7bb6lq"; - version = "85.0.4183.69"; - }; - dev = { - sha256 = "1yasmx3alal3gygyjvvjk799z0b6p6nm7q10m0qyls2mpfvxpcyw"; - sha256bin64 = "0lp93z9qwdbjblmj0d514plk44hs0yqw1v7vr5mnrrx6l9gm0yg0"; - version = "86.0.4229.0"; - }; - stable = { - sha256 = "1n4n95gllqmsrzxmcp9p4gz95gndq2v3vknfvm8p1qfhjqah0hfx"; - sha256bin64 = "1ak903wm8zq6pri88md2wdij3izr6kz9d4avyqnpmd68ch16vfnj"; - version = "84.0.4147.135"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix index ca868a0807..a16beb6520 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script -, python3, gtk3, libsecret, gst_all_1, webkitgtk +, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook }: +, gobject-introspection, wrapGAppsHook, gnome3 }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; - version = "0.9.63"; + version = "0.9.99"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/eolie"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0z8gcfg7i842rr5p8r3vqa31kf7nnj1yv3afax3jzf4zbnhb8wm0"; + sha256 = "077jww5mqg6bbqbj0j1gss2j3dxlfr2xw8bc43k8vg52drqg6g8w"; }; nativeBuildInputs = [ @@ -33,18 +33,23 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer + gnome3.gnome-settings-daemon gtk3 gtkspell3 hunspell libsecret - webkitgtk + (webkitgtk.override {enableGLES = false;}) + glib ]; propagatedBuildInputs = with python3.pkgs; [ + pyfxa beautifulsoup4 + cryptography pycairo pygobject3 python-dateutil + pycrypto ]; postPatch = '' @@ -52,9 +57,11 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_post_install.py ''; + dontWrapGApps = true; preFixup = '' buildPythonPath "$out $propagatedBuildInputs" patchPythonScript "$out/libexec/eolie-sp" + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; passthru = { @@ -63,6 +70,7 @@ python3.pkgs.buildPythonApplication rec { }; }; + strictDeps = false; meta = with stdenv.lib; { description = "A new GNOME web browser"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 10d9e7b2a2..7548eb94fa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "80.0b8"; + version = "81.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ach/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ach/firefox-81.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "0dfa5e6840276f2bda03babdbf5273f7d5549d7610b3cf00983fae5a1e8e4ad6"; + sha256 = "4b133dd14e8ce1b934e482c4f7f7b5ca4b58751181bed89f6573ba5994ebe644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/af/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/af/firefox-81.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ab51a6e8eb2fa5bd828da95600e7eeffa19c96fa8471299d832cc8024c5da998"; + sha256 = "8e50a0845eb058ee853fe40b13c88d764e721f7f8ac2eb54695049ab2a66e3e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/an/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/an/firefox-81.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5b7f60f06964dc13d0dff9c603d00a8bdaf86b1c0871fc60b6b074cd535f5dd4"; + sha256 = "3edf8e157cac424b1cbfff019240877e7b7c3bf5ed1b576580569c155c5dd660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ar/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ar/firefox-81.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8be8cc6f547475cccae9ff6675689334c5baa10025208035bbed4a186ff3d61e"; + sha256 = "b2167ff357963e3295eed2ed423a1c3bcf62d645329b8f4cf817ad3c0e101c97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ast/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ast/firefox-81.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2efd5fcf0e69f155ae0aadb28534e141224d16c64706e05c1b72f6ef44fed6fc"; + sha256 = "805a87a99a417ff4b762c01a9a2b88c7963f53a04fc19b42015db304b15f4bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/az/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/az/firefox-81.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "9ab8f6b96db687367bf8f770ba2f72f19ee7f438a949373830d03eca0dca22bc"; + sha256 = "79c61c9515a683731649bcb5d36b26b95dd56165765e5a952339910310c9d259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/be/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/be/firefox-81.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b1b3e44c5733e197c53f013bfbe82eb7f6a300278f5b170338fcd56670445bd6"; + sha256 = "318fece7d1ad734f6a19faa7003e060b1254b31bf62e59580c70a64c4a167ec6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bg/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bg/firefox-81.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e659b463c9a152e635dbc36ab972a64e3b6c28987ba5e5437672e68f24f6dcb7"; + sha256 = "55616606306dbd0933240d718fef8e83004fd65e4f53dd18f1601f09d0b94e92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bn/firefox-81.0b4.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "f2e4e6e80747754fa449105cc870b87fbae387b64d044f8dd2fef743e34c749f"; + sha256 = "c38fdef89f6aee7bf03362d2edfe4dcc665d540b1e1dc1dad8c53db20d70087d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/br/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/br/firefox-81.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "90749e4392f518e5636cc687946e066545eaa26badc23c46e6b63da6ce1cdd59"; + sha256 = "c5ac1c8e9dc2f4c5a1a2b6e33bf699a823a9422bce46922bc36222700a29d2e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bs/firefox-81.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "929758b30ab1ff8c034da26be688541ea1ba9e99e7206b981f11a7209ff6d771"; + sha256 = "a18718ef7f467ed87c76816fb6797165db3e06bc166c5e88b526c9f2ce5c1d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ca-valencia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca-valencia/firefox-81.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "1e60124bf4946605bd100945748302ba61d406b44563e9c51f58d781226d4a07"; + sha256 = "fcfccd0714c965801ce468f6817bf37eb074064e6e0b616c81be7218a6b632fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ca/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca/firefox-81.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6c16d41ae0748931de875f756b0a3b09268bc96c6ebec54a56e6fe8672879c95"; + sha256 = "5f08a2b2d357d5a6828865913b9e28fe90bda7a8ce17a0ea60effb25b8441b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cak/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cak/firefox-81.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f3f6877e2d8132737b978d073b54171ad6d30c227f50e1bb2dd2e1d15e2201db"; + sha256 = "db41156b75e1148527c51b915e3d9367d1c36a8d24a52132d1cc9cfe63bd9db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cs/firefox-81.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0677a8fd1ad69a8bb2869942624ae0cf37dfc5e89bc0bfccc68b79b7b4382688"; + sha256 = "d3287f28964581e63a3b1a5484e47e8ef33c136b39f13e07d6f3d555c27864cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cy/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cy/firefox-81.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c037ba4d4f757784923aedd914527e8fc079ab33384d84694b469af3e9eaf125"; + sha256 = "f41fd34cf1cc72d5fc80113cdc9fae7f03f434e45e990e17a94dd68463464c49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/da/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/da/firefox-81.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "5c0b86cede27223a159a0052ea146f4f79a2cc95a9515d4da6bac598b1a792e7"; + sha256 = "dbbf1611913315ac5294f400c727cd5afbc832efbea56bd839b77cd4d6a5b823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/de/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/de/firefox-81.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e40a4752fb32a31689bcf546aa4867ead0da80207de3583bb2ed43b944a12f53"; + sha256 = "1047799de5b42b5cb0827371872b7e85b93a4474bde9288da54a573841e156bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/dsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/dsb/firefox-81.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d0e22abdfecbfbe2a25dbacf35e1bdaba716bfd2e09c0a4206c7260f405df15b"; + sha256 = "602eaa32d32db35d6a6d07f1c0cc53eaa4e432b7ab81d1f23b47d3125ac98d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/el/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/el/firefox-81.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6a4206278f3aa89aa0a49b41df8372c4ae10a6afdd107210a7a1d8a240d800f8"; + sha256 = "8a460f9542e213b1605265c6497742e7d55213ac91b42d00a15b3123b47754ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-CA/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-CA/firefox-81.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3b767fdf9d08e08526f72bb8bf14a7577370003f29734a39a61cd31d65491f80"; + sha256 = "9bcc44ca3f4192a2a7a001f27db6884dd481551663b6d0c348ed0b9281dabe87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-GB/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-GB/firefox-81.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "29108de728a833a8f6df04e2e4aaa21aadf3a572534844f4a44ee4ae0b78eb2d"; + sha256 = "9d241d56362ec52619ce02cdd2f11dc90c2e0f7c515c707ea56eca2e8f0eb306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-US/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-US/firefox-81.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "01b005fe37487f7bc9ed39aacd09c891755fea9adff44addacb708000deebd1d"; + sha256 = "28972b08f8b3f2d19f5d50a2c9275fc459fc3e57df11c884149d1fdb9d99300b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/eo/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eo/firefox-81.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ca8f65b6bfb491ab66640ea2b02b234d2b68d268480532aafbba6fb6a190414f"; + sha256 = "013caa4590462b4bc5dc09cb963cfd85cba4b5419111cdc87316574ca5691e80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-AR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-AR/firefox-81.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "19bf5b10da6afe691cd50530c57256b18c4059c48561c1c776e5e35a7a0db327"; + sha256 = "d6970ccf4d58e2f1219cb0d43a8788084d0863f0f349ab3292e182fb0201e860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-CL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-CL/firefox-81.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "42e383a691ef11afe1ed5afc64a0e6fc7e87534826d71d169e060f10fb07cd1e"; + sha256 = "76fb3c865b3efa1da1d34c8caa7b56b5b6d0af2cbbaeaef873fa96d2b8c93bb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-ES/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-ES/firefox-81.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7cb0aa8fbe6983bb68a583bd61d307d3b44a6a38f5b4c8cfcb1bd401bcd10421"; + sha256 = "7b41a2b297df4f0f6d4f44e1eb0ea0cbf02454382d0994f119a77876c578c4b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-MX/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-MX/firefox-81.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e9485c3a290a0a240d3cb9d18ec6929645aee333a919b4aa09776da106d943f8"; + sha256 = "733b90640a30df66700397ab0cc2045fcbc25af94ef9f36463a191228b511b77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/et/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/et/firefox-81.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "eb1a74b4e901b09cf287e59d1c8fcb500cf2f948ecd5098f3d928413ff219897"; + sha256 = "027286d744b1d9f21157d8242445ccd7610a08d8d541d64635fc16549aac1b4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/eu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eu/firefox-81.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8daba1de73e594e3138ffc8bf58865fd4ece581a43337097691f2bec4f419fc6"; + sha256 = "ff555da3aaf1abb2c384772b309fb4129dad57b9fd523fcabef5b2743d3063ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fa/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fa/firefox-81.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "f0cbaec0e1087ad8f55d24ba39d60fd91972189aa367d6b80a22de3f5b5ff821"; + sha256 = "c99f9297568f93eda17058d96dfaf83e587907be9b5005e8f649f693662e4fb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ff/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ff/firefox-81.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6b98dcb2d5493dc7084f626b6e8aa807d1b71d0d8bc1ad30f2ebd3c002bfde23"; + sha256 = "91658b195a622afa3c6fde535391eff1aa6b70f4c0cccc5c55e56e6d66459435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fi/firefox-81.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "4ebc56f8a38c32026380e02271cde2f651046d0b0fe4efadc48883fc2562fa50"; + sha256 = "cbc70d2051c96813ab081251c339f6cacd29ff26bdd8174b35caf9905a874635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fr/firefox-81.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b6d4ca33e93968bc0efcb504db785f5dee55bed9834d90482ba5abf54ab97672"; + sha256 = "51890621c8c3c0e40103a10e705adbc860937e5dbbb8a3984eb71a5cae3ed63b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fy-NL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fy-NL/firefox-81.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "438d72ed1e22da87cd0ec63fad41b5e355cbd8d2417627d74ded59940b6b1b26"; + sha256 = "5c3a982a51951901732ec7684514be233fe1c44780531fb38f7205724c241387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ga-IE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ga-IE/firefox-81.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6d3b4a427fc80b4f7e69f94a90d5d2fb9ebd366d224136316de8e2b03c06ddb7"; + sha256 = "04b5d338c7557f12fc6fb2206d444a8a00be6814b1ca26de4923449a4425b57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gd/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gd/firefox-81.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ee54acaee8f5b2c0033fc3bf27cb6c90a6d1849c4eebb427e2efeb3a7fe44c0b"; + sha256 = "6bc0de0ac627203b1ba035f7a7ba7dd19bd82a7730c526c217150cc5de668fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gl/firefox-81.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bce9bfb74c965ec6d2e346b86910c73dfc242be98473ba52f7d0cc34f14b42f8"; + sha256 = "37522d032422af770e37a93e33de6c0b8b79b2d22c6e71f32107cc8808de4d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gn/firefox-81.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a98fce4baf9e0424317231aac5ffc0b3574c2ec6feddd9e538faab59bf9ab432"; + sha256 = "f761db975c72d7e419601988c0674acc7fe17227d5569cac85a1fe2d91f5141c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gu-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gu-IN/firefox-81.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "35161db5c7fb962ad5c60118d422250c2b6a776ef13d116bd23b31fa5c312a5b"; + sha256 = "8565c1965e09060ddc5b253fa126998f827d17dd58692ec4d17d194d29a464a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/he/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/he/firefox-81.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "66fc1b065881a4dea1ac8d82bbd64bb6aec223c1419663b7a50752cd1700781d"; + sha256 = "c3cc5911103ce955f89c5104ceb1ee50f7c047e4ec761681c8693b643f5d91a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hi-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hi-IN/firefox-81.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b1ce60f26dc79eb360e185805b98b2d1197a2e45c26cd24bd3c82edcfad42a5c"; + sha256 = "95463325675e56e700eaffb6e6690f4b398adb5cb77aaa34b87e16cb142f3533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hr/firefox-81.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "712ce7b7e90c4b424a4ed46385a34905b7c4f59e6d07ced9e5e94a6108a3c206"; + sha256 = "6332ae812507f79baaed24e4fb79fc6c383418c4c9d41c0f3dbebc2fb72efef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hsb/firefox-81.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "43fcc61024fa21216e7e05dd0fc46410b2dc32eaa87215014f9f3e0d83ebf37d"; + sha256 = "b18a7d31d3ce7373bcbd6bb7ff56adc023c58097126781d5f915828be8fef92b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hu/firefox-81.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0b73ab77e5e0f4ca34d0eed7fd734f30c1484a930751d5f2704e09e94179ed88"; + sha256 = "b1e4c6c9c21b2593f3fa111820a7e6a2e2e72e8b3065738f6a50df6ef4b7f18b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hy-AM/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hy-AM/firefox-81.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "bb52a07de2b0c1fccdc0910c0d861345822c9708f9f66471225a9e148f159cd4"; + sha256 = "562f4d9e094b688cb53860834e425997e65b78222724c48ff4ddd71ccca264fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ia/firefox-81.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "50cfffd20294f00e5194093b6114cfd1529e5f383f389565be7998c02a8802ae"; + sha256 = "87299a8aeee6da57666a06cc2d4f479b0c74c220e2b22ddf5254a052f11edacd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/id/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/id/firefox-81.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ed6473750ffa1006d0ed8a502809b56573681c85656f12cbc6fdfaf50506c15e"; + sha256 = "0cf1bae8def307d08e4c24fb44f7cfbebf150f1edfde2a3c0855a69775f26539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/is/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/is/firefox-81.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1467ae111e51a4cddbf3611503e35da489fa6f506bedf441989fd093a1b507cf"; + sha256 = "6140d270e99173d995e42d32c0b696a51f72b1c6baa746549bdbbe7e2a08a811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/it/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/it/firefox-81.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "b4c96a1e12d8c6e16b7e85c0080ff0c1e50cf78d0762907af075a9e272ea9ed1"; + sha256 = "3583cf0223528929141879c085278354927ced41d71321fe8d832ebd356d4614"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ja/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ja/firefox-81.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f79a5b441d4f6d10c9022e5b872e5e607065a6f8932b1f1ac4a32f586848a676"; + sha256 = "4a1bcf87b3cd09d7c3379bd922ede7a3c6c4a19bf11596e858634b408df95cad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ka/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ka/firefox-81.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4e1e846659d18470e098dd9244278de6343bdb2d076927a46ae154f7b19b7843"; + sha256 = "320567daf4e4bb12c7209aff34d98efdbb2dead9b34f23d4a2181d2cdddeed71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kab/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kab/firefox-81.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d538a9b1b4c439bb2f1c57cb076b9f6f5be5ad673ef7f4e468031cb8f9f83d86"; + sha256 = "5b9d60703b494a4eb5956e59bc2d6893bc70e8b890d0c940f25d25b605000c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kk/firefox-81.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3aad1bffa285439350fd1c3fb09450e1d27f51a011383106b5341f75450884a3"; + sha256 = "45580e0c3cbb265f718a69ac9de7220d3d89e52e3b8a5cfceb7363c20e63c83e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/km/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/km/firefox-81.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2d59a3a69a96e793efa5257fd9ba903fbcaefef99267f3f0921c3ef073a12f8e"; + sha256 = "24b4879f22829a2a5d72219cba2c5658bf7c7e73ffdc9640f6e897ec613733c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kn/firefox-81.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "804f85a1d5e8f5acd561aa8ae91e1100de2e62ae270d742f0b16111dab20f94f"; + sha256 = "905ed3fa762c73c5ba677b8ca5b620294cb1ad36dea2ac53fdfca5a739c0c0e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ko/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ko/firefox-81.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a09382d10e2114f02848e7deb8c770599ff8f84e18a5c0253f4884b7b7174233"; + sha256 = "a6a63ca4106ee9c710331ea50099e2a50842465095d38ea55a63dcb3ee3d80ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lij/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lij/firefox-81.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b088949b9d87986b2ff1fe4020a59faed22b0c205a432ab29b862d07bda0dc42"; + sha256 = "b6fa42dc9bc68d4b71ae93eebfb1a19416f0cdd06d20fb344c0c0347aa2d4862"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lt/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lt/firefox-81.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8dd0b88ab0d16dcdf218b58e9f2fe8d8311d826461de8a4c94c9cfdabc8bf905"; + sha256 = "c70f6e7c20e252fdef6bf136c99095ebc27672719594df302e58be801a3f06d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lv/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lv/firefox-81.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "bf289b7115d3114a59e92a3c63cbaf98bdb3f3fd1cc03a9cd5976a4834ef147e"; + sha256 = "c64d561be20fc8f0e7507a0b1dc2e5d79af407531a37cc7da3fd880789899fdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/mk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mk/firefox-81.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "cd9b7abe6c53a221d88c5f49fee164d069c21d956285ad2d0fe06e7012b72870"; + sha256 = "aa38b13c6bc5288ab491f5ccee3a881474b1f42f1bd959435035782d1c39f407"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/mr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mr/firefox-81.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "370d8540a678b356a4f373a81e4807170b3599db6472633b34c768070c77217a"; + sha256 = "e56eea60ca1cd447e30cccc82ce7a4797fa23e9bb4871a5e20e05d44ac35f720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ms/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ms/firefox-81.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f141f3a22d6b5914f8cebbef0d2e124fc50833ca86bb62dd2a01d957ced6c099"; + sha256 = "9d8445e2bda6a8cc8714a0eaf82e1b9ec03fbd94042c3557f07d9c8b25bc4b6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/my/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/my/firefox-81.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ac62b25be480b30ee2c71371a6a702c37b58e537a4c4781b92e4f0b74c11cace"; + sha256 = "4a7527e5e3e6ea0181cc8b9a2f206bbe162a4e1867faa75b4af261f08e89ae0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nb-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nb-NO/firefox-81.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c3364a0364176839b97d08294ec7291fa13d212edb806738392796218b7a7080"; + sha256 = "c2ae9f5fb235541cc69cc3c4307dd4b7de51a9f4b6e038ef3091a773edec6c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ne-NP/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ne-NP/firefox-81.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "75d005443c28be517828d07be438b8c980d6885b4dacf42eba58573be4291b47"; + sha256 = "05acc175b06ab7f5861a3a7e58e9a92c40e0660224426fc8225fba6c25888726"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nl/firefox-81.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "cebae8c9c06bba81194c7126f115ffca44ae020af33b0de8e201ba930f4649f2"; + sha256 = "640be4e631343c9f2a55c24a4d5c63908627e9ab2d39a5346d1842d8e4a57799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nn-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nn-NO/firefox-81.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "27607aad3a1d5ac50f159289cdb92e71d882b77ec9d2d320b470dfba799295d4"; + sha256 = "46a898f41e5c3c9853b05fda8f44be01b2fd5a7fe3dad281c21588c2deaaedce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/oc/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/oc/firefox-81.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "634372a5d704c890d464c7c3dceb365689f260feeb9ee273e97d32d8b8c9a102"; + sha256 = "7481c8bad2e905a033f09ec4c20f8d4b184a0f90fce1c10648c4fc57a7a5f301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pa-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pa-IN/firefox-81.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "16a165ec3517839d07d2177cd3e88a61f063ad7341095a2c70baaa5de1f7a2b5"; + sha256 = "a460ed0241c569e1ac62727b17f8c8d0d4091e794900e2e2be7d8d8e2b90ada4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pl/firefox-81.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cceb8d8fc319344bf031c7d86ab5d19ddd059b67a7293a2bb785621b99cd98ad"; + sha256 = "d82e300cc8be61ddc2aa66bd4d4ec35cd18e47603bd19530cf48728c5fe67a5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pt-BR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-BR/firefox-81.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "5be4bd15fdfd7b80a156740c57166eb31c77ff32f7e4c354d403606aa3049f8d"; + sha256 = "1ee1560d4597adbd230fb0c556a4d8fa6984ee86bb731f7a5a936d660897eb99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pt-PT/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-PT/firefox-81.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "0dbb3aff49303f94539f82ad5d434351f5c2d1ffaf414b94f6b8ebf6535d656e"; + sha256 = "be7e484f8c3f4d8b7b894a437b70b2f4b448e3a7df518ce6906295df9be7749d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/rm/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/rm/firefox-81.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6880c4976bb118fa934d189d6af4cde582d64b909ba0671a4ae62e41bba4d95b"; + sha256 = "819cf6a13d1690dee4e4255aa0c3f551411e2b7076f8ce3447bba47f07c806db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ro/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ro/firefox-81.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4e5ee175921c2e919d2cf1eace39d52c5b89c6bf4ff9bfd9080d885d2a2f83a5"; + sha256 = "2baa8154f358962983c7e0b26c4a7cc8cf97587b646884527fafe46f5d8d92ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ru/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ru/firefox-81.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d4be0a9f6d4dd99409a5099624429f951768585a955022c0efc0ca00140bebfb"; + sha256 = "eaaa5338ff8ffbc9bad5321ee3eb7410feb9a26a06d3cc49707c0a048f4412e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/si/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/si/firefox-81.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "77460dd1207e11ef6227756c1fabca26777a98a5ae92bd38be2e86161c0efa12"; + sha256 = "ce04721a96cea62eb7011c261f740e9e0ad6288ad9ff231538c3a6df86fb40ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sk/firefox-81.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "018602509df7c86cb001f007937dcd44694438fcfaa9002562995b8cec0d956f"; + sha256 = "4b19fef341d64f94ad97a0bb8821693b00e4e7e04454156f92f0c82f4fee0005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sl/firefox-81.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f35c5a8d8b3eb56c9241a13d20708069073558caa02bf6ca55459150869ad114"; + sha256 = "96192922f2012a3e6be634c7ed09017cebf9498c6fc2862336bfddbc4ea40840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/son/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/son/firefox-81.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "561d9939c3065e2a604d7b51535a5b4b8c0da7e3fc9274657ea88366c5924c74"; + sha256 = "dfb144edeb3712bc0a3bf7e0675de80315c78bea7d7c6ee5f6047c077acbddf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sq/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sq/firefox-81.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "1e38655b0ca5684decc1619a51b2bec39b8fdd7ed302513a8f8d14a3ddc7533a"; + sha256 = "54dfab9e843dcde43cf188ae33922371fb90c1bfda53ef629df16576d6a0bac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sr/firefox-81.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ab879d65f27ebe393ee86c12b2eea256639d17f2dcfd8b4981072772a277d783"; + sha256 = "f00b5184ccb47223858128aa26481867fb33aa50a914a8c807235c9a2bdf74fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sv-SE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sv-SE/firefox-81.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "832ca5b1e0d41675066e7bcfd16563a9e03dd87bcd96d4592232ca26321af7e9"; + sha256 = "d3884cf4a9ff23971badfb1a794c9489e0006e6851a0e501e290d8793054cc1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ta/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ta/firefox-81.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ad9c6fcb91fc87aa11ac0912f049db9cf93f5e62797335a8a699b9ea8a7ede9f"; + sha256 = "53584d2093feffd36a8a5249ee438b82d21af834a3c2c210944030c127b91cb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/te/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/te/firefox-81.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "37c7836f86fc5f4f48aefcf28330e1003687752d506d1050528a19b592bbd7d7"; + sha256 = "63b65440720bc492fc95d080b191ba452cc87c8501b195e02df66ea4487fb902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/th/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/th/firefox-81.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "66cd4f8cd18f1c076b9d7538600459fe01998185cbf6899126841b16b3184321"; + sha256 = "3b01fff09734f2206e4aee227ee7f0c13544fb1635f92a5221ee356117955446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/tl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tl/firefox-81.0b4.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d3f6102c2eeec1ecb1ba28884592c11e544e71d42ea2204de59ded1065f71f5f"; + sha256 = "00f1c65baf63246a9ff44d98171a6ceec6e276488f5d6fbdf6f97760509b3bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/tr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tr/firefox-81.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ea161412fd08571782f607c2aab116a1e1912caa3eae785db1129f617b389f11"; + sha256 = "064d6c6036fae215fcb50a87863e6808bd1626084d9144a18f7ea1f4c7072093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/trs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/trs/firefox-81.0b4.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a1824abd2c3f0e0ab3e1ad971137cc81c636af48865f7bdf7eb1029a7d08a16e"; + sha256 = "73c892e0b0ab0bcdbcf6af88fdc8de335bcd5c56805675ba7b487ed3b620ed22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/uk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uk/firefox-81.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "38afb4f054d9b577257509b17e32049e7c5fb50e47971fe52bc5ecc7d9b5806d"; + sha256 = "8ac48524702e3f177e78fe97e4fcf528752a3ea0ef08e9212037dbd0febea53e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ur/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ur/firefox-81.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8b9503d7b5452c43e7300c8a1b1c2ec9d2b0572aed78e7b8f05fc7c1ca883d07"; + sha256 = "154dd642021769aa67a081080f33d87d736686b9e6e46cdfa2bd2201605bda26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/uz/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uz/firefox-81.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "789a4b08daadd64f6275bf267bc269ea92177902ae7a8b20dd14bdabcda49cde"; + sha256 = "dd36910596d777f49de3dfe8e22f2838b76081cb259107047b9a98c3445c01eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/vi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/vi/firefox-81.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "10702553917f359954b204b65bfe311826cd44f6e81e7864c05a94d541dbd636"; + sha256 = "3cef9f657f83bbfc68ab4a7c8ab84e1e937553cca98cfc30d3fbbec5c8be7907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/xh/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/xh/firefox-81.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d99ea01e9d8bb5efeea45e2c2e14da6618d1eaaa25f4f1a1facfec1ebdef2291"; + sha256 = "30a98fa9218cbb07d792629e73a250659b321a3555eedca0a68e6ffb1d5191a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/zh-CN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-CN/firefox-81.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5c7c3d76a7e4fea7ca207cbcea698eedc970a6fb727fad7c071e19325fd8631d"; + sha256 = "bf15e819d84a3cd3825df2046bd9ffc139008f45fdbbdc64e04cec6a549af3e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/zh-TW/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-TW/firefox-81.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "9fbe3205110e83ff45fdc8f5c1659caeaef48c75db30a7014454d6338f1aceb7"; + sha256 = "b194749cb05fe282f59f2f6621a5d04fba42406d7a3ea71242b667fe94a5a857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ach/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ach/firefox-81.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "a6a965e26d90ef0dc4b892d0d90f8b0b81ea7ced3ea1de3a70126c4095731fd8"; + sha256 = "203ca1a13f76935935daf2124c662329df93af0e44b4bcee7334ff60092c8027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/af/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/af/firefox-81.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "649d3f77f16832b3a645f98616bdab4b788fad7d2ecc2d91558d369b439857be"; + sha256 = "481d233552b0702a8b8092748b4c71da3c14c8df5e971c5b4662273cd8808022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/an/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/an/firefox-81.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "8b0e52a60af14565dbc514536a8808fc8aafefab56d765fb0ce42565f67ce1da"; + sha256 = "a128b96a34eea409a8b5fa412e6a1a36bcc28f2fbed40ba9b474b9d86d23dbae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ar/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ar/firefox-81.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "522f35d947d56354d31ed106ba5fc6feda9ad0a4c29476c7497aec6cb2f6dd36"; + sha256 = "a2ab8b556b6b477bb1aa287f630e7ae6aa902fd1b75968c01c2e2c76fe9cdf09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ast/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ast/firefox-81.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "03220451f980f89f3d9b23b53f90e852402fdbf54494ac99be7dc8932287d732"; + sha256 = "193422cbafcaf5ed58f334a9d5b30f9a6181aa1cb649303df18626d9a3484088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/az/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/az/firefox-81.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "2d70285230ec8fd4f5f0e3232d08b5c669e5f71d4758d88947b82f907305df3e"; + sha256 = "c206f5351f0ba474a5277e223514f032c7ff0b66029f570143f2d1d2b8ccf566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/be/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/be/firefox-81.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "02967f01fe3f8b225d60d462e4dd17cee0d031bd5171ec781d2938796b1174ed"; + sha256 = "c3d7d04ea43230b6a6e4227b799d47348bc5c2ab6a60e93f4107efa6e7b34ef3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bg/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bg/firefox-81.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9b5acf3d80fc9f7e8ea20d0df282d6ff1b605fcd46a5a329a9138734df501035"; + sha256 = "08edf0db8aebd41f25366ef4302214b4ef00540be39406fc780eec288b0de324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bn/firefox-81.0b4.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e8a65769c738e9079d1aa9fda2ba74d21b96cbb76d4e348acba7ea1887d90d52"; + sha256 = "a6d5dd5918d94e74ee8ffeb10c4caba65697ecdb81598b0bda815fa5d4830a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/br/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/br/firefox-81.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7c2a12900d2adfa765b4036e05875adbf59f70e4eaab33568799cae91d948b5a"; + sha256 = "4e7ffbc380b6f8716399ee9d7b9ffc5fcdcae72f48b63ae4bcd2011a85efa0b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bs/firefox-81.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "bd0e3d7b35cb845288f91eb1ae21d405f4dea2a6633897c30fcf56219982cd59"; + sha256 = "ef36dae13dc3c943e5981a16d7ca61b4c6daa9a4873d2cd87022fbbcd01c8907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ca-valencia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca-valencia/firefox-81.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "a167e7db353adf008d28458aa24209175c29c1af92f21da7e999729a8ce7e5b9"; + sha256 = "584a0370f79011dd2691461acd573133348a94cc1323d6fb99dea9dd6df1e155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ca/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca/firefox-81.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "809cca0c4549e747944f043c96bab11e50a1ee6f4ddd6436ae94f85cb55063e8"; + sha256 = "e280fe05f4e9320fd354407811ea8664d50de3810298e5eb4922b2d3e549ad11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cak/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cak/firefox-81.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8575e1572ff2872993aa7cc07ea1fe82d66830e80c779f742412128344afdc07"; + sha256 = "3decca8b5b0d44db169abfa20f07b3c109bbea0a68ae3e44a35f97e3b989324b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cs/firefox-81.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a4e5c1e08e138c077a8cd5a3f54e3a7a1ebaf7ac674d2658e1c4cb10b4a26a5a"; + sha256 = "efccc2a43f961179f61eb7858b1e17ffd069bf7a26027faaad09f1b529ade52c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cy/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cy/firefox-81.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "149d1bb8bcedcf215095629e71e530a58e0dfb60a13e72d6346db1200f79a882"; + sha256 = "dc8a1945d0230070e2bdf65b673a9aecc4868c9821f7f1e2f6e0d18bb98c912d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/da/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/da/firefox-81.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5eb27549c370ca89421a9d39bc5f33c948f85c48d67446b32281a54c50e12ea1"; + sha256 = "058b800e2c9fc464f2a75fa48542269056a88916b9474a953f0d29a3e9041257"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/de/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/de/firefox-81.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d868edc9f9831a4f8f196f438a1235339592a05086c3d5e4ed25714df36421af"; + sha256 = "7fbd0b27073b2c46829fc0d631ed11fd9a38a07d0ce474f6837ad1f5c2adff62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/dsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/dsb/firefox-81.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ffc379cbd30f04c1f7c78f6991414b9214ca2c23280655690dea42c9a11992aa"; + sha256 = "d0b6083098d416366040a877a92b163d469e2764af995c65fced49de23148624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/el/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/el/firefox-81.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a87721a1a6da5674d0b9b754d142ad5c00fca4274cca7d4d1d5e15f1e21be389"; + sha256 = "104258b0e47b661d7c75c72f5a0d7750399a101a9996a3f8837f0f524e9820db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-CA/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-CA/firefox-81.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "dd04f6027f1cac7b5a34013ad4dfd3b0494f40f243665a80ae058887997ec299"; + sha256 = "be6750a6946b7ef58869d0c9f0412febffcbe4955c823a573d02822f9a14266e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-GB/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-GB/firefox-81.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "d425ea90fa18877faac09cd7ba1b499cc92133580f720cf0481dd651f529582c"; + sha256 = "e6d2c60c30aa90b6026cb85d6fc3a1d1b7266263980df652c9a1c158528cfc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-US/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-US/firefox-81.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "777291dacd6ada8f3777c63e0264d36f3477b15e262d575e60b9efc4ac5de30d"; + sha256 = "be534d43126a7fdd297f3431b579495b6f22832a358a0c793a23bea8adce1c9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/eo/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eo/firefox-81.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "df865cc147074318eb89c0ac4966b42aedd12aecb2a637bab18f6c231fafbb29"; + sha256 = "6ffe84994fe7db178e59ea667495e95e6fba621cd0e4ec812d94dc3d98cf0a3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-AR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-AR/firefox-81.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cbccc83c1e54a59716173e5f1a8e675ed1e3567a7a316e48b5bf83adbfe39597"; + sha256 = "982874a48791db0bc98559de45bb8884da93ee0a0738664c73ae5a08b3b1a2ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-CL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-CL/firefox-81.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "45b0243d594b5e8b4828746719b93a9388ab509aef54d03412292b76365f4fd2"; + sha256 = "c21fcdeacdf570a9f8bba9c34c64a60776aa8a4de56b5f773b1d26eca6d65b70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-ES/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-ES/firefox-81.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8eb9961ed19594381a761385af10bb0acd0bddc95166737a766b20de03e12e0c"; + sha256 = "bb34dda74d59c862ab24ad9ff0c5ad1e1fb5d73e6029b915f966d0913cf4506a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-MX/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-MX/firefox-81.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d4cd439aa71e06af039922fa98dc33bd25f90c728faf09c6bfaab4bfefc6dc0f"; + sha256 = "53686263f77643ad4f769faac81697c7e1eca216ed0a7b051c2318b181318d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/et/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/et/firefox-81.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "dedb23bc1ee86909143b02b1d1601beb1dce38e9bb14ec8cf015e274fbab9e97"; + sha256 = "053d8ad6cf01be9f51cd133090e99230dfe797effc749e14c8a21ba712546776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/eu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eu/firefox-81.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8e51b57208029e32ae01c93724f7b2f25d896f732e6739d5537e770b386e22be"; + sha256 = "77774b9126ccbca2b5716b1701f8eb7933ee67ec5437a00b8ab991f423888a80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fa/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fa/firefox-81.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1c332cda9a1445ba3b58ea93c614300f3b0679d3b32e9722068a554c92e3c8d8"; + sha256 = "4a0554bff8c11ca39f1de223537d595d298e6f61c2590543151e8ab1d8eca36e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ff/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ff/firefox-81.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "c99e29b5b31196dc71a8c89b66b0e34b9bca8ae630414190ef7f56133bd08959"; + sha256 = "272784bfa53ddc48fa43590b3ebd2fce808786b4649efa1d5b417488efbb8911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fi/firefox-81.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "98a35572115ce221a03215bc4a4347f9579a3052191d81f64af1455f38f47ff7"; + sha256 = "c389eb80f3cdd215549c7ce55402a7c03544eca2fa3c2074842af32755d14cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fr/firefox-81.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "34f0991b083d5a924a0e77000010d89f049767a86338db7f565a1fbc815216fe"; + sha256 = "dc5a79229fbdd3e9fada6b6bbb35183c17a703b9c3f29d9172f2b56cd5c0d289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fy-NL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fy-NL/firefox-81.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "157dacc021af4ca81590394c4dd01cb337f4436df1020718ffa424d43f023606"; + sha256 = "3eb69867818f0a8448e4f421f0ded4ad1a172bd5c99048065bd4b6cf83e8b25c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ga-IE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ga-IE/firefox-81.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0e338674ea0ebb68052aefbb33c8eadcbb0bd71c78fe9bb7eba455e7c58f1a5d"; + sha256 = "b09208ca65279e393f512a04712f91b2b170ca6e32777479acb7a03db89e87dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gd/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gd/firefox-81.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6129a4db1d2c0b0b2f250ea2ef30d08cf41da50c1d2401a7464ec4f6b8cbbe76"; + sha256 = "011beadfc3e78ff216a13d55a9b54471ebf84bb1be852aa986ab5ba1648836f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gl/firefox-81.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "94ea69444a49b0ea79f22d805963adff4a7d8fab8321e415fe8b4682b489e7b8"; + sha256 = "c492314ad418a190484fce335d1dc5a28a515f630c59b1cf2d7e812b6d3c3bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gn/firefox-81.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e3e6533130afd6577b8f1d41f66c2b16d3b385aeb398cfb211e7196073d7ff9e"; + sha256 = "25b03d5251a69631f5d0cbf9dd89d1ce1dd5355e05efcc233bcf62e5311d4d01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gu-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gu-IN/firefox-81.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "25ab691be04561a2dcfb2185fe5deac0b6e4785f3cbbed871b8f51e370429b3d"; + sha256 = "1cc9a3b933b625a26beeb7c31eb062e22ff8dc98c4860bf6ef4aef5567552d63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/he/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/he/firefox-81.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9ca2569009d5707c9ee9051173b24c5f531bb9c3aced445bc3bc01fe99c7926e"; + sha256 = "027cd01f51db3b4d27381870ddf95ca2f7252bf7c6588c3d073d303bebb45311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hi-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hi-IN/firefox-81.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "c39d4070be5517f8979527064b5553236d2f1f15eacfb3fc66fe4f7a2a063814"; + sha256 = "99d6d2159ae34ce2154678e4913145ccb9c96572ef19a18db6a223647b7ec68e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hr/firefox-81.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c6c37633f91a675dbd33180761542d8f1af950e876dbd1635f73a0243e2165ec"; + sha256 = "d9b2fbc6474bac73fe7fb5c4eb818f5dc0d74cbbd52c3aacbed0f17db8bce9eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hsb/firefox-81.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4bc5975c97a98c4a93ffb4940b2f0f35670cbc9785f5fc07be5d387c3403fa64"; + sha256 = "dcd0c254c542a50807cbf1d0036a4cab5463c237318fb1d1fec9826d052aef62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hu/firefox-81.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5c76f9bed31bd9e906b0a044b67113f1cc6d91ae738d3c6e1c2746eeccf8854c"; + sha256 = "5a0a94eeb9c8d219b3e34e92fc51163e190c606f975735215177d521b7ed9656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hy-AM/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hy-AM/firefox-81.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "40d1896dd1763f035ea5f626430e6de77df4e0c83f3cb4d2d9c2b992379695fb"; + sha256 = "2ff26ab884697d226bcfe224ff5c068aed355f6bb00777fa6d9f3bd0b9f9b386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ia/firefox-81.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5c8a0451233c3d55d764a3ab073ae25b3fd2125aae40c73968672fed9b2520f6"; + sha256 = "7bd9d940f81d76984886463cc10920896247084f91efedf99f787601a47abba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/id/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/id/firefox-81.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7328e7f45205c3f9109eef8d7e512f41dfaf179eea50233f63a549efec0412b4"; + sha256 = "c415b55ec7701219557cc4815ec0975d86f18312a2ef6a8abf3e82876edc5045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/is/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/is/firefox-81.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3f9e92d8218acf6da2ca09bda7544b6ae6d99d1ec2398bd3281fd28aaf3b7845"; + sha256 = "3ee6e83bd9c244b123c1a1989fbcc0524c4101fefe697ea0a9ab7c6a05302ac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/it/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/it/firefox-81.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "947b2947b5b33c3d62645fd2a5ba7e02eac525bd3fdc511f62881b61c77a1eb7"; + sha256 = "de141769375ff5da94ee1030f5af84b309917eeea48cde769419004ca5a015c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ja/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ja/firefox-81.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "fc82a3d2b816af47b8dd632d672135f7dfa3016a554c6b1840129394007f25da"; + sha256 = "69c5c01998a78c17ba55f262493c4e7bfa4fe03bd19a8ca605546f41f0c6f794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ka/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ka/firefox-81.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9dc51bcb8d60327d5f893f334a54181eb6a4f34800ca9f15671fbc833e8a4026"; + sha256 = "4c37f22f1a20c79c1b391b0f86bde8535c0766980a1b9a42ef912cbf91752392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kab/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kab/firefox-81.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bda38d2522f0fdf8d1d6903bb11b63dcd242684bea412f9176c49fdf56b6d5f6"; + sha256 = "1c6722e18e1eff26918de17454d8103929115f7f036a1c23247695f7fee13051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kk/firefox-81.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d89d7aaea34b094c6a452c3d566ca03f42e4a1dae4db26d1dea5bc2da49d808d"; + sha256 = "9ef2e2142d2e6d49adf59e6dd190b4ff816cf566cd35e5d288f66794aa2d73c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/km/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/km/firefox-81.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "932469479db43ced4b9ee82a481ef00adb5808f7d2e859ef7564e20cd764417f"; + sha256 = "bf0899cad62f3331d157c557cbf3cf1f7faadaa7f9aeed3c6547b4533689dd7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kn/firefox-81.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "80564390296e12424ad2fbe1952397cf7b36af4e9dfc1fdcf914745aa01a5836"; + sha256 = "cfea495b254e1ca8c1be94e95f0c1f126d5f1a1c9d54129562fbec5ded6dec58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ko/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ko/firefox-81.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b3f091451469caea3f87f81be1da8d2e981327ba36df12224f8466ab68a2e9ea"; + sha256 = "ba8c93f8567a4f6bbf7af3c38a2d2ee793b05c0246638ded86538f91e6e9112b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lij/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lij/firefox-81.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "becabccd189bad47d9e716889698811f39c0833474bf48df2e4f2792b67bca6f"; + sha256 = "c093b95b291af78460396e87ad39aa142d9925a7253f74aef9640fac0134e397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lt/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lt/firefox-81.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "fe38d20e2cc294f3ae11df9ea7d34849489b1456355b7d110f8639649d5cd944"; + sha256 = "b035e58bfe373138626d9c5a22e6b6a8c6f35e8ba30ce821f80a1a85fd16c35c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lv/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lv/firefox-81.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "1f6b7bf9f9b1fb0eeb80ef4a9ff280b042f9f524edd88b9ccd0500fa4ab40063"; + sha256 = "6dd5cf66db0207527966532a2728d37438f71d1e79caf9b97916d0e404c9509f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/mk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mk/firefox-81.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "732585681ae095a83428cdc32c4277f98861c73583c6b12fb1ba07f0265be8ab"; + sha256 = "1308f476d0052e1317b4c7db29d4d2218c60921a9ba7f619dde4455aee7978de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/mr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mr/firefox-81.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1aea289a62cee8243f69bccb02770b026ed183b6621bb99f33b1f5b4c8a5b667"; + sha256 = "7336012a19cd650dfb8f842de37da8e29e7b0948cc707880667eca87bb31869a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ms/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ms/firefox-81.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "12726f171b6d5a831898fe0c6379949860e8aa899789c2dbff7df86281549076"; + sha256 = "192e12151ed1be4c3f7ea12beedd2c50f6e7fa877ae8c448cc899cd0fa1c6d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/my/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/my/firefox-81.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4545ba6aee4231640d4670e08a5bfb71b0cae5faadd5bd3d9705b37df04f5dba"; + sha256 = "08db2ff728d5bfcf751e95eb9bba34a94c435e53863790ae06daf803d56c227d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nb-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nb-NO/firefox-81.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1b741c62a58ac9a0ca845fa942ae169576242a3d97018439d85c9efba09e41ed"; + sha256 = "22cfe518994fff77dc41e6f45550549593564ef2fa2dd34e31af17f5e42d636d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ne-NP/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ne-NP/firefox-81.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5f44c3bb3351ded2b7f5ed216323fcee990175ef55b34a32026a2c6afa280ebd"; + sha256 = "605180e46adcaee8fb813dc41c4e7bbe5f509f181b607554137712405c0cc294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nl/firefox-81.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "5da24260eec62457572431b2667eba929876c68e0122f589cd87c7df3c364e7d"; + sha256 = "ba8b45685a1d428d5fa1e38e1a3ec024f55db2f3ce4221fd53b96b0e0801a6b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nn-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nn-NO/firefox-81.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3d8ae8f44295cb55a3c148510922e5e74b0ec8b69333fc9dde04e6f05d1109e4"; + sha256 = "0b76c63f7942576a2deb29cf15b089d2e73aa0b25f07eb1a511ccf033c68234a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/oc/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/oc/firefox-81.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "913bfa234f56906bb48d2410ba8bb400cce92f6f960d7e1557786092f03aec30"; + sha256 = "5de508b4039c395b594a0c78d25655113906b95a735d1e94f8e1171ca789da19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pa-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pa-IN/firefox-81.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f6c276a03f658fe7f62b49d8ed4e7ecfa14c9852384b224b732bb80d6d0421df"; + sha256 = "0bf9e4751ef967f4c6f63cb6332fe3940698b3e67d0e4873ea6bf639487159f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pl/firefox-81.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f1118903f6774c4e24cf2a01238f0cdefbb137e8af829dc403b13290bad64124"; + sha256 = "0fcece8a65132810cb297a599cd4b003604854f0af684b33c9de554fbf7b1e86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pt-BR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-BR/firefox-81.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e421152016cf3551bc66382559e947aec03698090ed797514a35bbcee07229af"; + sha256 = "8363d209d1eb7e8053acb4805df119e230ab31e74b3389ddb01b53b032c12bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pt-PT/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-PT/firefox-81.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a4da74dda8c2641e349cabc2360bbcf4ad531719d3652c96a8c9a8f2130794d1"; + sha256 = "cf2ecf2a673f0a4f17cecb10b330bec530fd6e37aff9ed821aa68e202f59f864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/rm/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/rm/firefox-81.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "578499fc230856e300a6774a8ab0b1d58c1afaee1e0fe6987ae16ea033cd6beb"; + sha256 = "8849e945e79f0f9605e288de967e9f5316c792b150654e23ca65f6c91bba8978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ro/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ro/firefox-81.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "967ada36c6bfb6bd658493417f5f21e1cad56afc40081463072eee40a964f809"; + sha256 = "452496612b170e53423009a128f092a3d4a372e0e6fe352e649b3c989f6f254b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ru/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ru/firefox-81.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "58008daaf760fb6a9202d10771764cc3c46347b905aa622319b0631d833120e1"; + sha256 = "0e7787bee9fdbb1ca0bd3ef050b1ee5d6c6d8277da941232d6ef10c612003773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/si/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/si/firefox-81.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c599e263b7084a69ea0730755483fdd6334610e07188c5c9f06b4be6bb7f073e"; + sha256 = "bfd6df7b86490aa941f5878ad749d7918bc3c907a177213ab8a60df0270eea69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sk/firefox-81.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a7170c138b30450e5b56ef7d5460f549288488455e482c8a89ea897dc9607f73"; + sha256 = "87c4827968ac3de5fb7609b9d7685653ef279bafbbb8b15f15f93cc876d6e021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sl/firefox-81.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f7dea114d00831e71a6940348692b6523174a9fe099dad3743bb69f277cd2d7d"; + sha256 = "6b272ee0cc91ba6114dc777f1833ed5201a96fd905a0d68a71cbafafe1a066cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/son/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/son/firefox-81.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9d9917d01601e3de913267d1836764cc10acb09363b05049867d7069964171ad"; + sha256 = "342f9eedcb359409fb324c13120ed25421435b614e9b5e15585ccf1551c263c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sq/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sq/firefox-81.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "85c34be5e061157f94444cfa07d8c8c1768aea4d4ed29a63d46b13bbb5d80438"; + sha256 = "ad11f5878139c46a2344d0bcf6b02ad2c19e59f9861e7ac74668801e14742b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sr/firefox-81.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "15a348fbf5fb4ae31e0a33b17d866e40b655b4dd788329d579afc82bb5ed86a3"; + sha256 = "5e555aafe353036537609b9ba997374d106bb5ecaaa386b5395b7d156ff89901"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sv-SE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sv-SE/firefox-81.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "bb9bbd0edb5934f5d33d4f8db92d1e039f8519c0c126f5156f88d4a5be864902"; + sha256 = "cbd33b4fd20d8a7401e384196c28adf9fda6ee2bf24895d75e75f8b727d33e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ta/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ta/firefox-81.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1d886bf18808d2dd3d6a95e5ae377c24be50f7e3788bf2c37c42606e2141d3ae"; + sha256 = "8e4e9919ec79c1847449cc75539f24801d972b67d6895727aafddf7485d95ed3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/te/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/te/firefox-81.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "72bcbe4f087f8ed8248d5056adc786d96982a87fb79bc3e83dfb9e9f209211e2"; + sha256 = "cb756aa758e69f26eb50d2e81bcb922c2a15a2304ef99debe67a57c44b2c3c52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/th/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/th/firefox-81.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ba0d8e25d5d2de631c05b9aa7317eca67dfa12564e677f9391a7da61c7630ddd"; + sha256 = "8c2be1458aa4077264ec946181d7ab3160086d12c821dc3d5fa3bbba46de3574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/tl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tl/firefox-81.0b4.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "020791c52209fe806aa92f7945724ac1bbfc5554ec7827d7c320e1cefb5d6e60"; + sha256 = "e51e4cf97b79b3720129ed9467b57d393a4ffd5698a9a941cd28feffa1d166fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/tr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tr/firefox-81.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e803849628fb4a07aac2b23d457a8d1f954d2270d989fdd167c82e4ff407dd23"; + sha256 = "9f0a494434bc3d78c43428bc535517b5d61743326fbdbf1836a84f353408a54e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/trs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/trs/firefox-81.0b4.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "8aa74977fc2ae7e85150406541673b71b122f10a79762ae98787f9196d6e1ac9"; + sha256 = "24cadb7247a254595c29aebe60784d37061465f2c960a8d036096c6df71e4186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/uk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uk/firefox-81.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7489d2f06cc74a759e6128a9e1ae19305ac8d81f026e8d16fce30dd8c23762de"; + sha256 = "6aa85e7119fd3ca00cd87d898eb93d954b1e58d01edf14106c41df98bdca4d99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ur/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ur/firefox-81.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a0e924a25bdde879856fbf53fc0ca3972a3f701338079ef408694c0f87a13aa1"; + sha256 = "6b188379acb89178d08e827a60244c2298eae62434991d53378327c36829fa01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/uz/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uz/firefox-81.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4603be13c80926a5de1a2fac56d433798c2e2415ac5e769a7d4893b3eae7ec86"; + sha256 = "782ced50737f68a9fa6db854cde83ef7bbc6f95776a44918248efcedd95230ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/vi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/vi/firefox-81.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1f9aef09fd0707121eb3335d60bf0b3b06554294594f45158cd41cd37f0beb07"; + sha256 = "37b600b306c901080f659955163b1696f5129e71bc3c5f65dc74d280ee6e3024"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/xh/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/xh/firefox-81.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "4c61f2ca3c4ecbc5b6a71edfa540400633d689c2cb042030c2291117443ade65"; + sha256 = "ebdfb9a50a5a7cad0508ade647ef3f81e18837d6b84212de6393a854bbfc652f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/zh-CN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-CN/firefox-81.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b24226ecd5946ea1320dd8ceabcf5402af96c7674c45d058b548aa212da1e1aa"; + sha256 = "fbc7b8952fa6d2d73b736abf4e60a10512eb983ea4588f7e746bff9512b953ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/zh-TW/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-TW/firefox-81.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9765b5e72e0e2bb22b080d6a9a050a52fe003771e172f4865948b0c8b0000ff4"; + sha256 = "5c29c56ef6480703ef9b6a2dc3cae8bc45b2fc01495ba099bd1ee28bbcdce55a"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6f5b18bd56..d86b9d6f98 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -45,7 +45,7 @@ , gnused , gnugrep , gnupg -, ffmpeg_3 +, ffmpeg , runtimeShell , mesa # firefox wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en-US" @@ -130,7 +130,7 @@ stdenv.mkDerivation { libpulseaudio (lib.getDev libpulseaudio) systemd - ffmpeg_3 + ffmpeg ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 618a6fc519..403ef9bea1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "79.0"; + version = "81.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ach/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ach/firefox-81.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "25571c5d9aa4294f84d3e8aceb501efcadcc7d80dae799ee7246391782079885"; + sha256 = "7ff2b7ec6f3f55fccfb7988d7a42bc9cbe572af6edc64ac9b42ea15aaed9cd4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/af/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/af/firefox-81.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "400edad1b17de72f33237d5c0fbe20dee9a2032aac41745339d62eaafd36b157"; + sha256 = "c1a29b1473583d28f87c764c8ccf67f7cba874fd85e5820f968230c9ce29670b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/an/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/an/firefox-81.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "13971db840762cbe9b54c917c1cae459259df1bfc8783d0659accf539dc0bf05"; + sha256 = "bddab1deeaf3c6474586beb41ad9c720ed6e84f9e999a856b17bb4e7c9d97991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ar/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ar/firefox-81.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7c8f5692e483667ccc173d9205ab5b5b77b4e4d50a5643f4ac531b1809a97d80"; + sha256 = "3c4e339627fc94df273ba7e1e1c150188033331def09678b2e0abb54e52f2120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ast/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ast/firefox-81.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "50cc5928b1877be40e29f30b51cfd183d9196bf73f68234866eff9e0e50c2e36"; + sha256 = "e421c32fefef657287ad52dc11f2f3166e549ef9d54065099f84e5f35c8a52af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/az/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/az/firefox-81.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6f8f0b486652ac7bb4e3808a02b123acbd4babd6b272c503c6fc14159278d492"; + sha256 = "e1099ab7b028d8124446a21056e55dc4b87d1f20972dea60125347b1b099e35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/be/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/be/firefox-81.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f2dd77674d83b888e2016177eb80c7855a7fa26318ec052fbb919fd2abab6561"; + sha256 = "a216a2cd652905d946aff1cb3a0fc8738a1e3d5746d080dd863d34be244a2a50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bg/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bg/firefox-81.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "08514f73d202ed1f53f0ef23de3093ac7eb08049fedf3bb09b69c98148efb99b"; + sha256 = "68a8a4ec3d0c1fb8a174a7466abbfb6c806bb8a263ab852b15dfdd15c35487aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bn/firefox-81.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7f5114a60d966e2dedb95c1b65696bd3b04d25eb057b9a109d8bb0dc43b46f40"; + sha256 = "3eaae9060b690391cbc63aacdb1d833b2895c7aaf6da36c32cb117e7994d94d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/br/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/br/firefox-81.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "816dbbdd0f86874aad38733a30b54e683c7b18557c34d977ced6cd17ddf8b125"; + sha256 = "806b366419eb6edab57c8f3af9f0465d3547e3e28047983af7cb2f08ad822a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bs/firefox-81.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "6c975f990120e9c70121eea464e9c375df40f6aa78275922d005096135044067"; + sha256 = "025a79c350f35f8bba1a5fdd894d0eb237d22be8ee5825e6a657f18b0c99bd87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca-valencia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca-valencia/firefox-81.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e993527db5fac86e5a503cb7615c073363d73c733837f7acc66b30d17b7a369d"; + sha256 = "806f26efe0a6317cb5dd1b631f8b96bceeaa6e8fced624d15ac334d0d2d78dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca/firefox-81.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8ac5bfa08c2f082816c4f7bc45a0ebdadd04a078efcd172049899890ddcc3ffc"; + sha256 = "dfa651a556e024d2d27a27d97eec87750d8f4e692345a0f4e12c7a3480ac1d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cak/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cak/firefox-81.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "76680375d4f2ffb8f70414e2f934fe442e30d50c1921f7eb596f1325ee01a155"; + sha256 = "7225d8cf7a529d8688aa7386fe14e50e4e208d55732523d5407690f63b6ab775"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cs/firefox-81.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "99f83abcdc15839e879b7cced936fc3bb628d8b42f5381dad980d444d4fcfe1f"; + sha256 = "17d22031176a4604d498743eea242fe257c74620ac8ab88f8f197d57f8615663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cy/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cy/firefox-81.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d81fee7d2b5b8177f1b28f4e4d05f4b266b876adcf5ed62a7d458465ca50bf42"; + sha256 = "82581e54dc72e188a5d4976bed58bcb8ba4153e72854fc439d3a903a5f60e6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/da/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/da/firefox-81.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "40fdbaa88e3ac77d4cc846bf01b00ba1cdb5d3241f7af8a47efc92c929c862e1"; + sha256 = "87a600d73b3fb74ff8aaf26e1d915afa52692501ce67f13e308a7c9af63e6853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/de/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/de/firefox-81.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6635eb71b5f4dc01ceed02771cc4e7bf7b3ba340c75f471fb7ecfde8170f838b"; + sha256 = "a15fdfafe598fe5e2d5c5854755e316844518eb1b4634aad6cbe99fefc3e5986"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/dsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/dsb/firefox-81.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "afe56bea25e44fbd3cd1fff7411cc20473ed0212500304ed865a985c2565594c"; + sha256 = "abb71f8df0de953ab2c27e50c9b49a69c012fbe52a0d6eb66744b03754d494ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/el/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/el/firefox-81.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b83801b722069d476bdb3325051f6e0bf2c34b6081320b82824aaf218d0f968a"; + sha256 = "ed3782c6e619f9e0e59b2eb1f36e5c94a92e2f7b617b2ef87e0a2da0c4e65032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-CA/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-CA/firefox-81.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e5a1a6e755cf35287f455a36c2019157fc7a0de6296c0af5949f7d33c55c871b"; + sha256 = "5c5ae0e8345f13c346e2b756a57f465776e8d5a1ea62dd00dc6fe5a3b7c904fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-GB/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-GB/firefox-81.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "709d89f99e96d76a77b0a1a40d7f2ef49d6709b41336973c114fc25fee2f1d49"; + sha256 = "3ed2a11824c00fd157b9b3d02dcde95ae8347b6add687f4bbc3284601360c1a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-US/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-US/firefox-81.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d57ce2ec9d39d4f0e1100a2faf7cfdc827eeb45db672511d5a6aea7229430f85"; + sha256 = "689d75035303b47266a3819e8aa3bb9026559b819aec2f6e95faa67b86888ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eo/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eo/firefox-81.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "facef477b06aab7d67580c6931d97a26c5a7a9ae9555d92c7f31227d0e944dcd"; + sha256 = "cbebf5a97e5b2fb58c187553c8fcfd6474dae4a911c97cd8730977b8bee6c6cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-AR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-AR/firefox-81.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "43449d930cfd29ff06a1f38b3a36cf7b2bb7aa4feef1a4509f60f1370f08539e"; + sha256 = "e664214c7b2809919b672426c5d35e467eadf69fcbf43d20e00f379e5ab6f558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-CL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-CL/firefox-81.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "fd821e8cf3c2f67f0993d08dc43026b1f5454a91102dc44706587d5744a63d1c"; + sha256 = "10b07cafb315ef4497d9b2caaac0a83c86701506adab2f0e154a7873f39b3066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-ES/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-ES/firefox-81.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b1db4d75e75bd4329cc8ff4e637f920ebab47384442fae56584f170421a18657"; + sha256 = "aeb7d0af26b7fa4be27eb0b82da4051ab57ee1406eb20d3b5d12ec5d32d0104b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-MX/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-MX/firefox-81.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b08ce5a33ada7d551b341693545ec7d9c30afc4529a3e33f55836a4e2bec1a41"; + sha256 = "c515c089afe6e4ef46df7ace24260118ed464a62146f59cce064ca465bb7affe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/et/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/et/firefox-81.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5fea2b490a7323cf9cec5e02fd148aab16c18a4bc107b1f267ca2b442eb2d53e"; + sha256 = "930c174be085acb50b18b4ee5b20b158c9a790ca19232cc25a1e34628a7b4346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eu/firefox-81.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "98f89c8e3efcdc3585c6cd0cd6de6b5ab7ab7a55266328a2fd6198e1b739fd7f"; + sha256 = "2f0e39cece971b12f6f5c325277e77e5a3f053ab57cdc2a2905d9f7f3e739fe8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fa/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fa/firefox-81.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "874beed2e6b23f7edc7b51465a758243468e99e835951bb908336f16dc7baf0c"; + sha256 = "98029d664de21403cb54276a30d650a124e5b5250939c7e315a0435ebcc2bf26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ff/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ff/firefox-81.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f84e37769376d2a05fd1d76903ff75c79e3631c2c7c5ceccdadde59de991aead"; + sha256 = "097747294c73df707c7652c239330c106c69f77868fad65d490d1b896f90e689"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fi/firefox-81.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8898a7ba0aefe3e26c4239c8b4d3768f716004b18da5ce5799ac5fb159b699b0"; + sha256 = "c915afc5e73f837e1e09ac0d14510271602ef5527ebf270b399be880c183b5a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fr/firefox-81.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3f6e7cd8ffa7bf343d28cd289ea14f88e4e0ccf7229ff122c118627ba909a400"; + sha256 = "775fee38f2033be70e4d68d985602bce3df69f9106d1c427a06b3f8233e7c30f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fy-NL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fy-NL/firefox-81.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "de4d6f8aa0564ff23eed16f2bb41486a62ed4fad935625eb1d26829aa281d71c"; + sha256 = "49efc463dfe6b7b7a8dc0bf351cc903160bef3e1886c8faee6f11cca3abd3e90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ga-IE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ga-IE/firefox-81.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "48a595094b959f74455f568d872b3426bb6ad9be60df256d5cc1d5ac7cc688a2"; + sha256 = "6dcf0be88e5fad96c79ccd4b6a612d721b792099d9f1bc029ff5b592c4004922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gd/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gd/firefox-81.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8c64d89f708238affb2bc356a5f86b491d368f6b838371c62ed647291925e72a"; + sha256 = "924d9190a1d5dc85abcb1f23aacffb98c0116c5cbd430ec04c5275317639772e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gl/firefox-81.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2d391f67f0f911112332a155436e5013ebb505620e5070d03b794949df2a4f36"; + sha256 = "256c1b81294bc262770c655e2fdb5e36684286f4eb1857d6d38b87beba2b3d3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gn/firefox-81.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "732951a35fc0ab79327a225ee02494eff4a17a8b5b348764f980610fcb1de6ef"; + sha256 = "2d9d55f4755f372e18a7d07786d64f09a4b4f76e6a80d8904e06188bc6edff41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gu-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gu-IN/firefox-81.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0c3f65ab3736b43832feea9459a6fc336d0611c3221eba091c6194494eaf252c"; + sha256 = "86a64d446efcaa014fbbb05787223a025d99947ae4aa8e704661f1236c08bbcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/he/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/he/firefox-81.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c62d4e52a2f308061fc6348531b708cfb26c0aee71a5f08f33b265af1789ea54"; + sha256 = "64b1fcd9c454d1248eb1f2d02877f964e50dce38ffbdd93ca4c367246121eed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hi-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hi-IN/firefox-81.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e83f4fa9cd50d2389697b78eb6591b7d1c1a6b4a61ae91b429909cb3cdbe1a99"; + sha256 = "5d5f52e34c735df3ec5571e03e834919001fe3417a4190515f86f1e479690ace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hr/firefox-81.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "10ccf56a6f388a49ab6b5aa24ab3d82cf3ee685af5fd9592fec35055c1195d48"; + sha256 = "e6085effe2607a416e80a310ace23381fcdd752bba8e58ad7611f05885e01e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hsb/firefox-81.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "771b5bba633c08861acc056cf0cbd73752f6109f601b8d59685dcad23804e3db"; + sha256 = "6a35c1657d78cfa843a24bea346fd98aeae041fdeb65297693f89b012f0c3786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hu/firefox-81.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0f8631c95cc683d0c9faa5153cd3b499fa89374f6d8c2d0ef161074b03355d2b"; + sha256 = "3717f43d3d771cbf4dee43889e0bfac3eb60dff8989c06496cbf14ace5753ca3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hy-AM/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hy-AM/firefox-81.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e3f6989cf2716b455d5d962c88307a74cd57d57c8585f31a4007579534b168a3"; + sha256 = "c376e1f35c8067b41415175bcb597c331b5f5352d4262f5a38d08296a307343d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ia/firefox-81.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "aa769627a633e32b8bab9dc1e0cb3e4030a9d6af36c66a6fd365520eb978a7a3"; + sha256 = "99e0aafd820a965cd85fe9094b7465d700f8e62cbba86ef9746a44445e5bba2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/id/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/id/firefox-81.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "179529666d1dce606758f7a7ee700e1823a7c4f5840195ed57a5eb48f2ce21ac"; + sha256 = "ada432c2d6a04fe928416980b0f3575e2a42668c7298f68c32071ae2c4f5bb8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/is/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/is/firefox-81.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "53f5231e74ee28eef4ecf954ac850f1e6070fb7be51e7c8a0aa8477e0c9325e3"; + sha256 = "df304bee0b2235222c97e49e0ad8bc0e3fe1cbe3ec0ffbf1b996902a6817d863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/it/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/it/firefox-81.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "410c0c6f119b70006a947ea34ed1462247f4cfda996cf9797423784c8833776f"; + sha256 = "8c35e143b73d3019b284a006501f93aa2550b32688d7d3285e56f92703df959d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ja/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ja/firefox-81.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "38f1f110e1490626908dad0e8f638453e70adc2afe66da5ae834a889e0ed13b4"; + sha256 = "39c23321100cee799e7024ac27d547a6cd7672485f07125d02c75dcd8e38f268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ka/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ka/firefox-81.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "bd38f5fe5707a0ca0aee0de7d1ec8afcc92fa0faa8661b724b876c0faf5bccf7"; + sha256 = "b40137c85d1783ee9a8a11fbd72e33bb9a2d3baa4bc2cc9f31a0c0bf020c2233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kab/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kab/firefox-81.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d7c748eeeb4d26433147b02d08b57f41be742b86480220d4fa7ae08823ae7984"; + sha256 = "61dab84674aef3fd91db859900de4709744816f621fecdb3df46a63f4426289b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kk/firefox-81.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "8e3f43b8551b9844aeccfb21390ae1ce59eb7acde612efa4d9eeb4bcfc81bf60"; + sha256 = "a9e8e32cd7441a4b78c5c7b9ea7943c756f5b362a9e6a9028e20dfcb461bb056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/km/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/km/firefox-81.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "44819213495492477fc7401b816f45b2a7d3d4e6b5b04b2b5dbb73380fc60ef0"; + sha256 = "f003c7a5eab166f29c37aaaf2c5cc4669d90fff33854d43e157130f606011820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kn/firefox-81.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "89b97b079894174c2826e6106806d6bf9a46a3499e0e458a8219ba9f5ce6722e"; + sha256 = "f23a998f16c3a93c210b7f08337bb3e739311ada223e85ac4599819b89bf7110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ko/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ko/firefox-81.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "731f9a98b4edfcf249fd08f94e8849a8f1c396ed577c0a1ed921b2d58863d029"; + sha256 = "b6748a4a86fe9864a3378e32357c0fbc542846308ae8ac8005460d40f4f869b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lij/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lij/firefox-81.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "a3325d7298d0cffc04757e3d4617725145ab5dcb11d359b029f92e70cfa47905"; + sha256 = "267633fa63849ae002ebffd892ea3f520d59bace0a7dafe1f92dcbbfcaa7cf00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lt/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lt/firefox-81.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2071fa08893ca0b55181478c677669577c9011e8f4d39b499aaec939046e45e4"; + sha256 = "a985da29e6d91efed407bc9d898e8bd8f68d42cd4673b6ea163b99d8bb9cd642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lv/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lv/firefox-81.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b6639a338afa0fe86e0324d844740caa9260b26e3f06d075348999253f0a0bc7"; + sha256 = "05a05361cd3b5772c30c2a8cef03e8753311245caea3ee94e03fbb3b5b6ae9ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mk/firefox-81.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e06db923b89559735663c93b551f31e48cd12b86f5fc7fdf78e8db88fba48d59"; + sha256 = "0433579dfaa3dff715129cc45e72d83f93b7dc3a928b65744dece0a5b5687916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mr/firefox-81.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "dcd161187ddb20eaad0353c7ba0bf7d5d0149c8bc324151d41d013e5756a7e35"; + sha256 = "38177842df2df76fda10791eaa518d30b92f03016705eb555630fa356992416f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ms/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ms/firefox-81.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d309a899fe69b3b17a33c43093ce78e1942b497e3e3db252a46968884bb9d737"; + sha256 = "34b724fc82f330d897b1073fd4383f5fbfaec9d312cc7991f395d37d98416da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/my/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/my/firefox-81.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9f74bf01425741e1c08d5a637e20b3df7e5aefc0421da14eb3ecc8199a03a0d9"; + sha256 = "a527914488954bdf8aea31a6ab406791cc723b88c11a5a27f161aef970e00d6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nb-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nb-NO/firefox-81.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "638a017eb9d5f7402565dd293c44b236460be99d718fa43cfa705a55eca949e3"; + sha256 = "ccfa39917b8b0c2704a011bd41b0cfe4e890b0c1bc14bbbf641b7add2bf0750b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ne-NP/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ne-NP/firefox-81.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d7d0b87b0f3aa4c8cfe1d6a44b011c167b48e19384031a302d0e0eb5bf422951"; + sha256 = "a3deb02b843fa9ff7a12590ad86195a9deb1be1eae055b493c34614fb361edf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nl/firefox-81.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "88a6ed36cf8116634010f5a1ab27fb22f2519974ba10dd48deb2a6fbb2ac659e"; + sha256 = "864ab1ee8d70e0968570fabc1e110bd97c86d27ce5d8106a70a31c6843e16db3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nn-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nn-NO/firefox-81.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "aa6475e941d6e2f724447a94c2000f9f8983d872a317d4ccb1df421128687564"; + sha256 = "46d109379dba5dd3e5c9c413e54ff2578117960ac3c85ca937b48baf08bcdb76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/oc/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/oc/firefox-81.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2535537159fd34b6680cb676d607e3810f78d2db2130e35c1086210c8fc40c0e"; + sha256 = "71638cc84a7eccb4a563b7640c84557bc203cbb91114e433e1400554a16b2c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pa-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pa-IN/firefox-81.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ddf3f2da7c31bf2b52e9dc4ad9f3d2b25c42e4c621594bb48a9213d2a18ea91a"; + sha256 = "8fb76633497115f927ce2be5064f6c6bb70d552c53491ccd6558df163941ef52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pl/firefox-81.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "efb57f54e1cdf5a99b84856fa12d8591cc970d5850bab7595a5e804458b1f430"; + sha256 = "e6d38535433cc0a0c4aa07ab9aa33bad4d019041d4a2b30ccfc5553a10579a8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-BR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-BR/firefox-81.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "704d84a395b6d24b33723121785cc17d36ffb95eec1c550895f61277add01cba"; + sha256 = "399ef81afd3b05dbcb43553cdd36a2fd95e681296a21e7476cfa0c64c0c13ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-PT/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-PT/firefox-81.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c8f67765c2bd151c68a973135ad67c46287aa11bd8055b1ee084e7c18bdc7a38"; + sha256 = "d6d87228f6a46237583ad8520c6758fd53d778e1905d019978a8da5fe0819cfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/rm/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/rm/firefox-81.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5fe367fc5338a867cf16322fd4cfb55899275825a6aababbcc95be1f2df54a79"; + sha256 = "46dd4f4ddc69d82964289463baf67c05eab92a4500ad17f691a06fa0ea72830e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ro/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ro/firefox-81.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f22ce12f453e7c08a1fa1277f80a24038a2906d556c5d96fd6c331b185f38bcb"; + sha256 = "8720bf2abd57615d098360e7ddb384c0d570d4422f18d509c8b2b7759dd84550"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ru/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ru/firefox-81.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "057a5c87914e98c056a2213c348bbe72be46cad8566d7cdb0f68370b19f4b313"; + sha256 = "6a8db970a3be16e8a0524c2bb576e4c368d33f8bd874ae201d000d112f86282f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/si/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/si/firefox-81.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9b97d6588b9f304e090dd5c0258f0209fc7229ccf7ce21d6fb0d6da1f829dd38"; + sha256 = "1ee0f867be47f5a7884577caf08778152d8ee08d8fd1b25440a69fe8bb0d1174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sk/firefox-81.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "621fb92cccbf325edf25ea274e90fe9533a0ce5fdb1e0bd9f266b4a1f3a47ffa"; + sha256 = "97bc401f7c3c48b62fb66b3b5ea759345641874a46eb001ec1570ce53b610764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sl/firefox-81.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f840e911bebf98a7917f15421fcd8feaeb72097659bd3fb0f3d1fcd2e348ec75"; + sha256 = "5b5dbd25fc83048de4fdeaef13126701b01e070740345838c29b8aeba65934e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/son/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/son/firefox-81.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "9b834f1895db63a263d3f2ce2567095b8000ad39d0753020f69a704dac7d12f7"; + sha256 = "99a2c222c6e14f511dda1f5cbbef2effd2aec7d169893024e25f2dc8f4900e39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sq/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sq/firefox-81.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7136196b26f6e9b963d86e1cd9a088f9d2a7751e08193a59dd27c00b08da4d4f"; + sha256 = "7ff0ec6837ed3536f73aacc8295b5439aa0e18cdd80f2882bf2b644f5e7a1637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sr/firefox-81.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6cd5ce0c122a3b9cb6c066ab8df57277bec7d78e4fab9f15ef88c7ca16a6a3e1"; + sha256 = "274b86c7dbdffcd11453e8103feeaf6e98931c7224ca2336d231cf885c809f21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sv-SE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sv-SE/firefox-81.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "ed0104efacbe6c4054b5d6a2c4397c13db38d245bd557dfe8ed876334bb232a1"; + sha256 = "0fc7edddf1a3aa812664e08e94cf5967c69a5f4821616400a8144c3bdda9860b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ta/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ta/firefox-81.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "4589d31f7ba58e6f149ddf64f6020b262cfa9a7b8c228ddbad5ac9032013bb74"; + sha256 = "20121341b05c91142bd8fb4a0a2195693e78a89691b02651f6d6c3ac9f848a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/te/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/te/firefox-81.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3bae0a5ae9735ba623b8f3b4f333169f4f99fc37c43ee29e65221aae21060d9e"; + sha256 = "bc306272b6bd53e312dfab3f404f1f92199945be9f74e1d87d19b58e7ae2ee95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/th/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/th/firefox-81.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "eac036a449108ee78cf3d527a85abcb87b0c116d78e71d7a0274f326ebcf1218"; + sha256 = "52c8825f27f78624a81271a01c3b522cf6617030046a38734611ee741215658d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tl/firefox-81.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f8c9053e62b80b7ad1f20e622c25d01b8926c89b8780f1ae642d922d293d5018"; + sha256 = "c87f99419608a06d79bec67f54bafec6650dbcbed7fb52bda058bfe68d0ea102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tr/firefox-81.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8c6d089c9b0a1acdddbaf01d44b274da4a7d01751239dd017add9c7a0867dd38"; + sha256 = "a030a15ce1424717b8fd0787f1a0d13ad8e050f0f5b4cd679d6c2686fe81e0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/trs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/trs/firefox-81.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "086b1b43a42f3c1487ead061b822b94274dd58b927df5b481f8079b960b52dc3"; + sha256 = "762f7e33307811f6ec18c198b4f524526a085828af2621885b276ecd8bac6dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uk/firefox-81.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e3ee4bf352916f57bece093a079ef58f68a1d3c60d39e02ac7ba9587b98b6cf9"; + sha256 = "a698aa0d0599b97c7e9791547573d0afdc5e1bf0e5e644069752686d50644564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ur/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ur/firefox-81.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7e485392f74814c874c2efd153add419a110c790514f4fef4bad0a4c5043751f"; + sha256 = "7d1759bd2f0b746be76471ebc3c0da2fa224f4550a787e72ebe52b6356fb9370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uz/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uz/firefox-81.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a9f0e8e1a776d1155c609bce03380ecad60c2259a05248ddabb65a6c2f8080f"; + sha256 = "51c21a2cf377633a46c35b2bf9096b97f5acab1bf7f8014122c96668d14c6d95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/vi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/vi/firefox-81.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a50f5c651093bb205f5cf7d1c44c12994d0aa73cf3a3cf1dea22e3754c6943e0"; + sha256 = "e1f3cc7866b19e60b8c368b0633bb0603d7176a87ebc910fe4c4a7575a98be7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/xh/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/xh/firefox-81.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a94a46b428a87a3cd543dfcdbef46708931e18b377c548b11ca565067c953ebb"; + sha256 = "cce6577abd88d3b34ad3e83577bbb82b6df8754679fc4cdd8a34c9ec9d59acae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-CN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-CN/firefox-81.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "911e0b9591dea07aab26e4e35e84645d79c132fcfcabe504ff242ac87d853834"; + sha256 = "e042d66ae743d1889d6d8ce13ef3510644098efa0943d332656b7e361b976da3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-TW/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-TW/firefox-81.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "58afd8192b08eb343da9385344b87ad0e72046cdda26495a5534a75f12d40d38"; + sha256 = "07c6ac6268b54caefc44654bbc68d19dbe8e6e15fb768c921a8030e179ec8ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ach/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ach/firefox-81.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "055e0f66d0e5e3c9f3bc7ae94f6bd46a8ab0bb87dcefc2cace02f4ebbbabbf33"; + sha256 = "bdd0995ca7d73be587ef1a9bd0395b869ec4f7f90a93ec854a5bbd1c18060ea0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/af/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/af/firefox-81.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "0705f3f63655b6b55604d9b2b801ea07bacf2f0060ce6a2ca6c1d6021c35a594"; + sha256 = "f662391298377d8d7f38f90c31b90bf705e61b1c3df5e1a7ed7e6c705ac700e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/an/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/an/firefox-81.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "f1735cdcb500df69cf66886f194d101393f8e5880b790fc135348e6515fc7ba5"; + sha256 = "46ca1495a74861429af6cf33eb791738abcfb5fa29c23060c7b9d307fc6a1b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ar/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ar/firefox-81.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "97dc4e314f361d7afc3e77d13d712f45306af21e4ef2e5737409b9932b341f92"; + sha256 = "1b781b56560f0bad0d67f155d68da1b5b759051434c76095c8ff884837595866"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ast/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ast/firefox-81.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2cb19f22bc6372d4b3406d87b19acc4ec61cf60317869392145b7405a820b7ea"; + sha256 = "eae1a5378babbeb88c6b000dc6500bfccbbe8337eeb32d7bfdc9bab67448d8ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/az/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/az/firefox-81.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "83fe4b78ca684c9a58702451e4f8bbc9ee4a67aeb066d74699f7e3d471e0a16c"; + sha256 = "4ba58be6ffb171c843ac5d267e97bf8ad219b4d1058a96b18f08ac4dd83c6b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/be/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/be/firefox-81.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f08a685b2b99d3f508487215e426af802097599752ab82dfbd801c063588194a"; + sha256 = "b7cbd330b3b261e8b57134c27a291348219105cbd8cc685917ccf8e03099f2e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bg/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bg/firefox-81.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a5d3c78d91e813358e7b1c33c10854f43112398ee88310c078aa0b5db00b7518"; + sha256 = "e6354feae56c656365fc4604bf394c4038399ea3a7ee503fd38610e1525d6539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bn/firefox-81.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "eab386c0bc37dbe0ab2c8b51a470bc9f65a8f59ad17223d95fe631507da8fefa"; + sha256 = "280d01e9dbfb09a08264e36c01b5fecef97831fc2c9d99e2f5e0ed498bbf427a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/br/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/br/firefox-81.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "125e5bfe77bac8d9155b07d057e3e8e8de3c3b4bb3aa3de192f2ae55ab9f4e33"; + sha256 = "a223fec4d16418befd75ce455f470cdc831afcecb6fb4c36139fd2f7c2588337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bs/firefox-81.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "6d9fafc803b098e8fe93911e9d07baa28765dff6b072aa911f74b2076cef54f3"; + sha256 = "ed7910663750af303d197ab3919f54d2a108ed691e016696e4c9a6254fe74003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca-valencia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca-valencia/firefox-81.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "91d71b2538e059c9aed1d7a564125c25bca6f6c8213eb247aea7357b1f27b9a3"; + sha256 = "19d4244b6711d3378835fd00715d7db17052de0345dd9b33b013169920f388c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca/firefox-81.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5088cc39fd0b18926e6821348373f834a8b5d093ccaf9152cfc8da3157522734"; + sha256 = "bcfa0b1785d3aeec8e5ea25b472da288c3ebced8661a70c21db08741e9ed5c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cak/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cak/firefox-81.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "31c9be88e0263e0968fa2ebba0673234532d6a99d5cf97ab7b863b814d9d140e"; + sha256 = "cbf0745604bd3f757851cb4772eaac212d16288c7279634d470610ea280b7884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cs/firefox-81.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a606452009ca9e9e7d5f44fc9b42a222e3f557ac4d338c90ab9335dbd96e6683"; + sha256 = "1e91a12e484a2a41d87de5e60c0b3f455f81669025ceaec0c7adbb447446c367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cy/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cy/firefox-81.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a8254adacb701007945e4cbb48d861358cfefd4f590e509264ecdd4e0e858235"; + sha256 = "c48491eadec23c78f071f4bedd23ac02235ef090375dd0bcb190e0b1d94fe94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/da/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/da/firefox-81.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "350ce9d092799302a8c3830fc756c7ddacc752f9b42e70bd73dc1d61a1d1d07b"; + sha256 = "81a1fc46b7f92b2375edb20d3464c4d7facb493a07aa4471947f8b8b84cc3054"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/de/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/de/firefox-81.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "576c95fc5aadbaeba43991b2fb28e13cd3f18f2e81e6584a0208328a4f9c5ca6"; + sha256 = "719db056506ca0b908d121cd3e7785b1d8739610c7728723e650ca35b99ce26f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/dsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/dsb/firefox-81.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "024054a027af7a4e8f68a299ae24a47eaa2ab2e69a847cfaa053295cd454b947"; + sha256 = "1ef45291cecb8727951808d20df4469c1f0d731b0d3442283fa1f45f39c0e3c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/el/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/el/firefox-81.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "63ff8a79ec70c7ce44d8375e5ee377754e329f32ad751b87de214707984eba7f"; + sha256 = "b0cbd8c13a40116779b1dca51191fcc0a8b203327b568f8467f6864e4f5db9ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-CA/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-CA/firefox-81.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "eb8597936d2a3a2747827227082743a5b267ee12b45f16e901ab87ad897ae780"; + sha256 = "4e4e204fb9ed3ed167fb9e3a9af2727384d09e37f1d5262bba05e296a8cb4a16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-GB/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-GB/firefox-81.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8a1b4c0320439cd3ac22b46fc111564b7ed68ba9f04c7b20a276ac550ebd84e6"; + sha256 = "7533f99bc58783e5779b4fbbfc77b96a6c04958c0e752d71b1f57387824faa74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-US/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-US/firefox-81.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d56bc3d81f7e1807852b326d3f0b00f9e745fe4f8b97c0ffc64aee979db4fa15"; + sha256 = "68bebc780f225d5694506c4cdc6a7c31c779d2f1feffa792e599f99d0b2e58cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eo/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eo/firefox-81.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "cd979e28dbf2032ed8f1e5c7c84eda3ddefdef4223749b6fd61ef2f727401a4e"; + sha256 = "ab08e50d0a5e5d6d02a8daf1c6a428ce9ae19b3a343bf0838739adc9a4170bb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-AR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-AR/firefox-81.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4875b4139be6ddcf1e7bff57c3045f29e7730a7bd0e38fffa0443bd0f3aa45a4"; + sha256 = "837f5cff13186af4f38c0c21410f20c57f28a3b5293ec986a449fdcb3358ddc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-CL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-CL/firefox-81.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "68bf54d52e45e0b8e0cfd27ec39e3ff97307e91bcede2f2d2561ac5139d179b8"; + sha256 = "1f73cb2ab7eb1b7cd8198113941fc71c17972227365edfd5cad73680d30a9c6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-ES/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-ES/firefox-81.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e324772591d019b5b27a00716c30ed0f8803dee83276b19b43f5808f584d5000"; + sha256 = "1e95337b4607808c3c3b319343e253d575a07fbe48f7ae8d8346f92a3d9c70e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-MX/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-MX/firefox-81.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "bf40f1eec6d42c5706a2ae0f840ec00778801d98476dd6055a7170e8ebe8033a"; + sha256 = "cefb685c2da73fe485ff0817901a19c609a73befbb82fec151765e889e4c2d91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/et/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/et/firefox-81.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d0f45fa9c2e9559efe0376a53d1bfc7fed04a408d563419e283a0e1a4b4f0840"; + sha256 = "95dbe912beb0ee6196e3bbd169093388c22fb1ed0981a7827fee4bbdbb774316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eu/firefox-81.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "def48b817fcd432a3573a1d17bbc4dc8616e8b94366836406cf6341d610ba3aa"; + sha256 = "44047e7f01fb086c099db0ddda6e1d6641e33e038a4e658b3a57ce331ce61523"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fa/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fa/firefox-81.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "08e4e0c50bb80aba30c2f3666cf568c39bd031938a1e2a6b9fd092da688e3b4f"; + sha256 = "252f1e06b2faac3c3f94d1a1f9f52f566c84efffca8a3147c32ee6f109feaad2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ff/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ff/firefox-81.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "3e9e75e5501d2a5d1d1d11e628d6b9acbd613f3a0f7aed005752f4d07f15686d"; + sha256 = "1bd050b8d4840a17d12f042a27295b71a4a62ebdac4153ffec843230b1cc0b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fi/firefox-81.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "61e0d7ee1d4b0d8dfbea3869766497d88dcbf0c467d41d07ea45309d03839a49"; + sha256 = "6582223e393876a91ab0250c976b1aeac0559722b17e198e05925863e53d81d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fr/firefox-81.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9c502d317ae781e82a69a80c864958ea23eeed18b215b9f08a7ecc024bcc6249"; + sha256 = "b96dc92220680f3c87d6c7cfe79f071382f8183856967133b6fcb6783a60ae6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fy-NL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fy-NL/firefox-81.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "05ed05024ebdb58eb2c178c30da5d0f013299ffbf42c26b7e28c0bd1053106f5"; + sha256 = "4a90cf75ab890ebef3517db701bcdd065e42c2fd8055121ea9b97897be299543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ga-IE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ga-IE/firefox-81.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "101f512b07c22c24d55fab970b1d5140f6f7a54d470652511e8d053d5d3ba265"; + sha256 = "56491146a39eae10e9f8fb4ef1fe303a6bead300b680571427e6a410766d0069"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gd/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gd/firefox-81.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2a7998045852b8f3bcc86aecf40b5582724da71eb14d1fa612184dacdc751fcc"; + sha256 = "0d9f9ad6563e31fd0ead7ec35e594e033f7f1ad0b4c94f0a5cc01cf515fea5ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gl/firefox-81.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0aa2c2ca4cdffedc5d17e4223c2cc6e96ce89bc69989ae10be683bcd61f4a143"; + sha256 = "8100b774f3bb3a1c3551b9f2c4751ee9e184b04c61489652dbdc81b1fc0b6bcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gn/firefox-81.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "4e9f93db434ef45712c11ef5e3e812dba5927183d73da81db3b9698f35c51585"; + sha256 = "a0002b17f1133194c9f0a0b2b3c56c6ae0d4cd981d5325193a2c96d4b5ec78b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gu-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gu-IN/firefox-81.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f2c3cbef250bfdac654ec2eaf438f51c059521b6a0d1694427013b949a323cdd"; + sha256 = "6ef49394aec077569251eed4dc7631130be41991022672f477989f5202ac4d1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/he/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/he/firefox-81.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3b4d9dc608998b2d76db3ab2f21826983a12284bffa22e76ec60a275c5a54f97"; + sha256 = "07e11a9d1a4ef6e3c87e09227d070f75098697a89e057946bb71c1336429d9bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hi-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hi-IN/firefox-81.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "840ff442beb5c0599f7c67a00adf840a8f4306f2bc6ac8f2397af0b876304741"; + sha256 = "39e6c7eab9945a7b9e8d500d8e0dfd416a7a915498683a4966732d8e09183e2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hr/firefox-81.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e0098a3069cb9b86becd2f77a671731bd849a568d2fffb6064528f802e5cd6c6"; + sha256 = "8946ba5a92d73500cee5c379a796e18cf1b50fe0df4c1867040794850ba0df04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hsb/firefox-81.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8322028ef47168ecc2928284e0a96d36c9208dfa2a7f3eae6f7449fb77753e62"; + sha256 = "9d87edfdb5498c16a279f0f262855c4e6f822760cf6d90281cf6c38e65c325f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hu/firefox-81.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "801b62419499f9ae9fa48848aafdad7258cc95f7b04b1ade6d3cbf6663a6b3dc"; + sha256 = "9f515b6b8267b97efec1046c0c2329c5871337b95d7a3b4fdee310699c63b265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hy-AM/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hy-AM/firefox-81.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7b4af441958fbffbf43b7e1ff8e97d62dfd3aef2076bcdf1fb1eda8006093721"; + sha256 = "1de03462f87b629033b99bb014042d774a52404e279b625f20448809399af44d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ia/firefox-81.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ee2bf28f2cb18a5cdeb51420042d624c40bbaea73e4c567eb801273f0c4c8095"; + sha256 = "fdcbf5cc522e20587cbac0b4979d77589532ba683ca811e27a7b499f37fe1841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/id/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/id/firefox-81.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "1083dbcab9b2b297869ef7a4a65ee04b63e851805e7fe7f7977fbe6d2f69828c"; + sha256 = "e3cafaff6d65ca2da4513d27949b85b2fb8a1ab154d736e980df0ba8caf898be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/is/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/is/firefox-81.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c2c475e280f3f52a134182ac6dc679273c29198605d9214f4ceeb09e57f2cdf5"; + sha256 = "21fba4796f2ee43a3662c3f493879d4d656ec710e46369f6da92f757e24ee706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/it/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/it/firefox-81.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d7de926e398e6291e031f737da63fe223c7e4c70c01994bf74c8461e04af0840"; + sha256 = "c8775280055d5b8eb251253e72465149da165b7295cb4c8f400a5286a16168bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ja/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ja/firefox-81.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a5f1c6bd8bd5aba351511838c04a35f26aa107ca43d87489ae24bac3831df165"; + sha256 = "8870d59360577f8247be0fa51ad33afcc7ebaa2b7d6c8cd5bc100199c5436399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ka/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ka/firefox-81.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "513c9c885f741162301a980daf84eff5aa42f45aaf766a9b3e1376fea83bb78a"; + sha256 = "394edc1246d9cb08587a67069b27dfe3fb1a92f4ff4a58d314b55128c39d2bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kab/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kab/firefox-81.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "15fd46b89f7ea425121d02aef931bbaf624391e7039d81e646d6551303598579"; + sha256 = "e30a08d4427fe896b528beb93b08b1bdc96a38a0817739faa63cd15c2f3014b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kk/firefox-81.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "82a29718fdff57e6d02f8cc6ae76bb604d0e14374e7881c120ff6e38c4b21995"; + sha256 = "f1b807647ea9deaf7d44e9bfb56403b9a27205c19c3b9f07ba4cfa174b6532c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/km/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/km/firefox-81.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "406c361b49d9e5cb6eb952e5be0eea3a8b9ff535a3edb6dc1c60ec6171d5ae49"; + sha256 = "650ad04c9b0c4d461ba28fab7e591453aaf75fe5bddce3c6b8993389814be589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kn/firefox-81.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "0839a7af990a70523355047e5cfd24e73d0c8816cd12f2a21aa8cc244d9ef90c"; + sha256 = "459ec332671ff0e51e110ebb0e8b10e67743fb4b717e5fa165b5dae80054ffe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ko/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ko/firefox-81.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2ed856441ea51d642027b800911f134c27207dd8a53ee5a27b9674eb11417b05"; + sha256 = "266849f41f7aa820ba459740becfbbbcb4a551140bf8e76b1eaafc63a6f9d2da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lij/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lij/firefox-81.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "653c7c4be39dfc49f89e5e6c591ebc953ef0bff5a9d827d348dad26e3f06bcd8"; + sha256 = "b429ef6b085822fd3ea0fb14fd501a894b96a3f4af8fc34944fdc9ed1c82853b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lt/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lt/firefox-81.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b61fe55f65029ab661d0b589cc5301c6131b778d55524de6b13779dd2d0d6c35"; + sha256 = "7b3c089719e901d12c8ad9153a582d229958db035badd4b94b5b496a2ab545d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lv/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lv/firefox-81.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "2f9a99d7a344984736cb422ccc106db8d175f31c1b1a108852494b7201ff67cc"; + sha256 = "3efd9d52bc61076208cedef303396c066ec260f7aa5fcccec5b072f2935d89de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mk/firefox-81.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0cdde250523fbdbb8b651660fccbe1afe65068c263e03fe7ce26d9758fba7bba"; + sha256 = "f0b1dd701cd7e068d938ec4771fba8f4c3f04e906f575e64dca1dee640fdce22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mr/firefox-81.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0df4e48be06d800d1fa308841a1890f7b1c87e63b34901cdd1481a63a7080d24"; + sha256 = "bd5adc1fa68f82a9d2fa54b74b74bdc170f4ead9bed5a79ec1ebf1bd12781a07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ms/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ms/firefox-81.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "3fc1dcbe6c72acbee7a68ebf6a8b08b9961a5a04eb05f0cac86ac8fc56953917"; + sha256 = "dd106a1944d8ac9e49df16b3c67a86010be1ee62e3a780ad9c725f2335779131"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/my/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/my/firefox-81.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "aba83f9c9f41dc5660a480b6821dff2c405900d9370c3d1414a892ad0e44161a"; + sha256 = "86e45fb6f490ad0cd66564a36e40c6d23169d69d1875022027aed09a1cad3d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nb-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nb-NO/firefox-81.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "34e9cfa0bd9a065b58edeffffff690abb6240e90f1d788146ac3976d9e7d9cc7"; + sha256 = "ef6d5320470da9619f5668e13edae553038a53f80593b5d8392b3678dd8c1d5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ne-NP/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ne-NP/firefox-81.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8031d15b84eb3baa73064ba592434d4d36ae94c6bb3b7c9fa359f93486be3ea8"; + sha256 = "8607d4c024fb1d71068b73fb528bfbe42ee69bb12f9703343deb6a7e340c29f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nl/firefox-81.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "33f19d81143a26b7472b70558c2187a4ed39f67ba95e28332c7e8a8699aa33e9"; + sha256 = "a3ea133034cd0014f34c186d9c2fafc902bd51b5314429bb9b7c06e77447fd22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nn-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nn-NO/firefox-81.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ca27dd578f8054df63b77c314d3504a2277139cc2d54d43f8c202771ad12e76c"; + sha256 = "09bff657619d23af40014b2e3bc845e6901abee241dfd28f4b5ef8f90c211c30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/oc/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/oc/firefox-81.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "336cfde595de21f8ee355ec4e6a240da8a8946f357a100629ab0d0d883bee335"; + sha256 = "6eb63b7f50acf894e33fe9ea98c11b4133b7fb521e23e2fdd6bf9788570b4c78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pa-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pa-IN/firefox-81.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bb51ced0f4993862a7d025b1b504e29fb96e6341336c3fc61ffc6d3ffc18d884"; + sha256 = "df15da9ff35e192b587ffdaea4d47d368a054148061117bb8f4222e5da6c82a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pl/firefox-81.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c44b50bc19b0ba7cb198d144f05b10d5f453c110463dd945534ccd180b71c7d1"; + sha256 = "b12bd00b3de180f77f80e80622a8631ff37c32b45362856a64122ad54abf07d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-BR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-BR/firefox-81.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6cda521f9c8a02c948dd1461fafff84e7e1b793815b6f25697a78751264dc689"; + sha256 = "0296501261b2c55e9acd14fff125f40f8a84fe0508004ea9fda03d2ff69f238c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-PT/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-PT/firefox-81.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "56e5ced26db5466aebcd7108dc3f499b243631bf61505a1fffb92b2eeb2cb5cc"; + sha256 = "6a5a8328dcd10ad2da9bd45658bd43fca9ae58cc331546305594ce5d84f35017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/rm/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/rm/firefox-81.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "47913299e22f8b955bd5307241d368cb3c29d6a0bb0d90d5ed7667b85b6aa0e3"; + sha256 = "41b5bd2e52f0d57475179c46c089ce36c3e1441b5751c670f6fbb6406853aab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ro/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ro/firefox-81.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "528c36c4361f42a3d90f076800b0b73c8c1d630ae97ba33ff59e72d30d203cab"; + sha256 = "40a2e53b6b7dcdbd9380d3ede3e425178b670db2205b5a5066d0c4e93a3297c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ru/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ru/firefox-81.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "ff1a33da0bd8bb7c2d7f460724c292b7433087ba5596258cc4bbbac2087d81b7"; + sha256 = "b8f7ecf4a5d8f034e57672d19254cda671f213ce04914995260f6b5f97181edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/si/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/si/firefox-81.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "675d6238f6bcf07751ec5356f3f4824d681ef28ac26255e1bae84cdab23ac0a7"; + sha256 = "19d29defd33580089317b72bc6209749727a53978d48294950feba3226839135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sk/firefox-81.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "141416a2320bf355cf9f3ca33ec3983b5089c5b2c9172cf03e00d21577b570c9"; + sha256 = "4e57b3bdba217d1550fa1ec847b825d66e2d5211d6d0f5342c50ccbab33bf464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sl/firefox-81.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6d062305ad9e40add4f8c84d051647df8c6b3e083011e00d9380f3e2eb6f128b"; + sha256 = "cf89ee419f552622fb9eccf8a28c15f6647afd06de27af0635ab74bfd9aa9619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/son/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/son/firefox-81.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2e2adcfe7f26adac4aa820acbe894fa567f53faf2854eca3febf2d7fb66c97ee"; + sha256 = "64e7605b287432c38798e029ab2b02f136d7df876a9c8b3689ca603db0a736cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sq/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sq/firefox-81.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "eeddc2cb86011cbec49ace8c954ae9724ebb9a800cacd4354cfbee782ce7e481"; + sha256 = "9b56875e2f5505f7fef3c41d4ed7fd8801df8e981f9c8f7cf665104a40e255ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sr/firefox-81.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "88081a8c78e039aca0774b1ad61eb3508b9d4bf088cfd27e6b420431dcc6b95a"; + sha256 = "489a2d092f626f39a8e466c269486be8ae455d233e0e26d0c94953039668a57a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sv-SE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sv-SE/firefox-81.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "51096fc91f7bd36b6bf66c57eb870cfbc62c42880ef2b7d3ae8032c49b5dc07d"; + sha256 = "9e45e9a0c79f9cb3c0c34fb2a26e608afb544716aa16843d53b3e6fd390e2685"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ta/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ta/firefox-81.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "06f1af1fff1eff74d3aee7a7bffc7485911d350daf216bc8a3f6462b85ab28e7"; + sha256 = "2843290d4b90b057c6caa437514df0fa61a0cb901809c93690ac8247ff5b1233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/te/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/te/firefox-81.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5921702973c5c808f396fad81e736ffe7b9948996997cde5f721e55a6b0c172b"; + sha256 = "fc9f7e9312fd1430cbbf0d92d8f001077d0af89ccef6c7edb3eff504772ddb79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/th/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/th/firefox-81.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "5e8ff4f8b3204ed67545c4c68cc225ef7e28ce9c63108efdfb1ced7c77e2ce6e"; + sha256 = "622105aa85a0a5874c62f62afd77ffcdb1f4b2d329c255c56c7154a4bbfcb481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tl/firefox-81.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "72b9a9cef7a4d166e9d33e0a89d00a1c270d1e6b4e5039356f6145bab0d8f6a0"; + sha256 = "998b966b13dc0b1eaf9ffac1788cc354049c43834d3678b51e946f907e42bd9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tr/firefox-81.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "38cc4e45e3222633b7f85c59eb1fc8a993f4b77ffe9b50478ae894fb68f67304"; + sha256 = "3dacf51f059f7b974e18d0cf4437bba48a0cf246014ed8ec38d06e2e09cb76f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/trs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/trs/firefox-81.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f82d215f8a1a9b5b07ab71cadf75ef007e57b987d025c14fa671305dc5087182"; + sha256 = "e9ce3a2591c8a9b7c5cccc20c2b56ff47ff22947d2393f5e7b010f1242ba1982"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uk/firefox-81.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "014d024f4d14f465393f096147b661919dc1793289e68c4d13b6b01dba42d4d7"; + sha256 = "a8f78984d01fb54b7475e980aa5775fe7c298e1796cf603446e7cb9baa371bdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ur/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ur/firefox-81.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c2b7382f1e511dd7c79b3d5854059c403f633ec4423ec31dd9395d6dca4d31ee"; + sha256 = "0b56702343d7495b752246a9d03e4a5571be05394cebefd1ccd2ca822180259d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uz/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uz/firefox-81.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "66e35eb3fe6aef2a3d4986a585072f96b55877b0a15ce81c41096e1f1c001f2a"; + sha256 = "46a98ce354b40d64690c0aaf1c553b1d1e5ce51494291ff93ae0e54a82d897d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/vi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/vi/firefox-81.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d1cdb32bfb6f6d8e41d3f32de0c86654660d5d7ca4bfe0e763eeb799c0ead10f"; + sha256 = "fcbaf1dbab64bbc8983d444b1601721591c164bb8ff50ae09d2b7925fa41185a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/xh/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xh/firefox-81.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "508d17ec13f5b3e1d18641451374efb72331fe68b254f8a71bef4807c318bb9e"; + sha256 = "af8ff1f66472bbe39724ca714993246f02b0e9025b537ac7e52e65be29db4534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-CN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-CN/firefox-81.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "cf2f5617c652209daef0e6e5176181f2659e188f9007d7accb4041c030c54fad"; + sha256 = "147a51431333da2333e4ecb0b307d4c74b3d66a626340b6bc25ded8c22c1acf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-TW/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-TW/firefox-81.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ec99c9201151f134d72450513c518816f244fec0af6de2bb4ee08d3286b709f1"; + sha256 = "e8d577aca0ac90285e9db278c2fc9eec1318407b830e4c231082b139320a4216"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 4ecdec77dd..f76a108c7f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -7,8 +7,8 @@ , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification -, libvpx, libvpx_1_8 -, icu, icu67, libpng, jemalloc, glib +, libvpx_1_8 +, icu67, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , rust-cbindgen, nodejs, nasm, fetchpatch , debugBuild ? false @@ -21,7 +21,7 @@ , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook -, waylandSupport ? true, libxkbcommon +, waylandSupport ? true, libxkbcommon, pipewire , gssSupport ? true, kerberos ## privacy-related options @@ -94,6 +94,11 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch + (fetchpatch { + # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch + url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; + sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; + }) ] ++ patches; @@ -108,39 +113,48 @@ stdenv.mkDerivation ({ dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file libnotify xorg.pixman yasm libGLU libGL - xorg.libXScrnSaver xorg.xorgproto + xorg.xorgproto xorg.libXext unzip makeWrapper libevent libstartup_notification /* cairo */ libpng jemalloc glib - nasm + nasm icu67 libvpx_1_8 # >= 66 requires nasm for the AV1 lib dav1d # yasm can potentially be removed in future versions # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ nspr nss ] - ++ lib.optionals (lib.versionOlder ffversion "75") [ libvpx sqlite ] - ++ lib.optional (lib.versionAtLeast ffversion "75.0") libvpx_1_8 - ++ lib.optional (lib.versionOlder ffversion "78") icu - ++ lib.optional (lib.versionAtLeast ffversion "78.0") icu67 ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport kerberos - ++ lib.optional waylandSupport libxkbcommon + ++ lib.optionals waylandSupport [ libxkbcommon pipewire ] ++ lib.optionals stdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; - NIX_CFLAGS_COMPILE = toString ([ + NIX_CFLAGS_COMPILE = toString [ "-I${glib.dev}/include/gio-unix-2.0" "-I${nss.dev}/include/nss" - ] - ++ lib.optional (pname == "firefox-esr" && lib.versionOlder ffversion "69") - "-Wno-error=format-security"); + ]; + + MACH_USE_SYSTEM_PYTHON = "1"; postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + + # needed for enabling webrtc+pipewire + substituteInPlace \ + media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \ + --replace /usr/include ${pipewire.dev}/include + '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' + substituteInPlace dom/system/IOUtils.h \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' + + substituteInPlace dom/system/IOUtils.cpp \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' \ + --replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \ + --replace '#include "nspr/prtypes.h"' '#include "prtypes.h"' ''; nativeBuildInputs = @@ -220,16 +234,7 @@ stdenv.mkDerivation ({ "--with-system-nspr" "--with-system-nss" ] - ++ lib.optionals (lib.versionOlder ffversion "78") [ - "--with-system-bz2" - "--enable-startup-notification" - "--disable-gconf" - ] - ++ lib.optional (lib.versionOlder ffversion "75") "--enable-system-sqlite" ++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks" - ++ lib.optionals (lib.versionOlder ffversion "69") [ - "--enable-webrender=build" - ] ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -277,6 +282,7 @@ stdenv.mkDerivation ({ patchelf --set-rpath "${lib.getLib libnotify }/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \ "$out"/lib/${binaryName}*/libxul.so + patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName} ''; doInstallCheck = true; @@ -296,16 +302,13 @@ stdenv.mkDerivation ({ inherit execdir; inherit browserName; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; -} // -lib.optionalAttrs (lib.versionAtLeast ffversion "74") { - hardeningDisable = [ "format" ]; # -Werror=format-security -} // -# the build system verifies checksums of the bundled rust sources -# ./third_party/rust is be patched by our libtool fixup code in stdenv -# unfortunately we can't just set this to `false` when we do not want it. -# See https://github.com/NixOS/nixpkgs/issues/77289 for more details -lib.optionalAttrs (lib.versionAtLeast ffversion "72") { + hardeningDisable = [ "format" ]; # -Werror=format-security + + # the build system verifies checksums of the bundled rust sources + # ./third_party/rust is be patched by our libtool fixup code in stdenv + # unfortunately we can't just set this to `false` when we do not want it. + # See https://github.com/NixOS/nixpkgs/issues/77289 for more details # Ideally we would figure out how to tell the build system to not # care about changed hashes as we are already doing that when we # fetch the sources. Any further modifications of the source tree diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch deleted file mode 100644 index 1380c7dc9a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch +++ /dev/null @@ -1,24 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. -diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp ---- firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:48:28.988747428 +0100 -+++ firefox-65.0/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:51:13.378188397 +0100 -@@ -67,8 +67,6 @@ - {"about", "chrome://global/content/aboutAbout.xhtml", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xul", - nsIAboutModule::ALLOW_SCRIPT}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, -diff -ur firefox-65.0-orig/toolkit/content/jar.mn firefox-65.0/toolkit/content/jar.mn ---- firefox-65.0-orig/toolkit/content/jar.mn 2019-01-23 00:48:35.033372506 +0100 -+++ firefox-65.0/toolkit/content/jar.mn 2019-01-23 00:50:45.126565924 +0100 -@@ -36,7 +36,6 @@ - content/global/plugins.css - content/global/browser-child.js - content/global/browser-content.js --* content/global/buildconfig.html - content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 62181321ca..daed3c150b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "79.0"; + ffversion = "81.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r"; + sha512 = "1dnxn754vb99mccqrj3wr3pg2scjy42rvs5xc6bw022gh6n8kgipx9pbkapwfivkglynxmmbw1k11ak34zhr1g6p31m3550ad6azq19"; }; patches = [ @@ -26,6 +26,7 @@ rec { broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; + timeout = 28800; # eight hours }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; @@ -35,10 +36,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.1.0esr"; + ffversion = "78.3.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa"; + sha512 = "3rg4rjmigir2wsvzdl5dkh74hahjv36yvd04rhq0rszw6xz9wyig64nxhkrpf416z6iy3y1qavk7x9j6j02sc2f545pd6cx8abjgqc9"; }; patches = [ @@ -60,32 +61,4 @@ rec { versionKey = "ffversion"; }; }; - - firefox-esr-68 = (common rec { - pname = "firefox-esr"; - ffversion = "68.11.0esr"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx"; - }; - - patches = [ - ./no-buildconfig-ffx65.patch - ]; - - meta = firefox.meta // { - description = "A web browser built from Firefox Extended Support Release source tree"; - }; - updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-68-unwrapped"; - versionSuffix = "esr"; - versionKey = "ffversion"; - }; - }).override { - # Mozilla unfortunately doesn't support building with latest NSS anymore; - # instead they provide ESR releases for NSS: - # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases - nss = nss_3_44; - }; - } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index 8d711b6de2..fb261c2860 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -6,6 +6,7 @@ , alsaLib, libXdamage, libXtst, libXrandr, expat, cups , dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa +, libxkbcommon, wayland # ozone/wayland # Command line programs , coreutils @@ -62,6 +63,7 @@ let flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core kerberos libdrm mesa coreutils + libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; @@ -72,7 +74,7 @@ in stdenv.mkDerivation { name = "google-chrome${suffix}-${version}"; - src = chromium.upstream-info.binary; + src = chromium.chromeSrc; nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ @@ -119,9 +121,13 @@ in stdenv.mkDerivation { --replace /opt $out/share \ --replace $out/share/google/$appname/google-$appname $exe - for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do + for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do num_and_suffix="''${icon_file##*logo_}" - icon_size="''${num_and_suffix%.*}" + if [ $dist = "stable" ]; then + icon_size="''${num_and_suffix%.*}" + else + icon_size="''${num_and_suffix%_*}" + fi logo_output_prefix="$out/share/icons/hicolor" logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" mkdir -p "$logo_output_path" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix index bf10043e94..3c391c9ffd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "luakit"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "luakit"; repo = "luakit"; rev = version; - sha256 = "05mm76g72fs48410pbij4mw0s3nqji3r7f3mnr2fvhv02xqj05aa"; + sha256 = "sha256-rpHW5VyntmmtekdNcZMIw8Xdv4cfiqJaaHj4ZFFGjYc="; }; nativeBuildInputs = [ @@ -54,9 +54,17 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Fast, small, webkit based browser framework extensible in Lua"; + description = "Fast, small, webkit-based browser framework extensible in Lua"; + longDescription = '' + Luakit is a highly configurable browser framework based on the WebKit web + content engine and the GTK+ toolkit. It is very fast, extensible with Lua, + and licensed under the GNU GPLv3 license. It is primarily targeted at + power users, developers and anyone who wants to have fine-grained control + over their web browser’s behaviour and interface. + ''; homepage = "https://luakit.github.io/"; - license = licenses.gpl3; - platforms = platforms.linux; # Only tested linux + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.AndersonTorres ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index bec18edea3..247b2457b5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "184qy9zxk9ynp6avz1j0ca5mxqqqlhrc0m7d1cjxv39jfdiyz51i" + "18hr026743swpdjjk7cg3hnpw2ws3q246xnkb326lyvv90wqlfni" else - "1m8fay452zps5yw1qpsc6irxxdvqjhkwxg066ckxkjf68gln7cmn" + "1yhyirii6rmnk420imaa160r9akarb3jrrlyas5a8d2y65gya71g" else if arch == "x86_64" then - "0ng04yig7msq4mv01ngfsh7mkxia18j3k9clnp0y0sbpr60z8s83" + "0k80i98zkpf6r46y1aw2zg1dsgbirg6rc8q21vycpvln395jq0pf" else - "0fndnhznqz28wfmm32fafx30pi517vvkxy1isp4krsfvyl7fmzhn"; + "1qw6hjwv9y7qr333k4nlpd7fwyzbsk833sx2slfgjfhsbipr7p3r"; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 7a5c676ccb..996d298df5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1sfvxi0ngk1ny912hw1zp0l3v6md6qqpvnyab3h45562m2fm6vqz" + "1ys523wwhvj96jph435lnyp07qzg9f70j349l7ggwgg96rflalpf" else - "0pxb3fhwvajvb28w11iylx5rp0h1f4s2aiii53gz28sq082w9br4"; + "1ycw2amis7yvidc6q87gls6rb305p89pr7mhzknc10v0nh34781m"; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix index 8039c54924..316913be00 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix @@ -27,8 +27,12 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 webkitgtk - gst_all_1.gst-plugins-base gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly ]; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index 686ffee914..eefe7af26a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "67.0.3575.31"; + version = "68.0.3618.63"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "1ghygin7xf5lwd77s8f6bag339di4alwlkqwjzlq20wzwx4lns4w"; + sha256 = "1643043ywz94x2yr7xyw7krfq53iwkr8qxlbydzq6zb2zina7jxd"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { # This is a little tricky. Without it the app starts then crashes. Then it # brings up the crash report, which also crashes. `strace -f` hints at a # missing libudev.so.0. - systemd.lib + (lib.getLib systemd) ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index c59d23ecdb..9f2eda4c3b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -11,18 +11,18 @@ let - libPath = lib.makeLibraryPath [ ffmpeg_3 ]; + libPath = lib.makeLibraryPath [ ffmpeg_3 libpulseaudio ]; gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.12.0"; + version = "28.13.0"; src = fetchFromGitHub { owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1cc75972nhmxkkynkky1m2fijbf3qlzvpxsd98mxlx0b7h4d3l5l"; + sha256 = "1lza6239kb32wnwd9cwddn11npg1qx7p69l7qy63h9c59w29iypa"; fetchSubmodules = true; }; @@ -88,12 +88,16 @@ in stdenv.mkDerivation rec { ac_add_options --disable-debug ac_add_options --disable-necko-wifi ac_add_options --disable-updater + ac_add_options --with-pthreads # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. ac_add_options --enable-official-branding export MOZILLA_OFFICIAL=1 + # For versions after 28.12.0 + ac_add_options --enable-phoenix-extensions + ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]} export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 0e3e7205e1..69ca08e990 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, python3Packages +{ stdenv, lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null @@ -10,6 +10,7 @@ assert withMediaPlayback -> gst_all_1 != null; let + python3Packages = python3.pkgs; pdfjs = let version = "2.4.456"; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 21a34539b8..d8a2e04299 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.5.3"; + version = "10.0"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1kqvr0sag94xdkq85k426qq1hz2b52m315yz51w6hvc87d8332b4"; + sha256 = "1l2rfknffnh6hsi16dzps1wav5s723vyk57fzv9y5vjmbcbf7l2l"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "179g00xw964d6x11wvzs84r7d6rcczx7ganqrxrs499yklscc46b"; + sha256 = "0x80w02ckb6mznrm1gjdpkxk9yf2rdcl16ljjglivq358a309cl2"; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index 567a75a31a..421d6bb745 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -1,7 +1,7 @@ -{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar +{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl # default dependencies -, bzip2, flac, speex, libopus +, gnutar, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libcap , xdg_utils, yasm, nasm, minizip, libwebp @@ -17,7 +17,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg_3, libxslt, libxml2, at-spi2-core -, jre +, jre8 , pipewire_0_2 # optional dependencies @@ -41,6 +41,7 @@ , ungoogled-chromium , ungoogled ? false +, channel , upstream-info }: @@ -51,6 +52,8 @@ with stdenv.lib; # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html let + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; @@ -110,7 +113,7 @@ let versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (import ./upstream-info.nix).stable.version; + stable-version = (importJSON ./upstream-info.json).stable.version; in if versionAtLeast stable-version upto-version then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." result @@ -123,10 +126,13 @@ let }; base = rec { name = "${packageName}-unwrapped-${version}"; - inherit (upstream-info) channel version; - inherit packageName buildType buildPath; + inherit (upstream-info) version; + inherit channel packageName buildType buildPath; - src = upstream-info.main; + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; + inherit (upstream-info) sha256; + }; nativeBuildInputs = [ ninja which python2Packages.python perl pkgconfig @@ -151,8 +157,9 @@ let ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; - patches = [ + patches = optionals (versionRange "68" "86") [ ./patches/nix_plugin_paths_68.patch + ] ++ [ ./patches/remove-webp-include-69.patch ./patches/no-build-timestamps.patch ./patches/widevine-79.patch @@ -166,12 +173,18 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) [ # Improvements for the VA-API build: + ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build: ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) ]; - postPatch = '' + postPatch = optionalString (!versionRange "0" "86") '' + # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): + substituteInPlace native_client/SConstruct \ + --replace "#! -*- python -*-" "" + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" + '' + '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ --replace \ @@ -197,7 +210,7 @@ let sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ @@ -300,8 +313,8 @@ let use_system_libdrm = true; system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; } // optionalAttrs ungoogled { - closure_compile = false; enable_hangout_services_extension = false; + enable_js_type_check = false; enable_mdns = false; enable_nacl_nonsfi = false; enable_one_click_signin = false; @@ -313,7 +326,6 @@ let google_api_key = ""; google_default_client_id = ""; google_default_client_secret = ""; - optimize_webui = false; safe_browsing_mode = 0; use_official_google_api_keys = false; use_unofficial_version_number = false; @@ -366,9 +378,11 @@ let origRpath="$(patchelf --print-rpath "$chromiumBinary")" patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" ''; + + passthru.updateScript = ./update.py; }; # Remove some extraAttrs we supplied to the base attributes already. in stdenv.mkDerivation (base // removeAttrs extraAttrs [ "name" "gnFlags" "buildTargets" -]) +] // { passthru = base.passthru // (extraAttrs.passthru or {}); }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix index 9051fc55fe..7c581ee633 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -1,5 +1,5 @@ -{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 -, makeWrapper, ed, gnugrep +{ newScope, config, stdenv, fetchurl, makeWrapper +, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 @@ -29,24 +29,16 @@ let callPackage = newScope chromium; - chromium = { + chromium = rec { inherit stdenv llvmPackages; - upstream-info = (callPackage ./update.nix {}).getChannel channel; + upstream-info = (lib.importJSON ./upstream-info.json).${channel}; mkChromiumDerivation = callPackage ./common.nix ({ - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; + inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs + cupsSupport pulseSupport useOzone; inherit ungoogled; # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): - gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-03-23"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; - sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; - }; - }); - } // lib.optionalAttrs (channel == "dev") { gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-05-19"; src = fetchgit { @@ -55,6 +47,27 @@ let sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; }; }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { + llvmPackages = llvmPackages_11; + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-07-20"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe"; + sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q"; + }; + }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { + llvmPackages = llvmPackages_11; + useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-08-17"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "6f13aaac55a977e1948910942675c69f2b4f7a94"; + sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251"; + }; + }); }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; @@ -66,22 +79,33 @@ let ungoogled-chromium = callPackage ./ungoogled.nix {}; }; + pkgSuffix = if channel == "dev" then "unstable" else channel; + pkgName = "google-chrome-${pkgSuffix}"; + chromeSrc = fetchurl { + urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ + "https://dl.google.com/linux/chrome/deb/pool/main/g" + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + sha256 = chromium.upstream-info.sha256bin64; + }; + mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; - widevineCdm = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { + widevineCdm = stdenv.mkDerivation { name = "chrome-widevine-cdm"; - # The .deb file for Google Chrome - src = upstream-info.binary; + src = chromeSrc; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let widevineCdmPath = - if upstream-info.channel == "stable" then + if channel == "stable" then "./opt/google/chrome/WidevineCdm" - else if upstream-info.channel == "beta" then + else if channel == "beta" then "./opt/google/chrome-beta/WidevineCdm" - else if upstream-info.channel == "dev" then + else if channel == "dev" then "./opt/google/chrome-unstable/WidevineCdm" else throw "Unknown chromium channel."; @@ -191,10 +215,13 @@ in stdenv.mkDerivation { '' + '' # libredirect causes chromium to deadlock on startup - export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | ${coreutils}/bin/tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | ${coreutils}/bin/tr '\n' ':')" export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + # Mainly for xdg-open but also other xdg-* tools: + export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH" + . w EOF @@ -214,6 +241,7 @@ in stdenv.mkDerivation { passthru = { inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; - inherit sandboxExecutableName; + inherit chromeSrc sandboxExecutableName; + updateScript = ./update.py; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index 239a6282a6..530a4c8a4a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk"; + sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx"; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix index 109e410d5e..73f4e4c9e8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -1,6 +1,6 @@ { - "84.0.4147.89" = { - rev = "84.0.4147.89-1"; - sha256 = "1bqvcq3dj6615198j7cz3ylyyic5zpis06capvl6ybl1na3ainb0"; + "85.0.4183.102" = { + rev = "85.0.4183.102-1"; + sha256 = "1mdx4a5zcs3an9yx1jxx4amq8p9rcj0hv76r8y7nz6cpsfgd9n3y"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix deleted file mode 100644 index 6dff17c69d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix +++ /dev/null @@ -1,271 +0,0 @@ -let maybePkgs = import ../../../../../. {}; in - -{ stdenv ? maybePkgs.stdenv -, runCommand ? maybePkgs.runCommand -, fetchurl ? maybePkgs.fetchurl -, writeText ? maybePkgs.writeText -, curl ? maybePkgs.curl -, cacert ? maybePkgs.cacert -, nix ? maybePkgs.nix -}: - -let - inherit (stdenv) lib; - - sources = if builtins.pathExists ./upstream-info.nix - then import ./upstream-info.nix - else {}; - - bucketURL = "https://commondatastorage.googleapis.com/" - + "chromium-browser-official"; - - mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz"; - - debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g"; - - getDebURL = channelName: version: arch: mirror: let - packageSuffix = if channelName == "dev" then "unstable" else channelName; - packageName = "google-chrome-${packageSuffix}"; - in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb"; - - # Untrusted mirrors, don't try to update from them! - debMirrors = [ - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - -in { - getChannel = channel: let - chanAttrs = builtins.getAttr channel sources; - in { - inherit channel; - inherit (chanAttrs) version; - - main = fetchurl { - url = mkVerURL chanAttrs.version; - inherit (chanAttrs) sha256; - }; - - binary = fetchurl (let - mkUrls = arch: let - mkURLForMirror = getDebURL channel chanAttrs.version arch; - in map mkURLForMirror ([ debURL ] ++ debMirrors); - in if stdenv.is64bit && chanAttrs ? sha256bin64 then { - urls = mkUrls "amd64"; - sha256 = chanAttrs.sha256bin64; - } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then { - urls = mkUrls "i386"; - sha256 = chanAttrs.sha256bin32; - } else throw "No Chrome plugins are available for your architecture."); - }; - - update = let - csv2nix = name: src: import (runCommand "${name}.nix" { - src = builtins.fetchurl src; - } '' - esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs " - IFS=, read -r -a headings <<< "$(head -n1 "$src")" - echo "[" > "$out" - tail -n +2 "$src" | while IFS=, read -r -a line; do - echo " {" - for idx in "''${!headings[@]}"; do - echo " $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});" - done - echo " }" - done >> "$out" - echo "]" >> "$out" - ''); - - channels = lib.fold lib.recursiveUpdate {} (map (attrs: { - ${attrs.os}.${attrs.channel} = attrs // { - history = let - drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info"; - history = csv2nix drvName "http://omahaproxy.appspot.com/history"; - cond = h: attrs.os == h.os && attrs.channel == h.channel - && lib.versionOlder h.version attrs.current_version; - # Note that this is a *reverse* sort! - sorter = a: b: lib.versionOlder b.version a.version; - sorted = builtins.sort sorter (lib.filter cond history); - in map (lib.flip removeAttrs ["os" "channel"]) sorted; - version = attrs.current_version; - }; - }) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1")); - - /* - XXX: This is essentially the same as: - - builtins.tryEval (builtins.fetchurl url) - - ... except that tryEval on fetchurl isn't working and doesn't catch - errors for fetchurl, so we go for a different approach. - - We only have fixed-output derivations that can have networking access, so - we abuse SHA1 and its weaknesses to forge a fixed-output derivation which - is not so fixed, because it emits different contents that have the same - SHA1 hash. - - Using this method, we can distinguish whether the URL is available or - whether it's not based on the actual content. - - So let's use tryEval as soon as it's working with fetchurl in Nix. - */ - tryFetch = url: let - # SHA1 hash collisions from https://shattered.io/static/shattered.pdf: - collisions = runCommand "sha1-collisions" { - outputs = [ "out" "good" "bad" ]; - base64 = '' - QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4 - Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0 - MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk - 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN - GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp - o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ - qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH - MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B - mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0 - S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC - Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc - upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu - renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ - yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL - StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8 - wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE - JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW - lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU - pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6 - rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE - sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P - i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl - 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen - r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ - YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw - l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM - sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp - V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh - t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt - Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1 - i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p - y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW - 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k - NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA== - ''; - } '' - echo "$base64" | base64 -d | tar xj - mv good.pdf "$good" - mv bad.pdf "$bad" - touch "$out" - ''; - - cacheVal = let - urlHash = builtins.hashString "sha256" url; - timeSlice = builtins.currentTime / 600; - in "${urlHash}-${toString timeSlice}"; - - in { - success = import (runCommand "check-success" { - result = stdenv.mkDerivation { - name = "tryfetch-${cacheVal}"; - inherit url; - - outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a"; - outputHashMode = "flat"; - outputHashAlgo = "sha1"; - - nativeBuildInputs = [ curl ]; - preferLocalBuild = true; - - inherit (collisions) good bad; - - buildCommand = '' - if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \ - curl -s -L -f -I "$url" > /dev/null; then - cp "$good" "$out" - else - cp "$bad" "$out" - fi - ''; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - }; - inherit (collisions) good; - } '' - if cmp -s "$result" "$good"; then - echo true > "$out" - else - echo false > "$out" - fi - ''); - value = builtins.fetchurl url; - }; - - fetchLatest = channel: let - result = tryFetch (mkVerURL channel.version); - in if result.success then result.value else fetchLatest (channel // { - version = if channel.history != [] - then (lib.head channel.history).version - else throw "Unfortunately there's no older version than " + - "${channel.version} available for channel " + - "${channel.channel} on ${channel.os}."; - history = lib.tail channel.history; - }); - - getHash = path: import (runCommand "gethash.nix" { - inherit path; - nativeBuildInputs = [ nix ]; - } '' - sha256="$(nix-hash --flat --base32 --type sha256 "$path")" - echo "\"$sha256\"" > "$out" - ''); - - isLatest = channel: version: let - ourVersion = sources.${channel}.version or null; - in if ourVersion == null then false - else lib.versionOlder version sources.${channel}.version - || version == sources.${channel}.version; - - # We only support GNU/Linux right now. - linuxChannels = let - genLatest = channelName: channel: let - newUpstream = { - inherit (channel) version; - sha256 = getHash (fetchLatest channel); - }; - keepOld = let - oldChannel = sources.${channelName}; - in { - inherit (oldChannel) version sha256; - } // lib.optionalAttrs (oldChannel ? sha256bin32) { - inherit (oldChannel) sha256bin32; - } // lib.optionalAttrs (oldChannel ? sha256bin64) { - inherit (oldChannel) sha256bin64; - }; - in if isLatest channelName channel.version then keepOld else newUpstream; - in lib.mapAttrs genLatest channels.linux; - - getLinuxFlash = channelName: channel: let - inherit (channel) version; - fetchArch = arch: tryFetch (getDebURL channelName version arch debURL); - packages = lib.genAttrs ["i386" "amd64"] fetchArch; - isNew = arch: attr: !(builtins.hasAttr attr channel) - && packages.${arch}.success; - in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") { - sha256bin32 = getHash (packages.i386.value); - } // lib.optionalAttrs (isNew "amd64" "sha256bin64") { - sha256bin64 = getHash (packages.amd64.value); - }; - - newChannels = lib.mapAttrs getLinuxFlash linuxChannels; - - dumpAttrs = indent: attrs: let - mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val - else "\"${lib.escape ["$" "\\" "\""] (toString val)}\""; - mkIndent = level: lib.concatStrings (builtins.genList (_: " ") level); - mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n"; - attrLines = lib.mapAttrsToList mkAttr attrs; - in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}"; - in writeText "chromium-new-upstream-info.nix" '' - # This file is autogenerated from update.sh in the same directory. - ${dumpAttrs 0 newChannels} - ''; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.py new file mode 100755 index 0000000000..bfc7f0d247 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.py @@ -0,0 +1,77 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python -p python3 nix + +import csv +import json +import subprocess +import sys + +from codecs import iterdecode +from collections import OrderedDict +from os.path import abspath, dirname +from urllib.request import urlopen + +HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' +DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' +BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' + +JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' + +def load_json(path): + with open(path, 'r') as f: + return json.load(f) + +def nix_prefetch_url(url, algo='sha256'): + print(f'nix-prefetch-url {url}') + out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) + return out.decode('utf-8').rstrip() + +channels = {} +last_channels = load_json(JSON_PATH) + +print(f'GET {HISTORY_URL}', file=sys.stderr) +with urlopen(HISTORY_URL) as resp: + builds = csv.DictReader(iterdecode(resp, 'utf-8')) + for build in builds: + channel_name = build['channel'] + + # If we've already found a newer build for this channel, we're + # no longer interested in it. + if channel_name in channels: + continue + + # If we're back at the last build we used, we don't need to + # keep going -- there's no new version available, and we can + # just reuse the info from last time. + if build['version'] == last_channels[channel_name]['version']: + channels[channel_name] = last_channels[channel_name] + continue + + channel = {'version': build['version']} + suffix = 'unstable' if channel_name == 'dev' else channel_name + + try: + channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz') + channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb') + except subprocess.CalledProcessError: + # This build isn't actually available yet. Continue to + # the next one. + continue + + channels[channel_name] = channel + +with open(JSON_PATH, 'w') as out: + def get_channel_key(item): + channel_name = item[0] + if channel_name == 'stable': + return 0 + elif channel_name == 'beta': + return 1 + elif channel_name == 'dev': + return 2 + else: + print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) + sys.exit(1) + sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) + json.dump(sorted_channels, out, indent=2) + out.write('\n') diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh deleted file mode 100755 index ea67a62c10..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e -cd "$(dirname "$0")" -sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)" -cat "$sp" > upstream-info.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json new file mode 100644 index 0000000000..dae7f741b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json @@ -0,0 +1,17 @@ +{ + "stable": { + "version": "85.0.4183.102", + "sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a", + "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm" + }, + "beta": { + "version": "86.0.4240.30", + "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl", + "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa" + }, + "dev": { + "version": "87.0.4252.0", + "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y", + "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw" + } +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix deleted file mode 100644 index 874e45307e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file is autogenerated from update.sh in the same directory. -{ - beta = { - sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"; - sha256bin64 = "017ix9a74f2gzlg6in0x6fqgiw8bpk0rypr6wsqqkslywprypjd0"; - version = "84.0.4147.89"; - }; - dev = { - sha256 = "1dbbr7s8vbhxd0sk4k2yqp630zp1r4gzkkd2a86pzlzq2mjhsk8a"; - sha256bin64 = "0bphfwi6nkj9nzrjjaffiv27xfblgdikyifsbjl6vv2pawkh335q"; - version = "85.0.4183.15"; - }; - stable = { - sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"; - sha256bin64 = "1hzhgvs2ykqsncpnbnhzh09sw1vlsdfjhs06z5gc80l47brdi3wz"; - version = "84.0.4147.89"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 2fe4c63892..fbf49b9f41 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.1.1929.45-1"; + version = "3.3.2022.47-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0pg16zs9fcr6b360igszpkia3i8i5xf4m0hs1b2a17lf8vkldix9"; + sha256 = "0lraliqb5r8akh8lfmw2sy90s58sbghcpc598nlz2d89f91yq7vz"; }; unpackPhase = '' @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { description = "A Browser for our Friends, powerful and personal"; homepage = "https://vivaldi.com"; license = licenses.unfree; - maintainers = with maintainers; [ otwieracz nequissimus ]; + maintainers = with maintainers; [ otwieracz nequissimus badmutex ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/c14/default.nix b/third_party/nixpkgs/pkgs/applications/networking/c14/default.nix index 98d2f4aa81..afd9aa53ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/c14/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/c14/default.nix @@ -13,8 +13,6 @@ buildGoPackage rec { sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "C14 is designed for data archiving & long-term backups."; homepage = "https://www.online.net/en/storage/c14-cold-storage"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/c14/deps.nix b/third_party/nixpkgs/pkgs/applications/networking/c14/deps.nix deleted file mode 100644 index fe51488c70..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/c14/deps.nix +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix index 2ff9e5581b..bd927d2b68 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix @@ -16,18 +16,19 @@ , wrapGAppsHook , gobject-introspection , glib-networking +, librest , python3 }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.2.1"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "0zghryx5y47ff8kxa65lvgmy1cnhvhazxml7r1lxixxj3d88wh7p"; + sha256 = "11s8x48syy5wjj23ab4bn5jxhi7l5sx7aw6q2ggk99v042hxh3h2"; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { dconf gspell glib-networking + librest ] ++ (with gst_all_1; [ gstreamer gst-plugins-base diff --git a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix index 11eb24ff70..3dd9fe2c4f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix @@ -3,7 +3,7 @@ stdenv , makeWrapper , makeDesktopItem , fetchurl -, jre +, jdk8 }: let @@ -31,7 +31,7 @@ let buildInputs = [ makeWrapper ]; installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/charles \ + makeWrapper ${jdk8.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 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 252a6f5b48..96767f6365 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.5.1"; + version = "2020.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "0r1n3a8h8gyww4p2amb24jmp8zkyxy1ava3nbqgwlfjr3zagga00"; + sha256 = "09jdgpglm4v7pivx8016zzdvj0xkdhaa8xl71p2akc2jn8i8i6gb"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 601b3da157..72c3955f90 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.9.5"; + version = "2.10.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "1x44mgvnbn47a33xnhnh9bxxvj1vsr32lvh9bq6w5hpmxb7qbq4f"; + sha256 = "1k023rq4p0hvq5famxm83csp3zsijrki8myk6v83xyfigwxc8sia"; }; - vendorSha256 = "1vqmzz76lcwwnw89n4lyg4jjf7wbdgn9sdzwsgrjwkj8ax7d48cv"; + vendorSha256 = "0fqdxs3r4249qxlc9cac0lpbqf2aifkcah07v0cckb9rxfyiwhjz"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix index 86d1b80d06..d3e18ce691 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlantis"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "1g1bh1v3yd3dz80ckjrhspmsf78nw8hc907hh9jzbq62psqg4459"; + sha256 = "0nb0dm4yn6f5pw7clgb2d1khcwcxiidqyc0sdh38wwqg0zyil0cz"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix index 5bbd101412..02f5fc18d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix @@ -18,6 +18,6 @@ buildGoPackage rec { license = licenses.asl20; homepage = "https://github.com/containernetworking/cni"; maintainers = with maintainers; [ offline vdemeester ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index d3b2addee1..fb7d2e2d6a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "0f1cqxjf26sy1c4aw6y7pyd9lrz0vknby4q5j6xj77a1pab9073m"; + sha256 = "1sjk0cghldygx1jgx4bqv83qky7shk64n6xkkfxl92f12wyvsq9j"; }; vendorSha256 = null; @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; buildFlagsArray = [ - "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${version}" + "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}" ]; subPackages = [ @@ -38,7 +38,7 @@ buildGoModule rec { "plugins/meta/tuning" ]; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix index 3d418f9a47..f99c708161 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix @@ -8,8 +8,8 @@ let sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z"; }; "1.6" = { - flinkVersion = "1.9.0"; - sha256 = "1dzfcmqz5j4b545wq2q3xb2xkbhqllr04s3av1afv54y61l5y952"; + flinkVersion = "1.11.1"; + sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0"; }; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ jre ]; installPhase = '' - rm bin/*.bat + rm bin/*.bat || true mkdir -p $out/bin $out/opt/flink mv * $out/opt/flink/ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 865a892efb..44e21de0a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "1l514rf7rg05prq9548ygj6z284sy85ddzrwiiqr74vz4kilg3vb"; + sha256 = "1a44lmrvi5f9jr04rblhcsg3zvqzvdp9wyw4m4h4scsqp5g7dfb7"; }; - vendorSha256 = "00qm45vfz4afj8f9hikrlk96w0rdzxqq2azhzrnzfymyiwc6jk5c"; + vendorSha256 = "1yzh6iglrzd43yqs1b6qh1i62b6qaz3232lgxyg3gmc81p0i5kr0"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index bb76ad6988..3e24a3d060 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "0bp2yscrvdm46w2nxas5zs9mcvdn2yp05k0wmcjl7gh42fs6hmcs"; + sha256 = "0y3ilvafzwizd9zqvp8jijkkd1c2yy7zyl5xfma1zv2x96p7xgqh"; }; - vendorSha256 = "0lccglh5qpm5kp8xp1pn7y4cfxjpax83gyzjmnhh9h5y9zwgqp03"; + vendorSha256 = "0f8a0psvic923rh13f5041p7hr6w8dy9qxdw3l195yky5cf3fj6w"; doCheck = false; @@ -28,6 +28,6 @@ buildGoModule rec { homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; license = licenses.asl20; - maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ]; + maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman Chili-Man ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index d1cfc89f2d..3b3794e953 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.125.5"; + version = "0.128.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "00c1sppvdnsqay8zk6fz5xz8yw74zv30hq54r4sf1a5rb84nd05h"; + sha256 = "1ihvjbh3v91wxny9jq0x9qi3s2zzdpg96w1vrhiim43nnv0ydg1y"; }; - vendorSha256 = "04mga3jc2c01daygjcn245mv30lc2ibax0mpb1wjk3s8lkl4cxcz"; + vendorSha256 = "181iksfadjqrgsia8zy0zf5lr4h732s7hxjjfkr4gac586dlbj0w"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix deleted file mode 100644 index aa86dcbeb2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "heptio-ark"; - version = "0.10.0"; - - goPackagePath = "github.com/heptio/ark"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "heptio"; - repo = "ark"; - sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; - }; - - excludedPackages = [ "issue-template-gen" ]; - - meta = with stdenv.lib; { - description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; - homepage = "https://heptio.github.io/ark/"; - license = licenses.asl20; - maintainers = [maintainers.mbode]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index 59dd92a4d2..59be45bb53 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.6.7"; + version = "1.7.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "0zqp78ilr39j4pyqyk8a0rc0dlmkgzdd2ksfjd7vyjns5mrrjfj7"; + sha256 = "0541j1wdhlbm2spl1w3m0hig7lqn05xk1xws8748wfzbr8wkir31"; }; - vendorSha256 = "0cc0lmjsxrn3f78k95wklf3yn5k7h8slwnwmssy1i1h0bkcg1bai"; + vendorSha256 = "0sz92nspfclqxnx0mf80jxqqwxanqsx9nl9hg7f9izks7jw544vx"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix index 52e483424f..5199bbfaf3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.127"; + version = "2.1.138"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "01dfpnqgbrn8b6h2irq080xdm76b4jx6sd80f8x4zmyaz6hf5vlv"; + sha256 = "1i45gzaql6rfplliky56lrzwjnm2qzv25kgyq7gvn9c7hjaaq65b"; }; - vendorSha256 = "0la92a8720l8my5r4wsbgv74y6m19ikmm0wv3l4m4w5gjyplfsxb"; + vendorSha256 = "1wvggarakshpw7m8h0x2zvd6bshd2kzbrjynfa113z90pgksvjng"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index eedc34d7d4..9b1170ca57 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -42,9 +42,10 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.18.2+k3s1"; # k3s git tag + k3sVersion = "1.18.8+k3s1"; # k3s git tag traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag - k3sRootVersion = "0.3.0"; # taken from .s/cripts/download at the above k3s tag + k3sRootVersion = "0.4.1"; # taken from ./scripts/download at the above k3s tag + k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag # bundled into the k3s binary traefikChart = fetchurl { url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz"; @@ -62,12 +63,12 @@ let k3sRoot = fetchzip { # Note: marked as apache 2.0 license url = "https://github.com/rancher/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; - sha256 = "12xafn5jivl8lqdcs25b28xrc4mf7yf1xif5np169nvvxgvmpdxp"; + sha256 = "0ppj8y9g410hn6mjkfgfsi2j9yv7rcpic21znpmbrkx8b2070hf0"; stripRoot = false; }; k3sPlugins = buildGoPackage rec { name = "k3s-cni-plugins"; - version = "0.7.6-k3s1"; # from ./scripts/version.sh 'VERSION_CNIPLUGINS'; update when k3s's repo is updated. + version = k3sCNIVersion; goPackagePath = "github.com/containernetworking/plugins"; subPackages = [ "." ]; @@ -76,7 +77,7 @@ let owner = "rancher"; repo = "plugins"; rev = "v${version}"; - sha256 = "0ax72z1ziann352bp6khfds8vlf3bbkqckrkpx4l4jxgqks45izs"; + sha256 = "13kx9msn5y9rw8v1p717wx0wbjqln59g6y3qfb1760aiwknva35q"; }; meta = { @@ -93,7 +94,7 @@ let url = "https://github.com/rancher/k3s"; rev = "v${k3sVersion}"; leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "01ww3d71mlri2fk6z54rbd697aqwj942kbg323k0hfsnx7flkhps"; + sha256 = "17qsvbj1lvgxqdkxayyqnjwsjs3cx06nfv2hqvixjszn4vf30qlg"; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 1e700f2339..3c793cc9ec 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.21.2"; + version = "0.21.7"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "06yjc4lrqr3y7428xkfcgfg3aal71r437ij2hqd2yjxsq8r7zvif"; + sha256 = "1rw1vzxfjzklzdpcxz7mplvlmggavaym260s7vzvbgvd1snf38cb"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "1hmqvcvlffd8cpqcnn2f9mnyiwdhw8k46sl2p6rk16yrj06la9mr"; + vendorSha256 = "05rsbi40pihdh212d5zn6cchnkrqd6rsyl3vfsw77ksybwakrbf7"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index 282890ada5..baf10e273f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -1,18 +1,18 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: - let goPackagePath = "k8s.io/kops"; - generic = { version, sha256, ...}@attrs: - let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in - buildGoPackage { + generic = { version, sha256, rev ? version, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "rev" ]; in + buildGoPackage + { pname = "kops"; inherit version; inherit goPackagePath; src = fetchFromGitHub { - rev = version; + rev = rev; owner = "kubernetes"; repo = "kops"; inherit sha256; @@ -42,27 +42,30 @@ let meta = with stdenv.lib; { description = "Easiest way to get a production Kubernetes up and running"; homepage = "https://github.com/kubernetes/kops"; + changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases"; license = licenses.asl20; maintainers = with maintainers; [ offline zimbatm kampka ]; platforms = platforms.unix; }; } // attrs'; -in rec { +in +rec { mkKops = generic; - kops_1_15 = mkKops { - version = "1.15.3"; - sha256 = "0pzgrsl61nw8pm3s032lj020fw13x3fpzlj7lknsnd581f0gg4df"; - }; - kops_1_16 = mkKops { version = "1.16.4"; sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f"; }; kops_1_17 = mkKops { - version = "1.17.1"; - sha256 = "1km6nwanmhfx8rl1wp445z9ib50jr2f86rd92vilm3q4rs9kig1h"; + version = "1.17.2"; + sha256 = "0fmrzjz163hda6sl1jkl7cmg8fw6mmqb9953048jnhmd3w428xlz"; + }; + + kops_1_18 = mkKops rec { + version = "1.18.1"; + sha256 = "0jw23vmq2v9czxyansggq4fapz1bcaclmxpw6na4dsn8zcssz320"; + rev = "v${version}"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix index 634fa22fe7..c370d12270 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,22 +2,18 @@ buildGoModule rec { pname = "kpt"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1pgv15zgv30dpv148bn6x0anv9q6x78y6ldmzarb9fbjpk6j0wxl"; + sha256 = "1lvfbpxxddm1pk4mb4sm0chw15dalsfyhgy86npz94xjf1jssyh8"; }; - vendorSha256 = "0l8xdnv2m6byd5dwvs3zgcj1lsci7ax4xvx178a8a78sgkqalvmq"; + vendorSha256 = "1xkjgzy9z7v5z4kl1769dgrrr0ljr0fdxfdj7xbic9hl6nm94kif"; - doCheck = false; - - postInstall = '' - rm $out/bin/{mdtogo,formula} - ''; + subPackages = [ "." ]; meta = with lib; { description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index decbdbd1fb..0c1f452ea5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "3.0.0"; + version = "3.0.1"; k3sVersion = "1.18.6-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1p4rqzi67cr8vf1ih7zqxkpssqq0vy4pb5crvkxbbf5ad5mwrjri"; + sha256 = "1l6mh0dpf2bw9sxpn14iivv3pr8mj4favzx2hhn8k1j71cm1w4rj"; }; buildFlagsArray = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 91fa9e8b4f..691effa392 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.18.8"; + version = "1.19.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1dswgxxbybwllf2lf89saarsrn4pkb2617wycim07cd7i1l1dv5n"; + sha256 = "1wnlw2rl14q7cb8shhldbavdamvl3w3mlfvymwfvmvxfxzhrjlaq"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix index f69082bff3..98b71cfe11 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix @@ -1,15 +1,22 @@ -{ lib, python3Packages }: +{ lib, python3 }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = self: super: { + tornado = super.tornado_5; + }; + }; +in with python.pkgs; buildPythonApplication rec { pname = "luigi"; version = "3.0.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "02c480f5pjgqsvqnkaw7f6n4nhdspmhq5w7lw8sgg2v3jghg8n7i"; }; - propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ]; + propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 00b314b6cb..b319ee57b9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.12.3"; + version = "1.13.0"; - vendorSha256 = "014zgkh1l6838s5bmcxpvvyap96sd8ammrz5d7fncx0afik7zc4m"; + vendorSha256 = "09bcp7pqbs9j06z1glpad70dqlsnrf69vn75l00bdjknbrvbzrb9"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0z8hinhx521rphcm0cd5lli5jy09lw1jw63q2a4fqlmhpw39qrj9"; + sha256 = "1xlz07q0nlsq6js58b5ad0wxajwganaqcvwglj4w6fgmiqm9s1ny"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 48dabaac90..3ff0e4b397 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "0cphlaf9k2va879jgqd6fzdgkscpwg29j1cpr677i3zj3hfgaw1g"; + sha256 = "1sga5l8bvqgm0j71yj3l1ykqvchxa7cg8pkfvjsrqlikgrfb54f3"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix index 9d0f2248dd..ff0d1c69f4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -1,6 +1,7 @@ -{ callPackage }: +{ callPackage, buildGoPackage }: callPackage ./generic.nix { + inherit buildGoPackage; version = "0.11.4"; sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix index ae131702df..3687b58b5a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -1,6 +1,7 @@ -{ callPackage }: +{ callPackage, buildGoPackage }: callPackage ./generic.nix { - version = "0.12.2"; - sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404"; + inherit buildGoPackage; + version = "0.12.3"; + sha256 = "100ynhc4nm4mmjxx1jhq2kjbqshxvi5x8y482520j8gsyn40g6zc"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix new file mode 100644 index 0000000000..ff180bdc9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "popeye"; + version = "0.8.10"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "derailed"; + repo = "popeye"; + sha256 = "1cx39xipvvhb12nhvg7kfssnqafajni662b070ynlw8p870bj0sn"; + }; + + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/derailed/popeye/cmd.version=${version} + -X github.com/derailed/popeye/cmd.commit=b7a876eafd4f7ec5683808d8d6880c41c805056a + -X github.com/derailed/popeye/cmd.date=2020-08-25T23:02:30Z + ''; + + vendorSha256 = "0b2bawc9wnqwgvrv614rq5y4ns9di65zqcbb199y2ijpsaw5d9a7"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A Kubernetes cluster resource sanitizer"; + homepage = "https://github.com/derailed/popeye"; + changelog = "https://github.com/derailed/popeye/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.bryanasdev000 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix index 0835d268cd..c6f9217b35 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -1,22 +1,56 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: buildGoPackage rec { pname = "amazon-ssm-agent"; - version = "2.0.633.0"; + version = "2.3.1319.0"; goPackagePath = "github.com/aws/${pname}"; - subPackages = [ "agent" ]; + subPackages = [ + "agent" + "agent/framework/processor/executer/outofproc/worker" + "agent/framework/processor/executer/outofproc/worker" + "agent/framework/processor/executer/outofproc/sessionworker" + "agent/session/logging" + "agent/cli-main" + ]; + + buildInputs = [ makeWrapper ]; src = fetchFromGitHub { - rev = "v${version}"; + rev = version; owner = "aws"; repo = pname; - sha256 = "10arshfn2k3m3zzgw8b3xc6ywd0ss73746nq5srh2jir7mjzi4xv"; + sha256 = "1yiyhj7ckqa32b1rnbwn7zx89rsj00m5imn1xlpsw002ywxsxbnv"; }; preBuild = '' mv go/src/${goPackagePath}/vendor strange-vendor mv strange-vendor/src go/src/${goPackagePath}/vendor + + cd go/src/${goPackagePath} + echo ${version} > VERSION + + substituteInPlace agent/plugins/inventory/gatherers/application/dataProvider.go \ + --replace '"github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"' "" + + go run agent/version/versiongenerator/version-gen.go + substituteInPlace agent/appconfig/constants_unix.go \ + --replace /usr/bin/ssm-document-worker $bin/bin/ssm-document-worker \ + --replace /usr/bin/ssm-session-worker $bin/bin/ssm-session-worker \ + --replace /usr/bin/ssm-session-logger $bin/bin/ssm-session-logger + cd - + ''; + + postBuild = '' + mv go/bin/agent go/bin/amazon-ssm-agent + mv go/bin/worker go/bin/ssm-document-worker + mv go/bin/sessionworker go/bin/ssm-session-worker + mv go/bin/logging go/bin/ssm-session-logger + mv go/bin/cli-main go/bin/ssm-cli + ''; + + postInstall = '' + wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bash}/bin ''; meta = with stdenv.lib; { @@ -24,7 +58,6 @@ buildGoPackage rec { homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = with maintainers; [ copumpkin manveru ]; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 8ad0e8711f..0f8ed05d8e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -15,6 +15,7 @@ buildGoPackage rec { sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n"; }; + deleteVendor = true; goDeps = ./deps.nix; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index 2a7899f2fe..1793af1085 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "tanka"; @@ -17,6 +17,13 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + echo "complete -C $out/bin/tk tk" > tk.bash + installShellCompletion tk.bash + ''; + meta = with lib; { description = "Flexible, reusable and concise configuration for Kubernetes"; homepage = "https://github.com/grafana/tanka/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix index e906f035fd..6205b3bf5f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -27,6 +27,11 @@ buildPythonApplication rec { sha256 = "161mszmxqp3wypnda48ama2mmq8yjilkxahwc1mxjwzy1n19sn7v"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "IPython==7.16.1" "IPython" + ''; + checkInputs = [ pytestCheckHook ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 8aa1f4a44f..a6d9278f58 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -132,8 +132,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.0"; - sha256 = "0kangddd99ix50w67hi0pwa9js9c0hjxqvrc0lxaa6msjvjsxyyq"; + version = "0.13.3"; + sha256 = "1bjgsabkyh3xf4gdp41mwhw6bpmjg45bnq2hk522glk02n2xngpw"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index be5d47eb0e..e8b602b8a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.23.32"; + version = "0.23.40"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1pa3k0hjdb5bj0bp4aj3lfcgz98l3wd9kfa12rn9zzbcmp087kih"; + sha256 = "0gd2g1nl8dgj24mzk4qymcwnp6prbi3qxj863rkpi3k32zy2iw4k"; }; - vendorSha256 = "1xn7c6y32vpanqvf1sfpw6bs73dbjniavjbf00j0vx83bfyklsr4"; + vendorSha256 = "0f466qn5vp74mwx9s4rcbw1x793w8hr5dcf2c12sgshya1bxs4nl"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index c2ffb816aa..c3ec58df35 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "0bd01fmrf17njzf8ri4bw4qi7bxcvd3dx7yyf42qfvnp7hrfzipk"; + sha256 = "0wiqnlam4f7085n3djvb5phhvw9df61bj8w6c5rcpffykg33vhmi"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix new file mode 100644 index 0000000000..0d5835a8cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -0,0 +1,45 @@ +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "velero"; + version = "1.5.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "vmware-tanzu"; + repo = "velero"; + sha256 = "1rmymwmglcia5j0c692g34hlffba1yqs2s0iyjpafma2zabrcnai"; + }; + + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version} + -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=87d86a45a6ca66c6c942c7c7f08352e26809426c + -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean + ''; + + vendorSha256 = "1izl7z689jf3i3wax7rfpk0jjly7nsi7vzasy1j9v5cwjy2d5z4v"; + + excludedPackages = [ "issue-template-gen" ]; + + doCheck = false; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + $out/bin/velero completion bash > helm.bash + $out/bin/velero completion zsh > helm.zsh + installShellCompletion helm.{bash,zsh} + ''; + + meta = with stdenv.lib; { + description = + "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + homepage = "https://velero.io/"; + changelog = + "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.mbode maintainers.bryanasdev000 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix index 6dc996c797..f004a807aa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix @@ -11,11 +11,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "0ab1s1r6zrqxcfjnij5ar352kzyrl1m92c04nqk6hahpzzma2p3r"; + sha256 = "0vna3vaivi6w7nlkwpqhwmyly0s1d5y2yg51br2f918pjhp2cp7q"; }; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 70e107c063..8fb14ae3b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, buildGoPackage}: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "dnscontrol"; - version = "3.2.0"; - - goPackagePath = "github.com/StackExchange/dnscontrol"; + version = "3.3.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "1lrn1whmx9zkyvs505zxrsmnr5s6kpj3kjkr6rblfwdlnadkgfj7"; + sha256 = "0lldkx906imwm8mxcfafpanbgaqh0sdm3zdkwkn7j0nmngyncx9p"; }; + vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx"; + subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; license = licenses.mit; - maintainers = with maintainers; [ mmahut ]; + maintainers = with maintainers; [ mmahut SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix index b852eb02fe..977b71ebc5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.12.1"; + version = "3.12.2"; propagatedBuildInputs = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "0zqpibh31rl6xlfw9y66d9hfhwrnzy5cjzbksczyw3lh4dfzsql0"; + sha256 = "12w6x80wsw6xm17fxyymnl45aavsagg932zw621wcjz154vjghjr"; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index 93356dfb4f..40b6748436 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.7.0"; + version = "3.7.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "1maiazjsnjalx09rq1l84kd86s48cvljnwynv4rj6cln1h0al030"; + sha256 = "1l2ra06am6bgwb4q200lhi64sz3np1dzf2vpjh10znxbx0mahbq6"; }; buildInputs = [ qtwebengine qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index c599879614..d6a253efda 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.67"; + version = "3.1.71"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "d3f4b7bebff80a3a3aa00daf60145a6bc3d12847d7339b39846b2341bca75ef3"; + sha256 = "4c25d8733c8eb54c7d3ce60a17d8020049fb137b796e5ada9d15f41cdd0e1655"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index 7d07c7acbe..0cb0d17cc5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, autoreconfHook , dbus , gettext , gnutls @@ -16,11 +17,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.49.1"; + version = "3.50.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "1dmkwpc0vy7058bh9a10ida0k64rxggap8ysl5xx3457y468rk2f"; + sha256 = "sha256-4NuHJpylIIqtFKAkFTN7T57+PEnC1NFOZukhx4oTXBA="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { "--disable-autoupdatecheck" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ dbus diff --git a/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix new file mode 100644 index 0000000000..80fbb6dd6e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix @@ -0,0 +1,82 @@ +{ stdenv +, fetchurl +, fetchpatch +# native +, meson +, ninja +, pkg-config +, gettext +, desktop-file-utils +, appstream-glib +, wrapGAppsHook +, python3 +# Not native +, gst_all_1 +, gsettings-desktop-schemas +, gtk3 +, glib +, networkmanager +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "gnome-network-displays"; + version = "0.90.4"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "04snnfz5jxxpjkrwa7dchc2h4shszi8mq9g3ihvsvipgzjw3d498"; + }; + + patches = [ + # Undeclared dependency on gio-unix-2.0, see: + # https://github.com/NixOS/nixpkgs/issues/36468 and + # https://gitlab.gnome.org/GNOME/gnome-network-displays/-/merge_requests/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/ef3f3ff565acd8238da46de604a1e750d4f02f07.diff"; + sha256 = "1ljiwgqia6am4lansg70qnwkch9mp1fr6bga98s5fwyiaw6b6f4p"; + }) + # Fixes an upstream bug: https://gitlab.gnome.org/GNOME/gnome-network-displays/-/issues/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/23164b58f4d5dd59de988525906d6e5e82c5a63c.patch"; + sha256 = "0x32dvkzv9m04q41aicscpf4aspghx81a65462kjqnsavi64lga5"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + desktop-file-utils + appstream-glib + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + 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-rtsp-server + networkmanager + libpulseaudio + ]; + + preConfigure = '' + patchShebangs ./build-aux/meson/postinstall.py + ''; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-network-displays"; + description = "Miracast implementation for GNOME"; + maintainers = with maintainers; [ doronbehar ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix index 73f2ab2526..4341daba9a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.12"; + stableVersion = "2.2.14"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "05nnil8ljyj6h366yrniv6syznhhbnb7nzjkz5785rb9pzjizs19"; - serverSrcHash = "0gmfdnymiw4w13qbcsvd71yj3hc9640n43c305vq39hahvsn7rvc"; + guiSrcHash = "0y0dkyky2vw8ixm8nx4qhsj5b6hk0lv2cayrj4879icmp8zc4dy3"; + serverSrcHash = "1vpsvvisw0sivlbjwawskkyiavl092qxaqxi13khkimz5fk0d3rc"; in { guiStable = mkGui { stable = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix index 49f7bbfd81..3392ce282d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--enable-control-socket" "--with-daq-includes=${daq}/includes" "--with-daq-libraries=${daq}/lib" - ]; + ]; postInstall = '' wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine" diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix index a0e6433a20..a6189da7ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix @@ -14,17 +14,18 @@ , swig , gettext , fetchpatch +, coreutils }: let - preConfigure = (import ./script.nix); + preConfigure = (import ./script.nix {inherit coreutils;}); in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "0ky4485z0gpaj1z75y7jr5bn9wr8x8w3v637aqq4v9a0a5iyagmg"; + sha256 = "0rybs79h0sq12vsayah8dixqac404z84rlvqynvzf3dh2lwcgg0y"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/script.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/script.nix index 10a2d11a14..4c8bbcf22c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/script.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/script.nix @@ -1,4 +1,10 @@ +{coreutils}: '' + sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/base/frameworks/logging/writers/ascii.zeek + sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/policy/misc/trim-trace-file.zeek + sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/actions/pp-alarms.zeek + sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/main.zeek + sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek @@ -32,6 +38,7 @@ sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek + sed -i "1i##! test tunnels" $PWD/scripts/base/protocols/tunnels/__load__.zeek sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 0143e401c1..f8bcdc4bef 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , rpmextract , libnotify @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { expat gdk-pixbuf dbus - udev.lib + (lib.getLib udev) freetype nspr glib diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 8fd0128ef2..617c02de26 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "chatterino2"; - version = "2.1.7"; + version = "2.2.2"; src = fetchFromGitHub { - owner = "fourtf"; + owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "0bbdzainfa7hlz5p0jfq4y04i3wix7z3i6w193906bi4gr9wilpg"; + sha256 = "026cs48hmqkv7k4akbm205avj2pn3x1g7q46chwa707k9km325dz"; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; @@ -26,8 +26,9 @@ mkDerivation rec { improved/extended version of the Twitch web chat. Chatterino 2 is the second installment of the Twitch chat client series "Chatterino". - ''; - homepage = "https://github.com/fourtf/chatterino2"; + ''; + homepage = "https://github.com/Chatterino/chatterino2"; + changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ rexim ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix new file mode 100644 index 0000000000..a262b04874 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cordless"; + version = "2020-08-30"; + + src = fetchFromGitHub { + owner = "Bios-Marcel"; + repo = pname; + rev = version; + sha256 = "sha256-CwOI7Ah4+sxD9We+Va5a6jYat5mjOeBk2EsOfwskz6k="; + }; + + subPackages = [ "." ]; + + vendorSha256 = "sha256-01I7GrZkaskuz20kVK2YwqvP7ViPMlQ3BFaoLHwgvOE="; + + meta = with stdenv.lib; { + homepage = "https://github.com/Bios-Marcel/cordless"; + description = "Discord terminal client"; + license = licenses.bsd3; + maintainers = with maintainers; [ colemickens ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 9c286d0083..795f71a3cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon @@ -60,23 +60,39 @@ stdenv.mkDerivation rec { libgcrypt libsoup pcre - xorg.libxcb - xorg.libpthreadstubs - libXdmcp - libxkbcommon epoxy at-spi2-core dbus icu libsignal-protocol-c librsvg + ] ++ lib.optionals (!stdenv.isDarwin) [ + xorg.libxcb + xorg.libpthreadstubs + libXdmcp + libxkbcommon ]; + # Dino looks for plugins with a .so filename extension, even on macOS where + # .dylib is appropriate, and despite the fact that it builds said plugins with + # that as their filename extension + # + # Therefore, on macOS rename all of the plugins to use correct names that Dino + # will load + # + # See https://github.com/dino/dino/wiki/macOS + postFixup = lib.optionalString (stdenv.isDarwin) '' + cd "$out/lib/dino/plugins/" + for f in *.dylib; do + mv "$f" "$(basename "$f" .dylib).so" + done + ''; + meta = with stdenv.lib; { description = "Modern Jabber/XMPP Client using GTK/Vala"; homepage = "https://github.com/dino/dino"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mic92 qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index eadf90a0ba..649e3b673d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,30 +7,30 @@ in { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; - version = "0.0.11"; + version = "0.0.12"; src = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "1saqwigi1gjgy4q8rgnwyni57aaszi0w9vqssgyvfgzff8fpcx54"; + sha256 = "0qrzvc8cp8azb1b2wb5i4jh9smjfw5rxiw08bfqm8p3v74ycvwk8"; }; }; ptb = callPackage ./base.nix rec { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.21"; + version = "0.0.22"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "1i164wpi07d45w19i7l5hs47crc29k3plg4y9kc97x75rhh4xym1"; + sha256 = "06qyh8i9d7il6q7q7iaymbbcmdcgrj6rc4z4xik1ay3fr7qy299j"; }; }; canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.111"; + version = "0.0.112"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0ngmb40pwfwydvxyfby89yp17lsvmv642jci9b12cyc3hlkf85n4"; + sha256 = "1ibw3lsk1060g6b79v78292q45ayqj3izrs3ilvg4gfwmfxmm1a0"; }; }; }.${branch} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 3064579372..8d2632420f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.4", + "version": "1.7.7", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index f1c5ff1bfd..f0175f2feb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -722,11 +722,11 @@ }; } { - name = "bl___bl_4.0.2.tgz"; + name = "bl___bl_4.0.3.tgz"; path = fetchurl { - name = "bl___bl_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz"; - sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"; + name = "bl___bl_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; + sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; }; } { @@ -801,14 +801,6 @@ sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; }; } - { - name = "buffer___buffer_5.4.3.tgz"; - path = fetchurl { - name = "buffer___buffer_5.4.3.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz"; - sha1 = "3fbc9c69eb713d323e3fc1a895eee0710c072115"; - }; - } { name = "buffer___buffer_5.6.0.tgz"; path = fetchurl { @@ -4945,22 +4937,6 @@ sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; }; } - { - name = "readable_stream___readable_stream_2.3.6.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; - sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; - }; - } - { - name = "readable_stream___readable_stream_3.4.0.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz"; - sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc"; - }; - } { name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { @@ -5201,6 +5177,14 @@ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; }; } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } { name = "safer_buffer___safer_buffer_2.1.2.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 09fd89b0da..d44fadea78 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.4"; + version = "1.7.7"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "16ilkf5b8mz74x1r9fym5xjb4plxzhg3g5njj1sl4qvsbrkk6r9a"; + sha256 = "1h3v3d41ykgwn397nhm9zaqgf3n69zh592sjzrprvk1gsn5kj5h2"; }; electron = electron_9; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index 9c818a8e8b..3130c2cac4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.4"; + version = "1.7.7"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0ssyd5b9yrxidivr3rcjsd8ixkmppsmmr7a8k0sv16yk7hjnvz5b"; + sha256 = "1hly102725qh4xjggxv85w1hyq26mhkgj3y6s76yar7i3smj6kpw"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix index 2abd733b27..68e7282870 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -59,6 +59,9 @@ rustPlatform.buildRustPackage rec { gst_all_1.gst-editing-services gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base + (gst_all_1.gst-plugins-good.override { + gtkSupport = true; + }) gst_all_1.gstreamer gst_all_1.gst-validate gtk3 diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix index d1206cdf9b..3f05e3d7a5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -1,4 +1,5 @@ { stdenv +, lib , makeWrapper , wrapGAppsHook , autoPatchelfHook @@ -64,7 +65,7 @@ stdenv.mkDerivation { expat stdenv.cc.cc ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 930d288c36..2ee017dfdb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,12 +2,13 @@ # Native dependencies , python3, gtk3, gobject-introspection, gnome3 +, glib-networking # Test dependencies , xvfb_run, dbus # Optional dependencies -, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly, libnice +, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice , enableE2E ? true , enableSecrets ? true, libsecret , enableRST ? true, docutils @@ -19,32 +20,33 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - majorVersion = "1.1"; - version = "${majorVersion}.3"; + version = "1.2.2"; src = fetchurl { - url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"; + url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; + sha256 = "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"; }; - postPatch = '' - # This test requires network access - echo "" > test/integration/test_resolver.py - ''; - buildInputs = [ - gobject-introspection gtk3 gnome3.adwaita-icon-theme wrapGAppsHook - ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly libnice ] + gobject-introspection gtk3 gnome3.adwaita-icon-theme + glib-networking + ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell ++ lib.optional enableUPnP gupnp-igd; nativeBuildInputs = [ - gettext + gettext wrapGAppsHook ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + propagatedBuildInputs = with python3.pkgs; [ - nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring setuptools + nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 8df4e4b3ea..c98fd9e804 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v" + version; - sha256 = "11bainw4w9fdrhv2jm0j9fw0f7r4cxlblyazbhckgr4j9q900383"; + sha256 = "0sf1nqwimxqql8wm6763jyc5rclhd4zxgg9gfi0qvg5ccm1r1z5q"; }; - vendorSha256 = "11rk7pma6dr6fsyz8hpjyr7nc2c7ichh5m7ds07m89gzk6ar55gb"; + vendorSha256 = "sha256:0n9mwbzjkvlljlns7sby8nb9gm4vj0v4idp1zxv5xssqr5qalihf"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix index f2b026e79d..4c067e384f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -1,30 +1,50 @@ -{ stdenv, fetchFromGitHub, ocamlPackages }: +{ lib, fetchFromGitHub, ocamlPackages }: -assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07"; +with ocamlPackages; -stdenv.mkDerivation { +buildDunePackage rec { pname = "jackline"; - version = "unstable-2020-04-24"; + version = "unstable-2020-09-03"; + + minimumOCamlVersion = "4.08"; + + useDune2 = true; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "885b97b90d565f5f7c2b5f66f5edf14a82251b87"; - sha256 = "1mdn413ya2g0a1mrdbh1b65gnygrxb08k99z5lmidhh34kd1llsj"; + rev = "dd5f19636c9b99b72c348f0f639452d87b7c017c"; + sha256 = "076smdgig4nwvqsqxa6gsl0c3daq5agwgzp4n2y8xxm3qiq91y89"; }; - buildInputs = with ocamlPackages; [ - ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving - erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name - ocaml_lwt otr astring ptime notty sexplib hex uutf - dns-client base64 - ]; + nativeBuildInpts = [ + ppx_sexp_conv + ppx_deriving + ]; - buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; + buildInputs = [ + erm_xmpp + tls + mirage-crypto-pk + x509 + domain-name + ocaml_lwt + otr + astring + ptime + notty + sexplib + hex + uutf + uchar + uuseg + uucp + dns-client + cstruct + base64 + ]; - inherit (ocamlPackages.topkg) installPhase; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hannesm/jackline"; description = "minimalistic secure XMPP client in OCaml"; license = licenses.bsd2; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 66194d9d24..4797bf5ffc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "0gqyqjj69x1gxwj4zhwazddnj5xzy598xqz7vwkpdm1ldzna2iyj"; + sha256 = "0af87lvqw3sagi2cayripm62q17nfd841xz0ghvbixzfnqkvgf7x"; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 63bcc58ac3..938be9a977 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk +{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: , alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg }: +let jdk = jdk8; in stdenv.mkDerivation rec { pname = "jitsi"; version = "2.10.5550"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index d58688565f..a751501376 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.6.5"; + version = "0.7.0"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1pjrq71fkpvsc79nwhxhwjkqvqhj5wsnnwvsgslghaajdaw3n6wd"; + sha256 = "0cx8sqajf5lh8w61yy1l6ry67rv1b45xp264zkw3s7ip80i4ylb2"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 430a7cc4ca..cf7c1008a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, wrapQtAppsHook , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca2-qt5, libsecret, libXScrnSaver, hunspell +, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtx11extras qttools qtwebengine - libidn qca2-qt5 libsecret libXScrnSaver hunspell + libidn qca-qt5 libsecret libXScrnSaver hunspell libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix index 19438c4d03..c1984a218c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, wrapQtAppsHook , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca2-qt5, libXScrnSaver, hunspell +, libidn, qca-qt5, libXScrnSaver, hunspell }: stdenv.mkDerivation rec { pname = "psi"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase qtmultimedia qtx11extras qttools qtwebengine - libidn qca2-qt5 libXScrnSaver hunspell + libidn qca-qt5 libXScrnSaver hunspell ]; enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index 6bf3efa536..a067259d11 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook +{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook , libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook }: let - version = "0.7.5"; + version = "0.7.6"; in stdenv.mkDerivation rec { pname = "rambox"; inherit version; src = { x86_64-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb"; - sha256 = "108yd5djnap37yh0nbjyqkp5ci1zmydfzqcsbapin40a4f36zm31"; + sha256 = "1v9l5nfd25mq448457hg0mj5bzylh0krk411kbr73s7lbaaww1jl"; }; i686-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb"; - sha256 = "1pvh048h6m19rmbscsy69ih0jkyhazmq2pcagmf3kk8gmbi7y6p6"; + sha256 = "0zhn5hnpl6fpgshp1vwghq6f1hz3f7gds7rjnhky1352cb6cr89i"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 90e2b201eb..881d7458c0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -2,7 +2,9 @@ , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib -, cups, expat, systemd, libnotify, libuuid, at-spi2-core, libappindicator-gtk3 +, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3 +# Runtime dependencies: +, systemd, libnotify, libdbusmenu, libpulseaudio # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -23,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.5"; # Please backport all updates to the stable channel. + version = "1.36.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1s8nksrkfivsf9r460ifxsf8l7bnc1zix5yj39kvnx0mbync8lg1"; + sha256 = "0lc56g09g2xfwxwm046bcykvxd0nq63zazamnp268z28lnn937mc"; }; nativeBuildInputs = [ @@ -79,8 +81,9 @@ in stdenv.mkDerivation rec { ]; runtimeDependencies = [ - systemd.lib + (lib.getLib systemd) libnotify + libdbusmenu ]; unpackPhase = "dpkg-deb -x $src ."; @@ -119,6 +122,7 @@ in stdenv.mkDerivation rec { --replace /opt/Signal/signal-desktop $out/bin/signal-desktop autoPatchelf --no-recurse -- $out/lib/Signal/ + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node ''; # Tests if the application launches and waits for "Link your phone to Signal Desktop": diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix deleted file mode 100644 index 33bd4586bf..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/sky/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, file, libX11, libXScrnSaver -, libGL, qt5, SDL, libpulseaudio -, libXrandr, libXext, libXcursor, libXinerama, libXi -, curl, sqlite, openssl -, libuuid, openh264, libv4l, libxkbfile, libXv, zlib, libXmu -, libXtst, libXdamage, pam, libXfixes, libXrender, libjpeg_original -, ffmpeg_3 -}: - let - # Sky is linked to the libjpeg 8 version and checks for the version number in the code. - libjpeg_original_fix = libjpeg_original.overrideAttrs (oldAttrs: { - src = fetchurl{ - url = "https://www.ijg.org/files/jpegsrc.v8d.tar.gz"; - sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; - }; - }); -in -stdenv.mkDerivation rec { - version_major = "2.1.7369"; - version_minor = "1"; - version = version_major + "." + version_minor; - pname = "sky"; - unpackCmd = "ar x $curSrc; tar -xf data.tar.xz"; - src = fetchurl { - url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb"; - sha256 = "0b3j90km3rp5bgaklxw881g0gcy09mqzbhjdfrq4s2np026ql3d9"; - }; - buildInputs = [ - file - qt5.qtbase - SDL - ffmpeg_3 - sqlite - openssl - openh264 - pam - curl - libX11 libXScrnSaver libGL libpulseaudio libXrandr - libXext libXcursor libXinerama libXi libuuid libv4l - libxkbfile libXv zlib libXmu libXtst libXdamage - libXfixes libXrender - libjpeg_original_fix - ]; - dontBuild = true; - - installPhase = '' - ls -al ./ - mkdir -p "$out/bin" "$out/lib" "$out/share" - cp -a lib/sky/* $out/bin/ - cp -aR lib/sky/lib64/* "$out/lib/" - cp -a lib/sky/man.sh "$out/bin" - chmod +x $out/bin/sky - cp -a share/* "$out/share" - '' - ; - - - postFixup = '' - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-client.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-server.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-shadow.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libopenh264.so.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/librdtk.so.1.1.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libSDL-1.3.so.0.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libsipw.so.1.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libwinpr.so.1.1.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libxfreerdp-client.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/sky - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/sky_sender - sed -i "s#/usr/bin/sky#$out/bin/sky#g" $out/share/applications/sky.desktop - sed -i "s#/usr/lib/sky#$out/bin/#g" $out/share/applications/sky.desktop - ''; - - meta = with stdenv.lib; { - description = "Skype for business"; - longDescription = '' - Lync & Skype for business on linux - ''; - homepage = "https://tel.red/"; - license = licenses.unfree; - maintainers = [ maintainers.Scriptkiddi ]; - platforms = platforms.unix; - }; -} - diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 777aabf021..2edccd8c01 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -40,8 +40,8 @@ let pname = "slack"; version = { - x86_64-darwin = "4.8.0"; - x86_64-linux = "4.8.0"; + x86_64-darwin = "4.9.0"; + x86_64-linux = "4.9.1"; }.${system} or throwSystem; src = let @@ -49,11 +49,11 @@ let in { x86_64-darwin = fetchurl { url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = "0k22w3c3brbc7ivmc5npqy8h7zxfgnbs7bqwii03psymm6sw53j2"; + sha256 = "007fflncvvclj4agb6g5hc5k9j5hhz1rpvlcfd8w31rn1vad4abk"; }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0q8qpz5nwhps7y5gq1bl8hjw7vsk789srrv39hzc7jrl8f1bxzk0"; + sha256 = "1n8br5vlcnf13b8m6727hy4bkmd6wayss96ck4ba9zsjiyj7v74i"; }; }.${system} or throwSystem; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index e3b664e5fc..d58e27cc62 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - systemd.lib + (lib.getLib systemd) pulseaudio ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index cfb41fa9fc..190e051589 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg_3, openalSoft +, qtbase, qtimageformats, libdbusmenu, hunspell, xdg_utils, ffmpeg_3, openalSoft , lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , range-v3 }: @@ -21,7 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu + qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libdbusmenu zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 014e22bc51..7e932d74ab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, fetchsvn, stdenv +{ mkDerivation, lib, fetchurl, fetchsvn , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 @@ -63,8 +63,6 @@ mkDerivation rec { "-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default - ] ++ optionals stdenv.isLinux [ # TODO: Remove workaround once #94905 is resolved: - "-DCMAKE_OSX_ARCHITECTURES=" ]; # Note: The following packages could be packaged system-wide, but it's diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index bece4e467a..2910c389da 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, autoPatchelfHook +{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook , xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify , wrapGAppsHook }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ]) ++ [ gtk3 nss alsaLib ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; unpackPhase = '' rpmextract $src diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 1cd2df4c7a..bdc8aabf61 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation { alsaLib gtk3 nss ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (getLib udev) libnotify ]; installPhase = '' mkdir -p $out/bin $out/opt/wavebox diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 532eeb1d03..a07afc1811 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -5,10 +5,12 @@ , makeDesktopItem , makeWrapper , stdenv +, lib , udev , wrapGAppsHook , cpio , xar +, libdbusmenu }: let @@ -107,7 +109,8 @@ let ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) + libdbusmenu ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ytalk/default.nix new file mode 100644 index 0000000000..8cb22aabc6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ytalk/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "ytalk"; + version = "3.3.0"; + + src = fetchurl { + url = "ftp://ftp.ourproject.org/pub/ytalk/${pname}-${version}.tar.gz"; + sha256 = "1d3jhnj8rgzxyxjwfa22vh45qwzjvxw1qh8fz6b7nfkj3zvk9jvf"; + }; + + buildInputs = [ ncurses ]; + + meta = { + homepage = "http://ytalk.ourproject.org"; + description = "A terminal based talk client"; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ taeer ]; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index fde318c99a..d176b66f7e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.1.422789.0705"; + version = "5.3.465578.0920"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1sc454xadxsbxxyb68qi7ac20yq0vymzzw1i07z19c9idfpjy75f"; + sha256 = "0gqpisbzyx2xic0drvyqfbd2x2a5qcizl355qkwwibq3v24mx7kp"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index 6214d4e262..bda9c5ae0a 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -1,17 +1,8 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl pcre common-updater-scripts +#!nix-shell -i bash -p curl pup common-updater-scripts set -eu -o pipefail -oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion zoom-us" | tr -d '"') -version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')" +version="$(curl -Ls https://zoom.us/download\?os\=linux | pup '.linux-ver-text text{}' | cut -d' ' -f2)" -if [ ! "${oldVersion}" = "${version}" ]; then - update-source-version zoom-us "$version" - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix" - git add "${default_nix}" - git commit -m "zoom-us: ${oldVersion} -> ${version}" -else - echo "zoom-us is already up-to-date" -fi +update-source-version zoom-us "$version" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix new file mode 100644 index 0000000000..8f4b2200cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -0,0 +1,46 @@ +{ lib +, python3 +, fetchFromGitHub +, glibcLocales +}: + +python3.pkgs.buildPythonApplication rec { + pname = "zulip-term"; + version = "0.5.2"; + + # no tests on PyPI + src = fetchFromGitHub { + owner = "zulip"; + repo = "zulip-terminal"; + rev = version; + sha256 = "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf"; + }; + + patches = [ + ./pytest-executable-name.patch + ]; + + propagatedBuildInputs = with python3.pkgs; [ + urwid + zulip + urwid-readline + beautifulsoup4 + lxml + mypy-extensions + ]; + + checkInputs = [ + glibcLocales + ] ++ (with python3.pkgs; [ + pytestCheckHook + pytestcov + pytest-mock + ]); + + meta = with lib; { + description = "Zulip's official terminal client"; + homepage = "https://github.com/zulip/zulip-terminal"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch new file mode 100644 index 0000000000..4602a254ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch @@ -0,0 +1,13 @@ +diff --git a/tests/cli/test_run.py b/tests/cli/test_run.py +index 459aa82..c6e434e 100644 +--- a/tests/cli/test_run.py ++++ b/tests/cli/test_run.py +@@ -180,7 +180,7 @@ def test_main_multiple_autohide_options(capsys, options): + assert str(e.value) == "2" + captured = capsys.readouterr() + lines = captured.err.strip('\n') +- lines = lines.split("pytest: ", 1)[1] ++ lines = lines.split("__main__.py: ", 1)[1] + expected = ("error: argument {}: not allowed " + "with argument {}".format(options[1], options[0])) + assert lines == expected diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix index 8928cafa74..01e808a9e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix @@ -2,19 +2,20 @@ buildGoModule rec { pname = "ipfs"; - version = "0.6.0"; + version = "0.7.0"; rev = "v${version}"; # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "14bgq2j2bjjy0pspy2lsj5dm3w9rmfha0l8kyq5ig86yhc4nzn80"; + sha256 = "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3"; }; # tarball contains multiple files/directories postUnpack = '' mkdir ipfs-src - mv * ipfs-src || true + shopt -s extglob + mv !(ipfs-src) ipfs-src || true cd ipfs-src ''; @@ -26,12 +27,10 @@ buildGoModule rec { vendorSha256 = null; - doCheck = false; - postInstall = '' - install -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service - install -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket - install -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket + install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service + install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket + install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket substituteInPlace $out/etc/systemd/system/ipfs.service \ --replace /usr/bin/ipfs $out/bin/ipfs ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix index 6adcaa7b3d..7a30737c04 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "4.29"; + version = "4.33"; src = fetchFromGitHub { owner = "Nordaaker"; repo = pname; rev = version; - sha256 = "07m9lhwgqq77hi4n2zrya7n8apkjv8xi166bxa0n7pnlknlp74ar"; + sha256 = "0mxq4jpjk4vvhi5lqslj614dvk84iq12rsdyykxr8h9cnjjs57im"; }; nativeBuildInputs = [ makeWrapper ] @@ -33,6 +33,10 @@ perlPackages.buildPerlPackage rec { ''; preCheck = '' + # Remove online test + # + rm t/web-pwa.t + # A test fails since gethostbyaddr(127.0.0.1) fails to resolve to localhost in # the sandbox, we replace the this out from a substitution expression # diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 69c9aeaf89..ea00669006 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -44,7 +44,7 @@ let "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 "-DENABLE_PHP=OFF" ] - ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"] + ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix index 0880a32af9..6d22868860 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -7,6 +7,8 @@ weechat-matrix = python3Packages.callPackage ./weechat-matrix { }; + weechat-notify-send = python3Packages.callPackage ./weechat-notify-send { }; + wee-slack = callPackage ./wee-slack { }; weechat-autosort = callPackage ./weechat-autosort { }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix new file mode 100644 index 0000000000..d219aa481c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, libnotify }: + +stdenv.mkDerivation rec { + pname = "weechat-notify-send"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "s3rvac"; + repo = pname; + rev = "v${version}"; + sha256 = "1693b7axm9ls5p7hm6kq6avddsisi491khr5irvswr5lpizvys6a"; + }; + + passthru.scripts = [ "notify_send.py" ]; + + dontBuild = true; + doCheck = false; + + installPhase = '' + install -D notify_send.py $out/share/notify_send.py + substituteInPlace $out/share/notify_send.py \ + --replace "'notify-send'" "'${libnotify}/bin/notify-send'" + ''; + + meta = with stdenv.lib; { + description = "A WeeChat script that sends highlight and message notifications through notify-send"; + homepage = "https://github.com/s3rvac/weechat-notify-srnd"; + license = licenses.mit; + maintainers = with maintainers; [ tobim ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix index ea6303a3c3..d6a7705b19 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.1.0"; + version = "1.2.0"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "0clzzwwbrynfbvawhaaa4mp2qi8smng31mmz0is166z6g67bwdl6"; + sha256 = "sha256-bEVxtp2MqEsjQvcVXmrWcwys3AMg+lPcdYn4IlYhyqw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index a000cad470..08acda3adb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,4 +1,4 @@ -{ config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook +{ config, fetchurl, fetchpatch, stdenv, wrapGAppsHook, autoreconfHook , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap, perl, pkgconfig, poppler, python, shared-mime-info @@ -39,7 +39,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - patches = [ ./mime.patch ]; + patches = [ + ./mime.patch + + # Backports a mitigation to the "mailto vulnerability". This patch is + # included in the next release and must therefore be removed. + (fetchpatch { + name = "fix-4373-4374.patch"; + url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=4c9d15b4b37cdc57edfa16df550a0a881a156153"; + sha256 = "0sp0vxr6pk2fv5ydpcakb50rmn2w2nma98apgfsgcgan82qmwk7n"; + }) + ]; preConfigure = '' # autotools check tries to dlopen libpython as a requirement for the python plugin diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix index 3bb68d7805..6c6bf6f93d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , autoPatchelfHook , alsaLib @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ coreutils openssl - udev.lib + (lib.getLib udev) ]; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index ec4778cd4a..0b18a579e3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.6"; + version = "1.14.7"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7"; + sha256 = "0r58xnjgkw0kmnnzhb32mk5gkkani5kbi5krybpbag156fqhgxg4"; }; patches = optional smimeSupport (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index f15e4b5fbb..84c81ecff6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200814"; + version = "20200821"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "00i2xbadw7rq2b30yjla54m0df4jbh22g6phby41albw2wc2hn72"; + sha256 = "0l66xf6qp2fdhm5h2v58bbc73pwj72c80mriqac9pfyjh5padir5"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 0b2a76cc00..214f4311e6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "notmuch-bower"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "0vhac8yjnhb1gz60jfzg27spyn96c1rr849gc6vjym5xamw7zp0v"; + sha256 = "0hvvlbvad6h73iiyn9xshlj073p2ddchgh0pyizh9gi8niir4fn5"; }; nativeBuildInputs = [ gawk mercury pandoc ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix index e0f75692d2..c48a6d1c60 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix @@ -1,615 +1,615 @@ { - version = "68.11.0"; + version = "68.12.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ar/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ar/thunderbird-68.12.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "878336931005573f76fb15c25fcf2593bfabde16356ec6b1f9b8913663b5fcaa"; + sha256 = "70cfb9e6a7a1f285f37a8f13c9a010237e6aabf815b77a12f54ee0deedd36400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ast/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ast/thunderbird-68.12.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5e3f29fb47ccb059d983946d6efec14b8ab00695fdd84a5cc7baa0cc40657cc5"; + sha256 = "5645657f20d37ffdb11f383f164f03c66ed2024244849b09bfa60075d5d07490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/be/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/be/thunderbird-68.12.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5cd4c3a3d6ac865b727b58cbb51def60779c0d731a9f6b8f01d4b8cdc90d42b5"; + sha256 = "d38cdcc2ba4534c23a1bb42b93f271623c497f48e1d255a23bf12a368ff339bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/bg/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/bg/thunderbird-68.12.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f359cf1bd12f14bd6636fdb0bd885ed829235559c20c86bd361668f057039f34"; + sha256 = "c8883242683dec57f9db502d96d2036ec46753f474a33c0f1ae31f97f2c3113c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/br/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/br/thunderbird-68.12.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6cfc9608b392b1e604eaefda5a5dcdc346bd88a1bc411532e8864a04631cf6f8"; + sha256 = "cfb669e2378f97689a14f23e2c55ef4987e2508695eb195be3af75ed1d648345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ca/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ca/thunderbird-68.12.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "9068b49e2d8a6f5e82b70ddda1b0a048d094328c96cf21848eefa431d358e6ca"; + sha256 = "9ae4b43e0d5d9edd83291f0be7d53d07e5c84f1d0ad4348654136543b7b53a54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cak/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cak/thunderbird-68.12.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b3aef7c88302e2b9d0fcff8daa0d8ad4e2893d41e54ec29b746e79d5b03128b2"; + sha256 = "d6d635a15b913679ed943c3501dd03140d099ff36b48c8731a47eacda1b5232b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cs/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cs/thunderbird-68.12.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a2338c8ac38a4cef41d8fab1e7857c290afa30af0b131a31e675368944d69ba9"; + sha256 = "616fbf24e36d63ce3cbc957d69b8972d517524c613a22bedcf5b57534f9a9a41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cy/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cy/thunderbird-68.12.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b02118f945ee76653df0364da6b2b8c597fff2bf52f4e20b64f2b8ac69aaf60a"; + sha256 = "548c51228d2f3003bb94e1bee91cea0d2edb95bd0f86ee4259c8daef90a2dca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/da/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/da/thunderbird-68.12.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a565beeaf67c01edf83a2478732fa9e245645d6e6b4fb566affe552762b8bc86"; + sha256 = "ad0e4b7a693d881b8875a5b8cc3e607a3883df759278129f0933522b9a6acd24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/de/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/de/thunderbird-68.12.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "00a8f51254b2152ba37d964bfaca77cc06b9d778ef750eb6500e01510e298fb4"; + sha256 = "bf9b70b345ffe5df03365d819c5abc3339ed3af4d8a716cdfe7099134864a9b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/dsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/dsb/thunderbird-68.12.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7cfcafbf7f46a4be23003a59390b0404d04ee344c883c29a18f42accb5fddc4c"; + sha256 = "a2cd7ffb0e8b4c3d1715c18e636d0dcd5efa245200d6d0f14048fc4b399b8121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/el/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/el/thunderbird-68.12.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b0d0865f8b64de26af8eeff6eb84f159f585e3f9f7590dab413e04167215dcf3"; + sha256 = "07836ce122936848e26cd5a1522967760bee67654582076c53e4ec183cc4c40e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-GB/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-GB/thunderbird-68.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "eb6731a9baaa1cd99584aec7c6dcce8f819d41106ac6ed4f42f02f747cb2afe4"; + sha256 = "c89fa35af79eca3cc26b492c602a3f8af0dbaf6ce4ee3af93d93f10daf4e9d6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-US/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-US/thunderbird-68.12.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6ddd72732957282280a7209f2d5137229ca8af4ad7f02e112187fe333cc79a7f"; + sha256 = "6eeea0de838909f91da7270e42ae1513d2b801f412fc758f2f8c682d260a7c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-AR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-AR/thunderbird-68.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0d620d929ed41ffd16cfd8297ec70e8cb9105e726af99d2cd207de50920a1f93"; + sha256 = "e9d84032a91f7feb2db3d22a500c564f273c2b637f97aaab2edf3209b93dda1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-ES/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-ES/thunderbird-68.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "28bac94492c7444caab029f3cc3995275000496aab854f20368f941514cd7b11"; + sha256 = "a986e8a48b59354421193f2dd01e3c291fb6c98031af43531e723dc217a43d4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/et/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/et/thunderbird-68.12.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "49fe0adb4fc5c5135083ba53369030faa95d3a530e8eb49180f81e359229bf81"; + sha256 = "2f7508e83aba4fd64a817c7eb4b44d4ea9371956339a009ba541bf3a349693cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/eu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/eu/thunderbird-68.12.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a422935f96d5a3033c6c2a7bd39f19e3f84211d99b57d3996b31e404414703e4"; + sha256 = "edbc5ff4ba45106233cdbf5255405c4ee52ba7e6811736958323a616881b943f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fi/thunderbird-68.12.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "649c3908ecccc8466e555aa76aac47bf7153da8b6f45ddf83f36f6ac676cb4c3"; + sha256 = "f4ad740a724efdbfec54445304ca75e9a16e0881bc18789b8ea35632d8857d4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fr/thunderbird-68.12.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8270cf0e0acfb7280b8616462cd87a1d8d929c7c5fd4839f9607cb588a97c025"; + sha256 = "ebf60a227c9fe5237eff22fb81f3c8bc02a593de823d6f0ad9b67f07af129dea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fy-NL/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fy-NL/thunderbird-68.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "177a9f337719b2902ae964525803cd437b2cbcc8c7b85c7881e14f7e0d207875"; + sha256 = "b12983077a62c5bf7353f50dd951348a457ce07f5beb2a579f199c4d77ed0906"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ga-IE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ga-IE/thunderbird-68.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "80d3625a04d027382ec3fdfdabd45d501fa4b451c82ec5cfdf5c3352a395a6ba"; + sha256 = "aa7c3a4b54fd6fef0f120a6748c45a3f379268f31e087cb3df07d270bf060bad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gd/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gd/thunderbird-68.12.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0b2fc2582ef518529f204b5096601047b5b3406201b1fc9f7ea88736d1ce1e0a"; + sha256 = "39fadb2bd4c01da0eb188cb9f52ccd726ec9f7eb5ced44e2a30ee0cfac2527bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gl/thunderbird-68.12.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d1cfc4e646fa6ce03765a56ea4cc2ad3936ec8224f1a7f5e74a34c189be11721"; + sha256 = "b4ee1f89b0326b22fc7a5b980b857c2652d6881d096060a8bc083015b47762d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/he/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/he/thunderbird-68.12.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "588f22ff9dd4dea7c808c4786f2c897842dedbf2a04c0b4d28b3aa162f88773c"; + sha256 = "cefbc742672942e310dc9f4dbcefc8b66cf01d58ac64448ac8c0dc33fdace5ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hr/thunderbird-68.12.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "126ae387a1c97d253c4ca60441a192d6a00f63f0483b2888371624337e4fd2a9"; + sha256 = "9e132811cb6bd98faee86e298b78e845727bfded84c0cdab41608ed1565f1aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hsb/thunderbird-68.12.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "456c323f61f77c07ae73a260a3ad2641190f165d14c75da1dba33ed1f8d2a3d5"; + sha256 = "2a41d1e188fd5fed93a37a1bedc67cb745367447504a76836f79928194730d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hu/thunderbird-68.12.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4790f014d95fe3ae00433e27fa291f7e4657b8062538ca52c46dd46ea41a05cb"; + sha256 = "9196df7850b9cff69f52b5db69ec3b64cfa312bba5669380c137b95a8140cf39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hy-AM/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hy-AM/thunderbird-68.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "7d81493a67e27eb485c1cb702cb8305788733e133bcb22659026737cc2afe1e9"; + sha256 = "4a08137a9a714677ecf86a24f165047b809e22eff50d196b92c153e59f943c30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/id/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/id/thunderbird-68.12.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9f558c85ba88c6350da0445ca2d2b63205c8c1e6700388e1d4f7de0978321667"; + sha256 = "39784aab0bc3253af47cdcd95824eccdecae4dac819bacf6a04daa7b5c86d6e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/is/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/is/thunderbird-68.12.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1f1f65bb573fb4fb563e890c043ff8c3283687575892853dd3e076473072b63f"; + sha256 = "a041d1af23e9c64967e4d014b6a84ddc80ad24e852146e448f6b380cdd672e67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/it/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/it/thunderbird-68.12.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "de6c3adf83745370241c8935edccc412a60642ec758bd891d03c098b40b8792f"; + sha256 = "b0e3161c801fbaee2f589b1bc61a4fba9968f5f363a62cf0f8af855d23e4782c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ja/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ja/thunderbird-68.12.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "8b2ce4598af7323f59a31269c24bd05e369d9898266dc6e8cfa360dae7609273"; + sha256 = "ad416d47930d81be9ac2f20b3699f4c74471c36e08b14f9d5c6ee1af97c7c9d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ka/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ka/thunderbird-68.12.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "be74a3edf9a1d931124c4351b51147be2e7a74f453d07482bce4f7721de701ce"; + sha256 = "3b30bc5f0971310d71e1909b4ed891481457ac8baf11c1e505c3400b2a7cfb63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kab/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kab/thunderbird-68.12.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1be81ab7bb429b44e0c63c81ebf249b66a79d43a3dba39ba0af6242db165d6d3"; + sha256 = "abdc58d5d5ef251e63c0c40a48460f90e299a4420cbe4e290d519fbed4c335b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kk/thunderbird-68.12.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ee308381b1e0643b7e0683c365c763beb4afcaf21c9b0a1e8c8c2ec3c218c965"; + sha256 = "08018b951de59b1a92717fc82bd98a0c324a019ee0ae14888f09c5351a586284"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ko/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ko/thunderbird-68.12.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "af2d7ee49a6295e41dbfcc7b8e19b8f146890f12baa36ffddbc7dfbfa39a8eb3"; + sha256 = "1178adc42b3a2ddac46dd50ad8436d1be50db409963e8fac3beb22a431f885fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/lt/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/lt/thunderbird-68.12.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8d384844274d048772fbc35da75f91ab6398ca64e26f089c4da116065584acf1"; + sha256 = "18d88a8cbb24d2a78af0de282187a743e707136fdb61912e5f64bf75730e3a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ms/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ms/thunderbird-68.12.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6e447b3ed1903a20001963021598d957270c88980ff04d3da6c819ab106a2210"; + sha256 = "e1754cfbf20e286fd6304b8d75337e3794893c5ebd9b242cf624090e6fc6e9ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nb-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nb-NO/thunderbird-68.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "710a982216120cbec822d7a9f74d8ae789b4a234fb3a192797604c9a47a23a62"; + sha256 = "6379f6dca3d8bacb466044f0a7d11b32eb61166d3f14c37431f77843eb884c90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nl/thunderbird-68.12.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2b02b7e3b5e310e5b7935cb72e59d6a385567100d22e87d196c4b4700851d439"; + sha256 = "66a56e218365bb260980848427609d390674e2ba3c70b9adc4121f73c861d9b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nn-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nn-NO/thunderbird-68.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "128807f651cc0b09618bad42703970c391c17f5ff883c3ab11d115d0878fe1aa"; + sha256 = "ccdb135d43f5542151fe2c99a8e13cebfbc032367abb0308213433b753dc8125"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pl/thunderbird-68.12.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "181721ac04e9911f57ec7b4f36a5db82e261da71a310dc502efab75a101bec03"; + sha256 = "5dc2151d1bb956c4b6fbd1b6185d9328f7091e60fdcd51bad5a9ebaa8fcbb7d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-BR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-BR/thunderbird-68.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e82f40343e28ecd0abafb71f421c6d7df40b7cfca4898503b32fb0500686d7c4"; + sha256 = "5ebf77d47bf45b058aaeca857060c908dbf7036bae2c2c5812ff145aed840203"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-PT/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-PT/thunderbird-68.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "96bea893919ff89441dd47e027a7d83aa691cc99abf4eaa342c941777ecf319a"; + sha256 = "73baa68f79b4a15795fc426dfc9a8d573a05e4ab8a663d122cfd802f93941825"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/rm/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/rm/thunderbird-68.12.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "544f666af94043737503a30551ad5832f22ae529bc32495bef9d7443c8869072"; + sha256 = "29f8ba57d9000803bae795c2ff977347af9a1f0df123337eaab3bdcc20786734"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ro/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ro/thunderbird-68.12.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4c6e7793c206999e0a9510b390e4b47d82e19dc2da1cae8b4341b8afee440191"; + sha256 = "b8233ad81c6620c26a02457b9235ce0be0c5d93b81f88d9ddc84bc12f869dbad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ru/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ru/thunderbird-68.12.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "66e951339323a3a44326cada8c572d7040d33057a3a487d8078eb27efa791eb8"; + sha256 = "f959f786dbbb7d06cb33eca24efd9e2763c5ca73fc4ba47e9b933b6298d7f026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/si/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/si/thunderbird-68.12.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3ef89e462359d09d95216a132c462f0529948073a4f0aef6358362d0457e747e"; + sha256 = "dcf59c0c1ea0acdcc894463b04c54339a72dcceb25fe5478608265eb3ead226a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sk/thunderbird-68.12.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "476641e4d45cd114dca94f59ddee15fda5fbd432c50e4f29af09eb3298782854"; + sha256 = "2a06329fd4a9dd6333e2d73a44fca7eaf593032e8ace33736a03dbfffb2920a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sl/thunderbird-68.12.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5e85ff37554f47f585a155db65ae9e782c8604fa44db8d0dc9c3e2741704909d"; + sha256 = "f7bd3e3a407dbab07836342ff29fc143fe3904e7f878ea719522ade3fc4f6b84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sq/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sq/thunderbird-68.12.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fc4f839973d6986979089c1dcc1e9b219007c34ecd2d587538db706e4b01eccd"; + sha256 = "0edc58751a6794494efab8b0a2ce852374a747ccb73b38455475f0099ea0f238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sr/thunderbird-68.12.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "85a32f352d2b535366dd10a49116e65de4c8ec87886b37e34ac55082c4c310fd"; + sha256 = "91ac5cc0646c062b00b3b064af53ba03c7e034b75afa13dca7586eb80578d377"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sv-SE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sv-SE/thunderbird-68.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "19af3a847c9e28baed2db8f6b025dcfb0e688932b0483bae461c86861bfa67ea"; + sha256 = "5aa21e4b78f4294835197f784a651f17453d83fce98e7140e49c6da117464fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/tr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/tr/thunderbird-68.12.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "deea2513814df3e7a9004316dc50f6fa2bac46e0d9456cf124e33e6e03a9b4c8"; + sha256 = "3ab2639dd126e3ed9b031fc10f4396c7d98ffa7b7ffca6a9b3f2f47590e3b83c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uk/thunderbird-68.12.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "22b34b43ccc74eb2dc565a0c63bde89ff0d22f710bd26868341be91f51489f94"; + sha256 = "59be2ddc7c65405e0b3854c2a551dab73df9736842ee362b2a20dc9088242a96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uz/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uz/thunderbird-68.12.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "26bb8336c617dc6fe485339b3c8da814f7aa0b46eb0a821db36309305ea87e58"; + sha256 = "ae196683b283525511fbd2e3ad428339672f2f1339566a323e01f6f649d333c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/vi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/vi/thunderbird-68.12.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "88705691ae084991c198865f1e93d1ed127496245313cb8f28dafac0a64793a5"; + sha256 = "9d66b8e4eefbb6b8c0d9893b056fc684310ae583921d626cb676cd8a7b4b39de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-CN/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-CN/thunderbird-68.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5ebf1ad54acb6d6d17985d80bff9a0b39726d1f62eea30ad9ca0f04577f640a1"; + sha256 = "2839f2f076a8a6e283a3ffdd6100986a11d19b9108fce074f8e7f127cb0f375e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-TW/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-TW/thunderbird-68.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b795b0127cf922f65a2ad2d8f17ebe64089c6d06fe7a701c289b7af5afe7c371"; + sha256 = "02ef645a7de8abc1c5dd92eb685d64570cf1db971cfe7e248111d6a17b3ddcd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ar/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ar/thunderbird-68.12.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d19d082b55d76862977b9357e9cf245697c24d207a6d6b3aacd81abf1443747b"; + sha256 = "5c4d899245a38626fa18d849bcf01d50125dee60d715d76224ca0bb4623f73be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ast/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ast/thunderbird-68.12.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6cd6c484888fe96fb08eab2b6b2a4dc8495823efee6a373536c26e9679fc664e"; + sha256 = "f657bdc5b43b75e43578251abccf5c7b9e6d0848fd55c6105060daba33c36721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/be/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/be/thunderbird-68.12.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bdd2ac4571d6444ff9a3ffd72c1b55cf5f564c740b5ceafce7a2e2268f482dda"; + sha256 = "669a2cbfe600727b9d9a8ed5046272a1f19b80b6af9a6a6977ce1b89f60fa36e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/bg/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/bg/thunderbird-68.12.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3354c7e4b505e99a53a10cdbeac5b6425b13182def27a82c839eaee6ba6e2f86"; + sha256 = "e1b33857544c10c0191316f6e3d16b34957196b35a922c884315714fe851389b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/br/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/br/thunderbird-68.12.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "27339c12c5cdabea7a9a057cad70fa02cf4f69860e71b604f81a60f891345268"; + sha256 = "b9e4a530529449446fe5a302277878c4d2192ef7bb48206f8528024087f520ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ca/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ca/thunderbird-68.12.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b65b6d20d7251795e0a9f0ce88f8133d7742c6361375e4897a0bb2e043dd8c97"; + sha256 = "aa5e4ae20fa9e5dbb8c0ba275ba18d1ba94900094ba3186aac40ffb27396a96f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cak/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cak/thunderbird-68.12.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "173a85565dfb7b9d44b5757245f8b5f8a62fd15a8a15bfee0680a96ef8f84625"; + sha256 = "a812c9150feec48e2ebfb1786f5e30ade33203160fa4102382435641caeaf3b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cs/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cs/thunderbird-68.12.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9cb5def4eca0bb103516a66f90baf91f7b4e962d5ed59b4f09ae9f19e7f95b47"; + sha256 = "75813ad7dd0ae5c073964296dd687e5c1289178491adc98d40e853ed812bdca9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cy/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cy/thunderbird-68.12.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8b51e01daf38091d3b1b32a249f3c6fb220ad8075bbfd16914cb72b24435d8bb"; + sha256 = "b3894f05cf905aa96612860dcef0bdb4bb9564901ef84172e11856a9fa9e0ca4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/da/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/da/thunderbird-68.12.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1269600ab71c691563482c6d5787a7670fdceeda3a07c61d7cf2477aa16fe075"; + sha256 = "a4f21bd2017043872a962167f98db358b824ae1821fcf03e2df1bef7783e07c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/de/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/de/thunderbird-68.12.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "46c5fcae1b11b7e31fff2e70397a560c502bb3360ed646dd09945fcee81efad7"; + sha256 = "3a079685f75d2ec0320ec9e366b4e037954d67fa3f9e3bda055b8cd7de8fbdd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/dsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/dsb/thunderbird-68.12.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4dc661243d99edb84d0bafd45300bf18d86d5289ede3db066ff89cc4094afed1"; + sha256 = "295a0f56429b3638dd0dcbf8d97a6376636b67e22d493ce8dfaceeb579466d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/el/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/el/thunderbird-68.12.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "efd5f7f46d53bf34146a6f39149abb2aed9c47b735339cf767e32e6387ba50bb"; + sha256 = "86e4b98ede80cc07cc1aec043af82068a73b7c76820f70df8314e3b91c108d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-GB/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-GB/thunderbird-68.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ce97a84ba103a7e5bedba43ee47a5c603c1b5d9bf3bc1a8cab4c26ec9ace21c7"; + sha256 = "2cb03a17f88e3826181911ec6a7455528d1e4c051b065252c964c6c0794175e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-US/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-US/thunderbird-68.12.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "632f078407322995eef93db134f1da753a1b35696a668a5b8be29f908a34c223"; + sha256 = "11fe953ede0d99656534ac676f118e939024744c5301d378acbeac6792e668e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-AR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-AR/thunderbird-68.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "88b67f07b6069adcb82c04f818493e25bd145b5d874a7503453e88ea14200499"; + sha256 = "596264396a25adb873320222697e7f1a58aaab484de9c0d2e85f99962b6d893d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-ES/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-ES/thunderbird-68.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a52a6917d77364e5f7ed06f4484abf7e607c53445ff338e65af6b9bad4626e0d"; + sha256 = "a9512af30e2b1613a6bd1ae6f4ce785f676b2cf70b80a37d85a5e1566bb2b35f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/et/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/et/thunderbird-68.12.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a0c15f0000a00984760419e6f737840b4637bf5aa014ee88093aa2a7a3258807"; + sha256 = "b7dcb196881a23e979edb5ae247a7c07b1cf1250cb4c159ce523d1a26be188c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/eu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/eu/thunderbird-68.12.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d69e9af1a381743acc9ee1f800999b015129cba4fc112f312a04884c121535b0"; + sha256 = "4066164b4c9242a9885bc2de802c4f5b6b594c928db36ac72c94faabaad86679"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fi/thunderbird-68.12.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "876673de48a047d75e0ac766dca338629069af1872308a7bc6a7e068da026d3a"; + sha256 = "a7c635cbbbc10725b28052ccc61603fb60b91e06bbf1f240561bdb8f941af55a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fr/thunderbird-68.12.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d83d87dca716d4cd3850df1c5923e88f15e35354abc874202c8c12bf8d1a006f"; + sha256 = "7dba28adb1287e1aa9ae85840fc3aca42aaedd4b2c2aa6cc68d5f793549d19b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fy-NL/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fy-NL/thunderbird-68.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0cce3392aaace190f9ea0247d89699f73d534762278f4776146a1f75bbc09996"; + sha256 = "bd763e264eb684ec3b0b1f2c68ce295d1df86994d15f5c66c487e4742bfef86e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ga-IE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ga-IE/thunderbird-68.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "83b7e660e8098718bd4b205ad2de53522bd94e7a602afb960b6381fe4c11a395"; + sha256 = "52f9b5694efbdd8ecc76aef58695423c6a4b547b5b0cfedca313386b7500685e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gd/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gd/thunderbird-68.12.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "447a887ef76e57b9c12a0991d7eaf903ce29d7621d4f9143edd18b56bdab81d3"; + sha256 = "6c9c1b0f11ad13e0780371d54fedb52d2463713db3bc52adb72c8ea9ff80eb8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gl/thunderbird-68.12.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "288b865596e2b8b1087cbca98bd9c55f9aff1f1cb8d432953d20854b0b1e9ab8"; + sha256 = "608bf5c0d6148cc3014758829ba06135222b462242456ca0984e7dc12654c2cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/he/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/he/thunderbird-68.12.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9d801a18324849e4a6faf3266c09eb5898c8122e89b020e35ea25a6b3899a4d2"; + sha256 = "f92d569a53f34bfdda4dac185834e5692526f13f20853d1943f165af33b54a37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hr/thunderbird-68.12.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f20210372b36b43cdae8f7f1294927dfb364d1ca4db21ee8af1c059a06f3e45e"; + sha256 = "60d2f184219f8d17c2739ee3cc8463bed474142bd2caad74157b97db2306b27f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hsb/thunderbird-68.12.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "54daf67c97f2e7496fabe6bef2d1d9a60baccfee35d7331444d48fc6fe675c26"; + sha256 = "40ffece26101b2f6a7789511b026d99234bd34ec78e566e7e25065ae3201d693"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hu/thunderbird-68.12.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "0791aa7bec49ff1bfe862f9114ed4b0013361f2f1fa0e4745ad49c8c0e0a9f84"; + sha256 = "e74da0bdb27fe3375dfbd1ab042892de3ded84f33a6f6d46e209fdcaa28183d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hy-AM/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hy-AM/thunderbird-68.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e64bacff30d0b2b2a5038aa11d719c9ef3124d64b9923d52a9c5856f6584f9c2"; + sha256 = "fd93972c11842b56453449e72617deb3177d020c8f25cf4d5fb687f4a3ddb5c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/id/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/id/thunderbird-68.12.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ba6108ba9b4f31f49e7c925a6051738276c67545f7f8d2b3cb378e8834dbd0ce"; + sha256 = "546825968ad86e4c5c6effefd0f924cc1d10489fff7968f17401e3f84c4d1ab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/is/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/is/thunderbird-68.12.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a3eac36b640a61f2fc6bd62350bd8aaf020636035547c2b9d687df2bd2d7174b"; + sha256 = "1f2e2228c685be2d65d6e0b92eef8ff3e58d7b772f846d0707a9b02e6d0ad306"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/it/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/it/thunderbird-68.12.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bf3cc19a7d1c1415cad867b72c5765dfced27511616a8cbd230516adf8d3f20a"; + sha256 = "41b27c8195432e1412e3c4645b823b8dd1f673eabf07ddc72f3d792d3f7488da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ja/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ja/thunderbird-68.12.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d4788294f5e91c033c3c3251cfb614e50843631252a2b1fcc6389d099b1fee1e"; + sha256 = "68940d44d933bb7228d6f9a03406ca01903c54fdf57eb5a1e1033b12ef507df6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ka/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ka/thunderbird-68.12.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8735be035cf0ab5d4b2102aab8b207c1cc686da8843b45f15c1be91931850968"; + sha256 = "ce0aff0fd47b00803ea66278b3514dcf65ecb5547878f8081f7ec6c1f411ce10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kab/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kab/thunderbird-68.12.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a570fd29e5eacdc08ed484bce7336f90ae74744e80d8f2ac0f05395cb3363e51"; + sha256 = "3936b56eaa1e05a96626f7d10c8fcc3ba9014b1385b21243c049b133b923ddef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kk/thunderbird-68.12.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "186b7457a96a64da0564c1b411bb04598de1067362a6238f7327abe780cc6aa3"; + sha256 = "7fa0aa64d0f0dcc6f71d6a21647cc4fccef935b783deb5d19b88f5b96b4b4ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ko/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ko/thunderbird-68.12.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3c9513362c6b7a64bf6e74bbfad6ef586b0085baeb9a8ad8eb2fbc73461e9f67"; + sha256 = "4bddd0ccb747bb12cdc6d88c2c9544354293000c586454bb5932f4d81afbf400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/lt/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/lt/thunderbird-68.12.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e90df1606ec0e875fa02f7bf5a52b14d84f758bdc18ab0f395703c0129a18e57"; + sha256 = "f1a3514188c1b887afd2c662a1b6abf6fe37b558864be0cc79e87ed147188461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ms/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ms/thunderbird-68.12.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ea686adcfb5cf4b1642e7dcb21053090ffb57d344b27269d807cebcf8469934c"; + sha256 = "7ea045d6db78ec7d6ebf164c8e3d28c2540a573238de518e934646573aec71dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nb-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nb-NO/thunderbird-68.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6f827fee307917b590b99b5c85b16337865f027059f52bc9ab12da33f80448b9"; + sha256 = "d2c0e2099ea60b9da95ebd9bd79a5d0a6a1ebc84b8b490511a68c81355f97761"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nl/thunderbird-68.12.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b88843831b982d1317e8bf64df99a8c7a1fa9f67461aa966b2737f12715c9cf3"; + sha256 = "48741be79422d80140ec862d004fa75a407f67490f67a3e440c01e0defe1f85f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nn-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nn-NO/thunderbird-68.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ab8383a432f55944d417108b59d891953f2d322ec81d09e971ec63d1883d4b46"; + sha256 = "b40f0d7112cadab322c8b71cacce5d6df87fb80f40cc55ca22c279016c3ea805"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pl/thunderbird-68.12.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0f8c0feb68b090598a3db9295d4b4e09d9ffdedb69a73914228d7ef76b768414"; + sha256 = "e64b10526cb460f437427cc4a7ea90959cc693a75fd6a61b43e9d3fd76ded618"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-BR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-BR/thunderbird-68.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ca78fad9dce15534754571b14d82ede798b123210599ade352016420faf0db5a"; + sha256 = "bdb558f9430c06871954ec6c7d54267625184a0cba914a87ad199e8f32b03de2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-PT/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-PT/thunderbird-68.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "cf79430e02259d9117feeaebb5fe02139c3e3d95013e48fe290550814200cf6e"; + sha256 = "4631e8247446653e91f239fdb5ad3c8531f3d007dbdc83818178a4cdc525edf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/rm/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/rm/thunderbird-68.12.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cc7d9614130f24969356b3496f4d322a9f73cafa5c7b60302ca8f2e2efe1f6ec"; + sha256 = "13e6aca7139fd89e83e7ae9b71253731f0954b0a83cc3560ecc00500b9bc1df7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ro/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ro/thunderbird-68.12.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a8fcc2c6e0755fe701a56c2fa3bbf2d288d6351179ee74b8aa3da3180f14cdd1"; + sha256 = "023a567c42dad9bdbd465c8b99f12cf5f667ef4691e16971e09496c4a7db0f12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ru/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ru/thunderbird-68.12.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b9f68985e70f8aa47c36cd4a4fc0fb41918d43f089cc760ace8ec879e2561770"; + sha256 = "9ec35bbce5f026a4262a5d708b53a767f47ac8e90314513d36a587d1a49dbb6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/si/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/si/thunderbird-68.12.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a2563b3c9d0ecb567c366aa41cb6a10bde8d09b8c1065cd3934c8c221afee056"; + sha256 = "c540b94a45deeddf1f7f5a8cca8de7e944ee8ad9f8595a308836c159901ec0b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sk/thunderbird-68.12.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "566906f011283fd27abf55e1e9a1bf7504e4028f7c4a631716ba590c07fe9d91"; + sha256 = "5296241664023773d2c0c4fa55e74eb6470482389c834d1934c252f79e79ebff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sl/thunderbird-68.12.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8b74b751b3ee706be9aeb06726ffd3a989a57a1dc9794112262fa2aac45498ad"; + sha256 = "cd0376137d8018875873332fdfae3bc3c0d6b2a2b881dfa970d7d7999e8b312b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sq/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sq/thunderbird-68.12.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "9f7bcc51d4bb3f7c8d6ae49c61b88c17a7a59f6de8d2f62e0ee3fb3a68d30791"; + sha256 = "6fbf47759ca8c4d7cf30ca3af8a3fd35a01b7738422d29448cfd9eed81eba49b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sr/thunderbird-68.12.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "809c22c379c0c9943acb23de8b7023843ad6ecfedb9cf89006d6889ac1214203"; + sha256 = "636708320247c7c45622fd9179d5689da97472a9308f11810623129cf5a0e8d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sv-SE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sv-SE/thunderbird-68.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9381345ab9229f4b8465c183c936c17ab73680fa6aca27535daff9a2f9a133a3"; + sha256 = "9550c173b047e3ff774f4c3faf2c1f125b3abc34e6feb5801c108fda94e54e4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/tr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/tr/thunderbird-68.12.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0f08bc1e65a8bccf8765cf26af5c09ebf6b77ff463af2f8f133dd2499c1d935c"; + sha256 = "ffe82a300c7fa7a0e826d11613f5187c003b009efa29f4755f17af0f88d9e73b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uk/thunderbird-68.12.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "37a1fee3bcf2fca901c542295d01a32545e814217985414419a270ad9576c14c"; + sha256 = "b018769149c0a4ff323b90b5d51465733629e7c527b39381ba9696cb077ad767"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uz/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uz/thunderbird-68.12.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "50668670b10f3171b9033306d43c51ce24f1a48286c4156eff369530ae6d93d1"; + sha256 = "b0b59ac4d08c9f385f4ed7980065ce99ef24874734390a83af6e8fbd18173d99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/vi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/vi/thunderbird-68.12.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "3588d2ed7c67459f5c091a1881821eaba72c9f3307624f7890549fcd1da120f6"; + sha256 = "901b40a99d84e7c7360fd5be6a14aa04ef6cc04fe1275cac26824b310bbd26e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-CN/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-CN/thunderbird-68.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d8f2976535ef60e62c94338fd049365234a7b2a8658b32df231d1faa22529c0e"; + sha256 = "509478710f7c4fb404eec9fed0b6d22f4c5d76fee09ed833dffcefdacc53d55c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-TW/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-TW/thunderbird-68.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "aca4a8410429bde9926f6ce6a183439750f490fd68dda229531b2e16bb7068ef"; + sha256 = "a12dd777cc3eaf629cc7a6f4b8d4744cf63c3e778e559d9b3ce332414e509515"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1e238bf884..a2ff6ce963 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.1.1"; + version = "78.2.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/af/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/af/thunderbird-78.2.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "540aa91a70379c4d6975820649abbe3063515bae031229f01ed7e794cf87395d"; + sha256 = "12d8b417fe101e45460b66faa04e0c99bacd454b563c96b7bd7d5b77cabb8f2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ar/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ar/thunderbird-78.2.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "18d1b4f33895b5c4b17199ca8412f8060f40660c7e45e024d0dda486ad290044"; + sha256 = "1fa7a01cd370114ce9dc65c2d48e001d6969f953ba138fc4005329b2fce7f1fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ast/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ast/thunderbird-78.2.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "dd87c494ef5f142517aeec3d8890bc553664b323f2cadb46bca597101b275c91"; + sha256 = "c002ba6b4cded5b085abfad61daccad36a7936af40eacf77e4378caff42f9138"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/be/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/be/thunderbird-78.2.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "90e0d5354f41244e2ebaeeeb65959d64fcef52f914a15af7b9808125e6e25639"; + sha256 = "17021647dd58eb851f99e8f63e9d4a6ec302a7a7a1f5a0e561fe96bc63abb5f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/bg/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/bg/thunderbird-78.2.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "4e8f53fc2e1c3b8dddec3d62bfa104a458943c1b0794fcca3a1658b812359b97"; + sha256 = "e813d46a0ba8dccec07a1bc5201da859a8c23b1cb9140420d902ed9f3fa6f7fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/br/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/br/thunderbird-78.2.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "068c48e37b4d921cb33e2df27b32a8e9abfc29698c30779b1771f2ab61697f27"; + sha256 = "0bc12e80e5923271973a3037a26a2fd2702118deba326ab98a8a9d776d25c9ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ca/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ca/thunderbird-78.2.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1f09e12e53d7bc76551c47995b0fa5ff649db94013a66e4ee445e6901352ead6"; + sha256 = "f8e6abea863956613d646af01ca09f53311e325d6006a28319cb3f9932a03eaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cak/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cak/thunderbird-78.2.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e917249cbc16e1ccaf630a5335577e76d971f422fb7c7d9b7c7f05805de18d78"; + sha256 = "c7603bc86b2d86a9ceddc55a44f9a8a116ec67d1b23ea659f705ad78ecfc02e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cs/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cs/thunderbird-78.2.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "89926439c396b64a701d688b2520eb1364e5f2a348a645651396e7f91a4b774a"; + sha256 = "058405304cf6523cbcb1d217ebb393a66067b5cbf839d0b588930b59c828d700"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cy/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cy/thunderbird-78.2.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "65a124a1840efdc33b0426a0a8ab8426423425326f7905844c74f7503c6e60f4"; + sha256 = "e6af1a50954e495bd3145513dd7b7c5b3129862cbe5aa2622229855133233e6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/da/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/da/thunderbird-78.2.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a572014192e6ba98994f8693b062400b7909bdcede065dd363a3ab182cf40293"; + sha256 = "39a61048e47af6d96242291581ca29d016f4b667ff373167e7de9d5629f4e4d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/de/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/de/thunderbird-78.2.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a0eeef52d89bee326402354eb1de3f531c9c255d31840ed91e93110c9f170aaa"; + sha256 = "9ab3e2dc60662d37ab7623fafc8dc586c9baa13819c753331539879463bd6b63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/dsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/dsb/thunderbird-78.2.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "35d0295ebd60415457a7defa40c5bdee2dbf40b08dad387aef0557dc511ce489"; + sha256 = "114cd0d19683c0b8c7a5ff0d258d2cf01304eb26f4c7dc466b895c460b129e5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/el/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/el/thunderbird-78.2.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "135fe2424a1731e24c9602c40e0ae4f8fc551ed058fcd17516ce8f39a7d88bbe"; + sha256 = "011bb98710b5c6c371e122ada559ec010aa9b965da54bfbc73aef14681f39f97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-CA/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-CA/thunderbird-78.2.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b5741a82e8d59300c1f2046b4a4deaa2804d90ad8e8cda7cda9a39b7d6293b87"; + sha256 = "ff39f524ffd7f455940df65c42a40c045cdae4ead311de5dae8c3d563e0e77fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-GB/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-GB/thunderbird-78.2.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "61b0e85a24f56b1b7ad03e9d8206313d50cfc6480627cd377a4a4b1bfdd9f13a"; + sha256 = "ce353fc8e6e8e8d2ec1378f76879c0bebb55f867f39488fe48a1995685c85b00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-US/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-US/thunderbird-78.2.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9f0cc0edd2b23bc67824d3e8ed19b8c0a331e69a307b6d48c20e0e29e756e7e7"; + sha256 = "e3af4f4b1eaf21c3137047cb5190780fd51e4d27a620efeb6157ffab5ecca950"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-AR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/es-AR/thunderbird-78.2.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b0390addfb6133074aab52d1b6b73eccb9fae9031967fc94d57f95be30cce54d"; + sha256 = "30ba14c91750200fc8f4bb8c031fc7b9ecd3efc2d658d9debcafbe8f4b44ad22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-ES/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/es-ES/thunderbird-78.2.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4d9f115bba5f9f32247465398e8ccd2f279776fadc3961f79b9fcc923c9cc363"; + sha256 = "0e3d5f0a0f6f505b52d958cf34f26ea98e716516a7f06664aa3806fb1ade55db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/et/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/et/thunderbird-78.2.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6db8f8c69d8452e402724bf3fc6fb42242d2839307f6ad387f813a97286f4773"; + sha256 = "32acee8023857d5ed54ceb72acb0f5a621ce1884ecf114760f670a3166e7eea9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/eu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/eu/thunderbird-78.2.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7c8165bc0a0feffd71431f3dd30ce99092a0816581363c2d317c6f40149234e1"; + sha256 = "8827e24c546ccf27c8a02e61794675e675c475a833621840152bc840964bce56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fa/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fa/thunderbird-78.2.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9537892fa5e9ba5b3f79b96fafef1e8e37c4813f0515f965ce05b410bc7c9448"; + sha256 = "9b072f89cc4288443eb986cb6798d35e08ff003c73d0bbf54a2ccdfea1866d17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fi/thunderbird-78.2.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "31ca37c4d0f13d1a30b2d7541fa9fbe80add66c6d787bbec069cb904d1157e18"; + sha256 = "9ba017f70955a1aa9c8ff2c94653be569ff0dcdd4784e8ea21e425e5e29140f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fr/thunderbird-78.2.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c7507fd9096e9c47632be197054be68631c9d1812b7242b4de06774dbc9c3b1b"; + sha256 = "7eea9eb22bd47467740e1fa22977dcddd326ca7e9ad7adc8cf7964b9db5da6ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fy-NL/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fy-NL/thunderbird-78.2.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0a3d9d62861eb11bf409ac20905e787fdb273dd1d74b754f10790ff7deb7160d"; + sha256 = "c0987516569372c9f98d5c8b6b90ad9a1468c4ed8a4b543130a023c25affbeb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ga-IE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ga-IE/thunderbird-78.2.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4bd0b50313e9a85a83d5b5a032710478feb2df52936bcdfd2621cf30a4d02efb"; + sha256 = "344122ad4b549ce1610ce409e7f3ef2ab0144abb3c5ef1fe98a3e499ed292441"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gd/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/gd/thunderbird-78.2.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a72ed3ea99e863f4a6150cfeeaa0052adf84f8f5ad52388b8bc30bf15d58a310"; + sha256 = "7dc155a4a6bbf1b92822e23a7454e6021a3aa29b807bf9fb16327ecfb627b68f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/gl/thunderbird-78.2.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5d9bae1205ac9490821b1b6d5b700a540bccbb21a3d41943d7f3ccb8576e2087"; + sha256 = "c99e642618e273f96ef102bafd61c8bd10b626c3ee2d7072c1bb4264a9653fd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/he/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/he/thunderbird-78.2.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7cd6417391db27934b6945edcdd9d14b46a69052af7bccd5a62fed588c77894a"; + sha256 = "bbf0acf24c1f8e14833b801512b57d80cf5a07662cbfec841a6b7fa3de6facfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hr/thunderbird-78.2.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b641cb7393e1e655adff946c82c43edf580e9fe3852b5c0cffe8f6d12759d190"; + sha256 = "22237f9fa29556853af1d70343d6087f11b677a3648f521e215ffddf0a583407"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hsb/thunderbird-78.2.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "39a27b797117eaed4e939e1c38ade2da13486f9050b5c4d87219cdd46abb67c4"; + sha256 = "2ed485f1cf5e431cfa561bd266624fdf7e14c725e36fa89f653f71a4a1249eda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hu/thunderbird-78.2.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5c9795de2316add4e482f9e074c861ef2e05411ea3792d6256d3c43359dc692f"; + sha256 = "8e3b4ad2fdbdd5f84be3a8c77e8c0f4ce09449190eb0d54fe693f5a619d27562"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hy-AM/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hy-AM/thunderbird-78.2.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "be1ba0a8fecf9a577cd63de519f92f48ddaf7c4b68fd629f94bb2ebff3cf16fb"; + sha256 = "bdd7a97b027d30804b60d86559b15b0bfde2f688bc166677d3762887020e2a1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/id/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/id/thunderbird-78.2.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "15eb3d6acda87645da2874cc92366fb50e821d7ec7885f87951366ddc66db2a0"; + sha256 = "259e8fd126c426d8c5bb7c120ccfe28d41183551f41d49f20767e98f8f28d728"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/is/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/is/thunderbird-78.2.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "06549f464526e931f23c0925b402eb3da6fbd9bd16595387604fe7edc62c4672"; + sha256 = "1c74ec8e38bad9396faac387321608efb3463f539a91782db620ca73dfb26efd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/it/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/it/thunderbird-78.2.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d81344b5dc0e131d1796f63de559a18b59dc70403a957eab737354ab05fd31c4"; + sha256 = "659fca198575c52c5d90de4456368ea995b2e0dbf7dcb7578e310457142a2421"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ja/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ja/thunderbird-78.2.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "48bd5534bfebd6c6f976ea4230ac7d364544c1467b2912f0db46fd23944d0908"; + sha256 = "b9464e9364241e94f4e40286f1b0ffdbeb392d9986b9a9cb18c41f5b96baac6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ka/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ka/thunderbird-78.2.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8f581c4d9f6c2e8f79bf7be92bf06a69d0dfed017346e1c380a31f541c5155fa"; + sha256 = "7c73eb7efdca2e7648383c25ec3d0e2a4250b87908c9644e220eb16e1f5a0219"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kab/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/kab/thunderbird-78.2.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2cbcf1e64dcb914af8dfa0f8dab462d59d37992b3f4e22159e2edd340cb6e73a"; + sha256 = "d4d44ccb61058423ed42767d519215bd169dd022d8aa460df7622091522300dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/kk/thunderbird-78.2.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1fd067e9751c60dc6c6dcf1e5cfee3650758ae6593cb20fa5e6103cd01e6e6b7"; + sha256 = "3b8af8f7eed6da665baf1ed477d5f5f1b797baf8c63f3af6ecdc257d66e446e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ko/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ko/thunderbird-78.2.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "efdd154ad42d1b8f257d0cf619afc4bdea44d7014882c82847cb5f21d7037469"; + sha256 = "4129db882fde4040e1e87b4aa724b055dadeee98c46e201d24e9f485f3c2b31a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/lt/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/lt/thunderbird-78.2.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4256ec374ea5a22553469393e7fde51b46cd2ade5a620e9b0fc442e9d524494f"; + sha256 = "fb1d9fc89edbe4434ecfe18d7ccdeb33c4ced3ad5adb1853baf5b115a784a120"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ms/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ms/thunderbird-78.2.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "40f6fc9fb01a83288a6952b7a6e625bd00659594f7fa21ee883c16501407b8be"; + sha256 = "b6498d8ba9fbf63cd61cc968f375b0ecc50e3fadff993fa5070a249b679855da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nb-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nb-NO/thunderbird-78.2.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b3f363ccbc5946c6e0e87ca4b75e12e4e4372688ae7a034c9cf37fd401794840"; + sha256 = "1d931fad5ca59c3eb29cb8155cbb15a578de28b365cb680e6aab3dc51274078b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nl/thunderbird-78.2.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6963f3f09cf8a3370b06c894aa744c4ddbaa7c11df4e41f540a21427ec391135"; + sha256 = "1378867782f5e0b9cb9efbcc78e5ce9c28d89baca0f353a027fc6878cbb6de58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nn-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nn-NO/thunderbird-78.2.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "da647b3c85db5ebbfbc530dd8d8fb1005928430775cd5c8a2999709614f4e35c"; + sha256 = "bbe5f3cc81eac55401ac4a3a2498906077b1e831d369f7f40a4ddca4dfc146bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pa-IN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pa-IN/thunderbird-78.2.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9df18348eedd3b43a13ac991b875fe12678929faa58712b09ee7364a8dedbd2e"; + sha256 = "ea617550d8e2aa0b99d81ec8e39c587194a0b7978b3444261caf12fcc7a5b172"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pl/thunderbird-78.2.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7f60d5a0a819f6b69cd3f8444c12758f7cee17a681859c03cbea29ec27e1221e"; + sha256 = "84b15d310cb1fb7217f21891ee24654b13effa4f004315811d3bb221a8fc54c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-BR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pt-BR/thunderbird-78.2.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "229073650b742b4566350ce82ea65f93f639a2b502bf706de4038c3c13ead354"; + sha256 = "2e5682b09d8c6f6d260dd47b2ac7ab0f710103b0b28755c58375ccb132aea464"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-PT/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pt-PT/thunderbird-78.2.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f8596511964a688747ce51cf0ca6bb6da65ea78b9b3ef70ced4f69fae8edbeb0"; + sha256 = "8a7f90d4ce1b9bdc2d117fabd19fd4f6ca362b89138c5470f7d76f7ec456df54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/rm/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/rm/thunderbird-78.2.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "fb101dae4058f2cf804aacaf60c1354415cb0287432bb367a83e2ef8109375ce"; + sha256 = "c5a04ab8644dea990c938ab462eb8610471de524f78e09a2293ee9c79260339a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ro/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ro/thunderbird-78.2.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1cb1fc985122dea685fc1998764c60979a7c357d5e1e0646b8c4f45e856b4f00"; + sha256 = "84b555842d0502dffa99e388bcc6d90355ac4731b66876c279c84c8735a78fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ru/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ru/thunderbird-78.2.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d89b9a418c78422e2a715e7e1c5d2bf57e90c2293ad63dc5e9f2645fdc910103"; + sha256 = "d5bdde6bd4e155d78ef4fbc91718468406afc3888a80ab751647163aa087bef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/si/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/si/thunderbird-78.2.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "584cd0dca877163073824e9dfbee4d6146e0ef8bd0b23cd2325462a1a72a41a4"; + sha256 = "0311422b20df0b1081e889aa6301bb8930accd1c5b9b2e0e9850f4565f0ac5c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sk/thunderbird-78.2.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "cbb2b5678d11eef244a175d88207e00fc59584afd0b788a82319987368ff19c2"; + sha256 = "b91e58219d46ab7770958ec34a54323b5f7af0cf2548be93de786b76fa92db45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sl/thunderbird-78.2.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e8727e9942c4555d6413a3ebe1d4b2ab2ea39da4f5b3b2ad7baaeb8abf49fd47"; + sha256 = "e993d4c974b00452696dc68037537e18c550c3b6a634cc2da3cd28014594934f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sq/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sq/thunderbird-78.2.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "31141f45121dab9c5ce3f3d6195264df91e61e434ee993c409c3cac164215737"; + sha256 = "6b18bc35ad9127b6fb149aa71b7e93b556506820e661ddd3a1b9ab298c56ae14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sr/thunderbird-78.2.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "dc9a868b1345da0633d090877ae6cddaa3a1b2bb1fc3113bc9de2aac1c30366c"; + sha256 = "8fee447a4212f399645923c35de17d882a815adb81bd0b11f9fb1869b5dfaf39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sv-SE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sv-SE/thunderbird-78.2.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "fab7e11f8de1fcd2e8719d20e818d8bd2c39f7539328fb79f2cce56d4f312a78"; + sha256 = "2500816667416a3e4af77098451b98b3e975a1f30e3f393c4e8ebf36ca7495bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/th/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/th/thunderbird-78.2.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "fa3173940d4e7109385d65b479297110545cc7e2e76e8a657f376553e370563a"; + sha256 = "b035f9424db935281a57a181ac1116e8fa137c27a31b9bfb515bb3fef4ca4c0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/tr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/tr/thunderbird-78.2.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a8cf6b95a6b890892d034c0b014a62f710bbafa34f3282a80e17828ad9365513"; + sha256 = "c1cd6f9a2ebe163b8de18d26ecef4fe4beafe8e7212365c2aa71bba3b9fe0967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/uk/thunderbird-78.2.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a5086a87a87ccb605154aad5bc2986d6fe995391189b3e452640210e2016b08f"; + sha256 = "de843a0f9c09bc9d37b5d1bb1925075b80efdbe678f5009cd237cb91bc423b55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uz/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/uz/thunderbird-78.2.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b5bea650b678808b7fbcca432c1de0121dc19886b2f32e764e4fe1a797d1e8ab"; + sha256 = "770bfd792effc548a619deeb0385f9c8cf6475d1233ce79e83028cfed8e41859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/vi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/vi/thunderbird-78.2.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8b8b57417b1d6faeb283b1b6037eac92841029bd73769d5cb8bc6c227e87efbf"; + sha256 = "8183106b59c8999dc3054ead72dad3a14eabe3827ce3211278a35b20656efd62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-CN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/zh-CN/thunderbird-78.2.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4a0c8629e2a5e5f95799169dba4ee9c10b728bf503e090ed829cdd11fbeb57d1"; + sha256 = "c35ec93bd0e24f2cafb6948546a46ccde62677e6f73e2afa1e378ed040582544"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-TW/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/zh-TW/thunderbird-78.2.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "11a892d8ec3ec6e2dccbad4b97ce2fe7cb0a0b1dc309bef9819432f0be9d510c"; + sha256 = "444861cc1fa351dce587725d67eec87eecb56a581ce94f812ccd4dbc4ae198bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/af/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/af/thunderbird-78.2.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a254eecebf45c16f55b7d72cc38da2c4d22f49704cdb5db72d2adfc199a7a78c"; + sha256 = "05eb2e50d4129c39eb28e22f7b3922868d87d310261b765a4a2c721c4ed7c04a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ar/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ar/thunderbird-78.2.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3e735d996bb3bf2674f1c04f035489893169ab632208af1427756bc3c15b1600"; + sha256 = "264e3f57fed68ced27fb89bf8a1e5b715c465fc70a6fbaf8f161e69f80f46c68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ast/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ast/thunderbird-78.2.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a8fe0f85c250b0f71b0bac30cd51e10e5d1ded4265775afe93f986ccde4fbc49"; + sha256 = "5bfbefd9be834682cc144c063f6bffd56a09d2ea7ec9e83f78f0e984350a4006"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/be/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/be/thunderbird-78.2.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "279a98d38f6c33945ddd1e86c9263e72f9a52555e7f26c56a2f3062696436bbb"; + sha256 = "fa1b7c0432320aa293f89529f23321066e2c4e0e474313d267650bba8b39ed90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/bg/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/bg/thunderbird-78.2.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cb23b56841818af2e3e8dc922cace29c8538d22977ee951dee744bbc490c24a6"; + sha256 = "1d3f1a298d6ebda804e0aa2a9ad5491c0211dae96ec96e16a8816e5d3e202f63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/br/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/br/thunderbird-78.2.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f729274b064205cb9baf57be3732268a2c56893ac6b17ae6ddc0aed3269fda15"; + sha256 = "d7f71155d8696d9c17c4cb0e66b987652815761137578819fb4a137c32170347"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ca/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ca/thunderbird-78.2.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "eb434c12d8d841eb8426b95663591f742a9e62b630cadb7afebfa79ab1142a38"; + sha256 = "44e651bcd4010a00212ea3e295cc6e3e6e7de9e118078d5631c59158a132126c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cak/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cak/thunderbird-78.2.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "daa19634d796f849ab9b3a575bc53e451453902f82ce7384a7ae5ae4f99a2165"; + sha256 = "8f7849d17ae9a0d7f1b85b128a542d092c49b2b552369ce7de70ed108e4dc07e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cs/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cs/thunderbird-78.2.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "181cc3c70985d41a806395b353ccd98475c37ae8151fd5f59adbe25bf2059457"; + sha256 = "0426981c8c381227ec2dd19b59cc2c3a62b91f26541dbb8e57bc97b8f4cf3578"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cy/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cy/thunderbird-78.2.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4cb93a1b38582e6fd4e4fc514c36e469b88bedf0bd36bee4d7a66d9c33c3c8ca"; + sha256 = "12629cfeafc74a979a621c0c8f4ebee0aa6f35dfd6fbda8a59f26e0a63311c17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/da/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/da/thunderbird-78.2.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6eb46018b763d22e62739ec9dd98d5f3804f85b5b65ca3092c42d5d9a1a258ee"; + sha256 = "b280271248e99a68c2d38293275fb7ee5631bd96e7a2f67c96c60280e5148f13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/de/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/de/thunderbird-78.2.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "dff12cffa89c1ad5666b92b66361e17c604f0ca34305fb0e3b06be5fa8fb0f96"; + sha256 = "1caeeaa0b096378b3cab2e41d832a5c60da4e0a3cf9f84230bfe65edde106536"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/dsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/dsb/thunderbird-78.2.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "efa2f9449703fc0941620650f1ca1332682b2866339413aa03f2438580d18f78"; + sha256 = "d1822f534ee3d2e95cc412a7f51eabcdf3f56955650da8806f4acd5e48d19d83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/el/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/el/thunderbird-78.2.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "675cfc628dd02fe874a701e0e16986c797adac263605b304c1c69bb01552037f"; + sha256 = "7ec20a9b566728041394245ef5875be10b70fd04a58419fdf2150168aa86abad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-CA/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-CA/thunderbird-78.2.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a710c91df20b4b25d9e363b585344e1595ab96b9cc1df35e973e485834942957"; + sha256 = "62f31fd438ec2e33d5a1d72c57769cea3323d318ed8ad82ebf01050f4ca84fa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-GB/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-GB/thunderbird-78.2.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3acd3020cb6116588a0f061aa9ba5d620477e3265eefac3dc22f4705757fe025"; + sha256 = "e857efaa39cd409de86be87934896ecdf82d4e74dd615022995f708d18119a9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-US/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-US/thunderbird-78.2.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "bf9ebc54aff457654b5ea1fc81437281f70d78de96d5a4d3586ae83fb8135d39"; + sha256 = "54589215c44e291a11e2cb2b2a3de682d4c48367fa8bdac59035b550a07551b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-AR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/es-AR/thunderbird-78.2.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cf1c278a36c9303956ac8dc29a51226a42ea17cf64559c34bef318c79ba6ed74"; + sha256 = "b4075d697d141aa13cbcefce1e7082752588d2fc3ba00074550d6e8c1156c5d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-ES/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/es-ES/thunderbird-78.2.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4a9356476a18f292f763f1647611189ebe89ee368a3f01a7c75ef8dce48d91af"; + sha256 = "7d5f59720037153e0fbf059b0b8aea0dbb5dd20f616deea7744de87ab183023d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/et/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/et/thunderbird-78.2.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "03d3a43153b714f334a8f5d7d23e9080624488ec54400451b508c6aa50bcd594"; + sha256 = "9c999d231cb404fcaf3614483e6c74801cd52f9c2ba7988cab50e1d690bc3551"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/eu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/eu/thunderbird-78.2.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a7cca16186f0e2627dc6e06164b3cb2bb691cf798f7c41378ae90349521d9199"; + sha256 = "79a74421f364e5d9a5db182d54058eb6c243418a1960b4a653f554584ecd05da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fa/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fa/thunderbird-78.2.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6a19a79d409acdc25c69b5c8d75a18f2de665a7d18244d578e4ef0f65597daea"; + sha256 = "db6835853ceb2f597330c9e65c09df48ac308ab01d7320006b9943e3a10b471e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fi/thunderbird-78.2.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4b82f0fadfb5f388948e33fd3408e9f6ece6737c8e5e4b53c164a124f017e553"; + sha256 = "e96ea32da9cfd941b037d0a6bf95d4a293be6f3f9800e4008c62088f06bdcf6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fr/thunderbird-78.2.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bc4fb423664576d4d94eb24383e3f4f23c199e52f1c985fd3bfccc947212f82a"; + sha256 = "dd6dacbffa7968596666615f52cac80e776f75b4e1943e218856ab80f902f950"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fy-NL/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fy-NL/thunderbird-78.2.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6eb76c3a4d3b31160dc0d0b807596095354c7c0740f5593f86042af1e1b03d48"; + sha256 = "ed009214b863fa44048514870f835682944df010fcd5e1e1c149ec544fbfdaa8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ga-IE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ga-IE/thunderbird-78.2.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5321fff3eb4d341307233976de74624f6002abb8662f40ecbf77e3bdb5757add"; + sha256 = "fad826ef9820facc37bbd278c2bed11802f6b44b70416c803dc6b8fe50220c6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gd/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/gd/thunderbird-78.2.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "515207242fffd0513a550017f8bfb53061f0a0e3d795a111adf0154b55363d38"; + sha256 = "cccfdd4c3170969ca3f47c0a8398a257650fae0c64ecc375ab044eef969bfa8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/gl/thunderbird-78.2.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "84c32bd92a783c680343aa5b01dbf58e37eda9ee466b16f817a79a135e37fbe5"; + sha256 = "dd40efa2751705b0f023a98c01b030c04eb6101fe43062b3607421b1efc462aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/he/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/he/thunderbird-78.2.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "96d07263578fb16068e0f48309552ea9237d3dd5a46fc63e3293326778cb7af1"; + sha256 = "ff94efe5cd1fae04401d3d6fe364c309c24424c54b0e3787ad080ee1f468443e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hr/thunderbird-78.2.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9c612aad3a12530052dd609c2f20a3739c458b3c7f3d761e7c00754f9b43db95"; + sha256 = "4109b3a8da687d2c4b8e9f6539f40e51475b43243ff1fcb19b78b5d6f6d7594d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hsb/thunderbird-78.2.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "376e4d8eadb9bb8f301053d30260ab0cbeb3dc9f590564583f07547585105fe0"; + sha256 = "58fd8901df13d7f7fed552326553ce632d36d07f1a0eed63f1e8b671cf519e5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hu/thunderbird-78.2.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "4e7e51dbbe359ec542e553f5b0691f1d191343261094828b2572dd5a03ec2c8a"; + sha256 = "5145b3b137f6a905721a0cafe7b574b66f70891e75187fa082b852b67e195f03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hy-AM/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hy-AM/thunderbird-78.2.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "735624e30d1986d6c822fcbee4694389cf8a0061eba40926265bd4ac998e2186"; + sha256 = "7c1e163a78dc5a0791a4a5a730a3ec9d58f24619f5274ce4d4b0197ca4936e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/id/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/id/thunderbird-78.2.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ce6d668f38d1e74e7c8bbfc7408edc749eed9449908044bdd57b2dcd868cb89f"; + sha256 = "57254afb187662b15338b0133afa378432c9018af4d843ea2f81c1ab40ab4940"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/is/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/is/thunderbird-78.2.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "589369ce68b6c78ad7753ddd14412eb68f438dbd7cae449f828288d25ee3f795"; + sha256 = "ca0066237afa76925d294eb714bceeb7aaed0a512b9320ace604fcbe2d443f2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/it/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/it/thunderbird-78.2.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "fd909d5aaa68a208050a0812f15024ef115b99fbde0edb0afe995c3b766c0d76"; + sha256 = "5c29da94a9408220824f4ab11a0f4e46bfa38230eaf1fef266372620ad9c4220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ja/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ja/thunderbird-78.2.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "160c2a1c36ef34339270abd59fed13b37414f8c37edd60463e0945e6751a0c74"; + sha256 = "ab4685eae09e25018ab2a227d13642a47a0c0e8e6258975967449754bc16697a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ka/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ka/thunderbird-78.2.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e822a28e62aae6d6e84e6788d5311af45396248f48cc60152b4273d75359dd8f"; + sha256 = "152394685517d4e3e2ddb39ac6e297d14b4ead115ead325175797bf85d88bedd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kab/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/kab/thunderbird-78.2.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2ea58cc79b80966b5bbc310fa32bd27621f95d4ffbd3646bf9e04f922c36ca6e"; + sha256 = "2f3e1b7db83247add30da0372d1c1c125231e689b5005ed5a06359a02aed4180"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/kk/thunderbird-78.2.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a874bc02f065be73a54b70567b7a04be5fc6a9f766f3b054b12555763361ea2a"; + sha256 = "d0d2caffb144d6f64cd73780267cea99dc54f4ae63a0fbcb5a86fc917674d0c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ko/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ko/thunderbird-78.2.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d9678f72569dfde84544fcb9afa7cb8d5a4a35baa52d4e560aa2b082a418ab00"; + sha256 = "f42bda1eb1f4a422d4f60345c7e6cda1b7bc57ac3d0899ab32fac16b394e4953"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/lt/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/lt/thunderbird-78.2.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "1d7ec489dc52fae0f7597e40f8505bdd6a57a717389c75b66481749e85e2fab6"; + sha256 = "da55137e808a9c64cd6534afe8579b9077b3cfaccce918fca34f07ae2d74e6d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ms/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ms/thunderbird-78.2.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5d0c7cc00139c39a69dfc9ba1dc5c83b56973f26679860d048952bcf09baa737"; + sha256 = "65a44f52ae326b7ad777f4e66d29825f3cb7aae5e18e2c645b5889d664889f2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nb-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nb-NO/thunderbird-78.2.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e72a25e7d53e6e0d470632c487d31e08afdb6c27543d50c93ff72ecac3f70bc6"; + sha256 = "6d3abd2b862d3fb1e0285eb6851388a079c129d3132865eb424191f8064798c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nl/thunderbird-78.2.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "19efd7323e671fe25b64ee44c85f698f608e6c2b18fdbfc9f0cc95b9cd8cd149"; + sha256 = "90f78511b8ecee01c8e441c4c18cb1b40f7f9e2de0350be365dc317d8c06415f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nn-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nn-NO/thunderbird-78.2.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b4be21281c6a13de05e5d0b96e43454bab662140a00d3837f609e23f14360c90"; + sha256 = "2ec0103d3a89c3a57731542bd82e28e0da0b54c62ee0ab7755e395d991dfa5c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pa-IN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pa-IN/thunderbird-78.2.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f2795a504616404616f7d22022e105e9e4ea54025d60e262c405b867cb9c7936"; + sha256 = "d169f161bdb32a2ce6e25df9d5a643de9ac4e1345dc90cf1a54560b12bfb03ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pl/thunderbird-78.2.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "52f80b074dc168ec00d0fd78f6376c1dfd357c2b7e7ed78bb1b9cf17536508a6"; + sha256 = "5e7fbd12291d16f98f996eb0d3660902c9cddf9849e7082a1963b73afe0e4ec2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-BR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pt-BR/thunderbird-78.2.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d02867899a54eebffb2b6e600f7e6260b960d686a8bcd61ce705e9d0bbebe377"; + sha256 = "eed9d4a6378496dac0fefdf70f3c2f98d56c4daa1300bc041a3974d03303a0f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-PT/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pt-PT/thunderbird-78.2.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "659a7ff3a0dcbb4f3fec32eda6b5a2087191c8d49ea310662ad540433d869180"; + sha256 = "7fef461f1a2b0239c2825a9fdd2dc5237b5b5b0cffa0c9675451449a9e69372c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/rm/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/rm/thunderbird-78.2.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d9ee3c5e3cf2d7eedced9d12bf4d499ae931c262be166af6a14bbd4a2538788a"; + sha256 = "f3cf46324d1f1e5ab7e858fb3f203ac6762ba98986f510486146fb745535123e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ro/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ro/thunderbird-78.2.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c3db9965a25d52d25cde0b52bffcc274ae32862fb29be368f27b102774d0971b"; + sha256 = "921285ad32ed408229b07d34d358cc6dd78bc519cb60370fff01525a7cb0e96e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ru/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ru/thunderbird-78.2.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f0356ef5eadccfcdfc694d0bed9b1e4027e4883095f9c117403a68f1cb2810c8"; + sha256 = "37f28db57fc4d101df92ff5f2ca1ed800de35ecc6b3b00480bc8ee67805f47d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/si/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/si/thunderbird-78.2.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5b5d17a2b098fbe1c2d8686ab0e1adb7c72efedc38365ca9b39b1e122302c85c"; + sha256 = "96d2ff616eae7bba706bd3af8fa5de0dc2444c0b57b612775e61b0e23007404c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sk/thunderbird-78.2.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b39bd41a38947ea467e1a89c5a173fd07cbce09562c10e6a60adb2150b04c9cf"; + sha256 = "5f3ba3d2bcf1437373df7553dd4296511ea4845b87e0c02e7714f9838cadf281"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sl/thunderbird-78.2.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "602e0feffc5b786930005c376ca3e8819b834a0cfc9a649bc46d86c27999144d"; + sha256 = "f00c798638bc88a107f4ebb0feb0156f2d7667a040ef8fe9104340997df83741"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sq/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sq/thunderbird-78.2.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "fb265490d00c3a844f73e8f531b7c73f3787cb4e4ddc7cdcde72017fd7f3d612"; + sha256 = "42e2fb9ed08ce138d50e0fdddfc67d9feccbf6e5aa4cfd50d81f2ed493cb2dee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sr/thunderbird-78.2.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "1574eaee6effc4df2c88fc94597e295f352455a9f68501080385c08cb4ab7e35"; + sha256 = "72dc5e5f0024c17e4e1b30b3990d1cd1f1fd240da5c32ca4ddf2737290fa4bac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sv-SE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sv-SE/thunderbird-78.2.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8d55df4937fe28f7b9d0fcaebcde3fb9650de9f0b74f677111f339ae2365b822"; + sha256 = "2f3c882db2034adf74d638fc7a6055bb421fe08f890ac6d3c89433a818b06ca3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/th/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/th/thunderbird-78.2.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6a872a6c332c7b3bfc24721bf1114c85475a73ae5c7b16d8637b0eb0045e112d"; + sha256 = "3830e09d6aab98fddec1e60fea92ec3c5ba51dee63225c219010a37bc80f633a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/tr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/tr/thunderbird-78.2.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "26d2b8493a1508591b45f9ecc43598e244856c0d9bc3c185721a7239679c4e63"; + sha256 = "bdf2cf1a6a0c6cb8ae6d598adf30d84d1f43f399a2135cb041a17329fab78f73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/uk/thunderbird-78.2.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ddb4b5fab55ded8f7bc2ae914f41af42b3b69c738727b055efd5e05b253ac872"; + sha256 = "4bd587d7bfcd2ec6bc7516b48199c92dac1f6feac4c66779cae231a7fd436df3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uz/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/uz/thunderbird-78.2.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dce93fab320f90ece938ae2b2343c1d27a1143b0183318a9d9e0cbbcfb607982"; + sha256 = "5326d6b4f0dc90925bd26c3300ab5441a0edf706229cbde7121cfadeb6b1457f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/vi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/vi/thunderbird-78.2.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "cf1b4f96ef1a510d21b232e748ace6e567d27e382393a7d7f51ab392f026d55c"; + sha256 = "ea8db723cb46c60182c4fd557fbb72872cd112c707af66fae20b59a50c595d80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-CN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/zh-CN/thunderbird-78.2.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "574acd0743a1202b6629883618278eb3ce113c518bc9c39f3d90e2dc12d4f644"; + sha256 = "f2d5b1463c426dad638480782473442b6208cefe8fdd0eb74a6e01f75fbe6a52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-TW/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/zh-TW/thunderbird-78.2.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "51ccc5a4696841b3391a5dd9fb9ff1f55a9f6ccd6fbd86587ffb86c5f664f10f"; + sha256 = "3a0bff43f1b6b158ee8f5a80e5457fa17da09ba2270d84089a948b677f228ca7"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 3143c7f62b..707b35dd49 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -71,13 +71,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.11.0"; + version = "68.12.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1rdxizg1mpagh17fhnrbkilyv1i2zfcr6z62jf3ng31ns94za9kdg9f580srkp63png67jaj3b1kc33v5vb8wavl09n5d38g113x2m9"; + "33350vjgzvsg6sdhdld92z75k1xcf1wmngdcvzsj4f3y3aal73pyw03mlvgg6y36bm0j8fhaxvgbbg5zm7hxhn779z78970m4v9amg7"; }; nativeBuildInputs = [ @@ -307,7 +307,7 @@ stdenv.mkDerivation rec { # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? postFixup = '' local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul + patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul ''; doInstallCheck = true; @@ -333,6 +333,7 @@ stdenv.mkDerivation rec { eelco lovesegfault pierron + vcunat ]; platforms = platforms.linux; license = licenses.mpl20; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 53d337067d..06bfd92f5f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -6,6 +6,7 @@ , curl , dbus , dbus-glib +, fetchpatch , fetchurl , file , fontconfig @@ -69,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.1.1"; + version = "78.2.2"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1lf15zl3p8y1vxv4s04y088flkspf0r0c6j8gfrlfzla5ckfcsbad3zbygh6y73m35j882g7fbacby5a4hiw891zq2kji5dn3nbahyi"; + "2cbpyx9jn23kc289z8ikzx3035g5z6p076izvld50mj3kqc0v4n3igih3rv1lsdwysik8c0ax5w3pa037lnrp6ridgbnix34gxr4nw6"; }; nativeBuildInputs = [ @@ -146,6 +147,13 @@ stdenv.mkDerivation rec { patches = [ ./no-buildconfig.patch + (fetchpatch { # included in 78.3.0 + name = "empty-UI.patch"; + url = "https://hg.mozilla.org/releases/comm-esr78/raw-rev/f085dbd311bc"; + # paths: {a,b}/foo -> {a,b}/comm/foo + stripLen = 1; extraPrefix = "comm/"; + sha256 = "0x9pw62w93kyd99q9wi2d8llcfzbrqib7fp5kcrjidvhnkxpr6j7"; + }) ]; postPatch = '' @@ -301,7 +309,7 @@ stdenv.mkDerivation rec { # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? postFixup = '' local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul + patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul ''; doInstallCheck = true; @@ -327,6 +335,7 @@ stdenv.mkDerivation rec { eelco lovesegfault pierron + vcunat ]; platforms = platforms.linux; license = licenses.mpl20; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix index 6f885dd18b..51f6b4e062 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -1,6 +1,7 @@ { akonadi-contacts , cmake , fetchgit +, fetchsvn , gnupg , gpgme , kcontacts @@ -15,11 +16,20 @@ , qtkeychain , qttools , qtwebkit +, qttranslations +, substituteAll +, withI18n ? false }: -mkDerivation rec { +let + l10n = fetchsvn { + url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5"; + rev = "1566642"; + sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q"; + }; +in mkDerivation rec { pname = "trojita"; - version = "0.7.20200706"; + version = "unstable-2020-07-06"; src = fetchgit { url = "https://anongit.kde.org/trojita.git"; @@ -27,6 +37,12 @@ mkDerivation rec { sha256 = "0r8nmlqwgsqkk0k8xh32fkwvv6iylj35xq2h8b7l3g03yc342kbn"; }; + patches = (substituteAll { + # See https://github.com/NixOS/nixpkgs/issues/86054 + src = ./fix-qttranslations-path.patch; + inherit qttranslations; + }); + buildInputs = [ akonadi-contacts gpgme @@ -48,6 +64,14 @@ mkDerivation rec { gnupg ]; + postPatch = "echo ${version} > src/trojita-version" + + lib.optionalString withI18n '' + mkdir -p po + for f in `find ${l10n} -name "trojita_common.po"`; do + cp $f po/trojita_common_$(echo $f | cut -d/ -f5).po + done + ''; + meta = with lib; { description = "A Qt IMAP e-mail client"; homepage = "http://trojita.flaska.net/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch new file mode 100644 index 0000000000..c4eac39565 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch @@ -0,0 +1,13 @@ +diff --git i/src/Gui/main.cpp w/src/Gui/main.cpp +index 851db4f1..e997f46e 100644 +--- i/src/Gui/main.cpp ++++ w/src/Gui/main.cpp +@@ -52,7 +52,7 @@ int main(int argc, char **argv) + + QTranslator qtTranslator; + qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), +- QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ QLatin1String("@qttranslations@/translations")); + app.installTranslator(&qtTranslator); + + QLatin1String localeSuffix("/locale"); diff --git a/third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix index 38662bf7f6..64b1be363f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,15 +1,14 @@ { stdenv , pkgconfig , python3 -, fetchhg -, fetchpatch +, fetchFromGitLab , gtk3 , glib , gdbm , gtkspell3 , ofono , itstool -, libappindicator-gtk3 +, libayatana-appindicator-gtk3 , perlPackages , glibcLocales , meson @@ -18,22 +17,16 @@ stdenv.mkDerivation rec { pname = "modem-manager-gui"; - version = "0.0.19.1"; + version = "0.0.20"; - src = fetchhg { - url = "https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui"; - rev = "version ${version}"; - sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "modem-manager-gui"; + rev = "upstream%2F${version}"; + sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; }; - patches = [ - # Fix docs build - (fetchpatch { - url = "https://bitbucket.org/linuxonly/modem-manager-gui/commits/68fb09c12413b7de9b7477cbf4241c3527568325/raw"; - sha256 = "033nrlhjlk0zvadv5g9n2id53ajagswf77mda0ixnrskyi7wiig7"; - }) - ]; - nativeBuildInputs = [ pkgconfig python3 @@ -49,7 +42,7 @@ stdenv.mkDerivation rec { gdbm gtkspell3 ofono - libappindicator-gtk3 + libayatana-appindicator-gtk3 ]; postPatch = '' @@ -66,7 +59,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://linuxonly.ru/page/modem-manager-gui"; license = licenses.gpl3; - maintainers = with maintainers; [ ahuzik ]; + maintainers = with maintainers; [ ahuzik galagora ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix index e21cd5b3f0..ee5ea9d7e0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.11"; + version = "1.8.12"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0q0fg235qk448l1xjcwyxr7vcpzk6w57jzhjbkb0m7nffyhhypzj"; + sha256 = "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index 265c8add27..aa7aaab29a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, dpkg +{ stdenv, lib, makeWrapper, fetchurl, dpkg , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3 , xorg, autoPatchelfHook, systemd, libnotify, libappindicator @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; - runtimeDependencies = [ systemd.lib libnotify libappindicator ]; + runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix index 8490c0509a..c205f18e36 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -6,6 +6,7 @@ , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null , iceSupport ? false, zeroc-ice ? null +, grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null , nixosTests }: @@ -13,6 +14,7 @@ assert jackSupport -> libjack2 != null; assert speechdSupport -> speechd != null; assert pulseSupport -> libpulseaudio != null; assert iceSupport -> zeroc-ice != null; +assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null); with stdenv.lib; let @@ -117,9 +119,12 @@ let configureFlags = [ "CONFIG+=no-client" - ] ++ optional (!iceSupport) "CONFIG+=no-ice"; + ] ++ optional (!iceSupport) "CONFIG+=no-ice" + ++ optional grpcSupport "CONFIG+=grpc"; - buildInputs = [ libcap ] ++ optional iceSupport zeroc-ice; + buildInputs = [ libcap ] + ++ optional iceSupport zeroc-ice + ++ optionals grpcSupport [ grpc c-ares abseil-cpp which ]; installPhase = '' # bin stuff diff --git a/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix new file mode 100644 index 0000000000..2e5e840d50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, ncurses6 +, openssl +, sqlite +}: + +rustPlatform.buildRustPackage rec { + pname = "ncgopher"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "jansc"; + repo = "ncgopher"; + rev = "v${version}"; + sha256 = "1mv89sanmr49b9za95jl5slpq960b246j2054r8xfafzqmbp44af"; + }; + + cargoSha256 = "12r4vgrg2bkr3p61yxcsg02kppg84vn956l0v1vb08i94rxzc8zk"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + ncurses6 + openssl + sqlite + ]; + + meta = with lib; { + description = "A gopher and gemini client for the modern internet"; + homepage = "https://github.com/jansc/ncgopher"; + license = licenses.bsd2; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix index 2632acd73d..8ec4608023 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.12.6"; + version = "1.12.9"; src = fetchurl { - url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}b.tar.bz2"; - sha256 = "03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d"; + url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; + sha256 = "06ybr1wjlfir8iqjx6x0v1knd4b2hsy30qmkk4kssy6ky2ahc66q"; }; nativeBuildInputs = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "A GTK-based news feed aggregator"; homepage = "http://lzone.de/liferea/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ vcunat romildo ]; + maintainers = with maintainers; [ romildo ]; platforms = platforms.linux; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index e6bb229b11..8cdacf6d83 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.7.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "15xw8d6b9rv0lalzfllixm8n89clz9j8ag1gk4r16k7yv5l6xrpd"; + sha256 = "1bl6ky258hnai4v7d0gskn6nf5sdsc3xlwl959iwzqhpp0j3q9xg"; }; vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix index a487da6f5a..d990dfb39d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.5.4.11654"; + version = "2.6.3.14058"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "0gsnry0786crbnpgg3f1vcqw6mwbz6svhm6mw3767qi4lb33jm31"; + sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix index 2e14bd0eb0..f8a70d322f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.73"; + version = "2.74"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "1ncrfc4wgf02la2h3zpdcz07b980n9232lg5f62q7ab79fjrcrfr"; + sha256 = "1slsrqv97hnj1vxx3hw32dhqckbr05w622samjbrimh4dv8yrd29"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix new file mode 100644 index 0000000000..37f2a3584e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, python3Packages +, x11Support ? !stdenv.isDarwin +, xclip ? null +, pbcopy ? null +, useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat +}: +let + wrapperPath = with stdenv.lib; makeBinPath ( + optional x11Support xclip ++ + optional stdenv.isDarwin pbcopy + ); +in +python3Packages.buildPythonPackage rec { + version = "0.9.1"; + pname = "tremc"; + + src = fetchFromGitHub { + owner = "tremc"; + repo = pname; + rev = "0.9.1"; + sha256 = "1yhwvlcyv1s830p5a7q5x3mkb3mbvr5cn5nh7y62l5b6iyyynlvm"; + }; + + buildInputs = with python3Packages; [ + python + wrapPython + ]; + + pythonPath = with python3Packages; [ + ipy + pyperclip + ] ++ + stdenv.lib.optional useGeoIP GeoIP; + + phases = [ "unpackPhase" "installPhase" ]; + + makeWrapperArgs = ["--prefix PATH : ${wrapperPath}"]; + + installPhase = '' + make DESTDIR=$out install + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Curses interface for transmission"; + homepage = "https://github.com/tremc/tremc"; + license = licenses.gpl3; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index 46221ac147..643efd0f0f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,7 +5,7 @@ let sha256 = { - x86_64-linux = "19c6blkkqpyjf330v16mdmsh7q6x087p6gw5ag8r2mc6jwq5ixlx"; + x86_64-linux = "19751ygq1ng79aniqx91qawc0cw07cwdjdjd88azc9ww6z6nv0mp"; i386-linux = "0dwc7v4p1dz51444zwn0kds23yi87r4h2d3isfj9xwkn90pxb7in"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { urls = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 36ae194a16..a2ad8b8129 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { openssl' pango speex - systemd.lib + (lib.getLib systemd) stdenv.cc.cc xorg.libXaw xorg.libXmu @@ -149,6 +149,10 @@ stdenv.mkDerivation rec { sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)" + if [ -f "$ICAInstDir/util/setlog" ]; then + chmod +x "$ICAInstDir/util/setlog" + ln -sf "$ICAInstDir/util/setlog" "$out/bin/citrix-setlog" + fi ${mkWrappers wrapLink toWrap} ${mkWrappers wrap [ "PrimaryAuthManager" "ServiceRecord" "AuthManagerDaemon" "util/ctxwebhelper" ]} diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix index cc0d8637b9..abdd54f4af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -13,17 +13,6 @@ let # # The latest versions can be found at https://www.citrix.com/de-de/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "19.12.0" = { - major = "19"; - minor = "12"; - patch = "0"; - x64hash = "1si5mkxbgb8m99bkvgc3l80idjfdp0kby6pv47s07nn43dbr1j7a"; - x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy"; - x64suffix = "19"; - x86suffix = "19"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1912.html"; - }; - "20.04.0" = { major = "20"; minor = "04"; @@ -32,7 +21,7 @@ let x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; x64suffix = "21"; x86suffix = "21"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html"; }; "20.06.0" = { @@ -43,6 +32,17 @@ let x86hash = "1di29hrimbw3myjnf2nn26a14klidhdwvjqla6yxhwd3s6lil194"; x64suffix = "15"; x86suffix = "15"; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html"; + }; + + "20.09.0" = { + major = "20"; + minor = "9"; + patch = "0"; + x64hash = "15gjq1vk1y76c39p72xnam9h9rnr0632i4n11l6xbjnfnad8d4pr"; + x86hash = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4"; + x64suffix = "15"; + x86suffix = "15"; homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; @@ -52,7 +52,7 @@ let # # The lifespans of Citrix products can be found here: # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html - unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" ]; + unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" "19.12.0" ]; in { inherit supportedVersions unsupportedVersions; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index a857abcfed..9c3ed826a2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.5.6"; + version = "15.8.3"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "12dzrg9qf5gj9srv482n3jsjar8jhs3s5kkp6v5pvfp8kbmwcbib"; + sha256 = "1c947yxgs0mv5x6qvy40dypbbhhjbglma1pwl66z39gzg51n2dmc"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix b/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix index 864f10553e..b1a754193e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "scaleft"; - version = "1.45.3"; + version = "1.45.4"; src = fetchurl { url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; - sha256 = "02hsn64kg22pgga5ldjwhnqc6jq8w03mwf40dfanln1qz38x9nx1"; + sha256 = "1yskybjba9ljy1wazddgrm7a4cc72i1xbk7sxnjpcq4hdy3b50l0"; }; nativeBuildInputs = [ patchelf rpmextract ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix index 0893ee21a5..69b7b432b0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "7.0.7"; + version = "7.0.9"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "0szdyprljyckmbrw5sypizs22j96q84ak6nyidyr2j6gf4grh9mg"; + sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix index 93ccf254a3..61d149ba5b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix @@ -10,11 +10,11 @@ assert !withPython; stdenv.mkDerivation rec { pname = "kismet"; - version = "2020-04-R2"; + version = "2020-09-R2"; src = fetchurl { url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - sha256 = "0hxmaln0y6bk9m1rshr4swmg0sqy3ic693vfk8haj7f5gnph96cm"; + sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix index db33e7e6bb..7bc5563d47 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.17.7"; + version = "3.18.0"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "1xj2aqy7daf4r3ypch6hkvk1s0jnx70qwh0p63c7rzm16vh8kb2f"; + sha256 = "1sb9q1qj5mj4cf8d9dsc498mg8a1ri2y0p9qbh44i8ykby8jkgjc"; }; binary = appimageTools.wrapType2 { @@ -40,14 +40,14 @@ in cp ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with lib; { - description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)"; - longDescription = '' - sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. - ''; - homepage = "https://www.scuttlebutt.nz/"; - license = licenses.agpl3; - maintainers = with maintainers; [ asymmetric ninjatrappeur thedavidmeister ]; - platforms = [ "x86_64-linux" ]; - }; -} + meta = with lib; { + description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)"; + longDescription = '' + sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. + ''; + homepage = "https://www.scuttlebutt.nz/"; + license = licenses.agpl3; + maintainers = with maintainers; [ asymmetric ninjatrappeur ]; + platforms = [ "x86_64-linux" ]; + }; + } diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index db05056e7e..bd68531db1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "rclone"; - version = "1.52.3"; + version = "1.53.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1bf3rhs4dcb8vkzs4a6pk5xrhnkhqsrbf4xrhcqf407r668gdav1"; + sha256 = "1yi6n5ip680ydqhz8fnd0igr8dy7zzhpx37mdgahsfac7cwf6k0q"; }; - goPackagePath = "github.com/rclone/rclone"; + vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; subPackages = [ "." ]; @@ -19,6 +19,8 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/rclone/rclone/fs.Version=${version}" ]; + postInstall = let rcloneBin = @@ -26,13 +28,13 @@ buildGoPackage rec { then "$out" else stdenv.lib.getBin buildPackages.rclone; in - '' - installManPage $src/rclone.1 - for shell in bash zsh fish; do - ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell - installShellCompletion rclone.$shell - done - ''; + '' + installManPage rclone.1 + for shell in bash zsh fish; do + ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell + installShellCompletion rclone.$shell + done + ''; meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index aec44c1bfd..7baff125ba 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.8.0"; + version = "1.9.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "047y2sy9zif19dlh098ihaski9f3b971q3mmqg97qgfzpa8z8fpr"; + sha256 = "1p5wmcmv72hbd3dap9hqv4ryarsj8ljn833x9mcfgh8ff4k25qwr"; }; - vendorSha256 = "0l08d96226l135cqbv1qqw0136f5nzw7likc0nmhcm6ynzv83kj2"; + vendorSha256 = "1mwjfv0l2n21srxsh8w18my2j8diim91jlg00ailiq9fwnvxxn8c"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix index 2019e1c2b8..9ce2f1fcfd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix @@ -5,6 +5,7 @@ , makeDesktopItem , makeWrapper , stdenv +, lib , udev , wrapGAppsHook }: @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { cp "${desktopItem}/share/applications/"* "$out/share/applications" ''; - runtimeDependencies = [ udev.lib ]; + runtimeDependencies = [ (lib.getLib udev) ]; postFixup = '' makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix index 6e30e03531..b6bae284dc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix @@ -11,7 +11,6 @@ buildGoPackage rec { }; goPackagePath = "github.com/cloudflare/utahfs"; - goDeps = ./deps.nix; meta = with lib; { homepage = "https://github.com/cloudflare/utahfs"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/utahfs/deps.nix b/third_party/nixpkgs/pkgs/applications/networking/utahfs/deps.nix deleted file mode 100644 index a144211fc9..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/utahfs/deps.nix +++ /dev/null @@ -1,327 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "a6b88cf34a491498e4c7d15c107a31058693e2cb"; - sha256 = "0ilqqymrphg546c66jc0npd48dlr88wbgrg462h1jgm2ykbnq1ba"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "420cda5d6383f94f7d9c231aa44bad3325181950"; - sha256 = "1mp0c9173328r67iica662013jnshiv8yg2p5zgs0kr5sh3ri0ws"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/readahead"; - fetch = { - type = "git"; - url = "https://github.com/google/readahead"; - rev = "eaceba16903255cb149d1efc316f6cc83d765268"; - sha256 = "19l6a29yyypgpqf7v5877ni0bqgxfp41q7ffp2xj57rvikimwiyb"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/jacobsa/fuse"; - fetch = { - type = "git"; - url = "https://github.com/jacobsa/fuse"; - rev = "cd3959611bcb6bb23d49f1598d98f2bf44476805"; - sha256 = "0qy7gyczmdwclhml0n4js3rai7qinnvlr8xz1wn0g6z0vqc9p9iz"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "cc1f095d5cc5eca2844f5c5ea7bb37f6b9bf6cac"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "c7c4067b79cc51e6dfdcef5c702e74b1e0fa7c75"; - sha256 = "1zmz6asplixfihxhj11spgfs0v3xzb3nv0hlq6n6zsg781ni31xx"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/pquerna/ffjson"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/ffjson"; - rev = "e517b90714f7c0eabe6d2e570a5886ae077d6db6"; - sha256 = "0lb76zvdi045r3kab529p9ippccsi9vw84xhinddyr4qrxvs9b06"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "4ab88e80c249ed361d3299e2930427d9ac43ef8d"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "31bed53e4047fd6c510e43a941f90cb31be0972a"; - sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "3f98efb27840a48a7a2898ec80be07674d19f9c8"; - sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "d835ff86be02193d324330acdb7d65546b05f814"; - sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; - sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "738671d3881b9731cc63024d5d88cf28db875626"; - sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "ed3ec21bb8e252814c380df79a80f366440ddb2d"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "244492dfa37ae2ce87222fd06250a03160745faa"; - sha256 = "0vm2q44phz4vjnzq9428rjk58c82fxf003whczp7c9ryn9fazh7s"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d622ce64ec6ce98d2c98f916b6303"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fae7ac547cb717d141c433a2a173315e216b64c4"; - sha256 = "11pl0dycm5d8ar7g1l1w5q2cx0lms8i15n8mxhilhkdd2xpmh8f0"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "e8dd451b4bcb2ef4a22627699ed7d9df7653d6f3"; - sha256 = "0a088x8gpq7y0nx7z5baz2p9n1br908yrwjqnh2f9b4mv38kagzi"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-api-go-client"; - rev = "c24765c18bb761c90df819dcdfdd62f9a7f6fa22"; - sha256 = "13syr1x33k6mrn5w6l4sgdbzn368w3m60vf6kk2j10fwa45125rg"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "971852bfffca25b069c31162ae8f247a3dba083b"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "43be25429f5aa0b9a3f18fa4e32583729ca30b78"; - sha256 = "0rj8xjyn4b73wvfg6v0fff7brnc61xd41500vxa6lw8cg36d51gr"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "142182889d38b76209f1d9f1d8e91d7608aff542"; - sha256 = "1m36rg3w2mf4r3383yf0r1pjrz890mdw506h1lpm6bkc8w3kyqz3"; - }; - } - { - goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; - fetch = { - type = "git"; - url = "https://github.com/kothar/go-backblaze"; - rev = "7594ed38700f5ca3fc7da8f8c7b91b0526ee66f2"; - sha256 = "0zgd5jwwdrqrnx828yxkzywh1dnwqi9y8pmq0vsndi6bwdp6dvkb"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "508b5eb18ee2f667ce06235ed383647038e2afc5"; - sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; - }; - } -] \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix b/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix index 6915be9b6d..40c4b77f1b 100644 --- a/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix @@ -7,7 +7,7 @@ knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, sonnet, threadweaver, kcontacts, akonadi, akonadi-calendar, akonadi-contacts, - eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen, + eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, poppler, pstoedit, qca-qt5, vc # TODO: package Spnav, m2mml LibEtonyek, Libqgit2 @@ -15,18 +15,14 @@ mkDerivation rec { pname = "calligra"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; + sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE="; }; - patches = [ ./qt5_11.patch ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost qtwebkit qtx11extras shared-mime-info @@ -35,7 +31,7 @@ mkDerivation rec { kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver kcontacts akonadi akonadi-calendar akonadi-contacts - eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge + eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc ]; @@ -43,13 +39,10 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i \ - --prefix PATH ':' "${pstoedit.out}/bin" \ - --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share" - done - ''; + qtWrapperArgs = [ + "--prefix PATH : ${lib.getBin pstoedit}/bin" + "--prefix XDG_DATA_DIRS : ${breeze-icons}/share" + ]; meta = with lib; { description = "A suite of productivity applications"; @@ -64,7 +57,5 @@ mkDerivation rec { maintainers = with maintainers; [ phreedom ebzzry zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; - hydraPlatforms = []; - broken = true; # fails to start, kde home not found }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix index 04a40875f7..86a2c96119 100644 --- a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "espanso"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "federico-terzi"; repo = pname; rev = "v${version}"; - sha256 = "1x5p7hniapggqd18rx26mjvdf33z7rm7zz5vsqm2siv3mcl19033"; + sha256 = "1yspycgmg7vwf4d86r6n24lvgn14aq73fl8sn00shxndramp46ib"; }; - cargoSha256 = "0liwwdncymjql5dw7rwhhimcr7qdbyvfgmsd0bawvi0ym7m1v408"; + cargoSha256 = "0g0xf8j4yjayl7a5sqxm3piiif1hc7ws3i7q8vi7dk8nk609pbxr"; nativeBuildInputs = [ extra-cmake-modules diff --git a/third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix b/third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix index 452fc7aecd..f33eb98a48 100644 --- a/third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: let - version = "2020.2.1.2"; + version = "2020.2.3.1"; majorVersion = builtins.substring 0 6 version; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1a382lwyscvl5gdax5vs0shzmbnhjgggrv0hcwid8kf2s98diw5n"; + sha256 = "05wzg7f6mzz7r6azzb8k2g5fakkqh6762y4q9qkmrzbixvxh4lz9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix index 40351ba64a..b0609863c5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, perlPackages +{ stdenv, fetchurl, pkg-config, intltool, perlPackages , goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages , itstool }: @@ -7,16 +7,16 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.47"; + version = "1.12.48"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1khrf72kiq50y8b5prbj2207k9shn36h2b2i588cc4wa28s9y5a0"; + sha256 = "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p"; }; configureFlags = [ "--disable-component" ]; - nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool bison itstool wrapGAppsHook ]; # ToDo: optional libgda, introspection? buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix index d990bc07ad..9fccd574eb 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "gtg"; - version = "unstable-2020-08-02"; + version = "unstable-2020-09-16"; src = fetchFromGitHub { owner = "getting-things-gnome"; repo = "gtg"; - rev = "6623731f301c1b9c7b727e009f4a6462ad381c68"; - sha256 = "14gxgg4nl0ki3dn913041jpyfhxsj90fkd55z6mmpyklhr8mwss1"; + rev = "1be991c6d7f7b2e4b8ac16f82e8a07f9dce4272f"; + sha256 = "1f5acpjwnp08c78dds7xm22qjzcfnx2qs121yvm3rswkh27s4n23"; }; @@ -50,9 +50,16 @@ python3Packages.buildPythonApplication rec { liblarch ]; + checkInputs = with python3Packages; [ + nose + mock + ]; + format = "other"; strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943) + checkPhase = "python3 ../run-tests"; + meta = with stdenv.lib; { description = " A personal tasks and TODO-list items organizer."; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix index 1f60d7df92..dcda1c41e3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.4.2"; + name = "homebank-5.4.3"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "0bkjvd819kw9cwmr3macggbg8yil3yc8v2za8pjrl6g746s89kn6"; + sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix b/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix index a0a558f5ed..543545de26 100644 --- a/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix @@ -27,10 +27,6 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" (lib.optionalString usePython "-DUSE_PYTHON=true") - ] ++ lib.optionals (usePython && stdenv.isDarwin) [ - # Fix python lookup on Darwin. Not necessary after - # https://github.com/NixOS/nixpkgs/pull/94090 lands in master - "-DPython_ROOT_DIR=${python}" ]; # by default, it will query the python interpreter for it's sitepackages location diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 7e20c0bb4f..111e50b7d4 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -61,15 +61,12 @@ in (mkDrv rec { # of rasqal/rasqal.h NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" - ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; + ] ++ lib.optionals stdenv.isx86_64 [ "-mno-fma" "-mno-avx" ] + # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 + ++ [ "-fno-visibility-inlines-hidden" ]; patches = [ ./xdg-open-brief.patch - (fetchpatch { - url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; - name = "poppler-0.86.patch"; - sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; - }) ]; tarballPath = "external/tarballs"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index f4b14870eb..16d754a18a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_69_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; - sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; + name = "boost_1_71_0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; + sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; md5 = ""; - md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; + md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { name = "breakpad.zip"; @@ -63,11 +63,11 @@ md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz"; - sha256 = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48"; + name = "libcdr-0.1.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; + sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; md5 = ""; - md5name = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48-libcdr-0.1.5.tar.xz"; + md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -76,6 +76,13 @@ md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } + { + name = "dtoa-20180411.tgz"; + url = "http://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; + sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; + md5 = ""; + md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; + } { name = "libcmis-0.5.2.tar.xz"; url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; @@ -91,11 +98,11 @@ md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { - name = "cppunit-1.14.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; - sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; + name = "cppunit-1.15.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; + sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7"; md5 = ""; - md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; + md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; @@ -105,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.65.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; - sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; + name = "curl-7.71.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; + sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772"; md5 = ""; - md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; + md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -161,11 +168,11 @@ md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.12.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2"; - sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"; + name = "fontconfig-2.13.91.tar.gz"; + url = "http://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; + sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5"; md5 = ""; - md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2"; + md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -315,11 +322,11 @@ md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { - name = "glm-0.9.4.6-libreoffice.zip"; - url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; - sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a"; - md5 = "bae83fa5dc7f081768daace6e199adc3"; - md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + name = "glm-0.9.9.7.zip"; + url = "http://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; + sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95"; + md5 = ""; + md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { name = "gpgme-1.9.0.tar.bz2"; @@ -329,11 +336,11 @@ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.13.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; - sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; + name = "graphite2-minimal-1.3.14.tgz"; + url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; + sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc"; md5 = ""; - md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; + md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { name = "harfbuzz-2.6.0.tar.xz"; @@ -364,18 +371,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-65_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz"; - sha256 = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948"; + name = "icu4c-67_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; + sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; md5 = ""; - md5name = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948-icu4c-65_1-src.tgz"; + md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; } { - name = "icu4c-65_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-65_1-data.zip"; - sha256 = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6"; + name = "icu4c-67_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; + sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; md5 = ""; - md5name = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6-icu4c-65_1-data.zip"; + md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -462,11 +469,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-09-16.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; - sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; + name = "language-subtag-registry-2020-04-01.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2"; + sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da"; md5 = ""; - md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; + md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -532,11 +539,11 @@ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"; - sha256 = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7"; + name = "libnumbertext-1.0.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; + sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; md5 = ""; - md5name = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7-libnumbertext-1.0.5.tar.xz"; + md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; } { name = "ltm-1.0.zip"; @@ -546,11 +553,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; - sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; + name = "xmlsec1-1.2.30.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; + sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; md5 = ""; - md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; + md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { name = "libxml2-2.9.10.tar.gz"; @@ -581,18 +588,18 @@ md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; } { - name = "mariadb_client-2.0.0-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; - sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; - md5 = "a233181e03d3c307668b4c722d881661"; - md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + name = "mariadb-connector-c-3.1.8-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; + sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b"; + md5 = ""; + md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.5.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2"; - sha256 = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d"; + name = "mdds-1.6.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; + sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; md5 = ""; - md5name = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d-mdds-1.5.0.tar.bz2"; + md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -609,11 +616,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.15.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; - sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; + name = "libmwaw-0.3.16.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; + sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; md5 = ""; - md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; + md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -644,11 +651,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - sha256 = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504"; + name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0"; md5 = ""; - md5name = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { name = "officeotron-0.7.4-master.jar"; @@ -672,11 +679,11 @@ md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { - name = "liborcus-0.15.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz"; - sha256 = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2"; + name = "liborcus-0.15.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; + sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; md5 = ""; - md5name = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2-liborcus-0.15.3.tar.gz"; + md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -693,11 +700,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3963.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2"; - sha256 = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895"; + name = "pdfium-4137.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2"; + sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6"; md5 = ""; - md5name = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895-pdfium-3963.tar.bz2"; + md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -791,11 +798,18 @@ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"; - sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4"; + name = "skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; + url = "http://dev-www.libreoffice.org/src/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; + sha256 = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0"; md5 = ""; - md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz"; + md5name = "f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0-skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz"; + } + { + name = "libstaroffice-0.0.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; + sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db"; + md5 = ""; + md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } { name = "swingExSrc.zip"; @@ -840,11 +854,11 @@ md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.10.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"; - sha256 = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca"; + name = "libwps-0.4.11.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; + sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; md5 = ""; - md5name = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca-libwps-0.4.10.tar.xz"; + md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 5b62b0df95..1beb8f1156 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -6,10 +6,10 @@ rec { inherit sha256; }; - major = "6"; - minor = "4"; - patch = "3"; - tweak = "2"; + major = "7"; + minor = "0"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1cmbrhha7mlflnlbpla8fix07cxcgkdb7krnrgs1bylf31y5855w"; + sha256 = "sha256-sl+vgnLGIWtyw8Y/ovVsxThdOMg2Gby4SRaiaqvZVB0="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "06z9hz4m3kdcljjc6y5s18001axjibj9xiyakdndkl9pmnnhn9h3"; + sha256 = "sha256-i3yfD5cmM6D9BctjablIFRqfibjrwLAaxxPIsQdk0sY="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "0mpgrwg8z1q38j03l6m1sdpcplyjd5nz1nqaa13vfkryj2lflw45"; + sha256 = "sha256-hYBEEPRmh16zgGZBUN20xfTY6qL07aKMC1lC/0ij9/0="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix index c0880aa3ec..54935dd707 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,6 +1,13 @@ -{ stdenv, kdeIntegration, ... }: +{ stdenv, kdeIntegration, fetchpatch, ... }: attrs: { + patches = attrs.patches or [ ] ++ [ + (fetchpatch { + url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; + name = "poppler-0.86.patch"; + sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; + }) + ]; postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix b/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix new file mode 100644 index 0000000000..55854be102 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix @@ -0,0 +1,55 @@ +{ stdenv, appimageTools, desktop-file-utils, fetchurl }: + +let + version = "2020.10.111"; + name = "p3x-onenote-${version}"; + + plat = { + aarch64-linux = "-arm64"; + armv7l-linux = "-armv7l"; + i386-linux = "-i386"; + i686-linux = "-i386"; + x86_64-linux = ""; + }.${stdenv.hostPlatform.system}; + + sha256 = { + aarch64-linux = "0a3c0w1312l6k2jvn7cn8priibnh8wg0184zjcli29f9ds1afl5s"; + armv7l-linux = "172m2d94zzm8q61pvnjy01cl5fg11ad9hfh1han0gycnv3difniy"; + i386-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; + i686-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; + x86_64-linux = "0bn48r55l5dh8zcf8ijh3z6hlyp3s6fvfyqc1csvnslm63dfkzcq"; + }.${stdenv.hostPlatform.system}; + + src = fetchurl { + url = "https://github.com/patrikx3/onenote/releases/download/v${version}/P3X-OneNote-${version}${plat}.AppImage"; + inherit sha256; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in +appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + mkdir -p $out/share/pixmaps $out/share/licenses/p3x-onenote + cp ${appimageContents}/p3x-onenote.png $out/share/pixmaps/ + cp ${appimageContents}/p3x-onenote.desktop $out + cp ${appimageContents}/LICENSE.electron.txt $out/share/licenses/p3x-onenote/LICENSE + mv $out/bin/${name} $out/bin/p3x-onenote + + ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ + --set-key Exec --set-value $out/bin/p3x-onenote \ + --set-key Comment --set-value "P3X OneNote Linux" \ + --delete-original $out/p3x-onenote.desktop + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/patrikx3/onenote"; + description = "Linux Electron Onenote - A Linux compatible version of OneNote"; + license = licenses.mit; + maintainers = with maintainers; [ tiagolobocastro ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix index c549b107c5..ebd057da5c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix @@ -106,26 +106,26 @@ let }; python = python3.override { - packageOverrides = self: super: { - # Paperless only supports Django 2.0 - django = django_2_0 super; + packageOverrides = self: super: let + customPkgs = import ./python-modules super fetchFromGitHub; in + { pyocr = pyocrWithUserTesseract super; + + # Paperless only supports Django 2.0 + django = customPkgs.django_2_0; + + # Paperless is incompatible with factory_boy >= 3 + factory_boy = customPkgs.factory_boy_2_12_0; + + # The current version of django_extensions is incompatible with django 2.0 + django_extensions = customPkgs.django_extensions_2_2_8; + # These are pre-release versions, hence they are private to this pkg django-filter = self.callPackage ./python-modules/django-filter.nix {}; django-crispy-forms = self.callPackage ./python-modules/django-crispy-forms.nix {}; }; }; - django_2_0 = pyPkgs: pyPkgs.django_2_2.overrideDerivation (_: rec { - pname = "Django"; - version = "2.0.12"; - name = "${pname}-${version}"; - src = pyPkgs.fetchPypi { - inherit pname version; - sha256 = "15s8z54k0gf9brnz06521bikm60ddw5pn6v3nbvnl47j1jjsvwz2"; - }; - }); - runtimePackages = with python.pkgs; [ dateparser dateutil diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix new file mode 100644 index 0000000000..40a496312f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix @@ -0,0 +1,30 @@ +pyPkgs: fetchFromGitHub: +{ + django_2_0 = pyPkgs.django_2_2.overridePythonAttrs (old: rec { + version = "2.0.12"; + src = pyPkgs.fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "15s8z54k0gf9brnz06521bikm60ddw5pn6v3nbvnl47j1jjsvwz2"; + }; + }); + + django_extensions_2_2_8 = pyPkgs.django_extensions.overridePythonAttrs (old: rec { + version = "2.2.8"; + src = fetchFromGitHub { + owner = old.pname; + repo = old.pname; + rev = version; + sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj"; + }; + }); + + factory_boy_2_12_0 = pyPkgs.factory_boy.overridePythonAttrs (old: rec { + version = "2.12.0"; + src = pyPkgs.fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s"; + }; + }); +} diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index 73f50998f6..b3538dd2b7 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.47.0"; + version = "0.48.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0l328wvikdmm2i0kbpv9qwd0mkbs24y89cgfg28swhcvpywjpk36"; + sha256 = "0xhxp4iglggv6rqwsg0xjn8z46v910rj372abkaviwa3cqzf7gdb"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix b/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix index 66d028144f..e84e849674 100644 --- a/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.22.1"; + version = "2.23.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; - sha256 = "194vwnc2fi7cgdhasxpr1gxjqqsiqadhadvv43d0lxaxys6f360h"; + sha256 = "10k3j67x5xm5whsvb84k9p70bkn4jbbbvdfan7q49dh2mmpair5a"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix b/third_party/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix index d9f901ff46..2e12e6d3d4 100644 --- a/third_party/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix +++ b/third_party/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix @@ -1,14 +1,26 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage +, fetchurl + + # This is a bit unusual, but makes version and hash easily + # overridable. This is useful when the upstream archive was replaced + # and nixpkgs is not in sync yet. +, officeVersion ? { + version = "978"; + edition = "2018"; + sha256 = "1c5div1kbyyj48f89wkhc1i1759n70bsbp3w4a42cr0jmllyl60v"; +} + +, ... } @ args: callPackage ./generic.nix (args // rec { + inherit (officeVersion) version edition; + pname = "freeoffice"; - version = "976"; - edition = "2018"; suiteName = "FreeOffice"; src = fetchurl { + inherit (officeVersion) sha256; url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; - sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl"; }; archive = "freeoffice${edition}.tar.lzma"; diff --git a/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix b/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix index c7803fa3d1..c1e25ecb00 100644 --- a/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix @@ -5,7 +5,7 @@ # For fixing up execution of /bin/ls, which is necessary for # product unlocking. -, coreutils, libredirect +, coreutils , pname, version, edition, suiteName, src, archive @@ -52,22 +52,7 @@ in stdenv.mkDerivation { runHook postUnpack ''; - installPhase = let - # SoftMaker/FreeOffice collects some system information upon - # unlocking the product. But in doing so, it attempts to execute - # /bin/ls. If the execve syscall fails, the whole unlock - # procedure fails. This works around that by rewriting /bin/ls - # to the proper path. - # - # SoftMaker Office restarts itself upon some operations, such - # changing the theme and unlocking. Unfortunately, we do not - # have control over its environment then and it will fail - # with an error. - lsIntercept = '' - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" - ''; - in '' + installPhase = '' runHook preInstall mkdir -p $out/share @@ -76,12 +61,9 @@ in stdenv.mkDerivation { # Wrap rather than symlinking, so that the programs can determine # their resource path. mkdir -p $out/bin - makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \ - ${lsIntercept} - makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ - ${lsIntercept} - makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ - ${lsIntercept} + makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker + makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations + makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker for size in 16 32 48 64 96 128 256 512 1024; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps diff --git a/third_party/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix b/third_party/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix index 39a6c9288b..d0eb2ffdc9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/third_party/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix @@ -1,14 +1,27 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage +, fetchurl + + # This is a bit unusual, but makes version and hash easily + # overridable. This is useful when people have an older version of + # Softmaker Office or when the upstream archive was replaced and + # nixpkgs is not in sync yet. +, officeVersion ? { + version = "1020"; + edition = "2021"; + sha256 = "1v227pih1p33x7axsw7wz8pz5walpbqnk0iqng711ixk883nqxn5"; +} + +, ... } @ args: callPackage ./generic.nix (args // rec { + inherit (officeVersion) version edition; + pname = "softmaker-office"; - version = "1016"; - edition = "2021"; suiteName = "SoftMaker Office"; src = fetchurl { + inherit (officeVersion) sha256; url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; - sha256 = "0s8kzpc6w2cjkfqmhb2p1pkmkiq9vk9gnc7z2992kijaf9bwk3qz"; }; archive = "office${edition}.tar.lzma"; diff --git a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix new file mode 100644 index 0000000000..f0fc5c3738 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix @@ -0,0 +1,45 @@ +{ + stdenv, + fetchurl, + appimageTools, + libsecret +}: + +let + version = "3.4.1"; + pname = "timeular"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; + sha256 = "1s5jjdl1nzq9yd582lqs904yl10mp0s25897zmifmcbw1vz38bar"; + }; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src; + + extraPkgs = pkgs: with pkgs; [ + libsecret + ]; + + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop + install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png + substituteInPlace $out/share/applications/timeular.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with stdenv.lib; { + description = "Timetracking by flipping 8-sided dice"; + longDescription = '' + The Timeular Tracker is an 8-sided dice that sits on your desk. + Assign an activity to each side and flip to start tracking your time. + The desktop app tell you where every minute of your day is spent. + ''; + homepage = https://timeular.com; + license = licenses.unfree; + maintainers = with maintainers; [ ktor ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix b/third_party/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix index d711440fc3..489b759f48 100644 --- a/third_party/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/todo.txt-cli/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "2.11.0"; + version = "2.12.0"; in stdenv.mkDerivation { pname = "todo.txt-cli"; inherit version; src = fetchurl { url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz"; - sha256 = "0majx8lcvhh8ji54qi0sxr833wchdss95fjc92byd8g3lfz27rsz"; + sha256 = "0gni8nj3wwdf7nl98d1bpx064bz5xari65hb998qqr92h0n9pnp6"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix b/third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix index c2ccbabe2f..6438bed482 100644 --- a/third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/wordgrinder/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" + "OBJDIR=$TMP/wg-build" ]; preBuild = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index cc8412e1ac..e34c548f60 100644 --- a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -12,7 +12,7 @@ , cups , dbus , expat -, ffmpeg_3 +, ffmpeg , fontconfig , freetype , gdk-pixbuf @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { cairo dbus.lib expat - ffmpeg_3 + ffmpeg fontconfig freetype gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index c0690415d6..d615f2a06f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, wrapGAppsHook, makeDesktopItem , atk , cairo +, coreutils , curl , cups , dbus-glib @@ -35,11 +36,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.88"; + version = "5.0.89"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "19r9jmakr04raqripfnqm2b9gwpi52lklrrqgqyb1x35a4xvnj62"; + sha256 = "18p4qnnfx9f2frk7f2nk1d7jr4cjzg9z7lfzrk7vq11qgbjdpqbl"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -131,6 +132,12 @@ stdenv.mkDerivation rec { "$out/usr/lib/zotero-bin-${version}/{}" \; ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils ]} + ) + ''; + meta = with stdenv.lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix index 377619f508..8fb719567d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20200430"; + version = "20200807"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda"; + sha256 = "60b682793698e6427ad485546eae3a044b8290a220f190633158a2fb0e942fa0"; }; propagatedBuildInputs = with python2.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix index b4815803cc..af93b7ee65 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.13"; + version = "4.1.14"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0mlq4z5k3h466plij8hg9xn5xbjxk557g4pw13cplpf32fhng224"; + sha256 = "0hr6xbv01xf7z4r2jxxhn8xjdmca2198q4m9glh4877dllvfq6xj"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix b/third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix index a205cec714..f55c78ea26 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/inspectrum/default.nix @@ -8,20 +8,21 @@ , gnuradio , liquid-dsp , qtbase +, wrapQtAppsHook }: -mkDerivation { +mkDerivation rec { pname = "inspectrum"; - version = "unstable-2017-05-31"; + version = "0.2.2"; src = fetchFromGitHub { owner = "miek"; repo = "inspectrum"; - rev = "a89d1337efb31673ccb6a6681bb89c21894c76f7"; - sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv"; + rev = "v${version}"; + sha256 = "1a517y7s1xi66y5kjrpjay450pad9nc228pa8801mxq1c7m1lamm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ fftwFloat boost diff --git a/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix b/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix new file mode 100644 index 0000000000..55703ea44d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix @@ -0,0 +1,64 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, atk +, cairo +, gdk-pixbuf +, glib +, gtk3 +, openssl +, pango +}: + +rustPlatform.buildRustPackage rec { + pname = "noaa-apt"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "martinber"; + repo = "noaa-apt"; + rev = "v${version}"; + sha256 = "0fqki4a9c54rixdz5bpswvn433f9saw6yazgw4av3xdd7g2fdvvj"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + openssl + pango + ]; + + cargoSha256 = "1pzcq31inazmc9cz31fspzqkp0lpkjid8ai3g17sin1pfzby5jlh"; + + preBuild = '' + # Used by macro pointing to resource location at compile time. + export NOAA_APT_RES_DIR=$out/share/noaa-apt + ''; + + postInstall = '' + # Resources. + mkdir -p $out/share/noaa-apt + cp -R $src/res/* $out/share/noaa-apt/ + + # Desktop icon. + install -Dm644 -t $out/share/applications $src/debian/ar.com.mbernardi.noaa-apt.desktop + install -Dm644 -t $out/share/icons/hicolor/48x48/apps $src/debian/noaa-apt.png + install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/debian/noaa-apt.svg + ''; + + meta = with lib; { + description = "NOAA APT image decoder."; + homepage = "http://noaa-apt.mbernardi.com.ar/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ trepetti ]; + changelog = "https://github.com/martinber/noaa-apt/releases/tag/v${version}"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix b/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix index ce4c872821..77969c5ca3 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix @@ -3,7 +3,7 @@ , faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let - version = "2.1"; + version = "2.2"; in mkDerivation { @@ -14,7 +14,7 @@ in mkDerivation { owner = "AlbrechtL"; repo = "welle.io"; rev = "v${version}"; - sha256 = "1j63gdbd66d6rfjsxwdm2agrcww1rs4438kg7313h6zixpcc1icj"; + sha256 = "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix index 74eea15e83..e84a542f1a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "jun20b"; - version = "20200601_b"; + srcVersion = "sep20a"; + version = "20200901_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "190na9p9kaif4hviraksig6hsq35i1q3nlrm50l00kpj2n8knisk"; + sha256 = "9faa0b3e674b5ffe5b1aee88027d7401a46ae28cd0b306595300547605d6222a"; }; nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bwa/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bwa/default.nix index e478c104ed..7212b42198 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bwa/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bwa/default.nix @@ -11,8 +11,15 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; + # it's unclear which headers are intended to be part of the public interface + # so we may find ourselves having to add more here over time installPhase = '' - install -vD bwa $out/bin/bwa + install -vD -t $out/bin bwa + install -vD -t $out/lib libbwa.a + install -vD -t $out/include bntseq.h + install -vD -t $out/include bwa.h + install -vD -t $out/include bwamem.h + install -vD -t $out/include bwt.h ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix index aa6c95071b..bc4f1677fc 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix @@ -1,32 +1,34 @@ -{ stdenv, fetchurl, unzip, jre }: +{ stdenv, fetchzip, jdk11 }: stdenv.mkDerivation rec { pname = "igv"; - version = "2.4.19"; - - src = fetchurl { - url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "048dgrhxcb854d24kyjkqz12bw04bsv49i5jawb75yzkswwfkb0z"; + version = "2.8.9"; + src = fetchzip { + url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip"; + sha256 = "1874w1xprv91caz1ymfxilq6inhj36xzx8j9m0mcyp0qfvfvyjp7"; }; - buildInputs = [ unzip jre ]; - installPhase = '' mkdir -pv $out/{share,bin} cp -Rv * $out/share/ sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igv.sh - sed -i 's#java#${jre}/bin/java#g' $out/share/igv.sh + sed -i 's#java#${jdk11}/bin/java#g' $out/share/igv.sh + + sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igvtools + sed -i 's#java#${jdk11}/bin/java#g' $out/share/igvtools ln -s $out/share/igv.sh $out/bin/igv + ln -s $out/share/igvtools $out/bin/igvtools chmod +x $out/bin/igv + chmod +x $out/bin/igvtools ''; meta = with stdenv.lib; { homepage = "https://www.broadinstitute.org/igv/"; description = "A visualization tool for interactive exploration of genomic datasets"; - license = licenses.lgpl21; + license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix index 21af5b8220..1ce6357d2e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix @@ -26,14 +26,15 @@ in stdenv.mkDerivation rec { sha256 = "01gm9gj2x2zs4yx6wk761fi1papi7qr3gp4ln1kkn8n2f9y9h849"; }; - buildInputs = [ nim ]; + nativeBuildInputs = [ nim ]; + buildInputs = [ htslib pcre ]; buildPhase = '' HOME=$TMPDIR nim -p:${hts-nim}/src -p:${docopt}/src c --nilseqs:on -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."; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix b/third_party/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix new file mode 100644 index 0000000000..076e459c8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/obitools/obitools3.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, python3Packages, cmake, python3 }: + +let + pythonPackages = python3Packages; +in + +pythonPackages.buildPythonApplication rec { + pname = "obitools3"; + version = "3.0.0-beta14"; + + src = fetchurl { + url = "https://git.metabarcoding.org/obitools/${pname}/repository/v${version}/archive.tar.gz"; + sha256 = "17krklxfvxl6baf2m394gm1a88y0lg0bwqx20cf5q39zyw04z442"; + }; + + preBuild = '' + substituteInPlace src/CMakeLists.txt --replace \$'{PYTHONLIB}' "$out/lib/${python3.libPrefix}/site-packages"; + export NIX_CFLAGS_COMPILE="-L $out/lib/${python3.libPrefix}/site-packages $NIX_CFLAGS_COMPILE" + ''; + + disabled = !pythonPackages.isPy3k; + + nativeBuildInputs = [ pythonPackages.cython cmake ]; + + dontConfigure = true; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib ; { + description = "Management of analyses and data in DNA metabarcoding"; + homepage = "https://git.metabarcoding.org/obitools/obitools3"; + license = licenses.cecill20; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix index 9d81e08d72..7dee07275a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "octopus"; - version = "0.6.3-beta"; + version = "0.7.0"; src = fetchFromGitHub { owner = "luntergroup"; repo = "octopus"; rev = "v${version}"; - sha256 = "042fycg8ppld7iajpzq2d8h8wr0nw43zbl57y125sfihryvr373n"; + sha256 = "0y3g0xc3x3adbcmds6hh60023pfv1qrz6ak7jd88fg9vxi9bdrfb"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 99bac0c4b7..d496e78748 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.3"; + version = "2.23.4"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "08wgi0hijfbchr2srmndxq3h2fijvyvr8b6zv680fpcjixm5bbhf"; + sha256 = "0xg4nbx02a2kckr6p8pqjpv5rmp95bkmglgm1bma6f77s7hkab7q"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix index 6f4211d0c0..c331acbfe7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.3a"; + version = "2.7.5c"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "1hgiqw5qhs0pc1xazzihcfd92na02xyq2kb469z04y1v51kpvvjq"; + sha256 = "1plx9akrzwjk7f2j94l9ss0apg0asqmrf2bp0728d4bvlhnzmjyy"; }; sourceRoot = "source/source"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix index e64c9d3493..fffeca2c74 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "truvari"; - version = "1.3.4"; + version = "2.0.2"; src = fetchFromGitHub { owner = "spiralgenetics"; repo = "truvari"; rev = "v${version}"; - sha256 = "1bph7v48s7pyfagz8a2fzl5fycjliqzn5lcbv3m2bp2ih1f1gd1v"; + sha256 = "0lp1wnldjv92k4ncga1h0icb0dpjsrx427vggg40x04a7kp9lwx0"; }; propagatedBuildInputs = with python3Packages; [ @@ -21,17 +21,20 @@ python3Packages.buildPythonApplication rec { pysam pyfaidx intervaltree + pytabix + acebinf + bwapy + joblib + pandas ]; - prePatch = '' - substituteInPlace ./setup.py \ - --replace '"progressbar2==3.41.0",' '"progressbar2==3.47.0",' \ - --replace '"pysam==0.15.2",' '"pysam==0.15.4",' \ - --replace '"pyfaidx==0.5.5.2",' '"pyfaidx==0.5.8",' - ''; + # no tests + doCheck = false; + pythonImportsCheck = [ "truvari" ]; meta = with lib; { description = "Structural variant comparison tool for VCFs"; + homepage = "https://github.com/spiralgenetics/truvari"; license = licenses.mit; maintainers = with maintainers; [ scalavision ]; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix new file mode 100644 index 0000000000..9e33660020 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/whisper/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, fetchurl }: + +stdenv.mkDerivation rec { + pname = "whisper"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "refresh-bio"; + repo = pname; + rev = "v${version}"; + sha256 = "0wpx1w1mar2d6zq2v14vy6nn896ds1n3zshxhhrrj5d528504iyw"; + }; + + preConfigure = '' + cd src + + # disable default static linking + sed -i 's/ -static / /' makefile + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin whisper whisper-index + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Short read sequence mapper"; + license = licenses.gpl3; + homepage = "https://github.com/refresh-bio/whisper"; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.x86_64; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index 99101a5fd1..6545472a52 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.2"; + version = "14.31.3"; pname = "jmol"; 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 = "0p2cbzxhw1s4l76kbriag3r4dkpsfvrnydryyikgkbdwnq479hm2"; + sha256 = "067051wp9kgkgcy3mvqwxhim0h1qfcf4jk8vrbzd3y9pwmjismzy"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix index 88a55b52b5..e8cd077afd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.16.0"; + version = "20.17.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "0wfg5zd8dvjy6x6al58jd5d53gar3ds326q3b6771h5p5jzv0x2g"; + sha256 = "0ip6ma9ivk5b74s9najn2rrkiha7hya1rjhgyrc71kwsj5gqgli0"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/adms/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/adms/default.nix index f55dd2f052..0fcf4d25e2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/adms/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/adms/default.nix @@ -2,14 +2,14 @@ libxml2, perl, perlPackages, gd }: stdenv.mkDerivation rec { - version = "2.3.6"; + version = "2.3.7"; pname = "adms"; src = fetchFromGitHub { owner = "Qucs"; repo = "adms"; rev = "release-${version}"; - sha256 = "1pcwq5khzdq4x33lid9hq967gv78dr5i4f2sk8m8rwkfqb9vdzrg"; + sha256 = "0i37c9k6q1iglmzp9736rrgsnx7sw8xn3djqbbjw29zsyl3pf62c"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix new file mode 100644 index 0000000000..247f99485b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix @@ -0,0 +1,56 @@ +{ lib +, python3Packages +, fetchFromBitbucket +, fetchpatch +}: + +python3Packages.buildPythonApplication rec { + pname = "flatcam"; + version = "8.5"; + + src = fetchFromBitbucket { + owner = "jpcgt"; + repo = "${pname}"; + rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging. + sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; + }; + + propagatedBuildInputs = with python3Packages; [ + matplotlib + numpy + pyqt4 + Rtree + scipy + setuptools + shapely + simplejson + six + svg-path + ]; + + packaging_fix_pull_request_patch = fetchpatch { + name = "packaging_fix_pull_request.patch"; + url = "https://bitbucket.org/trepetti/flatcam/commits/5591ed889d1f48a5190fe237b562cb932cb5876c/raw"; + sha256 = "19rhjdrf1n1q29cgpcry6pl2kl90zq0d613hhkwdir9bhq5bkknp"; + }; + + patches = [ + packaging_fix_pull_request_patch + ./release.patch + ]; + + # Only non-GUI tests can be run deterministically in the Nix build environment. + checkPhase = '' + python -m unittest tests.test_excellon + python -m unittest tests.test_gerber_buffer + python -m unittest tests.test_paint + python -m unittest tests.test_pathconnect + ''; + + meta = with lib; { + description = "2-D post processing for PCB fabrication on CNC routers."; + homepage = "https://bitbucket.org/jpcgt/flatcam"; + license = licenses.mit; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/release.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/release.patch new file mode 100644 index 0000000000..945228e35b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/release.patch @@ -0,0 +1,13 @@ +diff --git a/FlatCAMVersion.py b/FlatCAMVersion.py +index ba9e04a5..2c64d5a6 100644 +--- a/FlatCAMVersion.py ++++ b/FlatCAMVersion.py +@@ -16,7 +16,7 @@ version = { + "number": 8.5, + "date": (2016, 7, 1), # Year, Month, Day + "name": None, +- "release": False, ++ "release": True, + } + + diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/hyp2mat/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/hyp2mat/default.nix index 1fa2c23b56..154b68dd5a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/hyp2mat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "hyp2mat"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "koendv"; repo = "hyp2mat"; rev = "v${version}"; - sha256 = "04bd2vrn8y1izir7pwl34a60cg2v05baqcrmpfdx5fvf33bbflaj"; + sha256 = "03ibk51swxfl7pfrhcrfiffdi4mnf8kla0g1xj1lsrvrjwapfx03"; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Import Hyperlynx Boardsim files to openEMS, an open source 3D full-wave electromagnetic field solver"; - homepage = https://github.com/koendv/hyp2mat; + homepage = "https://github.com/koendv/hyp2mat"; license = licenses.gpl3Plus; maintainers = with maintainers; [ matthuszagh ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index b7ab5fa70d..2fd4c12204 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { i18n = libraries.i18n; pname = "kicad-base"; - version = "${versions.${baseName}.kicadVersion.version}"; + version = "${builtins.substring 0 10 versions.${baseName}.kicadVersion.src.rev}"; src = fetchFromGitLab ( { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index a8340a2c22..e5ce1f0092 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -9,7 +9,7 @@ , oceSupport ? false, opencascade , withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice -, scriptingSupport ? false, swig, python3 +, scriptingSupport ? true, swig, python3 , debug ? false, valgrind , with3d ? true , withI18n ? true diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix index 4dde2a0a12..057bc15bf5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix @@ -15,7 +15,9 @@ let mkLib = name: stdenv.mkDerivation { pname = "kicad-${name}"; - version = "${version}"; + # Use the revision instead of `version` (which is an ISO 8601 date) + # to prevent duplicating the library when just the date changed + version = "${builtins.substring 0 10 libSources.${name}.rev}"; src = fetchFromGitHub ( { owner = "KiCad"; @@ -50,7 +52,7 @@ in i18n = let name = "i18n"; in stdenv.mkDerivation { pname = "kicad-${name}"; - version = "${version}"; + version = "${builtins.substring 0 10 libSources.${name}.rev}"; src = fetchFromGitLab ( { group = "kicad"; @@ -60,8 +62,7 @@ in inherit name; } // (libSources.${name} or { }) ); - buildInputs = [ gettext ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gettext ]; meta = { license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 platforms = stdenv.lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 7299e8ee90..d001cc4336 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-07-21"; + version = "2020-08-22"; src = { - rev = "9a801d8b72f24e297a7d9d6e8cee2eef6cab2988"; - sha256 = "0yilmmng7y3rz1bxw2b0s0aqs8hdqr7ach2r45bx8v1f4bih4ka9"; + rev = "a2341f0f335b0abb9fc8cb86d19cbe6f9b38fade"; + sha256 = "0167yb39f800xarq3khn7sbdkgcx9j2ayhy8c7lhhks6kh7459g0"; }; }; libVersion = { - version = "2020-07-21"; + version = "2020-08-22"; libSources = { - i18n.rev = "a311975d139caf8be9848dd613a9800570adc245"; - i18n.sha256 = "1bkn2hhwcg8xdpn9yfm9nnqsg02c1nizhpxd4yhpxgifhh4psz1g"; - symbols.rev = "18572c4c118fe8ef779edf3131eebf2c33c6fa46"; - symbols.sha256 = "0hqx0aznzrnlbdkpsnl8mbs9bdgiv029d6zjh10nyjzcw27q3hxz"; + i18n.rev = "cbbb1efd940094bf0c3168280698b2b059a8c509"; + i18n.sha256 = "1q4jakn6m8smnr2mg7jgb520nrb6fag9mdvlcpx3smp3qbxka818"; + symbols.rev = "9ca6a5348cdeb88e699582d4ed051ff7303b44d3"; + symbols.sha256 = "13w6pb34rhz96rnar25z7kiscy6q1fm8l39hq1bpb8g9yn86ssz4"; templates.rev = "ae16953b81055855bcede4a33305413599d86a15"; templates.sha256 = "1pkv90p3liy3bj4nklxsvpzh9m56p0k5ldr22armvgqfaqaadx9v"; - footprints.rev = "4835f80b4a52256aa7a3eb650e6e0fef33a77d0d"; - footprints.sha256 = "00rc6phxmkry35i0xzry14axvh2akvvkly45s3xxi06vaydaw7i5"; - packages3d.rev = "9b560cf94a35b692ca516d37bdaf392ce10e549d"; - packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; + footprints.rev = "f94c2d5d619d16033f69a555b449f59604d97865"; + footprints.sha256 = "1g71sk77jvqaf9xvgq6dkyvd9pij2lb4n0bn0dqnwddhwam935db"; + packages3d.rev = "f699b0e3c13fe75618086913e39279c85da14cc7"; + packages3d.sha256 = "0m5rb5axa946v729z35ga84in76y4zpk32qzi0hwqx957zy72hs9"; }; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix index 5a70831d82..ad8fa3c7a7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "17b0qmz7g0nk7n7jhbh5xhs135dpj9kv41n42vvpdzwr6z5rk4qm"; + sha256 = "104j7d3i5y6jd20c2z3l10sr6sgdy8iki3g9mlwhddnr8x6nzc03"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index 0613e22bbd..ce8ebe42ea 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, perl, flex, bison }: +{ stdenv, fetchurl +, perl, flex, bison +}: stdenv.mkDerivation rec { pname = "verilator"; - version = "4.036"; + version = "4.100"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "1sy02pgq3kvk8548l57hsh08vfbqdg8dghj8mwlybdi8fdjz4z1h"; + sha256 = "0vg1gk1hqlnz74gfpf57588758myxvhqzi37yl4vqjcq40r83nr2"; }; enableParallelBuilding = true; - buildInputs = [ perl flex bison ]; + buildInputs = [ perl ]; + nativeBuildInputs = [ flex bison ]; - meta = { + # these tests need some interpreter paths patched early on... + doCheck = false; + checkTarget = "test"; + + meta = with stdenv.lib; { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix index fa1efe2998..082d44ddc6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "iverilog"; - version = "unstable-2019-08-01"; + version = "unstable-2020-08-24"; src = fetchFromGitHub { - owner = "steveicarus"; + owner = "steveicarus"; repo = pname; - rev = "c383d2048c0bd15f5db083f14736400546fb6215"; - sha256 = "1zs0gyhws0qa315magz3w5m45v97knczdgbf2zn4d7bdb7cv417c"; + rev = "d8556e4c86e1465b68bdc8d5ba2056ba95a42dfd"; + sha256 = "sha256-sT9j/0Q2FD5MOGpH/quMGvAuM7t7QavRHKD9lX7Elfs="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix new file mode 100644 index 0000000000..43dfdcabd0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, bison +, flex +, verilog +}: + +stdenv.mkDerivation rec { + pname = "vhd2vl"; + version = "unstable-2018-09-01"; + + src = fetchFromGitHub { + owner = "ldoolitt"; + repo = pname; + rev = "37e3143395ce4e7d2f2e301e12a538caf52b983c"; + sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; + }; + + nativeBuildInputs = [ + bison + flex + ]; + + buildInputs = [ + verilog + ]; + + installPhase = '' + mkdir -p $out/bin + cp src/vhd2vl $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "VHDL to Verilog converter"; + homepage = "https://github.com/ldoolitt/vhd2vl"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index e396f1c4a9..519b1f9813 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,29 +2,27 @@ let pname = "alt-ergo"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-${version}/alt-ergo-${version}.tar.gz"; - sha256 = "130hisjzkaslygipdaaqib92spzx9rapsd45dbh5ssczjn5qnhb9"; + sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj"; }; - preConfigure = "patchShebangs ./configure"; - nativeBuildInputs = [ which ]; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src preConfigure nativeBuildInputs; + inherit version src nativeBuildInputs; configureFlags = pname; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src preConfigure nativeBuildInputs; + inherit version src nativeBuildInputs; configureFlags = pname; buildInputs = with ocamlPackages; [ menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -32,7 +30,7 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src preConfigure nativeBuildInputs; + inherit pname version src nativeBuildInputs; configureFlags = pname; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch b/third_party/nixpkgs/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch deleted file mode 100644 index a53142faba..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/avy/CMakeLists.txt b/avy/CMakeLists.txt -index 5913076..b0453b5 100644 ---- a/avy/CMakeLists.txt -+++ b/avy/CMakeLists.txt -@@ -23,7 +23,6 @@ if (CUSTOM_BOOST_ROOT) - set (Boost_NO_SYSTEM_PATHS "ON") - endif() - --set (Boost_USE_STATIC_LIBS ON) - find_package (Boost 1.46.1 REQUIRED program_options) - IF (Boost_FOUND) - include_directories (${Boost_INCLUDE_DIRS}) diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/avy/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/avy/default.nix index 78ed641a80..6b48c1e344 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/avy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/avy/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit, cmake, zlib, boost }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avy"; - version = "2017.10.16"; + version = "2019.05.01"; # date of cav19 tag src = fetchgit { url = "https://bitbucket.org/arieg/extavy"; - rev = "c75c83379c38d6ea1046d0caee95aef77283ffe3"; - sha256 = "0zcycnypg4q5g710bnkjpycaawmibc092vmyhgfbixkgq9fb5lfh"; + rev = "cav19"; + sha256 = "0qdzy9srxp5f38x4dbb3prnr9il6cy0kz80avrvd7fxqzy7wdlwy"; fetchSubmodules = true; }; @@ -31,10 +31,6 @@ stdenv.mkDerivation { patch -p1 -d glucose -i ${./glucose-fenv.patch} ''; - patches = - [ ./0001-no-static-boost-libs.patch - ]; - installPhase = '' mkdir -p $out/bin cp avy/src/{avy,avybmc} $out/bin/ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 9b9647a2ac..946cba41b1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,6 @@ , ocamlPackages, ncurses , buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10") , glib, gnome3, wrapGAppsHook -, darwin , csdp ? null , version }: @@ -116,7 +115,6 @@ self = stdenv.mkDerivation { ++ stdenv.lib.optionals buildIde (if versionAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa else [ ocamlPackages.lablgtk ]); propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix index ff481fd7ab..be80565115 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix @@ -13,16 +13,21 @@ stdenv.mkDerivation rec { patches = [ ./cvc3-2.4.1-gccv6-fix.patch ]; - preConfigure = '' + postPatch = '' sed -e "s@ /bin/bash@bash@g" -i Makefile.std find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' + + # bison 3.7 workaround + for f in parsePL parseLisp parsesmtlib parsesmtlib2 ; do + ln -s ../parser/''${f}_defs.h src/include/''${f}.hpp + done ''; meta = with stdenv.lib; { description = "A prover for satisfiability modulo theory (SMT)"; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.free; homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix index d2e49d8178..a12d75eabb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "isabelle"; - version = "2018"; + version = "2020"; dirname = "Isabelle${version}"; src = if stdenv.isDarwin then fetchurl { - url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg"; - sha256 = "0jwnvsf5whklq14ihaxs7b9nbic94mm56nvxljrdbvl6y628j9r5"; + url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; + sha256 = "1sfr5filsaqj93g5y4p9n8g5652dhr4whj25x4lifdxr2pp560xx"; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "1928lwrw1v1p9s23kix30ncpqm8djmrnjixj82f3ni2a8sc3hrsp"; + sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3"; }; buildInputs = [ perl polyml z3 ] @@ -42,14 +42,14 @@ stdenv.mkDerivation rec { ML_SOURCES="\$POLYML_HOME/src" EOF - cat >contrib/jdk/etc/settings <contrib/jdk*/etc/settings <>etc/settings - for comp in contrib/jdk contrib/polyml-* contrib/z3-*; do + for comp in contrib/jdk* contrib/polyml-* contrib/z3-*; do rm -rf $comp/x86* done '' + (if ! stdenv.isLinux then "" else '' @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { bin/isabelle install $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "A generic proof assistant"; longDescription = '' @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { to be expressed in a formal language and provides tools for proving those formulas in a logical calculus. ''; - homepage = "http://isabelle.in.tum.de/"; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.jwiegley ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://isabelle.in.tum.de/"; + license = licenses.bsd3; + maintainers = [ maintainers.jwiegley ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix index 224795f2a6..32a75cabc1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.18.4"; + version = "3.19.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1pmc2wi1pa346w89ayrrjv9xk6v6myg2zmx1wj4pd9qxv7ivrbsn"; + sha256 = "1dybq6104vc62x620izgblfd8dqc4ynaiw8ml07km78lq38anm6v"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/leo3/binary.nix b/third_party/nixpkgs/pkgs/applications/science/logic/leo3/binary.nix index dcea9c27ac..29a9adf94c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/leo3/binary.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/leo3/binary.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mkdir -p "$out"/{bin,lib/java/leo3} cp "${jar}" "$out/lib/java/leo3/leo3.jar" echo "#!${runtimeShell}" > "$out/bin/leo3" - echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" + echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" >> "$out/bin/leo3" chmod a+x "$out/bin/leo3" ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix index 02e9844115..b5d13db3b9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/ltl2ba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ltl2ba"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${pname}-${version}.tar.gz"; - sha256 = "0vzv5g7v87r41cvdafxi6yqnk7glzxrzgavy8213k59f6v11dzlx"; + sha256 = "1bz9gjpvby4mnvny0nmxgd81rim26mqlcnjlznnxxk99575pfa4i"; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/mcy/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/mcy/default.nix index bbdcacf2b5..eba910e07e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/mcy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/mcy/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation { pname = "mcy"; - version = "2020.07.06"; + version = "2020.08.03"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "mcy"; - rev = "6e8433ed9acbface5e080719110a957d89d849df"; - sha256 = "1vbzg0rgmf7kp735m6p4msxc51vpsrdwk24ir7z0zxsb8lv53gg7"; + rev = "62048e69df13f8e03670424626755ae8ef4c36ff"; + sha256 = "15xxgzx1zxzx5kshqyrxnfx33cz6cjzxcdcn6z98jhs9bwyvf96f"; }; buildInputs = [ python ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix index fa2ad9c4ab..ecc253a64d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/ott/default.nix @@ -1,27 +1,22 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ocaml }: +{ stdenv, fetchFromGitHub, pkgconfig, ocaml, opaline }: stdenv.mkDerivation rec { pname = "ott"; - version = "0.30"; + version = "0.31"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "16bxfnm30z94x36vr8vs6zd6fj55vnb7aypjl6hf7clk42040brc"; + sha256 = "0l81126i2qkz11fs5yrjdgymnqgjcs5avb7f951h61yh1s68jpnn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig opaline ]; buildInputs = [ ocaml ]; - installPhase = '' - mkdir -p $out/bin - cp src/ott.opt $out/bin - ln -s $out/bin/ott.opt $out/bin/ott + installTargets = "ott.install"; - mkdir -p $out/share/emacs/site-lisp - cp emacs/ott-mode.el $out/share/emacs/site-lisp - ''; + postInstall = "opaline -prefix $out"; meta = { description = "Ott: tool for the working semanticist"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix index 6a9367b30a..6acae2bcb7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "proverif"; - version = "2.01"; + version = "2.02pl1"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz"; - sha256 = "01wp5431c77z0aaa99h8bnm5yhr6jslpqc8iyg0a7gxfqnb19gxi"; + sha256 = "1jmzfpx0hdgfmkq0jp6i3k5av9xxgndjaj743wfy37svn0ga4jjx"; }; buildInputs = with ocamlPackages; [ ocaml findlib lablgtk ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix index b3ae458025..9cf8b0845d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub , bash, python3, yosys -, yices, boolector, aiger +, yices, boolector, z3, aiger }: stdenv.mkDerivation { pname = "symbiyosys"; - version = "2020.07.03"; + version = "2020.08.22"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "SymbiYosys"; - rev = "06e80194c77f5cc38c6999b1d3047a2d6ca82e15"; - sha256 = "1hl03qy98pgq24ijyimf9pf7qxp42l7cki66wx48jys4m1s6n8v9"; + rev = "33b0bb7d836fe2a73dc7b10587222f2a718beef4"; + sha256 = "03rbrbwsji1sqcp2yhgbc0fca04zsryv2g4izjhdzv64nqjzjyhn"; }; - buildInputs = [ python3 ]; + buildInputs = [ ]; patchPhase = '' patchShebangs . @@ -26,14 +26,15 @@ stdenv.mkDerivation { # Fix various executable references substituteInPlace sbysrc/sby_core.py \ --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \ - --replace ': "btormc"' ': "${boolector}/bin/btormc"' \ - --replace ': "yosys"' ': "${yosys}/bin/yosys"' \ - --replace ': "yosys-smtbmc"' ': "${yosys}/bin/yosys-smtbmc"' \ - --replace ': "yosys-abc"' ': "${yosys}/bin/yosys-abc"' \ - --replace ': "aigbmc"' ': "${aiger}/bin/aigbmc"' \ + --replace ', "btormc"' ', "${boolector}/bin/btormc"' \ + --replace ', "aigbmc"' ', "${aiger}/bin/aigbmc"' + + substituteInPlace sbysrc/sby_core.py \ + --replace '##yosys-program-prefix##' '"${yosys}/bin/"' ''; buildPhase = "true"; + installPhase = '' mkdir -p $out/bin $out/share/yosys/python3 @@ -43,6 +44,10 @@ stdenv.mkDerivation { chmod +x $out/bin/sby ''; + doCheck = false; # not all provers are yet packaged... + checkInputs = [ python3 yosys boolector yices z3 aiger ]; + checkPhase = "make test"; + meta = { description = "Tooling for Yosys-based verification flows"; homepage = "https://symbiyosys.readthedocs.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix index cbca37ea53..3872d3a982 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.badi ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix index 5edc3e4129..5c445459a3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -76,6 +76,6 @@ in stdenv.mkDerivation { # http://lamport.azurewebsites.net/tla/license.html license = with lib.licenses; [ mit ]; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.badi ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix index b9bd2172bb..eacff32bdf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation { pname = "why3"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38291/why3-1.3.1.tar.gz"; - sha256 = "16zcrc60zz2j3gd3ww93z2z9x2jkxb3kr57y8i5rcgmacy7mw3bv"; + url = "https://gforge.inria.fr/frs/download.php/file/38367/why3-1.3.3.tar.gz"; + sha256 = "1n0a2nn1gnk0zg339lh698g4wpk7m8m1vyi2yvifd5adqvk4milw"; }; buildInputs = with ocamlPackages; [ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix index 53dfb84760..84c1544071 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "z3"; - version = "4.8.7"; + version = "4.8.9"; src = fetchFromGitHub { owner = "Z3Prover"; repo = pname; rev = "z3-${version}"; - sha256 = "0hprcdwhhyjigmhhk6514m71bnmvqci9r8gglrqilgx424r6ff7q"; + sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"; }; buildInputs = [ python fixDarwinDylibNames ] ++ optional javaBindings jdk; @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Z3Prover/z3"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.x86_64; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix index a952fb559c..05c56b0b09 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,20 +1,31 @@ -{ stdenv, python2Packages, fetchurl }: - python2Packages.buildPythonApplication rec { +{ stdenv, python3Packages, fetchFromGitHub, qt5 }: + python3Packages.buildPythonApplication rec { pname = "labelImg"; - version = "1.8.1"; - src = fetchurl { - url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; - sha256 = "1banpkpbrny1jx3zsgs544xai62z5yvislbq782a5r47gv2f2k4a"; + version = "1.8.3"; + src = fetchFromGitHub { + owner = "tzutalin"; + repo = "labelImg"; + rev = "v${version}"; + sha256 = "07v106fzlmxrbag4xm06m4mx9m0gckb27vpwsn7sap1bbgc1pap5"; }; - nativeBuildInputs = with python2Packages; [ - pyqt4 + nativeBuildInputs = with python3Packages; [ + pyqt5 + qt5.wrapQtAppsHook ]; - propagatedBuildInputs = with python2Packages; [ - pyqt4 + propagatedBuildInputs = with python3Packages; [ + pyqt5 lxml + sip ]; preBuild = '' - make qt4py2 + make qt5py3 + ''; + postInstall = '' + cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs + ''; + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with stdenv.lib; { description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images"; diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix index 3856b8ec84..26b241ff0a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchPypi , altair, astor, base58, blinker, boto3, botocore, click, enum-compat - , future, pillow, protobuf, requests, toml, tornado, tzlocal, validators, watchdog + , future, pillow, protobuf, requests, toml, tornado_5, tzlocal, validators, watchdog , jinja2, setuptools }: @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ altair astor base58 blinker boto3 botocore click enum-compat - future pillow protobuf requests toml tornado tzlocal validators watchdog + future pillow protobuf requests toml tornado_5 tzlocal validators watchdog jinja2 setuptools ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix index 52da3b4a1a..717b240c1c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -12,11 +12,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-4.0.0"; + name = "R-4.0.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; - sha256 = "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"; + sha256 = "0xdy3dy2bzdiba8z94hjykyra8si8a5q15s0bri7c26scjrymg6k"; }; dontUseImakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch b/third_party/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch index 5b8f492a8e..2334d54711 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch +++ b/third_party/nixpkgs/pkgs/applications/science/math/calculix/calculix.patch @@ -1,16 +1,7 @@ -diff --git a/ccx_2.15/src/Makefile b/ccx_2.15/src/Makefile -index 9cab2fc..6e977b8 100755 ---- a/ccx_2.15/src/Makefile -+++ b/ccx_2.15/src/Makefile -@@ -1,6 +1,6 @@ - - CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT --FFLAGS = -Wall -O3 -+FFLAGS = -Wall -O3 - - CC=cc - FC=gfortran -@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o) +diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile +--- a/ccx_2.17/src/Makefile 2020-07-23 21:41:38.507761972 +0200 ++++ b/ccx_2.17/src/Makefile 2020-08-22 16:53:50.004938281 +0200 +@@ -18,15 +18,10 @@ OCCXC = $(SCCXC:.c=.o) OCCXMAIN = $(SCCXMAIN:.c=.o) @@ -22,10 +13,10 @@ index 9cab2fc..6e977b8 100755 - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc - --ccx_2.15: $(OCCXMAIN) ccx_2.15.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) -+ccx_2.15: $(OCCXMAIN) ccx_2.15.a -+ $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) +-ccx_2.17: $(OCCXMAIN) ccx_2.17.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) ++ccx_2.17: $(OCCXMAIN) ccx_2.17.a ++ $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) - ccx_2.15.a: $(OCCXF) $(OCCXC) + ccx_2.17.a: $(OCCXF) $(OCCXC) ar vr $@ $? diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calculix/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calculix/default.nix index 4488259455..e37e9d0910 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/calculix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/calculix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calculix"; - version = "2.15"; + version = "2.17"; src = fetchurl { url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; - sha256 = "0d4axfxgm3ag4p2vx9rjcky7c122k99a2nhv1jv53brm35rblzdw"; + sha256 = "0l3fizxfdj2mpdp62wnk9v47q2yc3cy39fpsm629z7bjmba8lw6a"; }; nativeBuildInputs = [ gfortran ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix index c068225bb6..65caff82ea 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ name = "geogebra-${version}"; - version = "6-0-598-0"; + version = "6-0-600-0"; src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20200815132422/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20200904093945/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" ]; - sha256 = "1klazsgrpmfd6vjzpdcfl5x8qhhbh6vx2g6id4vg16ac4sjdrb0c"; + sha256 = "1l49rvfkil2cz6r7sa2mi0p6hvb6p66jv3x6xj8hjqls4l3sfhkm"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix index f39c6a04d1..673c28ffa7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/lp_solve/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { cd lp_solve*/lpsolve55 bash ccc mkdir -pv $out/lib - cp -v bin/*/* $out/lib + find bin -type f -exec cp -v "{}" $out/lib \; ) ( cd lp_solve*/lp_solve bash ccc mkdir -pv $out/bin - cp -v bin/*/* $out/bin + find bin -type f -exec cp -v "{}" $out/bin \; ) ( mkdir -pv $out/include diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix index c75c91be05..8ec6ac5048 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix @@ -7,6 +7,12 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ + { + version = "12.1.1"; + lang = "en"; + language = "English"; + sha256 = "02mk8gmv8idnakva1nc7r7mx8ld02lk7jgsj1zbn962aps3bhixd"; + } { version = "12.1.0"; lang = "en"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix index 002acbf387..9d14df5a79 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix @@ -1,7 +1,9 @@ { stdenv , fetchFromGitHub -, fetchpatch , pkgconfig +, python3 +, meson +, ninja , vala , gtk3 , glib @@ -9,52 +11,67 @@ , libsoup , gtksourceview , libgee -, cmake +, nix-update-script +, webkitgtk , libqalculate -, cln +, intltool +, gnuplot , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "nasc"; - version = "0.5.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "parnold-x"; repo = pname; rev = version; - sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn"; + sha256 = "kSRc5RLkI6SBJirUYw6swZi8IJhaL3y74b2Zw8kh2XA="; + fetchSubmodules = true; }; - patches = [ - # fix build with gcc9 - (fetchpatch { - url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch"; - sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3"; - }) - ]; - nativeBuildInputs = [ - cmake - vala + glib # post_install.py + gtk3 # post_install.py + intltool # for libqalculate + meson + ninja pkgconfig + python3 + vala wrapGAppsHook ]; buildInputs = [ - cln - libsoup - gtk3 glib + gtk3 gtksourceview libgee - libqalculate pantheon.elementary-icon-theme pantheon.granite - ]; + webkitgtk + # We add libqalculate's runtime dependencies because nasc has it as a modified subproject. + ] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + + # patch subproject. same code in libqalculate expression + substituteInPlace subprojects/libqalculate/libqalculate/Calculator-plot.cc \ + --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ + --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - ' + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; meta = with stdenv.lib; { - description = "Do maths like a normal person"; + description = "Do maths like a normal person, designed for elementary OS"; longDescription = '' It’s an app where you do maths like a normal person. It lets you type whatever you want and smartly figures out what is math and @@ -63,7 +80,7 @@ stdenv.mkDerivation rec { the equations it’s used in. ''; homepage = "https://github.com/parnold-x/nasc"; - maintainers = with maintainers; [ samdroid-apps ]; + maintainers = pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix index c1d408213b..d75fc9731c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix @@ -10,15 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww"; }; outputs = [ "out" "dev" ]; - configureFlags = { + configureFlags = [ # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA - default = [ "--disable-clz" "--disable-popcnt" ]; - westmere = [ "--disable-clz" ]; - sandybridge = [ "--disable-clz" ]; - ivybridge = [ "--disable-clz" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-popcnt" + "--${if stdenv.hostPlatform.sse4_aSupport then "enable" else "disable"}-clz" + ]; installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index 213530b60a..df622e7303 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,17 +2,25 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.8.0a"; + version = "3.12.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0bjd61bbc5b2i09kz3ss01c0xmxrhmiv5wpbhhplkp3yhw2qrf3m"; + sha256 = "0ylsxj9rn3dc1grn9w6jisci3ak0hxgbwzqp54azs3aj5cmvkfgg"; }; patchPhase = '' - substituteInPlace src/main.cc --replace 'getPackageDataDir().c_str()' \"$out/share\" + # The gnome-search-provider2.c file generated by gdbus-codegen depends + # on gio-unix-2.0, which is a Requires.private of gtk+-3.0, + # and private dependencies are dropped in our default patched pkg-config. + # https://github.com/Qalculate/qalculate-gtk/pull/178 + # https://github.com/NixOS/nixpkgs/issues/292 + substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0' + + # https://github.com/Qalculate/qalculate-gtk/pull/179 + echo searchprovider.o: gnome-search-provider2.c >>src/Makefile.am ''; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix index 84adb2358d..40b2711ff6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "046x2zpvza7n0m81s75qkvmnpkvsvvyqqqjxcqzj7by0llpqs7wa"; + sha256 = "0vwb9c3xvd2cms6cw8j8parg7w4bsxvvrd1wgggr8sz2p8rrvy5p"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix index 626e1bf1ea..ba7f6ccd18 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix @@ -50,7 +50,7 @@ , zlib , gsl , ntl -, jdk +, jdk8 , less }: @@ -61,6 +61,8 @@ assert (!blas.isILP64) && (!lapack.isILP64); # dependencies. let + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + runtimepath = (lib.makeBinPath ([ "@sage-local@" "@sage-local@/build" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index a6afc95ac0..7a81a0d679 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "20.04.0"; + version = "20.06.6"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "0vrjxzfgmjdzm1rgl0crz4b4badl14jwh032y3xkcdvjl5j67lp3"; + sha256 = "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w"; }; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix index 9a24496c6a..b868706a05 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: rustPlatform.buildRustPackage rec { - version = "0.5.0"; + version = "0.5.1"; pname = "rink"; src = fetchFromGitHub { owner = "tiffany352"; repo = "rink-rs"; rev = "v${version}"; - sha256 = "1z51n25hmgqkn4bm9yj18j8p4pk5i1x3f3z70vl1vx3v109jhff0"; + sha256 = "1s67drjzd4cf93hpm7b2facfd6y1x0s60aq6pygj7i02bm0cb9l9"; }; - cargoSha256 = "0p63py8q4iqj5rrsir9saj7dvkrafx63z493k7p5xb2mah7b21lb"; + cargoSha256 = "1wd70y13lly7nccaqlv7w8znxfal0fzyf9d67y5c3aikj7hkzfin"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ncurses ]; diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix index 425e82000b..fe9719efde 100644 --- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, lib, bison -, qt4, xapian, file, python, perl +{ mkDerivation, stdenv, fetchurl, lib, bison +, qtbase, xapian, file, python, perl , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx , libwpd, unrtf, untex , ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib @@ -7,7 +7,7 @@ assert stdenv.hostPlatform.system != "powerpc-linux"; -stdenv.mkDerivation rec { +mkDerivation rec { ver = "1.24.5"; name = "recoll-${ver}"; @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { sha256 = "10m3a0ghnyipjcxapszlr8adyy2yaaxx4vgrkxrfmz13814z89cv"; }; - configureFlags = [ "--enable-recollq" ] + configureFlags = [ "--enable-recollq" "--disable-webkit" ] ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); buildInputs = [ xapian file python bison zlib ] - ++ lib.optional withGui qt4 + ++ lib.optional withGui qtbase ++ lib.optional stdenv.isDarwin libiconv; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with - # the absolute path to the filtering command. + # the absolute path to the filtering command. postInstall = '' for f in $out/share/recoll/filters/* ; do if [[ ! "$f" =~ \.zip$ ]]; then @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "A full-text search tool"; longDescription = '' Recoll is an Xapian frontend that can search through files, archive - members, email attachments. + members, email attachments. ''; homepage = "https://www.lesbonscomptes.com/recoll/"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix new file mode 100644 index 0000000000..c673fd6d0c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -0,0 +1,17 @@ +{ pkgs, nodejs, stdenv, lib, ... }: + +let + nodePackages = import ./node-composition.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; +in +nodePackages.commitizen.override { + meta = with lib; { + description = "The commitizen command line utility"; + homepage = "https://commitizen.github.io/cz-cli"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/generate-dependencies.sh b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/generate-dependencies.sh new file mode 100755 index 0000000000..7111289d29 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/generate-dependencies.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +node2nix \ + --node-env node-env.nix \ + --development \ + --input package.json \ + --output node-packages.nix \ + --composition node-composition.nix diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-composition.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-composition.nix new file mode 100644 index 0000000000..c970861a86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_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.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-env.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-env.nix new file mode 100644 index 0000000000..e1abf53049 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/node-env.nix @@ -0,0 +1,542 @@ +# This file originates from node2nix + +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: + +let + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + stdenv.lib.optionalString (dependencies != []) + (stdenv.lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${stdenv.lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(packageLock.lockfileVersion !== 1) { + process.stderr.write("Sorry, I only understand lock file version 1!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${stdenv.lib.optionalString bypassCache '' + ${stdenv.lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + 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 = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + 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 + ++ 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" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${stdenv.lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + 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.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell < bar + ${mercurial}/bin/hg add bar + ${mercurial}/bin/hg commit --message "baz" + popd + + mkdir repo-git + pushd repo-git + ${git}/bin/git init + ${git}/bin/git config core.ignoreCase false # for darwin + $out/bin/hg-fast-export.sh -r ../repo-hg/ --hg-hash + for s in "foo" "bar" "baz" ; do + (${git}/bin/git show | grep $s > /dev/null) && echo $s found + done + popd + ''; + meta = with stdenv.lib; { description = "Import mercurial into git"; homepage = "https://repo.or.cz/w/fast-export.git"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index d456dc15c5..13fe6cf4ef 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "gh"; - version = "0.11.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0l1d75smvly2k6s3j55n674ld6i5hd8yn6lfhg8vvkvhxx2jjvb9"; + sha256 = "10ixjrb56ddqxla7mfxqnf74zissjx66akcyvgl9xfmww0bvg64x"; }; - vendorSha256 = "1xq1n583p0a3j78afprm2hk5f1hchdrx4vvphml95rv9786vjbcc"; + vendorSha256 = "079zbm57xfcskwhsfj1x0c0lg6ip6c6dbk8hfwrzkpy8gfs2ysmr"; nativeBuildInputs = [ installShellFiles ]; buildPhase = '' + export GO_LDFLAGS="-s -w" make GH_VERSION=${version} bin/gh manpages ''; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 721a7784e9..e1caede77d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, buildPythonApplication, fetchPypi, installShellFiles }: -stdenv.mkDerivation rec { +buildPythonApplication rec { pname = "git-imerge"; - version = "1.1.0"; + version = "1.2.0"; - src = fetchFromGitHub { - owner = "mhagger"; - repo = "git-imerge"; - rev = "v${version}"; - sha256 = "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4"; + src = fetchPypi { + inherit pname version; + sha256 = "df5818f40164b916eb089a004a47e5b8febae2b4471a827e3aaa4ebec3831a3f"; }; - buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; + nativeBuildInputs = [ installShellFiles ]; - makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ; - - meta = with stdenv.lib; { + postInstall = '' + installShellCompletion --bash completions/git-imerge + ''; + + meta = with lib; { homepage = "https://github.com/mhagger/git-imerge"; description = "Perform a merge between two branches incrementally"; - license = licenses.gpl2; - platforms = platforms.all; + license = licenses.gpl2Plus; maintainers = [ maintainers.spwhitt ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 6d548f0405..b656deaa71 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - checkFlagsArray = [ "--test-threads=1" ]; + cargoParallelTestThreads = false; meta = with stdenv.lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 76c991f228..cbb6940353 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.3"; + version = "2.15.6"; src = fetchPypi { inherit pname version; - sha256 = "0kpfi1w1jnn7v7mny71jil3sc9mm08lz47l9v3hzgs5z3ham98jb"; + sha256 = "0ajb3m3i3pfc5v3gshglk7qphk1rpniwx8q8isgx1a6cyarzr9bd"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 75ca58d433..4e9c3b7a5c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-subtrac"; - version = "0.03"; + version = "0.04"; src = fetchFromGitHub { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "1ky04h18vg1yl9lykbhkmf25qslg0z2qzziy8c7afmvzvvvhm2v5"; + sha256 = "0p1n29k2a2rpznwxlwzkmx38ic6g041k9vx7msvick7cydn417fx"; }; - vendorSha256 = "1ccwbhzwys8sl3m2rs2lp70snzsi2a0ahnnq8kn15rrlvsv5qahf"; + vendorSha256 = "0m64grnmhjvfsw7a56474s894sgd24rvcp5kamhzzyc4q556hqny"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix index 5fe6b34fd3..3e07a93458 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -9,11 +9,11 @@ }: buildPythonApplication rec { - version = "0.10.9"; + version = "0.10.10"; pname = "gita"; src = fetchFromGitHub { - sha256 = "0wilyf4nnn2jyxrfqs8krya3zvhj6x36szsp9xhb6h08g1ihzp5i"; + sha256 = "0k7hicncbrqvhmpq1w3v1309bqij6izw31xs8xcb8is85dvi754h"; rev = "v${version}"; repo = "gita"; owner = "nosarthur"; @@ -45,6 +45,7 @@ buildPythonApplication rec { postInstall = '' installShellCompletion --bash --name gita ${src}/.gita-completion.bash + installShellCompletion --zsh --name gita ${src}/.gita-completion.zsh ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index b0e14859ee..cb41ae6705 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -1,23 +1,73 @@ -{ callPackage, stdenv, fetchFromGitHub, ...}: +{ callPackage, stdenv, fetchFromGitHub, git, zsh, ...}: stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1kspz2fhryyjhn6gqf029rv0386a1ga08sf6g0l6smivw628k71l"; + sha256 = "0zan1sa8c24hpqwj66y9srd4n15f4nk64fc5jrd4smgfgn22wph8"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; patchPhase = '' - sed -i "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh + sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.zsh + sed -i "1a GITSTATUS_DAEMON=$out/bin/gitstatusd" install ''; installPhase = '' install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd install -Dm444 gitstatus.plugin.zsh $out + install -Dm555 install $out + install -Dm444 build.info $out + ''; + # Don't install the "install" and "build.info" files, which the end user + # should not need to worry about. + pathsToLink = [ + "/bin/gitstatusd" + "/gitstatus.plugin.zsh" + ]; + + # The install check sets up an empty Git repository and a minimal zshrc that + # invokes gitstatus.plugin.zsh. It runs zsh against this zshrc and verifies + # that the script was sourced successfully and that the "gitstatus_query" + # command ran successfully. This tests the binary itself and the zsh + # integration. + installCheckInputs = [ git zsh ]; + doInstallCheck = true; + installCheckPhase = '' + TEMP=$(mktemp -d) + cd "$TEMP" + + git init + + echo ' + GITSTATUS_LOG_LEVEL=DEBUG + . $out/gitstatus.plugin.zsh || exit 1 + + gitstatus_stop NIX_TEST && gitstatus_start NIX_TEST + gitstatus_query NIX_TEST + if [[ $? -ne 0 ]]; then + print -- "Something went wrong with gitstatus" + exit 1 + elif [[ $VCS_STATUS_RESULT != "ok-sync" ]]; then + print -- "Not in a Git repo" + exit 1 + else + print -- "OK" + exit 0 + fi + ' > .zshrc + + # If we try to run zsh like "zsh -i -c true" or "zsh -i > output" then job + # control will be disabled in the shell and the gitstatus plugin script + # will fail when it tries to set the MONITOR option. As a workaround, we + # run zsh as a full-fledged independent process and then wait for it to + # exit. (The "exit" statements in the zshrc ensure that zsh will exit + # almost immediately after starting.) + ZDOTDIR=. zsh -i & + wait $! ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 15c323680a..a13e4b33d3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,5 +1,11 @@ { stdenv, buildGoModule, fetchFromGitHub }: +# Currently `buildGo114Module` is passed as `buildGoModule` from +# `../default.nix`. Please remove the fixed 1.14 once a new release has been +# made and the issue linked below has been closed upstream. + +# https://github.com/Arkweid/lefthook/issues/151 + buildGoModule rec { pname = "lefthook"; version = "0.7.2"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix new file mode 100644 index 0000000000..6968508f8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, makeWrapper +, watchman +}: + +rustPlatform.buildRustPackage rec { + pname = "rs-git-fsmonitor"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "jgavris"; + repo = pname; + rev = "v${version}"; + sha256 = "021vdk5i7yyrnh4apn0gnsh6ycnx15wm3g2jrfsg7fycnq8167wc"; + }; + + cargoSha256 = "0kfj09xq1g866507k3gcbm30pyi1xzfr7gca6dab7sjlvf83h9xs"; + + nativeBuildInputs = [ makeWrapper ]; + + fixupPhase = '' + wrapProgram $out/bin/rs-git-fsmonitor --prefix PATH ":" "${lib.makeBinPath [ watchman ]}" ; + ''; + + meta = with lib; { + description = "A fast git core.fsmonitor hook written in Rust"; + homepage = "https://github.com/jgavris/rs-git-fsmonitor"; + license = licenses.mit; + maintainers = [ maintainers.SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index 80f236559f..2df8b335bd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "05qd96bn2cl7gn5qarbcv6scdpj28qiwdfzalamqk5jjiidpmng5"; + sha256 = "0pyvlcy6jxh0vzpsmywlbzwwdyj3jkcclnqb6sg786mmwrnqzj88"; }; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -30,6 +30,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; + changelog = "https://github.com/git-lfs/git-lfs/releases/tag/v${version}"; license = [ licenses.mit ]; maintainers = [ maintainers.twey maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index eb3f95a354..b4e7138482 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "00sahddplisg55zpjz4v4sc7zqbh3apx36xv77g55nabwz7han8d"; + sha256 = "1ii6vjgs5nd2hhp475mqa48165garc7ac2w9fyspajaanc7zhnik"; }; patches = [ ./import-ssl-module.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 70169bd90e..5005b9137a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "05z1pp2lnbr82pw97wy0j0qk2vv1qv9c46df13d03xdfsc3gsm50"; + sha256 = "0zz3mwf1yhncvi6pl52lcwbl7k4kkrqyw8q3476akwszjn79n83c"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch b/third_party/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch index 985dbe0408..e486397d9c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/static-root-path.patch @@ -1,13 +1,13 @@ diff --git a/modules/setting/setting.go b/modules/setting/setting.go -index 714015c47..a2f85337e 100644 +index 45e55a2..9d18ee4 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go -@@ -641,7 +641,7 @@ func NewContext() { - PortToRedirect = sec.Key("PORT_TO_REDIRECT").MustString("80") +@@ -667,7 +667,7 @@ func NewContext() { OfflineMode = sec.Key("OFFLINE_MODE").MustBool() DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() -- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath) -+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") + if len(StaticRootPath) == 0 { +- StaticRootPath = AppWorkPath ++ StaticRootPath = "@data@" + } + StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(StaticRootPath) StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour) - AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data")) - EnableGzip = sec.Key("ENABLE_GZIP").MustBool() diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index 6457ac3af0..827d9539db 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -3,7 +3,7 @@ , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid -, e2fsprogs, krb5 +, e2fsprogs, krb5, libdrm, mesa }: with stdenv.lib; @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.2.0"; + version = "7.3.2"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0nrrcwikx6dx1j1s0b80gh1s932zvxmijpddqp6a1vh3ddc5v1mp"; + sha256 = "0bw75m87qbnnn1gjphik3xcjx2zwczsa37rpr16la1zjhqjl5m7j"; }; dontBuild = true; @@ -61,6 +61,8 @@ stdenv.mkDerivation rec { libuuid e2fsprogs krb5 + libdrm + mesa ]; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index fe211d1b87..9389934ffc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.0.12", - "repo_hash": "0m9pn1alxdib9ppf878wf186bvn0llik7vcpqijzcdzc18q9cldq", + "version": "13.0.14", + "repo_hash": "15is18x631ifsj4iwmrs1s9lc3i99hwsxxf5v42qldbmsys31l1k", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.0.12-ee", + "rev": "v13.0.14-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.0.12", + "GITALY_SERVER_VERSION": "13.0.14", "GITLAB_PAGES_VERSION": "1.18.0", "GITLAB_SHELL_VERSION": "13.2.0", "GITLAB_WORKHORSE_VERSION": "8.31.2" } -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5f3fa345d8..84cf1e500a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "13.0.12"; + version = "13.0.14"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "00jzrib8f51b3wkl0zy9a9cr5j9kp6cmm49vxm27zgxpyz8k1axw"; + sha256 = "16ynkwiv0faa60msashj5w1bc4rdh7yv2qjmpcbf7dwq54gqmlbv"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix index d0853f3397..5e2fdc087f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/gitolite-shell \ - --prefix PATH : "${git}/bin" + --prefix PATH : ${lib.makeBinPath [ git perl ]} ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index 0e9b3dbedb..b6b9c7e566 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -1,24 +1,29 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "0xpic9jx7nrxi5d8lqch2vxpvipx994d717c4n0kgr3ipyij1347"; + sha256 = "0sx3z9l9n9qq2zj91pgm7znhxjsj59zvwms3aivfglhawwj3iwyj"; }; - cargoSha256 = "104lyfni75h1i30s2jlzf66sp1czfd9ywqz78kj4i7lfdf6fc4x9"; + cargoSha256 = "0ykkh86p4csi0v3pb2idjk94w9m32a34a5qrvna7ml5yz84m8hva"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + # Needed to get openssl-sys to use pkgconfig. + OPENSSL_NO_VENDOR = 1; meta = with lib; { description = "A command-line application for interacting with git repositories"; homepage = "https://github.com/Byron/gitoxide"; - # NOTE: the master branch is dual-licensed with APACHE but v0.3.0 is only MIT - license = licenses.mit; + license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.syberant ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gomp/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gomp/default.nix new file mode 100644 index 0000000000..efdef3b967 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/gomp/default.nix @@ -0,0 +1,23 @@ +{ lib +, python3Packages + }: + +python3Packages.buildPythonApplication rec { + pname = "gomp"; + version = "1.1.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb"; + }; + + doCheck = false; # tests require interactive terminal + + meta = with lib; { + description = "A tool for comparing Git branches"; + homepage = "https://github.com/MarkForged/GOMP"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix new file mode 100644 index 0000000000..3a397b5bf8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, lib, autoPatchelfHook }: + +stdenv.mkDerivation rec { + pname = "p4"; + version = "2020.1.1991450"; + + src = fetchurl { + url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/helix-core-server.tgz"; + sha256 = "0nhcxhwx3scx6vf7i2bc8j0b1l57lmq9bfy1cfbfbqasd3an721k"; + }; + + sourceRoot = "."; + + dontBuild = true; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + mkdir -p $out/bin + cp p4 p4broker p4d p4p $out/bin + ''; + + meta = { + description = "Perforce Command-Line Client"; + homepage = "https://www.perforce.com"; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ corngood ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix index d5a72a70ec..76103eba8a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix @@ -4,15 +4,13 @@ , srht, redis, celery, pyyaml, markdown }: let - version = "0.56.13"; + version = "0.62.6"; buildWorker = src: buildGoModule { inherit src version; pname = "builds-sr-ht-worker"; - vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp"; - - doCheck = false; + vendorSha256 = "1sbcjp93gb0c4p7dd1gjhmhwr1pygxvrrzp954j2fvxvi38w6571"; }; in buildPythonPackage rec { inherit version; @@ -21,13 +19,9 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; rev = version; - sha256 = "0la9i93fxxphi4gf913ccjiqlfn92h3nbpl9gxcwcplm2vvi4nmq"; + sha256 = "1vSUcqYyOitfGaSZVOj5vkmoiAvQbTHgiDVSV5qJLyQ="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -40,7 +34,6 @@ in buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix index 0023eb407b..9f7b4b158c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix @@ -1,18 +1,18 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage -, pgpy, flask, bleach, misaka, humanize, html5lib, markdown, psycopg2, pygments +, pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments , requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client -, celery, alembic, importlib-metadata +, celery, alembic, importlib-metadata, mistletoe , sassc, nodejs , writeText }: buildPythonPackage rec { pname = "srht"; - version = "0.59.13"; + version = "0.64.0"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "1rgndpr0w25mxg0d8x54lay82d0p01aygallsgr1lw5zs4r3ldz6"; + sha256 = "ubCbDh60zg88LXupWAo2EnqhE5jt0F0L9ikTBebusYQ="; }; node_modules = fetchNodeModules { @@ -34,13 +34,13 @@ buildPythonPackage rec { pgpy flask bleach - misaka humanize html5lib markdown psycopg2 pygments requests + mistletoe sqlalchemy cryptography beautifulsoup4 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix index f6de0036af..8d2e8ceed3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix @@ -1,4 +1,4 @@ -{ python37, openssl +{ python38, openssl , callPackage, recurseIntoAttrs }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` @@ -8,7 +8,7 @@ let fetchNodeModules = callPackage ./fetchNodeModules.nix { }; - python = python37.override { + python = python38.override { packageOverrides = self: super: { srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; @@ -16,6 +16,7 @@ let dispatchsrht = self.callPackage ./dispatch.nix { }; gitsrht = self.callPackage ./git.nix { }; hgsrht = self.callPackage ./hg.nix { }; + hubsrht = self.callPackage ./hub.nix { }; listssrht = self.callPackage ./lists.nix { }; mansrht = self.callPackage ./man.nix { }; metasrht = self.callPackage ./meta.nix { }; @@ -31,6 +32,7 @@ in with python.pkgs; recurseIntoAttrs { dispatchsrht = toPythonApplication dispatchsrht; gitsrht = toPythonApplication gitsrht; hgsrht = toPythonApplication hgsrht; + hubsrht = toPythonApplication hubsrht; listssrht = toPythonApplication listssrht; mansrht = toPythonApplication mansrht; metasrht = toPythonApplication metasrht; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix index 1531a6e69b..fa557ce78a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -4,18 +4,14 @@ buildPythonPackage rec { pname = "dispatchsrht"; - version = "0.14.1"; + version = "0.14.9"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; rev = version; - sha256 = "0h3nn73qvxspqv0myiss0y5i8jynh2rh9m57awy89vv6rwgai7vq"; + sha256 = "JUffuJTKY4I8CrJc8tJWL+CbJCZtiqtUSO9SgYoeux0="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -26,7 +22,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix index d71568b94f..838a997031 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix @@ -4,57 +4,47 @@ , srht, minio, pygit2, scmsrht }: let - version = "0.50.3"; + version = "0.60.7"; buildShell = src: buildGoModule { inherit src version; pname = "gitsrht-shell"; - - vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; - - doCheck = false; + vendorSha256 = "1abyv2s5l3bs0iylpgyj3jri2hh1iy8fiadxm7g6l2vl58h0b9ba"; }; buildDispatcher = src: buildGoModule { inherit src version; pname = "gitsrht-dispatcher"; - vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; - - doCheck = false; }; buildKeys = src: buildGoModule { inherit src version; pname = "gitsrht-keys"; - - vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv"; - - doCheck = false; + vendorSha256 = "0lks3js57bb41x1ry5xfadlzf0v2gm68g7h3j94gzlm6j4jfprk9"; }; buildUpdateHook = src: buildGoModule { inherit src version; pname = "gitsrht-update-hook"; + vendorSha256 = "06ykh9ncamd922xsd329jpn293wsq6vkqnlf3sckjlp2hm290pd8"; + }; - vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63"; - - doCheck = false; + buildAPI = src: buildGoModule { + inherit src version; + pname = "gitsrht-api"; + vendorSha256 = "0d6kmsbsgj2q5nddx4w675zbsiarffj9vqplwvqk7dwz4id2wnif"; }; in buildPythonPackage rec { - inherit version; pname = "gitsrht"; + inherit version; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; rev = version; - sha256 = "0rxsr8cizac5xv8bgx2s1p2q4n8i5s51p9qbqdjad9z1xmwi6rvn"; + sha256 = "EdxgT6IQZgj3KeU3UC+QAQb7BilBY769NhJK633tmE4="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -66,7 +56,6 @@ in buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' @@ -75,6 +64,7 @@ in buildPythonPackage rec { cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys cp ${buildUpdateHook "${src}/gitsrht-update-hook"}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook + cp ${buildAPI "${src}/api"}/bin/api $out/bin/gitsrht-api ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix index bddc065eac..841cec581a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix @@ -4,18 +4,14 @@ buildPythonPackage rec { pname = "hgsrht"; - version = "0.26.0"; + version = "0.26.18"; src = fetchhg { url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; rev = version; - sha256 = "06sgd7pzjabwv66i4v5abqdnx955lqgjmbxxqkhhyq9k45jhlzci"; + sha256 = "j+7yG6WdWoU0Uk6doz9GpKZsEGXy/n2smgU6c56/A+Q="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -27,7 +23,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix new file mode 100644 index 0000000000..0b671940ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, srht }: + +buildPythonPackage rec { + pname = "hubsrht"; + version = "0.10.6"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; + rev = version; + sha256 = "N54GOk9pxwoF1Wv0ZSe4kIAPBLl/zHrSu8OlKBkacVg="; + }; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + ]; + + preBuild = '' + export PKGVER=${version} + ''; + + meta = with stdenv.lib; { + homepage = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; + description = "Project hub service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix index b1446bbebc..7037688f92 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix @@ -4,18 +4,14 @@ buildPythonPackage rec { pname = "listssrht"; - version = "0.41.8"; + version = "0.45.9"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; rev = version; - sha256 = "0x49i1fdgi4nawnl362hp4d9ki5phh221zr1lxhidjm9vfv7lsqs"; + sha256 = "2Wb1hBx4GuRvVC0pD7gpE9dj5ketW/4ozxuVq2X5dDM="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -28,7 +24,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix index 9b8e5901d9..7fdf42a52e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix @@ -4,18 +4,14 @@ buildPythonPackage rec { pname = "mansrht"; - version = "0.14.7"; + version = "0.15.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/man.sr.ht"; rev = version; - sha256 = "1ys9186lbxhbg5ms9sxjk3va5qwjrsd4nzrz6zx50gzng9axd988"; + sha256 = "hCpuVngpu2AacFGn0F78k2qrn09Z/p1rP8vfW7gkzWc="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -25,7 +21,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix index e2d155e1a0..9d2f71eaeb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,16 +1,26 @@ { stdenv, fetchgit, buildPythonPackage , python +, buildGoModule , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache , sshpubkeys, weasyprint }: -buildPythonPackage rec { +let + version = "0.50.2"; + + buildAPI = src: buildGoModule { + inherit src version; + pname = "metasrht-api"; + + vendorSha256 = "0k7i7j604wqvzjavmcsw7g2x059jkkgrgz1qyvzlqc0y4ws59xkq"; + }; +in buildPythonPackage rec { pname = "metasrht"; - version = "0.42.13"; + inherit version; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; rev = version; - sha256 = "0bnrhk4w35w9dndihfqki66vyk123my98p4jqic4ypxcyffs1dd7"; + sha256 = "utS/HMFtHPAP1QRYd4WAFApyBPRY5UD72ANmC/SU93c="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -29,13 +39,13 @@ buildPythonPackage rec { weasyprint ]; - patches = [ - ./use-srht-path.patch - ]; - preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + postInstall = '' + mkdir -p $out/bin + cp ${buildAPI "${src}/api"}/bin/api $out/bin/metasrht-api ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix index 26650156c5..15d9839ea3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix @@ -4,18 +4,14 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.10.3"; + version = "0.11.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; rev = version; - sha256 = "0sbs591ackrml09jmml4jspnbbqxqdmqy1c1j2rrvms6jcpkhlwb"; + sha256 = "vk+h9gQX9KeynjulDaK/vHpKeRQAjVyxk7ttKG27ZIo="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -25,7 +21,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix index 788c90e487..7c6ed02c9f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.19.11"; + version = "0.22.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; rev = version; - sha256 = "0wqqqfp8f0gq0jqz3ac6kfkax2bw7yp8wznvsdw8mpmzqdjlhhkb"; + sha256 = "MwgWDYGqOuci55gUFAiKnUfUWgLvQVP5omAMNv/2gPY="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix index 53cd8756ad..7eaa677656 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix @@ -5,18 +5,14 @@ buildPythonPackage rec { pname = "todosrht"; - version = "0.57.14"; + version = "0.61.11"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/todo.sr.ht"; rev = version; - sha256 = "15x78rl0zh1rw0izc36k47b27l75k7iyina5ajm3mgkslpndym4y"; + sha256 = "lUM81FYlR6AXCtXZtYiB+1FD8E1aOX7qxbWUVc36lJM="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -28,7 +24,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; # pytest tests fail diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh index fdc0639c4c..156d4cc35e 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh @@ -40,8 +40,8 @@ update_version() { git commit -m "$1: $version_old -> $version" } -services=( "srht" "buildsrht" "dispatchsrht" "gitsrht" "hgsrht" "listssrht" "mansrht" "metasrht" - "pastesrht" "todosrht" "scmsrht" ) +services=( "srht" "buildsrht" "dispatchsrht" "gitsrht" "hgsrht" "hubsrht" "listssrht" "mansrht" + "metasrht" "pastesrht" "todosrht" "scmsrht" ) # Whether or not a specific service is requested if [ -n "$1" ]; then diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/use-srht-path.patch b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/use-srht-path.patch deleted file mode 100644 index 43b494bf9d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/use-srht-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/setup.py b/setup.py -index e6ecfb6..89fa92a 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,28 +5,16 @@ import os - import site - import sys - --if hasattr(site, 'getsitepackages'): -- pkg_dirs = site.getsitepackages() -- if site.getusersitepackages(): -- pkg_dirs.append(site.getusersitepackages()) -- for pkg_dir in pkg_dirs: -- srht_path = os.path.join(pkg_dir, "srht") -- if os.path.isdir(srht_path): -- break -- else: -- raise Exception("Can't find core srht module in your site packages " -- "directories. Please install it first.") --else: -- srht_path = os.getenv("SRHT_PATH") -- if not srht_path: -- raise Exception("You're running inside a virtual environment. " -- "Due to virtualenv limitations, you need to set the " -- "$SRHT_PATH environment variable to the path of the " -- "core srht module.") -- elif not os.path.isdir(srht_path): -- raise Exception( -- "The $SRHT_PATH environment variable points to an invalid " -- "directory: {}".format(srht_path)) -+srht_path = os.getenv("SRHT_PATH") -+if not srht_path: -+ raise Exception("You're running inside a virtual environment. " -+ "Due to virtualenv limitations, you need to set the " -+ "$SRHT_PATH environment variable to the path of the " -+ "core srht module.") -+elif not os.path.isdir(srht_path): -+ raise Exception( -+ "The $SRHT_PATH environment variable points to an invalid " -+ "directory: {}".format(srht_path)) - - subp = subprocess.run(["make", "SRHT_PATH=" + srht_path]) - if subp.returncode != 0: diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix new file mode 100644 index 0000000000..ef61d518a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/sparkleshare/default.nix @@ -0,0 +1,89 @@ +{ + appindicator-sharp, + coreutils, + fetchFromGitHub, + git, + git-lfs, + glib, + gtk-sharp-3_0, + lib, + makeWrapper, + meson, + mono, + ninja, + notify-sharp, + openssh, + openssl, + pkg-config, + stdenv, + symlinkJoin, + webkit2-sharp, + xdg_utils, +}: + +stdenv.mkDerivation rec { + pname = "sparkleshare"; + version = "3.28"; + + src = fetchFromGitHub { + owner = "hbons"; + repo = "SparkleShare"; + rev = version; + sha256 = "sha256:1x5nv2f3mrsr4a336bz5kc2lzkzilfh43bxy2yqhhjp2dgb20497"; + }; + + nativeBuildInputs = [ + makeWrapper + meson + mono + ninja + pkg-config + ]; + + buildInputs = [ + appindicator-sharp + gtk-sharp-3_0 + notify-sharp + webkit2-sharp + ]; + + patchPhase = '' + # Nix will manage the icon cache. + echo '#!/bin/sh' >scripts/post-install.sh + ''; + + postInstall = '' + wrapProgram $out/bin/sparkleshare \ + --set PATH ${symlinkJoin { + name = "mono-path"; + paths = [ + coreutils + git + git-lfs + glib + mono + openssh + openssl + xdg_utils + ]; + }}/bin \ + --set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [ + appindicator-sharp + gtk-sharp-3_0 + webkit2-sharp + ]} \ + --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ + appindicator-sharp + gtk-sharp-3_0.gtk3 + webkit2-sharp + webkit2-sharp.webkitgtk + ]} + ''; + + meta = { + description = "Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows."; + homepage = "https://sparkleshare.org"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix index 7a0c0d1f1e..d5713ea234 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2020"; - sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; + buildVersion = "2032"; + sha256 = "b782c768383893ba7803c2cffd428b09bec46be8a65e61a5f17964bdcc2aaf7c"; } {}; sublime-merge-dev = common { - buildVersion = "2022"; - sha256 = "0fhxz6nx24wbspn7vfli3pvfv6fdbd591m619pvivig3scpidj61"; + buildVersion = "2033"; + sha256 = "ab937a393eb6ae776a81b30ec5a589ae37763885ba8a91680d5c43e19a01a8fa"; dev = true; } {}; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix index fab89d663f..37fd805566 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, git, gnupg }: -let version = "2.4.0"; in +let version = "2.5.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "0kpahznrkxkyj92vrhwjvldg2affi1askgwvpgbs4mg40f92szlp"; + sha256 = "128qlx8mp7h5ifapqqgsj3fwghn3q6x6ya0y33h5r7gnassd3njr"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix b/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix index 64c7dc20f3..54dac5c2aa 100644 --- a/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix @@ -68,6 +68,12 @@ stdenv.mkDerivation url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch"; sha256 = "1n8wmjka480j43b1pr30i665z8hdy6n3wdiz1ls81wyv7ai5yygf"; }) + + # Compatbility with make 4.3 + (fetchpatch { + url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch"; + sha256 = "1s9cc5rikrqb9ivjbag4b8yxcyjsmmmw744394d5xq8xi4k12vxc"; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix index 7f2b855115..d22657d651 100644 --- a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix @@ -1,12 +1,19 @@ -{ buildPythonApplication, fetchPypi, lib -, youtube-dl -, PyChromecast -, click -, ifaddr -, requests -}: +{ lib, python3 }: -buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec { + version = "6.0.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "05f8r3b2pdqbl76hwi5sv2xdi1r7g9lgm69x8ja5g22mn7ysmghm"; + }; + }); + }; + }; + +in with py.pkgs; buildPythonApplication rec { pname = "catt"; version = "0.11.0"; diff --git a/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix b/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix index 80a30852da..ca9ecb4818 100644 --- a/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/celluloid/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - sha256 = "1jdmwljckajqb3ys8azd1nyy49nvq9kb2knrrqdcfnvzq0m5lpqr"; + hash = "sha256-fEZnH8EqU6CykgKINXnKChuBUlisroa97B1vjcx2cWA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix index 0e39ab0568..f8b74a1754 100644 --- a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.13"; + version = "3.8.14"; src = fetchurl { - sha256 = "0ryaha33m41y0xjrspa838qqr4iy2c8vbvhbb334qimpqn1hj3q5"; + sha256 = "19337qjxwlkpdnnh6q0y4b8askk17a8zb88gifznllrk06a6pgyf"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix b/third_party/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix new file mode 100644 index 0000000000..577c85c6b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix @@ -0,0 +1,33 @@ +{ appimageTools, stdenv, fetchurl }: +let + pname = "electronplayer"; + version = "2.0.8"; + name = "${pname}-${version}"; + + #TODO: remove the -rc4 from the tag in the url when possible + src = fetchurl { + url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${name}.AppImage"; + sha256 = "wAsmSFdbRPnYnDyWQSbtyj+GLJLN7ibksUE7cegfkhI="; + }; + + appimageContents = appimageTools.extractType2 { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=ElectronPlayer' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with stdenv.lib; { + description = "An electron based web video services player"; + homepage = "https://github.com/oscartbeaumont/ElectronPlayer"; + license = licenses.mit; + maintainers = with maintainers; [ extends ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix b/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix new file mode 100644 index 0000000000..e57f46c8c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchFromGitHub, makeWrapper, bash, nodejs, nodePackages, gzip }: + +let + workaround-opencollective-buildfailures = stdenv.mkDerivation { + # FIXME: This should be removed when a complete fix is available + # https://github.com/svanderburg/node2nix/issues/145 + name = "workaround-opencollective-buildfailures"; + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/bin + touch $out/bin/opencollective-postinstall + chmod +x $out/bin/opencollective-postinstall + ''; + }; +in +nodePackages.epgstation.override (drv: { + src = fetchFromGitHub { + owner = "l3tnun"; + repo = "EPGStation"; + rev = "v${drv.version}"; # version specified in ./generate.sh + sha256 = "15z1kdbamj97frp3dfnbm0h8krihmv2xdab4id0rxin29ibrw1k2"; + }; + + buildInputs = [ bash ]; + nativeBuildInputs = [ + workaround-opencollective-buildfailures + makeWrapper + nodePackages.node-pre-gyp + ]; + + preRebuild = '' + # Fix for not being able to connect to mysql using domain sockets. + patch -p1 ${./use-mysql-over-domain-socket.patch} + ''; + + postInstall = let + runtimeDeps = [ nodejs bash ]; + in + '' + mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} + + pushd $out/lib/node_modules/EPGStation + + npm run build + npm prune --production + + mv config/{enc.sh,enc.js} $out/libexec + mv LICENSE Readme.md $out/share/doc/epgstation + mv doc/* $out/share/doc/epgstation + sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ + | ${gzip}/bin/gzip > $out/share/man/man1/epgstation.1.gz + rm -rf doc + + # just log to stdout and let journald do its job + rm -rf logs + + # Replace the existing configuration and runtime state directories with + # symlinks. Without this, they would all be non-writable because they reside + # in the Nix store. Note that the source path won't be accessible at build + # time. + rm -r config data recorded thumbnail + ln -sfT /etc/epgstation config + ln -sfT /var/lib/epgstation data + ln -sfT /var/lib/epgstation/recorded recorded + ln -sfT /var/lib/epgstation/thumbnail thumbnail + + makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ + --run "cd $out/lib/node_modules/EPGStation" \ + --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps} + + popd + ''; + + meta = with stdenv.lib; drv.meta // { + maintainers = with maintainers; [ midchildan ]; + + # nodePackages.epgstation is a stub package to fetch npm dependencies and + # is marked as broken to prevent users from installing it directly. This + # technique ensures epgstation can share npm packages with the rest of + # nixpkgs while still allowing us to heavily customize the build. It also + # allows us to provide devDependencies for the epgstation build process + # without doing the same for all the other node packages. + broken = false; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/epgstation.1 b/third_party/nixpkgs/pkgs/applications/video/epgstation/epgstation.1 new file mode 100644 index 0000000000..bb5c023813 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/epgstation.1 @@ -0,0 +1,52 @@ +.Dd $Mdocdate$ +.Dt EPGSTATION 1 +.Os +.Sh NAME +.Nm epgstation +.Nd @DESCRIPTION@ +.Sh SYNOPSIS +.Nm +.Bk -words +.Op Ar command Op Ar args +.Ek +.Sh DESCRIPTION +.Nm +is a wrapper command for EPGStation provided by Nix. It's actually a thin +wrapper around the +.Xr npm 1 +command line tool which you can use to invoke npm commands from the EPGStation +project directory. The command line arguments are simply passed as-is to +.Xr npm 1 . +.Pp +On NixOS, it is strongly recommended that you enable the epgstation module +instead of invoking this command directly to launch EPGStation. On other +platforms, run +.Pp +.Dl $ epgstation start +.Pp +to start EPGStation. +.Sh FILES +.Bl -tag -width Ds -compact +.It Pa /etc/epgstation/config.json +.Nm +configuration file. +.El +.Sh EXAMPLES +Start EPGStation. +.Pp +.Dl $ epgstation start +.Pp +Start EPGStation in development mode. +.Pp +.Dl $ epgstation run dev-start +.Pp +Backup the EPGstation database. +.Pp +.Dl $ epgstation run backup /path/to/dst +.Pp +Restore the EPGstation database. +.Pp +.Dl $ epgstation run restore /path/to/src +.Pp +.Sh SEE ALSO +.Xr npm 1 diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/generate.sh b/third_party/nixpkgs/pkgs/applications/video/epgstation/generate.sh new file mode 100755 index 0000000000..d193a01506 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/generate.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# Script to generate the Nix package definition for EPGStation. Run this script +# when bumping the package version. + +VERSION="1.7.4" +URL="https://raw.githubusercontent.com/l3tnun/EPGStation/v$VERSION/package.json" +JQ_BIN="$(nix-build ../../../.. --no-out-link -A jq)/bin/jq" + +set -eu -o pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +main() { + # update package.json + curl -sSfL "$URL" \ + | jq '. + {"dependencies": (.devDependencies + .dependencies)} | del(.devDependencies)' \ + > package.json + + # regenerate node packages to update the actual Nix package + pushd ../../../development/node-packages \ + && ./generate.sh + popd + + # generate default streaming settings for EPGStation + pushd ../../../../nixos/modules/services/video/epgstation \ + && cat "$(./generate)" > streaming.json + popd +} + +jq() { + "$JQ_BIN" "$@" +} + +main "@" diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/package.json b/third_party/nixpkgs/pkgs/applications/video/epgstation/package.json new file mode 100644 index 0000000000..96525ec809 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/package.json @@ -0,0 +1,101 @@ +{ + "name": "EPGStation", + "version": "1.7.4", + "description": "DTV Software in Japan.", + "main": "dist/server/index.js", + "scripts": { + "start": "node dist/server/index.js", + "dev-start": "node dist/server/index.js --env development", + "clean": "gulp clean", + "build": "gulp build --max_old_space_size=768 --env production", + "dev-build": "gulp build --max_old_space_size=512 --env development", + "test": "echo \"Error: no test specified\" && exit 1", + "task": "gulp --max_old_space_size=512", + "install-win-service": "winser -i -a", + "uninstall-win-service": "winser -r -x", + "backup": "node dist/server/DBTools.js -m backup -o", + "restore": "node dist/server/DBTools.js -m restore -o", + "move-log": "node dist/server/LogFileMoveTools.js", + "convert-str": "node dist/server/ConvertDBStrTools.js" + }, + "repository": { + "type": "git", + "url": "https://github.com/l3tnun/EPGStation.git" + }, + "author": "l3tnun", + "license": "MIT", + "bugs": { + "url": "https://github.com/l3tnun/EPGStation/issues" + }, + "homepage": "https://github.com/l3tnun/EPGStation#readme", + "engines": { + "node": "^10.x.x < 11 || ^12.14.0 < 13 || ^14.5.0 < 15" + }, + "dependencies": { + "@types/basic-auth": "1.1.3", + "@types/body-parser": "1.19.0", + "@types/chart.js": "2.9.23", + "@types/express": "4.17.7", + "@types/hls.js": "0.13.0", + "@types/js-yaml": "3.12.5", + "@types/lodash": "4.14.158", + "@types/material-design-lite": "1.1.16", + "@types/minimist": "1.2.0", + "@types/mithril": "2.0.3", + "@types/mkdirp": "1.0.1", + "@types/multer": "1.4.3", + "@types/mysql": "2.15.15", + "@types/node": "14.0.26", + "@types/pg": "7.14.4", + "@types/request": "2.48.5", + "@types/socket.io": "2.1.10", + "@types/socket.io-client": "1.4.33", + "@types/sqlite3": "3.1.6", + "@types/url-join": "4.0.0", + "del": "5.1.0", + "gulp": "4.0.2", + "gulp-clean-css": "4.3.0", + "gulp-concat": "2.6.1", + "gulp-dart-sass": "1.0.2", + "gulp-plumber": "1.2.1", + "gulp-sourcemaps": "2.6.5", + "gulp-tslint": "8.1.4", + "gulp-typescript": "5.0.1", + "terser-webpack-plugin": "3.0.7", + "ts-loader": "8.0.1", + "tslint": "6.1.2", + "typescript": "3.9.7", + "webpack": "4.44.0", + "webpack-stream": "5.2.1", + "aribts": "^2.1.12", + "b24.js": "1.0.3", + "basic-auth": "2.0.1", + "body-parser": "1.19.0", + "chart.js": "2.9.3", + "css-ripple-effect": "1.0.5", + "diskusage": "1.1.3", + "express": "4.17.1", + "express-openapi": "7.0.0", + "fs-extra": "9.0.1", + "hls-b24.js": "0.12.3", + "js-yaml": "3.14.0", + "lodash": "4.17.19", + "log4js": "6.3.0", + "material-design-icons": "3.0.1", + "material-design-lite": "1.3.0", + "minimist": "1.2.5", + "mirakurun": "3.2.0", + "mithril": "2.0.4", + "mkdirp": "1.0.4", + "multer": "1.4.2", + "mysql": "2.18.1", + "openapi-types": "7.0.0", + "pg": "8.3.0", + "request": "2.88.2", + "socket.io": "2.3.0", + "socket.io-client": "2.3.0", + "sqlite3": "5.0.0", + "swagger-ui-dist": "3.30.2", + "url-join": "4.0.1" + } +} diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch b/third_party/nixpkgs/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch new file mode 100644 index 0000000000..48640f2ba0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch @@ -0,0 +1,17 @@ +diff --git a/src/server/ConfigInterface.ts b/src/server/ConfigInterface.ts +index d23badd..1dd2b98 100644 +--- a/src/server/ConfigInterface.ts ++++ b/src/server/ConfigInterface.ts +@@ -11,9 +11,10 @@ interface ConfigInterface { + dbPath: string; + dbInfoPath: string; + mysql: { +- host: string; ++ host?: string; ++ socketPath?: string; + user: string; +- password: string; ++ password?: string; + database: string; + connectTimeout: number; + connectionLimit: number; diff --git a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix new file mode 100644 index 0000000000..cdd70b4c89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook +, zlib, libzen, libmediainfo, curl, libmms, glib +}: + +let + # FileBot requires libcurl-gnutls.so to build + curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; + +in + +stdenv.mkDerivation rec { + pname = "filebot"; + version = "4.9.1"; + + src = fetchurl { + url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms"; + }; + + unpackPhase = "tar xvf $src"; + + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + + buildInputs = [ zlib libzen libmediainfo curlWithGnuTls libmms glib ]; + + dontBuild = true; + installPhase = '' + mkdir -p $out/opt $out/bin + # Since FileBot has dependencies on relative paths between files, all required files are copied to the same location as is. + cp -r filebot.sh lib/ jar/ $out/opt/ + # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead. + substituteInPlace $out/opt/filebot.sh \ + --replace 'APP_DATA="$FILEBOT_HOME/data/$USER"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ + --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' + wrapProgram $out/opt/filebot.sh \ + --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]} + # Expose the binary in bin to make runnable. + ln -s $out/opt/filebot.sh $out/bin/filebot + ''; + + meta = with stdenv.lib; { + description = "The ultimate TV and Movie Renamer"; + longDescription = '' + FileBot is the ultimate tool for organizing and renaming your Movies, TV + Shows and Anime as well as fetching subtitles and artwork. It's smart and + just works. + ''; + homepage = "https://filebot.net"; + changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ gleber felschr ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix index e587a59990..4fcff75f09 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix @@ -1,16 +1,20 @@ { stdenv, fetchFromGitHub, pkgconfig, zlib }: stdenv.mkDerivation rec { - version = "0.8.0"; + version = "1.0.0"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "1w1dyrn6900yi8ngchfzy5hvxr6yc60blvdq8y8mczimmmq8khb5"; + sha256 = "11jrklaahhdfqhci7f3lzv8wchh9bc91rg6w8ibh6varrk692vsb"; }; + postPatch = '' + substituteInPlace Makefile --replace 'dh_link' 'ln -s' + ''; + # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix b/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix index ae156574f5..da413915e3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix @@ -47,7 +47,7 @@ let # This adds it to lightworks' search path while keeping the default # using the FONTCONFIG_FILE env variable echo " - + /usr/share/fonts/truetype /etc/fonts/fonts.conf diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 9b2c8f8357..fa68c58f5a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake , ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib -, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark +, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , withGUI ? true , qtbase ? null , qtmultimedia ? null @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "48.0.0"; + version = "50.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0lbl3w2m12blymda3m00afl9racgahvl0z4b2clwbawhvypc5vfc"; + sha256 = "001i206lwxjyrp406svv4zpb1pliac3f4k5zhzgkjbk2dzj85pyd"; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat file xdg_utils boost libebml zlib fmt - libmatroska libogg libvorbis flac cmark + libmatroska libogg libvorbis flac cmark pcre2 ] ++ optional stdenv.isDarwin libiconv ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix index 697a468f89..4b7d78303b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -209,6 +209,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf + cp TOOLS/mpv_identify.sh $out/bin cp TOOLS/umpv $out/bin '' + optionalString stdenv.isDarwin '' mkdir -p $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/autoload.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/autoload.nix new file mode 100644 index 0000000000..f64e702f21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/autoload.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, mpv-unwrapped, lib }: + +stdenv.mkDerivation rec { + pname = "mpv-autoload"; + version = mpv-unwrapped.version; + src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autoload.lua"; + dontBuild = true; + dontUnpack = true; + installPhase = '' + install -Dm644 ${src} $out/share/mpv/scripts/autoload.lua + ''; + passthru.scriptName = "autoload.lua"; + + meta = { + description = "This script automatically loads playlist entries before and after the the currently played file"; + homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autoload.lua"; + maintainers = [ lib.maintainers.dawidsowa ]; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix new file mode 100644 index 0000000000..8213e514d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub, fetchpatch, python3 }: + +# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` +stdenv.mkDerivation { + pname = "mpv_sponsorblock"; + version = "unstable-2020-07-05"; + + src = fetchFromGitHub { + owner = "po5"; + repo = "mpv_sponsorblock"; + rev = "f71e49e0531350339134502e095721fdc66eac20"; + sha256 = "1fr4cagzs26ygxyk8dxqvjw4n85fzv6is6cb1jhr2qnsjg6pa0p8"; + }; + + dontBuild = true; + + patches = [ + # Use XDG_DATA_HOME and XDG_CACHE_HOME if defined for UID and DB + # Necessary to avoid sponsorblock to write in the nix store at runtime. + # https://github.com/po5/mpv_sponsorblock/pull/17 + (fetchpatch { + url = "https://github.com/po5/mpv_sponsorblock/pull/17/commits/e65b360a7d03a3430b4829e457a6670b2f617b09.patch"; + sha256 = "00wv0pvbz0dz2ibka66zhl2jk0pil4pyv6ipjfz37i81q6szyhs5"; + }) + (fetchpatch { + url = "https://github.com/po5/mpv_sponsorblock/pull/17/commits/3832304d959205e99120a14c0560ed3c37104b08.patch"; + sha256 = "149ffvn714n2m3mqs8mgrbs24bcr74kqfkx7wyql36ndhm88xd2z"; + }) + ]; + + postPatch = '' + substituteInPlace sponsorblock.lua \ + --replace "python3" "${python3}/bin/python3" \ + --replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" + ''; + + installPhase = '' + mkdir -p $out/share/mpv/scripts + cp -r sponsorblock.lua sponsorblock_shared $out/share/mpv/scripts/ + ''; + + passthru.scriptName = "sponsorblock.lua"; + + meta = with stdenv.lib; { + description = "mpv script to skip sponsored segments of YouTube videos"; + homepage = "https://github.com/po5/mpv_sponsorblock"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ pacien ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix index 79f38fa8fe..f22ddd39ee 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -5,14 +5,14 @@ # mkdir -p ~/.config/obs-studio/plugins/bin # ln -s ~/.nix-profile/lib/obs-plugins/obs-ndi.so ~/.config/obs-studio/plugins/bin/ -{ stdenv, fetchFromGitHub, obs-studio, cmake, qt5, ndi }: +{ stdenv, fetchFromGitHub, obs-studio, cmake, qtbase, ndi }: stdenv.mkDerivation rec { pname = "obs-ndi"; version = "4.7.1"; nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio qt5.qtbase ndi ]; + buildInputs = [ obs-studio qtbase ndi ]; src = fetchFromGitHub { owner = "Palakis"; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix index 97eae68b6e..eb8e418688 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-v4l2sink"; - version = "0.1.0"; + version = "0.1.0-12-g1ec3c8a"; src = fetchFromGitHub { owner = "CatxFish"; repo = "obs-v4l2sink"; rev = version; - sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z"; + sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix index 276c2fa787..b1c1dd285e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -1,15 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook -, python3Packages, gst_all_1, gtk3 -, gobject-introspection, librsvg, gnome3, libnotify, gsound -, meson, ninja, gsettings-desktop-schemas +{ stdenv +, fetchFromGitHub +, fetchurl +, fetchpatch +, pkg-config +, gettext +, itstool +, python3 +, wrapGAppsHook +, python3Packages +, gst_all_1 +, gtk3 +, gobject-introspection +, librsvg +, gnome3 +, libnotify +, gsound +, meson +, ninja +, gsettings-desktop-schemas }: let - version = "0.999"; - - # gst-transcoder will eventually be merged with gstreamer (according to - # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we - # don't bother exposing the package to all of nixpkgs. + # gst-transcoder was merged with gst-plugins-bad 1.18. + # TODO: switch to that once available. gst-transcoder = stdenv.mkDerivation rec { version = "1.14.1"; pname = "gst-transcoder"; @@ -19,46 +32,121 @@ let rev = version; sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f"; }; - nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection python3 ]; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + gobject-introspection + python3 + ]; + buildInputs = with gst_all_1; [ + gstreamer + gst-plugins-base + ]; }; in python3Packages.buildPythonApplication rec { - name = "pitivi-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb"; - }; + pname = "pitivi"; + version = "0.999"; format = "other"; + src = fetchurl { + url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb"; + }; + patches = [ # By default, the build picks up environment variables like PYTHONPATH # and saves them to the generated binary. This would make the build-time # dependencies part of the closure so we remove it. ./prevent-closure-contamination.patch + + # Port from intltool to gettext. + # Needed for the following patches to apply. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pitivi/commit/89b1053f2516c594f414c5c67c835471bce44b67.patch"; + sha256 = "8yhArzAtZC+WjHftcSDrstBlT8j6WlGHffU9Nj+ny+c="; + excludes = [ "po/POTFILES.in" ]; + }) + + # Complete switching to gst-transcoder in gst-plugins-bad. + # Otherwise there will likely be conflics. + # TODO: Apply this patch once we are using gst-transcoder from gst-plugins-bad. + # (fetchpatch { + # url = "https://gitlab.gnome.org/GNOME/pitivi/commit/51ae6533ee26ffd47e453eb5f5ad8cd46f57d15e.patch"; + # sha256 = "zxJm+E5o+oZ3lW6wYNY/ERo2g4NmCjoY8oV+uScq8j8="; + # }) + + # Generate renderer.so on macOS instead of dylib. + # Needed for the following patch to apply. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pitivi/commit/bcacadcafabf8911efb0fddc8d57329237d08cd1.patch"; + sha256 = "2BM5acIwOgdr1L9vhtMMN4trrLuqCg/K6v6ZYtD1Fjw="; + postFetch = '' + sed -i -e "s/1.90.0.1/0.999/g" "$out" + ''; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pitivi/commit/0a3cc054a2c20b59f5aaaaa307de3c9af3c0d270.patch"; + sha256 = "6DhqRlxFWFFdLwGoFem+vPt8x7v732KMVjMF9fypMK4="; + postFetch = '' + sed "$out" -i \ + -e "s/1.90.0.1/0.999/g" \ + -e "s/\(-python_dep.*\)/\1\n /" \ + -e "s/-1,9 +1,16/-1,10 +1,17/" + ''; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + python3 + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + librsvg + gnome3.gnome-desktop + gsound + gnome3.adwaita-icon-theme + gsettings-desktop-schemas + libnotify + gst-transcoder + ] ++ (with gst_all_1; [ + gstreamer + gst-editing-services + gst-plugins-base + (gst-plugins-good.override { gtkSupport = true; }) + gst-plugins-bad + gst-plugins-ugly + gst-libav + gst-validate + ]); + + pythonPath = with python3Packages; [ + pygobject3 + gst-python + pyxdg + numpy + pycairo + matplotlib + dbus-python ]; postPatch = '' patchShebangs ./getenvvar.py + + # fetchpatch does not support renamings + mv data/org.pitivi.Pitivi-mime.xml data/org.pitivi.Pitivi-mime.xml.in ''; - nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ]; - - buildInputs = [ - gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound - gnome3.adwaita-icon-theme - gsettings-desktop-schemas libnotify - gst-transcoder - ] ++ (with gst_all_1; [ - gstreamer gst-editing-services - gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) - gst-plugins-bad gst-plugins-ugly gst-libav gst-validate - ]); - - pythonPath = with python3Packages; [ pygobject3 gst-python pyxdg numpy pycairo matplotlib dbus-python ]; - passthru = { updateScript = gnome3.updateScript { packageName = "pitivi"; diff --git a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix index 85c71e86a6..a8d2aaaff0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "smplayer"; - version = "20.4.2"; + version = "20.6.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0kqdx6q2274gm83rycvdcglka60ymdk4iw2lc39iw7z1zgsv6ky3"; + sha256 = "0c59gfgm2ya8yb2nx7gy1zc0nrr4206213xy86y7jw0bk9mmjxmy"; }; buildInputs = [ qtscript ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/smtube/default.nix b/third_party/nixpkgs/pkgs/applications/video/smtube/default.nix index 1cd6fb693e..26b14ab739 100644 --- a/third_party/nixpkgs/pkgs/applications/video/smtube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }: mkDerivation rec { - version = "20.1.0"; + version = "20.6.0"; pname = "smtube"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2"; - sha256 = "00x7gyk06d01hrr1lcqbrffbkkpj2j0j1fy9mkxc7slbzqcl27dz"; + sha256 = "0hnza5gszwqnkc1py5g34hi4p976vpkc4h3ab0247ynqs83fpwc2"; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix new file mode 100644 index 0000000000..251f495b7e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -0,0 +1,100 @@ +{ autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook +, at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped +, gdk-pixbuf, glib, gnome2, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg +, streamlink }: + +let + basename = "streamlink-twitch-gui"; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; + arch = + if stdenv.hostPlatform.system == "x86_64-linux" + then + "linux64" + else + "linux32"; + +in +stdenv.mkDerivation rec { + pname = "${basename}-bin"; + version = "1.10.0"; + + src = fetchurl { + url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz"; + sha256 = + if arch == "linux64" + then + "17s9zbzj4pgz9mxxwjbp3788afkddc9s3p7xp28y5084z9wwzph2" + else + "1pww05hr48m6v0g1sz48g1c7p615lig3s12l21xgyz4gkjzmjy22"; + }; + + nativeBuildInputs = with xorg; [ + at-spi2-core + atk + alsaLib + autoPatchelfHook + cairo + cups.lib + dbus.daemon.lib + expat + gcc-unwrapped + gdk-pixbuf + glib + gnome2.pango + gtk3-x11 + nss + nspr + libuuid + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXScrnSaver + libXtst + makeWrapper + wrapGAppsHook + ]; + + buildInputs = [ streamlink ]; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + mkdir -p $out/{bin,opt/${basename},share} + + # Install all files, remove unnecessary ones + cp -a . $out/opt/${basename}/ + rm -r $out/opt/${basename}/{{add,remove}-menuitem.sh,credits.html,icons/} + + wrapProgram $out/opt/${basename}/${basename} --add-flags "--no-version-check" --prefix LD_LIBRARY_PATH : ${runtimeLibs} + + ln -s "$out/opt/${basename}/${basename}" $out/bin/ + ln -s "${desktopItem}/share/applications" $out/share/ + ''; + + desktopItem = makeDesktopItem { + name = basename; + exec = basename; + icon = basename; + desktopName = "Streamlink Twitch GUI"; + genericName = meta.description; + categories = "AudioVideo;Network;"; + }; + + meta = with stdenv.lib; { + description = "Twitch.tv browser for Streamlink"; + longDescription = "Browse Twitch.tv and watch streams in your videoplayer of choice"; + homepage = "https://streamlink.github.io/streamlink-twitch-gui/"; + downloadPage = https://github.com/streamlink/streamlink-twitch-gui/releases; + license = licenses.mit; + maintainers = with maintainers; [ rileyinman ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix b/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix new file mode 100644 index 0000000000..0cbdeaaf6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper +, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, utillinux +, dejavu_fonts +}: +with stdenv.lib; +let + version = "1.13.4"; + runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer utillinux ]; +in +stdenv.mkDerivation { + pname = "vcs"; + inherit version; + src = fetchurl { + url = "http://p.outlyer.net/files/vcs/vcs-${version}.bash"; + sha256 = "0nhwcpffp3skz24kdfg4445i6j37ks6a0qsbpfd3dbi4vnpa60a0"; + }; + + unpackCmd = "mkdir src; cp $curSrc src/vcs"; + patches = [ ./fonts.patch ]; + nativeBuildInputs = [ makeWrapper ]; + doBuild = false; + + inherit dejavu_fonts; + installPhase = '' + mkdir -p $out/bin + mv vcs $out/bin/vcs + substituteAllInPlace $out/bin/vcs + chmod +x $out/bin/vcs + wrapProgram $out/bin/vcs --argv0 vcs --set PATH "${makeBinPath runtimeDeps}" + ''; + + meta = { + description = "Generates contact sheets from video files"; + homepage = "http://p.outlyer.net/vcs"; + license = licenses.cc-by-nc-sa-30; + maintainers = with maintainers; [ elitak ]; + platforms = with platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/vcs/fonts.patch b/third_party/nixpkgs/pkgs/applications/video/vcs/fonts.patch new file mode 100644 index 0000000000..3df0359f8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/vcs/fonts.patch @@ -0,0 +1,23 @@ +--- a/vcs 2020-04-04 14:37:53.531095977 -0700 ++++ b/vcs 2020-04-04 14:40:46.459407878 -0700 +@@ -3669,18 +3669,8 @@ + [[ ( -z $USR_FONT_TITLE ) && ( $FONT_TITLE != 'DejaVu-Sans-Book' ) ]] && return + [[ ( -z $USR_FONT_TSTAMPS ) && ( $FONT_TSTAMPS != 'DejaVu-Sans-Book' ) ]] && return + [[ ( -z $USR_FONT_SIGN ) && ( $FONT_SIGN != 'DejaVu-Sans-Book' ) ]] && return +- # Try to locate DejaVu Sans +- local dvs='' +- if [[ -d /usr/local/share/fonts ]]; then +- dvs=$(find /usr/local/share/fonts/ -type f -iname 'dejavusans.ttf') +- fi +- if [[ ( -z $dvs ) && ( -d /usr/share/fonts ) ]]; then +- dvs=$(find /usr/share/fonts/ -type f -iname 'dejavusans.ttf') +- fi +- if [[ -z $dvs ]]; then +- warn "Unable to locate DejaVu Sans font. Falling back to helvetica." +- dvs=helvetica +- fi ++ # Use DejaVu Sans, by default ++ local dvs='@dejavu_fonts@/share/fonts/truetype/DejaVuSans.ttf' + [[ -z $USR_FONT_HEADING ]] && FONT_HEADING="$dvs" + [[ -z $USR_FONT_TITLE ]] && FONT_TITLE="$dvs" + [[ -z $USR_FONT_TSTAMPS ]] && FONT_TSTAMPS="$dvs" diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix index 14ca503f2e..bc3d54f3b5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig -, gettext, systemd, perl, lib, fetchpatch +{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig +, gettext, systemd, perl, lib , enableSystemd ? true , enableBidi ? true }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.4.1"; + version = "2.4.4"; - src = fetchurl { - url = "ftp://ftp.tvdr.de/vdr/${pname}-${version}.tar.bz2"; - sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5"; + src = fetchgit { + url = "git://git.tvdr.de/vdr.git"; + rev = "V20404"; + sha256 = "1fzghnp5mpcwn3a3fyk3w8h15z4f2cnc75247kvxj1c9069mgnwa"; }; - patches = [ - # Derived from http://git.tvdr.de/?p=vdr.git;a=commit;h=930c2cd2eb8947413e88404fa94c66e4e1db5ad6 - ./glibc2.31-compat.patch - ]; - enableParallelBuilding = true; postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/glibc2.31-compat.patch b/third_party/nixpkgs/pkgs/applications/video/vdr/glibc2.31-compat.patch deleted file mode 100644 index 9a52d4b290..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/glibc2.31-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/eit.c b/eit.c -index 50d8229..373dbca 100644 ---- a/eit.c -+++ b/eit.c -@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data) - if (abs(diff) > MAX_TIME_DIFF) { - mutex.Lock(); - if (abs(diff) > MAX_ADJ_DIFF) { -- if (stime(&dvbtim) == 0) -+ timespec ts = { 0 }; -+ ts.tv_sec = dvbtim; -+ if (clock_settime(CLOCK_REALTIME, &ts) == 0) - isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); - else - esyslog("ERROR while setting system time: %m"); diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix index 2ae4cbac4d..30cd93178c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix @@ -49,7 +49,8 @@ in { vaapidevice = stdenv.mkDerivation { - name = "vdr-vaapidevice-0.7.0"; + pname = "vdr-vaapidevice"; + version = "20190525"; buildInputs = [ vdr libxcb xcbutilwm ffmpeg_3 @@ -61,14 +62,14 @@ in { makeFlags = [ "DESTDIR=$(out)" ]; postPatch = '' - substituteInPlace softhddev.c --replace /usr/bin/X ${xorgserver}/bin/X + substituteInPlace vaapidev.c --replace /usr/bin/X ${xorgserver}/bin/X ''; src = fetchFromGitHub { owner = "pesintta"; repo = "vdr-plugin-vaapidevice"; - sha256 = "072y61fpkh3i2dragg0nsd4g3malgwxkwpdrb1ykdljyzf52s5hs"; - rev = "c99afc23a53e6d91f9afaa99af59b30e68e626a8"; + sha256 = "1gwjp15kjki9x5742fhaqk3yc2bbma74yp2vpn6wk6kj46nbnwp6"; + rev = "d19657bae399e79df107e316ca40922d21393f80"; }; meta = with stdenv.lib; { @@ -129,11 +130,12 @@ in { epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; - version = "2.4.0"; + version = "20191202"; - src = fetchurl { - url = "https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${version}.tar.bz2"; - sha256 = "0xfgn17vicyjwdf0rbkrik4q16mnfi305d4wmi8f0qk825pa0z3y"; + src = fetchgit { + url = "git://projects.vdr-developer.org/vdr-plugin-epgsearch.git"; + sha256 = "18kskwnnscr4rb4yzfikw1la318zjgraf340cl7n9z77chi2gi8m"; + rev = "602d66c55964998ce25c6c57b302949a9517f149"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix index e655e0fbff..365eb8cd99 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; + broken = versionAtLeast qtbase.version "5.15"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix new file mode 100644 index 0000000000..600bc715ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix @@ -0,0 +1,71 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, fetchpatch +, pkg-config +, qmake +, qttools +, gstreamer +, libX11 +, qtbase +, qtmultimedia +, qtx11extras + +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, gst-plugins-ugly +}: +mkDerivation rec { + + pname = "vokoscreen-ng"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "vkohaupt"; + repo = "vokoscreenNG"; + rev = version; + sha256 = "1spyqw8h8bkc1prdb9aixiw5h3hk3gp2p0nj934bnwq04kmfp660"; + }; + + patches = [ + # Better linux integration + (fetchpatch { + url = "https://github.com/vkohaupt/vokoscreenNG/commit/0a3784095ecca582f7eb09551ceb34c309d83637.patch"; + sha256 = "1iibimv8xfxxfk44kkbrkay37ibdndjvs9g53mxr8x8vrsp917bz"; + }) + ]; + + qmakeFlags = [ "src/vokoscreenNG.pro" ]; + + nativeBuildInputs = [ qttools pkg-config qmake ]; + buildInputs = [ + gstreamer + libX11 + qtbase + qtmultimedia + qtx11extras + + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]; + + postPatch = '' + substituteInPlace src/vokoscreenNG.pro \ + --replace lrelease-qt5 lrelease + ''; + + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "User friendly Open Source screencaster for Linux and Windows"; + license = licenses.gpl2Plus; + homepage = "https://github.com/vkohaupt/vokoscreenNG"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/vokoscreen/default.nix b/third_party/nixpkgs/pkgs/applications/video/vokoscreen/default.nix index 0cd3c814b1..94d0de20cc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vokoscreen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vokoscreen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr -, ffmpeg_3 +, ffmpeg }: mkDerivation rec { @@ -35,7 +35,7 @@ mkDerivation rec { ''; postConfigure = '' - substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg_3} + substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg} ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix b/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix index 41304c21ac..aa559215fe 100644 --- a/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/webcamoid/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 -, ffmpeg-full, gstreamer, gst_all_1, libpulseaudio, alsaLib, jack2 +, ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , v4l-utils }: mkDerivation rec { pname = "webcamoid"; @@ -17,7 +17,7 @@ mkDerivation rec { libxcb qtbase qtdeclarative qtquickcontrols qtquickcontrols2 ffmpeg-full - gstreamer gst_all_1.gst-plugins-base + gst_all_1.gstreamer gst_all_1.gst-plugins-base alsaLib libpulseaudio jack2 v4l-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix index a316952a01..54663f9c5e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchFromGitHub, python }: +{ stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }: stdenv.mkDerivation rec { - version = "0.12"; + version = "0.18"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "177rcf1klcxsp6x9cw75cmz3y2izgd1hvi1rb9vc6iz9qx1nmk3v"; + sha256 = "0x2kvp95ld0yii93z9i0k9sknfx7jkgy4rkw9l369fl7f73ghsiq"; }; - buildInputs = [ python ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ + docker + (python3.withPackages (ps: [ ps.lark-parser ps.requests ])) + ]; + + configureFlags = let + pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]); + in [ + "--with-python=${pythonEnv}/bin/python3" + ]; preConfigure = '' - substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}' patchShebangs test/ + substituteInPlace configure.ac --replace "/usr/bin/env" "${coreutils}/bin/env" ''; makeFlags = [ @@ -24,12 +34,16 @@ stdenv.mkDerivation rec { "LIBEXEC_DIR=lib/charliecloud" ]; + # Charliecloud calls some external system tools. + # Here we wrap those deps so they are resolved inside nixpkgs. postInstall = '' - mkdir -p $out/share/charliecloud - mv $out/lib/charliecloud/examples $out/share/charliecloud - mv $out/lib/charliecloud/test $out/share/charliecloud + for file in $out/bin/* ; do \ + wrapProgram $file --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]} + done ''; + passthru.tests.charliecloud = nixosTests.charliecloud; + meta = { description = "User-defined software stacks (UDSS) for high-performance computing (HPC) centers"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index 675d713f4b..d2f1f2debe 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.20"; + version = "2.0.21"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1f09wx5k98fa55r73y5v0sgf2lha675xhk40piyf0b7zqknl6lya"; + sha256 = "13g436s00bcwzs31qsx5rpgkbbyxd4zvx8mbkq10gkrsv4r04q23"; }; nativeBuildInputs = [ pkg-config ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with stdenv.lib; { homepage = "https://github.com/containers/conmon"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 4210994f43..e6595a207b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "containerd"; - version = "1.2.13"; + version = "1.4.0"; # git commit for the above version's tag commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn"; + sha256 = "1ajns679ck5yp6vmf39pyshzf8jijw5fcg5biixkj54jhj3bv1sq"; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 9ec34e1b54..54ffb036f3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -10,17 +10,18 @@ , libselinux , lvm2 , pkg-config +, nixosTests }: buildGoModule rec { pname = "cri-o"; - version = "1.18.3"; + version = "1.19.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1csdbyypqwxkfc061pdv7nj52a52b9xxzb6qgxcznd82w7wgfb3g"; + sha256 = "1lrr8y0k6609z4gb8cg277rq58sh0bqd2b4mzjlynyjdgp3xskfq"; }; vendorSha256 = null; @@ -40,10 +41,6 @@ buildGoModule rec { BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' - patchShebangs . - - sed -i '/version.buildDate/d' Makefile - make binaries docs BUILDTAGS="$BUILDTAGS" ''; @@ -57,6 +54,8 @@ buildGoModule rec { installManPage docs/*.[1-9] ''; + passthru.tests = { inherit (nixosTests) cri-o; }; + meta = with stdenv.lib; { homepage = "https://cri-o.io"; description = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix index 1578eaf4f5..6d72623d86 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -10,7 +10,6 @@ , utillinux # nsenter , cni-plugins # not added to path , iptables -, socat }: let @@ -22,12 +21,11 @@ let conmon utillinux iptables - socat ] ++ extraPackages); in runCommand cri-o.name { name = "${cri-o.pname}-wrapper-${cri-o.version}"; - inherit (cri-o) pname version; + inherit (cri-o) pname version passthru; meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 4c5699419e..e52401ba35 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -25,6 +25,7 @@ let "test_pid.py" "test_pid_file.py" "test_preserve_fds.py" + "test_resources" "test_start.py" "test_uid_gid.py" "test_update.py" @@ -34,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.14.1"; + version = "0.15"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0r77ksdrpxskf79m898a7ai8wxw9fmmsf2lg8fw3ychnk74l8jvh"; + sha256 = "0cqzk2lm1w0g2v6qhiliq565cf4p7hzh839jb01p3i5cr9kx11kc"; fetchSubmodules = true; }; @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) podman; }; meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 6e5ba4abf3..058f6fd8cc 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.30.0"; + version = "1.32.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "10w5v0qqj8yqd81hpz65pq1lx0j9pl112s7hl6y9p3i3f0m0931f"; + sha256 = "0pd2v7df176ca923c4nw9ns5gz442jkb0jhzqjl53rwfwz1vxy9h"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index e9fc96986a..14cfa7b312 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage +, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git @@ -56,7 +57,7 @@ rec { NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); in - stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) { + buildGoPackage ((optionalAttrs (stdenv.isLinux) { inherit docker-runc docker-containerd docker-proxy docker-tini; @@ -66,7 +67,7 @@ rec { ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; - }) // { + }) // rec { inherit version rev; name = "docker-${version}"; @@ -78,9 +79,19 @@ rec { sha256 = sha256; }; - nativeBuildInputs = [ installShellFiles pkgconfig ]; + patches = lib.optional (versionAtLeast version "19.03") [ + # Replace hard-coded cross-compiler with $CC + (fetchpatch { + url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch; + sha256 = "1af20bzakhpfhaixc29qnl9iml9255xdinxdnaqp4an0n1xa686a"; + }) + ]; + + goPackagePath = "github.com/docker/docker-ce"; + + nativeBuildInputs = [ pkgconfig go-md2man go libtool removeReferencesTo installShellFiles ]; buildInputs = [ - makeWrapper removeReferencesTo go-md2man go libtool + makeWrapper ] ++ optionals (stdenv.isLinux) [ sqlite lvm2 btrfs-progs systemd libseccomp ]; @@ -91,7 +102,7 @@ rec { export GOCACHE="$TMPDIR/go-cache" '' + (optionalString (stdenv.isLinux) '' # build engine - cd ./components/engine + cd ./go/src/${goPackagePath}/components/engine export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="${rev}" export VERSION="${version}" @@ -99,7 +110,7 @@ rec { cd - '') + '' # build cli - cd ./components/cli + cd ./go/src/${goPackagePath}/components/cli # Mimic AUTO_GOPATH mkdir -p .gopath/src/github.com/docker/ ln -sf $PWD .gopath/src/github.com/docker/cli @@ -113,7 +124,7 @@ rec { ''; # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd - patchPhase = '' + postPatch = '' substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" "" '' + optionalString (stdenv.isLinux) '' patchShebangs . @@ -125,7 +136,13 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]); - installPhase = optionalString (stdenv.isLinux) '' + installPhase = '' + cd ./go/src/${goPackagePath} + install -Dm755 ./components/cli/docker $out/libexec/docker/docker + + makeWrapper $out/libexec/docker/docker $out/bin/docker \ + --prefix PATH : "$out/libexec/docker:$extraPath" + '' + optionalString (stdenv.isLinux) '' install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ @@ -141,24 +158,20 @@ rec { # systemd install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service '' + '' - install -Dm755 ./components/cli/docker $out/libexec/docker/docker - - makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "$out/libexec/docker:$extraPath" - # completion (cli) installShellCompletion --bash ./components/cli/contrib/completion/bash/docker installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker # Include contributed man pages (cli) + cd ./components/cli + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Generate man pages from cobra commands echo "Generate man pages from cobra" - cd ./components/cli mkdir -p ./man/man1 go build -o ./gen-manpages github.com/docker/cli/man ./gen-manpages --root . --target ./man/man1 - + '' + '' # Generate legacy pages from markdown echo "Generate legacy manpages" ./man/md2man-all.sh -q @@ -167,7 +180,7 @@ rec { ''; preFixup = '' - find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' + + find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' + '' + optionalString (stdenv.isLinux) '' find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' + ''; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix index 79d1b606bc..9513457d86 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.21.1"; + version = "0.22.0"; suffix = { x86_64-linux = "x86_64"; @@ -15,13 +15,13 @@ let }; firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "0g4fja3bz1fsyz8vj99199yblkn46ygf33ldwd1ssw8f957vbwnb"; - aarch64-linux = "1qyppcxnh7f42fs4px5rvkk6lza57h2sq9naskvqn5zy4vsvq89s"; + x86_64-linux = "1jl7cmw53fbykcji8a0bkdy82mgpfr8km3ab6iwsrswvahh4srx7"; + aarch64-linux = "15vi6441gr4jy0698ifashgv1ic7iz0kbm7c28m2jd8z08p6bnlz"; }; jailer-bin = fetchbin "jailer" { - x86_64-linux = "0x89pfmqci9d3i9fi9b9zm94yr2v7pq7kp3drlb952jkdfj0njyk"; - aarch64-linux = "03fx9sk88jm23wqm8fraqd1ccfhbqvc310mkfv1f5p2ykhq2ahrk"; + x86_64-linux = "0wir7fi1iqvw02908axfaqzp9q5qyg4yk5jicp8s493iz3vhm9h7"; + aarch64-linux = "1l3yc9j27vxfyn89xmxi1ir635v7l8ikwpw9a30dhh50wa3rm4jy"; }; in diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index cc805aefc9..e1e7d2c277 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.0.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "0rnli16nh5m3a8jjkkm1k4f896yk1k1rg48rjiajqhfrr98qwr0f"; + sha256 = "033pdkrmdsk33n1mglpcpl3g9i62raw47wpab752qhbmpy1c49lr"; }; vendorSha256 = null; @@ -60,7 +60,7 @@ buildGoModule rec { MANDIR=$man/share/man make install.man-nobuild ''; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) podman; }; meta = with stdenv.lib; { homepage = "https://podman.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 7cbc3e4c61..535f837115 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -18,6 +18,7 @@ , openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , smbdSupport ? false, samba +, tpmSupport ? true , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (stdenv.lib.optional stdenv.isx86_64 "i386-softmmu" @@ -127,6 +128,7 @@ stdenv.mkDerivation rec { ++ optional cephSupport "--enable-rbd" ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer" + ++ optional tpmSupport "--enable-tpm" ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; doCheck = false; # tries to access /dev diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index ecd282d6f7..fd3d914af6 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -45,7 +45,7 @@ buildGoPackage rec { installManPage man/*/*.[1-9] ''; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with lib; { homepage = "https://github.com/opencontainers/runc"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index 8cec24534d..2f2d66f3b2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -18,15 +18,14 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "070jj6kbiw23sd2p4xhvmyb8gd83imwgisdf18ahkwp7dq85db3c"; + sha256 = "1zd29s8lggv4x5xracgzywayg1skl9qc2bqh1zdxh1wrg9sqbadi"; }; goPackagePath = "github.com/sylabs/singularity"; - goDeps = ./deps.nix; buildInputs = [ gpgme openssl libuuid ]; nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper cryptsetup ]; @@ -67,10 +66,6 @@ buildGoPackage rec { runHook postInstall ''; - postFixup = '' - find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true - ''; - meta = with stdenv.lib; { homepage = "http://www.sylabs.io/"; description = "Application containers for linux"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix deleted file mode 100644 index fe51488c70..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/deps.nix +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/tini/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/tini/default.nix index db3fb1c96e..e3b1ccd4ce 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/tini/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/tini/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; - buildInputs = [ cmake glibc glibc.static ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ glibc glibc.static ]; meta = with stdenv.lib; { description = "A tiny but valid init for containers"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix index 8f9c28c785..455e3249ad 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, libX11, libXinerama, libXft, patches ? []}: +{stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}: + +with stdenv.lib; let name = "dwm-6.2"; @@ -18,7 +20,9 @@ stdenv.mkDerivation { # Allow users set their own list of patches inherit patches; - buildPhase = " make "; + # Allow users to set the config.def.h file containing the configuration + postPatch = let configFile = if isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; + in optionalString (conf!=null) "cp ${configFile} config.def.h"; meta = { homepage = "https://suckless.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix new file mode 100644 index 0000000000..f6e24d979a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, xorg, i3lock }: + +stdenv.mkDerivation rec { + pname = "i3lock-fancy-rapid"; + version = "2019-10-09"; + src = fetchFromGitHub { + owner = "yvbbrjdr"; + repo = "i3lock-fancy-rapid"; + rev = "c67f09bc8a48798c7c820d7d4749240b10865ce0"; + sha256 = "0jhvlj6v6wx70239pgkjxd42z1s2bzfg886ra6n1rzsdclf4rkc6"; + }; + + buildInputs = [ xorg.libX11 ]; + propagatedBuildInputs = [ i3lock ]; + + postPatch = '' + substituteInPlace i3lock-fancy-rapid.c \ + --replace '"i3lock"' '"${i3lock}/bin/i3lock"' + ''; + + installPhase = '' + install -D i3lock-fancy-rapid $out/bin/i3lock-fancy-rapid + ''; + + meta = with stdenv.lib; { + description = "A faster implementation of i3lock-fancy"; + homepage = "https://github.com/yvbbrjdr/i3lock-fancy-rapid"; + maintainers = with maintainers; [ nickhu ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix index 2404129b16..ac28abc31d 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sxhkd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "sxhkd"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "baskerville"; repo = "sxhkd"; rev = version; - sha256 = "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h"; + sha256 = "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix index 4a09cac934..a1f3b3708a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig -, wayland, libGL, mesa, libxkbcommon, cairo, libxcb +{ stdenv, fetchurl, meson, ninja, pkg-config, wayland +, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2, pipewire ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null @@ -10,14 +10,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "weston"; - version = "8.0.0"; + version = "9.0.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0j3q0af3595g4wcicldgy749zm2g2b6bswa6ya8k075a5sdv863m"; + sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva @@ -45,9 +45,19 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "weston" ]; meta = { - description = "Reference implementation of a Wayland compositor"; - homepage = "https://wayland.freedesktop.org/"; - license = licenses.mit; + description = "A lightweight and functional Wayland compositor"; + longDescription = '' + Weston is the reference implementation of a Wayland compositor, as well + as a useful environment in and of itself. + Out of the box, Weston provides a very basic desktop, or a full-featured + environment for non-desktop uses such as automotive, embedded, in-flight, + industrial, kiosks, set-top boxes and TVs. It also provides a library + allowing other projects to build their own full-featured environments on + top of Weston's core. A small suite of example or demo clients are also + provided. + ''; + homepage = "https://gitlab.freedesktop.org/wayland/weston"; + license = licenses.mit; # Expat version platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix new file mode 100644 index 0000000000..efba386327 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/windowchef/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libxcb, libXrandr +, xcbutil, xcbutilkeysyms, xcbutilwm, xcbproto +}: + +stdenv.mkDerivation rec { + pname = "windowchef"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "tudurom"; + repo = "windowchef"; + rev = "v${version}"; + sha256 = "0fs5ss2z6qjxvmls0g2f3gmv8hshi81xsmmcjn9x7651rv9552pl"; + }; + + buildInputs = [ libxcb libXrandr xcbutil xcbutilkeysyms xcbutilwm xcbproto]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "A stacking window manager that cooks windows with orders from the Waitron"; + homepage = "https://github.com/tudurom/windowchef"; + maintainers = with maintainers; [ bhougland ]; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix index 64783ac5fb..9f5d2e2539 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "windowmaker"; - version = "0.95.8"; + version = "0.95.9"; srcName = "WindowMaker-${version}"; src = fetchurl { url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz"; - sha256 = "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx"; + sha256 = "055pqvlkhipyjn7m6bb3fs4zz9rd1ynzl0mmwbhp05ihc3zmh8zj"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { "--with-x" "--enable-modelock" "--enable-randr" - "--enable-magick" + "--enable-webp" + "--disable-magick" # Many distros reported imagemagick fails to be found ]; meta = with stdenv.lib; { @@ -40,5 +41,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.AndersonTorres ]; }; } - -# TODO: investigate support for WEBP (its autodetection is failing) diff --git a/third_party/nixpkgs/pkgs/build-support/alternatives/blas/default.nix b/third_party/nixpkgs/pkgs/build-support/alternatives/blas/default.nix index 9e1aacfaf8..5ebbc737e1 100644 --- a/third_party/nixpkgs/pkgs/build-support/alternatives/blas/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/alternatives/blas/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { exit 1 fi - nm -an "$libblas" | cut -f3 -d' ' > symbols + $NM -an "$libblas" | cut -f3 -d' ' > symbols for symbol in ${toString blasFortranSymbols}; do grep -q "^$symbol_$" symbols || { echo "$symbol" was not found in "$libblas"; exit 1; } done diff --git a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix index f15ce80d6d..e6014e35ae 100644 --- a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix @@ -163,7 +163,6 @@ rec { SDL_mixer SDL2_ttf SDL2_mixer - gstreamer libappindicator-gtk2 libcaca libcanberra diff --git a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix index bbcbc4e2e1..4d22a329e4 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix @@ -37,6 +37,12 @@ args@{ # Debian-specific /usr/share/java paths, but doesn't in the configured build). , fetchConfigured ? false +# Don’t add Bazel --copt and --linkopt from NIX_CFLAGS_COMPILE / +# NIX_LDFLAGS. This is necessary when using a custom toolchain which +# Bazel wants all headers / libraries to come from, like when using +# CROSSTOOL. Weirdly, we can still get the flags through the wrapped +# compiler. +, dontAddBazelOpts ? false , ... }: @@ -170,6 +176,8 @@ in stdenv.mkDerivation (fBuildAttrs // { done '' + fBuildAttrs.preConfigure or ""; + inherit dontAddBazelOpts; + buildPhase = fBuildAttrs.buildPhase or '' runHook preBuild @@ -181,20 +189,22 @@ in stdenv.mkDerivation (fBuildAttrs // { # copts=() host_copts=() - for flag in $NIX_CFLAGS_COMPILE; do - copts+=( "--copt=$flag" ) - host_copts+=( "--host_copt=$flag" ) - done - for flag in $NIX_CXXSTDLIB_COMPILE; do - copts+=( "--copt=$flag" ) - host_copts+=( "--host_copt=$flag" ) - done linkopts=() host_linkopts=() - for flag in $NIX_LDFLAGS; do - linkopts+=( "--linkopt=-Wl,$flag" ) - host_linkopts+=( "--host_linkopt=-Wl,$flag" ) - done + if [ -z "''${dontAddBazelOpts:-}" ]; then + for flag in $NIX_CFLAGS_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + for flag in $NIX_CXXSTDLIB_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + for flag in $NIX_LDFLAGS; do + linkopts+=( "--linkopt=-Wl,$flag" ) + host_linkopts+=( "--host_linkopt=-Wl,$flag" ) + done + fi BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ USER=homeless-shelter \ diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index 4f3680f219..0e4e76d728 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -61,21 +61,35 @@ let then import ../expand-response-params { inherit (buildPackages) stdenv; } else ""; + useGccForLibs = isClang + && libcxx == null + && !(stdenv.targetPlatform.useLLVM or false) + && !(stdenv.targetPlatform.useAndroidPrebuilt or false) + && gccForLibs != null; + # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: if isGNU then - { skylake = versionAtLeast ccVersion "6.0"; + { # Intel + skylake = versionAtLeast ccVersion "6.0"; skylake-avx512 = versionAtLeast ccVersion "6.0"; cannonlake = versionAtLeast ccVersion "8.0"; icelake-client = versionAtLeast ccVersion "8.0"; icelake-server = versionAtLeast ccVersion "8.0"; knm = versionAtLeast ccVersion "8.0"; + # AMD + znver1 = versionAtLeast ccVersion "6.0"; + znver2 = versionAtLeast ccVersion "9.0"; }.${arch} or true else if isClang then - { cannonlake = versionAtLeast ccVersion "5.0"; + { # Intel + cannonlake = versionAtLeast ccVersion "5.0"; icelake-client = versionAtLeast ccVersion "7.0"; icelake-server = versionAtLeast ccVersion "7.0"; knm = versionAtLeast ccVersion "7.0"; + # AMD + znver1 = versionAtLeast ccVersion "4.0"; + znver2 = versionAtLeast ccVersion "9.0"; }.${arch} or true else false; @@ -209,6 +223,7 @@ stdenv.mkDerivation { wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77 + export named_fc=${targetPrefix}gfortran '' + optionalString cc.langJava or false '' @@ -227,8 +242,8 @@ stdenv.mkDerivation { setupHooks = [ ../setup-hooks/role.bash - ./setup-hook.sh - ]; + ] ++ stdenv.lib.optional (cc.langC or true) ./setup-hook.sh + ++ stdenv.lib.optional (cc.langFortran or false) ./fortran-hook.sh; postFixup = # Ensure flags files exists, as some other programs cat them. (That these @@ -263,7 +278,7 @@ stdenv.mkDerivation { ## ## GCC libs for non-GCC support ## - + optionalString (isClang && libcxx == null && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs != null) '' + + optionalString useGccForLibs '' echo "-B${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-cflags echo "-L${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-ldflags @@ -307,11 +322,11 @@ stdenv.mkDerivation { # We have a libc++ directly, we have one via "smuggled" GCC, or we have one # bundled with the C compiler because it is GCC - + optionalString (libcxx != null || (isClang && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs.langCC or false) || (isGNU && cc.langCC or false)) '' + + optionalString (libcxx != null || (useGccForLibs && gccForLibs.langCC or false) || (isGNU && cc.langCC or false)) '' touch "$out/nix-support/libcxx-cxxflags" touch "$out/nix-support/libcxx-ldflags" '' - + optionalString (libcxx == null && (isClang && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs.langCC or false)) '' + + optionalString (libcxx == null && (useGccForLibs && gccForLibs.langCC or false)) '' for dir in ${gccForLibs}/include/c++/*; do echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/fortran-hook.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/fortran-hook.sh new file mode 100644 index 0000000000..d72f314c01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/fortran-hook.sh @@ -0,0 +1,11 @@ +getTargetRole +getTargetRoleWrapper + +export FC${role_post}=@named_fc@ + +# If unset, assume the default hardening flags. +# These are different for fortran. +: ${NIX_HARDENING_ENABLE="stackprotector pic strictoverflow relro bindnow"} +export NIX_HARDENING_ENABLE + +unset -v role_post diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index d3f7d382c1..5714b228c5 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -15,6 +15,8 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi +cInclude=0 + source @out@/nix-support/utils.bash # Flirting with a layer violation here. diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index bf815af6f7..b2c132afd7 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -718,28 +718,41 @@ rec { architecture = buildPackages.go.GOARCH; os = "linux"; }); - customisationLayer = runCommand "${name}-customisation-layer" { inherit extraCommands; } '' - cp -r ${contentsEnv}/ $out - if [[ -n $extraCommands ]]; then - chmod u+w $out - (cd $out; eval "$extraCommands") - fi - ''; - contentsEnv = symlinkJoin { - name = "${name}-bulk-layers"; - paths = if builtins.isList contents - then contents - else [ contents ]; + contentsList = if builtins.isList contents then contents else [ contents ]; + + # We store the customisation layer as a tarball, to make sure that + # things like permissions set on 'extraCommands' are not overriden + # by Nix. Then we precompute the sha256 for performance. + customisationLayer = symlinkJoin { + name = "${name}-customisation-layer"; + paths = contentsList; + inherit extraCommands; + postBuild = '' + mv $out old_out + (cd old_out; eval "$extraCommands" ) + + mkdir $out + + tar \ + --owner 0 --group 0 --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -C old_out \ + -cf $out/layer.tar . + + sha256sum $out/layer.tar \ + | cut -f 1 -d ' ' \ + > $out/checksum + ''; }; - # NOTE: the `closures` parameter is a list of closures to include. - # The TOP LEVEL store paths themselves will never be present in the - # resulting image. At this time (2020-06-18) none of these layers - # are appropriate to include, as they are all created as - # implementation details of dockerTools. - closures = [ baseJson contentsEnv ]; - overallClosure = writeText "closure" (lib.concatStringsSep " " closures); + closureRoots = [ baseJson ] ++ contentsList; + overallClosure = writeText "closure" (lib.concatStringsSep " " closureRoots); + + # These derivations are only created as implementation details of docker-tools, + # so they'll be excluded from the created images. + unnecessaryDrvs = [ baseJson overallClosure ]; + conf = runCommand "${name}-conf.json" { inherit maxLayers created; imageName = lib.toLower name; @@ -751,9 +764,6 @@ rec { paths = referencesByPopularity overallClosure; buildInputs = [ jq ]; } '' - paths() { - cat $paths ${lib.concatMapStringsSep " " (path: "| (grep -v ${path} || true)") (closures ++ [ overallClosure ])} - } ${if (tag == null) then '' outName="$(basename "$out")" outHash=$(echo "$outName" | cut -d - -f 1) @@ -768,6 +778,12 @@ rec { created="$(date -Iseconds -d "$created")" fi + paths() { + cat $paths ${lib.concatMapStringsSep " " + (path: "| (grep -v ${path} || true)") + unnecessaryDrvs} + } + # Create $maxLayers worth of Docker Layers, one layer per store path # unless there are more paths than $maxLayers. In that case, create # $maxLayers-1 for the most popular layers, and smush the remainaing diff --git a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix index bc10747176..4a611add8a 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix @@ -298,21 +298,10 @@ rec { name = "no-store-paths"; tag = "latest"; extraCommands = '' - chmod a+w bin - # This removes sharing of busybox and is not recommended. We do this # to make the example suitable as a test case with working binaries. cp -r ${pkgs.pkgsStatic.busybox}/* . ''; - contents = [ - # This layer has no dependencies and its symlinks will be dereferenced - # when creating the customization layer. - (pkgs.runCommand "layer-to-flatten" {} '' - mkdir -p $out/bin - ln -s /bin/true $out/bin/custom-true - '' - ) - ]; }; nixLayered = pkgs.dockerTools.buildLayeredImageWithNixDb { @@ -415,7 +404,7 @@ rec { pkgs.dockerTools.buildLayeredImage { name = "bash-layered-with-user"; tag = "latest"; - contents = [ pkgs.bash pkgs.coreutils (nonRootShadowSetup { uid = 999; user = "somebody"; }) ]; + contents = [ pkgs.bash pkgs.coreutils ] ++ nonRootShadowSetup { uid = 999; user = "somebody"; }; }; } diff --git a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py index ffb6ba0ade..cbae0f723f 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py +++ b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py @@ -33,7 +33,6 @@ function does all this. import io import os -import re import sys import json import hashlib @@ -45,21 +44,14 @@ from datetime import datetime, timezone from collections import namedtuple -def archive_paths_to(obj, paths, mtime, add_nix, filter=None): +def archive_paths_to(obj, paths, mtime): """ Writes the given store paths as a tar file to the given stream. obj: Stream to write to. Should have a 'write' method. paths: List of store paths. - add_nix: Whether /nix and /nix/store directories should be - prepended to the archive. - filter: An optional transformation to be applied to TarInfo - objects. Should take a single TarInfo object and return - another one. Defaults to identity. """ - filter = filter if filter else lambda i: i - # gettarinfo makes the paths relative, this makes them # absolute again def append_root(ti): @@ -72,7 +64,7 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): ti.gid = 0 ti.uname = "root" ti.gname = "root" - return filter(ti) + return ti def nix_root(ti): ti.mode = 0o0555 # r-xr-xr-x @@ -85,11 +77,9 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): with tarfile.open(fileobj=obj, mode="w|") as tar: # To be consistent with the docker utilities, we need to have - # these directories first when building layer tarballs. But - # we don't need them on the customisation layer. - if add_nix: - tar.addfile(apply_filters(nix_root(dir("/nix")))) - tar.addfile(apply_filters(nix_root(dir("/nix/store")))) + # these directories first when building layer tarballs. + tar.addfile(apply_filters(nix_root(dir("/nix")))) + tar.addfile(apply_filters(nix_root(dir("/nix/store")))) for path in paths: path = pathlib.Path(path) @@ -136,7 +126,7 @@ class ExtractChecksum: LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) -def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): +def add_layer_dir(tar, paths, mtime): """ Appends given store paths to a TarFile object as a new layer. @@ -144,11 +134,6 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): paths: List of store paths. mtime: 'mtime' of the added files and the layer tarball. Should be an integer representing a POSIX time. - add_nix: Whether /nix and /nix/store directories should be - added to a layer. - filter: An optional transformation to be applied to TarInfo - objects inside the layer. Should take a single TarInfo - object and return another one. Defaults to identity. Returns: A 'LayerInfo' object containing some metadata of the layer added. @@ -164,8 +149,6 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): extract_checksum, paths, mtime=mtime, - add_nix=add_nix, - filter=filter ) (checksum, size) = extract_checksum.extract() @@ -182,8 +165,6 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): write, paths, mtime=mtime, - add_nix=add_nix, - filter=filter ) write.close() @@ -199,29 +180,38 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): return LayerInfo(size=size, checksum=checksum, path=path, paths=paths) -def add_customisation_layer(tar, path, mtime): +def add_customisation_layer(target_tar, customisation_layer, mtime): """ - Adds the contents of the store path as a new layer. This is different - than the 'add_layer_dir' function defaults in the sense that the contents - of a single store path will be added to the root of the layer. eg (without - the /nix/store prefix). + Adds the customisation layer as a new layer. This is layer is structured + differently; given store path has the 'layer.tar' and corresponding + sha256sum ready. tar: 'tarfile.TarFile' object for the new layer to be added to. - path: A store path. - mtime: 'mtime' of the added files and the layer tarball. Should be an - integer representing a POSIX time. + customisation_layer: Path containing the layer archive. + mtime: 'mtime' of the added layer tarball. """ - def filter(ti): - ti.name = re.sub("^/nix/store/[^/]*", "", ti.name) - return ti - return add_layer_dir( - tar, - [path], - mtime=mtime, - add_nix=False, - filter=filter - ) + checksum_path = os.path.join(customisation_layer, "checksum") + with open(checksum_path) as f: + checksum = f.read().strip() + assert len(checksum) == 64, f"Invalid sha256 at ${checksum_path}." + + layer_path = os.path.join(customisation_layer, "layer.tar") + + path = f"{checksum}/layer.tar" + tarinfo = target_tar.gettarinfo(layer_path) + tarinfo.name = path + tarinfo.mtime = mtime + + with open(layer_path, "rb") as f: + target_tar.addfile(tarinfo, f) + + return LayerInfo( + size=None, + checksum=checksum, + path=path, + paths=[customisation_layer] + ) def add_bytes(tar, path, content, mtime): diff --git a/third_party/nixpkgs/pkgs/build-support/dotnetenv/build-solution.nix b/third_party/nixpkgs/pkgs/build-support/dotnetenv/build-solution.nix index 62370d361c..57af1fe9bd 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnetenv/build-solution.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnetenv/build-solution.nix @@ -16,20 +16,20 @@ assert modifyPublicMain -> mainClassFile != null; stdenv.mkDerivation { inherit name src; - - buildInputs = [ dotnetfx ]; + + buildInputs = [ dotnetfx ]; preConfigure = '' cd ${baseDir} ''; - + preBuild = '' ${stdenv.lib.optionalString modifyPublicMain '' sed -i -e "s|static void Main|public static void Main|" ${mainClassFile} ''} ${preBuild} ''; - + installPhase = '' addDeps() { @@ -39,44 +39,44 @@ stdenv.mkDerivation { do windowsPath=$(cygpath --windows $i) assemblySearchPaths="$assemblySearchPaths;$windowsPath" - + addDeps $i done fi } - + for i in ${toString assemblyInputs} do - windowsPath=$(cygpath --windows $i) + windowsPath=$(cygpath --windows $i) echo "Using assembly path: $windowsPath" - + if [ "$assemblySearchPaths" = "" ] then assemblySearchPaths="$windowsPath" else assemblySearchPaths="$assemblySearchPaths;$windowsPath" fi - + addDeps $i done - + echo "Assembly search paths are: $assemblySearchPaths" - + if [ "$assemblySearchPaths" != "" ] then echo "Using assembly search paths args: $assemblySearchPathsArg" export AssemblySearchPaths=$assemblySearchPaths fi - + mkdir -p $out MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} - + # Because .NET assemblies store strings as UTF-16 internally, we cannot detect # hashes. Therefore a text files containing the proper paths is created # We can also use this file the propagate transitive dependencies. - + mkdir -p $out/nix-support - + for i in ${toString assemblyInputs} do echo $i >> $out/nix-support/dotnet-assemblies diff --git a/third_party/nixpkgs/pkgs/build-support/dotnetenv/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnetenv/default.nix index 781a5ba8c0..c7145504eb 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnetenv/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnetenv/default.nix @@ -10,7 +10,7 @@ let dotnetenv = buildWrapper = import ./wrapper.nix { inherit dotnetenv; }; - + inherit (dotnetfx) assembly20Path wcfPath referenceAssembly30Path referenceAssembly35Path; }; in diff --git a/third_party/nixpkgs/pkgs/build-support/dotnetenv/wrapper.nix b/third_party/nixpkgs/pkgs/build-support/dotnetenv/wrapper.nix index 4b07fc27dc..423303c308 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnetenv/wrapper.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnetenv/wrapper.nix @@ -36,25 +36,25 @@ dotnetenv.buildSolution { do windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" - + addRuntimeDeps $i done fi } - + export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g') - + # Generate assemblySearchPaths string array contents for path in ${toString assemblyInputs} do assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " addRuntimeDeps $path done - + sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \ -e "s|@ASSEMBLYNAME@|${namespace}|" \ Wrapper/Wrapper.csproj.in > Wrapper/Wrapper.csproj - + sed -e "s|@NAMESPACE@|${namespace}|g" \ -e "s|@MAINCLASSNAME@|${mainClassName}|g" \ -e "s|@EXEPATH@|$exePath|g" \ diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgitlab/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgitlab/default.nix index f1850fbaa1..77512510a7 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgitlab/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgitlab/default.nix @@ -12,7 +12,7 @@ let ((optional (group != null) group) ++ [ owner repo ]); escapedSlug = replaceStrings ["." "/"] ["%2E" "%2F"] slug; - escapedRev = replaceStrings ["+"] ["%2B"] rev; + escapedRev = replaceStrings ["+" "%" "/"] ["%2B" "%25" "%2F"] rev; in fetchzip ({ diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/modules-closure.sh b/third_party/nixpkgs/pkgs/build-support/kernel/modules-closure.sh index 68d840f161..3f895d9cfe 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/modules-closure.sh +++ b/third_party/nixpkgs/pkgs/build-support/kernel/modules-closure.sh @@ -68,7 +68,17 @@ done mkdir -p $out/lib/firmware for module in $(cat closure); do - for i in $(modinfo -F firmware $module); do + # for builtin modules, modinfo will reply with a wrong output looking like: + # $ modinfo -F firmware unix + # name: unix + # + # There is a pending attempt to fix this: + # https://github.com/NixOS/nixpkgs/pull/96153 + # https://lore.kernel.org/linux-modules/20200823215433.j5gc5rnsmahpf43v@blumerang/T/#u + # + # For now, the workaround is just to filter out the extraneous lines out + # of its output. + for i in $(modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:'); do mkdir -p "$out/lib/firmware/$(dirname "$i")" echo "firmware for $module: $i" cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi diff --git a/third_party/nixpkgs/pkgs/build-support/release/default.nix b/third_party/nixpkgs/pkgs/build-support/release/default.nix index 6b9aa9a8c4..6aaa0338f0 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/default.nix @@ -41,10 +41,6 @@ rec { doCoverityAnalysis = true; } // args); - gcovReport = args: import ./gcov-report.nix ( - { inherit runCommand lcov rsync; - } // args); - rpmBuild = args: import ./rpm-build.nix ( { inherit vmTools; } // args); diff --git a/third_party/nixpkgs/pkgs/build-support/release/gcov-report.nix b/third_party/nixpkgs/pkgs/build-support/release/gcov-report.nix deleted file mode 100644 index 8ce5c0488a..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/release/gcov-report.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ runCommand, lcov, rsync, coverageRuns, lcovFilter ? [ "/nix/store/*" ], baseDirHack ? false }: - -runCommand "coverage" - { buildInputs = [ lcov rsync ]; - inherit lcovFilter baseDirHack; - } - '' - mkdir -p $TMPDIR/gcov $out/nix-support $out/coverage - info=$out/coverage/full.info - - for p in ${toString coverageRuns}; do - if [ -f $p/nix-support/hydra-build-products ]; then - cat $p/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products - fi - - [ ! -e $p/nix-support/failed ] || touch $out/nix-support/failed - - opts= - for d in $p/coverage-data/*; do - for i in $(cd $d/nix/store && ls); do - if ! [ -e /nix/store/$i/.build ]; then continue; fi - if [ -e $TMPDIR/gcov/nix/store/$i ]; then continue; fi - echo "copying $i..." - rsync -a /nix/store/$i/.build/* $TMPDIR/gcov/ - if [ -n "$baseDirHack" ]; then - opts="-b $TMPDIR/gcov/$(cd /nix/store/$i/.build && ls)" - fi - done - - for i in $(cd $d/nix/store && ls); do - rsync -a $d/nix/store/$i/.build/* $TMPDIR/gcov/ --include '*/' --include '*.gcda' --exclude '*' - done - done - - chmod -R u+w $TMPDIR/gcov - - echo "producing info..." - geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info $opts - cat $TMPDIR/app.info >> $info - done - - echo "making report..." - set -o noglob - lcov --remove $info ''$lcovFilter > $info.tmp - set +o noglob - mv $info.tmp $info - genhtml --show-details $info -o $out/coverage - echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products - '' diff --git a/third_party/nixpkgs/pkgs/build-support/rust/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/default.nix index c292b8ea4d..f6177ce198 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/default.nix @@ -29,6 +29,8 @@ , target ? null , cargoVendorDir ? null , checkType ? buildType +, depsExtraArgs ? {} +, cargoParallelTestThreads ? true # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the @@ -43,11 +45,11 @@ assert buildType == "release" || buildType == "debug"; let cargoDeps = if cargoVendorDir == null - then fetchCargoTarball { + then fetchCargoTarball ({ inherit name src srcs sourceRoot unpackPhase cargoUpdateHook; patches = cargoPatches; sha256 = cargoSha256; - } + } // depsExtraArgs) else null; # If we have a cargoSha256 fixed-output derivation, validate it at build time @@ -83,7 +85,7 @@ let in -stdenv.mkDerivation (args // { +stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; @@ -155,7 +157,7 @@ stdenv.mkDerivation (args // { echo echo "To fix the issue:" echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value' - echo "2. Build the derivation and wait it to fail with a hash mismatch" + echo "2. Build the derivation and wait for it to fail with a hash mismatch" echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field" echo @@ -181,7 +183,7 @@ stdenv.mkDerivation (args // { "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ - cargo build \ + cargo build -j $NIX_BUILD_CORES \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ --target ${rustTarget} \ --frozen ${concatStringsSep " " cargoBuildFlags} @@ -204,11 +206,12 @@ stdenv.mkDerivation (args // { checkPhase = args.checkPhase or (let argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; + threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; in '' ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preCheck echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=${threads} ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} ''); diff --git a/third_party/nixpkgs/pkgs/build-support/rust/fetchcrate.nix b/third_party/nixpkgs/pkgs/build-support/rust/fetchcrate.nix index 95dfd38b12..4e6c38b032 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/fetchcrate.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/fetchcrate.nix @@ -1,10 +1,13 @@ { lib, fetchurl, unzip }: -{ crateName +{ crateName ? args.pname +, pname ? null , version , sha256 , ... } @ args: +assert pname == null || pname == crateName; + lib.overrideDerivation (fetchurl ({ name = "${crateName}-${version}.tar.gz"; @@ -30,6 +33,6 @@ lib.overrideDerivation (fetchurl ({ fi mv "$unpackDir/$fn" "$out" ''; -} // removeAttrs args [ "crateName" "version" ])) +} // removeAttrs args [ "crateName" "pname" "version" ])) # Hackety-hack: we actually need unzip hooks, too (x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) diff --git a/third_party/nixpkgs/pkgs/build-support/singularity-tools/default.nix b/third_party/nixpkgs/pkgs/build-support/singularity-tools/default.nix index f1d4808e3c..d937ec6266 100644 --- a/third_party/nixpkgs/pkgs/build-support/singularity-tools/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/singularity-tools/default.nix @@ -86,7 +86,9 @@ rec { done # Create runScript and link shell - ln -s ${runtimeShell} bin/sh + if [ ! -e bin/sh ]; then + ln -s ${runtimeShell} bin/sh + fi mkdir -p .singularity.d ln -s ${runScriptFile} .singularity.d/runscript diff --git a/third_party/nixpkgs/pkgs/build-support/writers/default.nix b/third_party/nixpkgs/pkgs/build-support/writers/default.nix index 4673b4e6cd..495a56b419 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/default.nix @@ -164,12 +164,13 @@ rec { # ''; writeHaskell = name: { libraries ? [], - ghc ? pkgs.ghc + ghc ? pkgs.ghc, + ghcArgs ? [] }: makeBinWriter { compileScript = '' cp $contentPath tmp.hs - ${ghc.withPackages (_: libraries )}/bin/ghc tmp.hs + ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs} tmp.hs mv tmp $out ${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded "$out" ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix index 3338b77841..a972bd7c3d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.0.4"; + version = "2.1.0"; in -fetchzip rec { +fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_ece94f6.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip"; - sha256 = "04q7dnrlq5hm30iibh3jafb33m5lwsgb3g9n9i188sg02ydkrsl9"; + sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/third_party/nixpkgs/pkgs/data/fonts/caladea/cambria-alias.conf b/third_party/nixpkgs/pkgs/data/fonts/caladea/cambria-alias.conf index f763e2a8c3..78452961e8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/caladea/cambria-alias.conf +++ b/third_party/nixpkgs/pkgs/data/fonts/caladea/cambria-alias.conf @@ -1,5 +1,5 @@ - + diff --git a/third_party/nixpkgs/pkgs/data/fonts/carlito/calibri-alias.conf b/third_party/nixpkgs/pkgs/data/fonts/carlito/calibri-alias.conf index 294af3b6c7..bbffff2372 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/carlito/calibri-alias.conf +++ b/third_party/nixpkgs/pkgs/data/fonts/carlito/calibri-alias.conf @@ -1,5 +1,5 @@ - + diff --git a/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix index 220d2684ee..30738a3c3c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2007.01"; + version = "2008.25"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "173dpr0k4y5b02ps9426pyaazl2pxj1kw5l5jrikbi6zjv4590gb"; + sha256 = "182ssznm6f5fhykmqqvimq7ihmxkc64gh76faqxg1ihdyzqgi2y6"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/third_party/nixpkgs/pkgs/data/fonts/clearlyU/default.nix b/third_party/nixpkgs/pkgs/data/fonts/clearlyU/default.nix index 62002b14dd..84cf3ebc53 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/clearlyU/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/clearlyU/default.nix @@ -20,19 +20,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' - # install bdf fonts + # install otb and bdf fonts fontDir="$out/share/fonts" - install -m 644 -D *.bdf -t "$fontDir" - mkfontdir "$fontDir" - - # install otb fonts - fontDir="$otb/share/fonts" - install -m 644 -D *.otb -t "$fontDir" + install -m 644 -D *.bdf *.otb -t "$fontDir" mkfontdir "$fontDir" ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "A Unicode font"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/data/fonts/comic-neue/default.nix b/third_party/nixpkgs/pkgs/data/fonts/comic-neue/default.nix index 709d93dc2c..d50e897434 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/comic-neue/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/comic-neue/default.nix @@ -1,32 +1,44 @@ -{ lib, fetchzip }: +{ stdenv, fetchzip }: -let - version = "2.3"; -in fetchzip rec { - name = "comic-neue-${version}"; +stdenv.mkDerivation rec { + pname = "comic-neue"; + version = "2.5"; - url = "http://comicneue.com/${name}.zip"; + src = fetchzip { + url = "http://comicneue.com/${pname}-${version}.zip"; + sha256 = "1kc0yyha6cc584vcl9z1cq1z6prgkxk93g75mr8gapfdrj25dp3q"; + stripRoot = false; # because it comes with a __MACOSX directory + }; - postFetch = '' - mkdir -vp $out/share/{doc,fonts} - unzip -j $downloadedFile OTF/\*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile Web/\*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile Web/\*.eot -d $out/share/fonts/EOT - unzip -j $downloadedFile Web/\*.woff -d $out/share/fonts/WOFF - unzip -j $downloadedFile Web/\*.woff2 -d $out/share/fonts/WOFF2 - unzip -j $downloadedFile \*.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt -d $out/share/doc/${name} + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,EOT,WOFF,WOFF2}} + cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/ + cp -v ${pname}-${version}/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype + cp -v ${pname}-${version}/OTF/ComicNeue/*.otf $out/share/fonts/opentype + cp -v ${pname}-${version}/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype + cp -v ${pname}-${version}/TTF/ComicNeue/*.ttf $out/share/fonts/truetype + cp -v ${pname}-${version}/WebFonts/eot/ComicNeue-Angular/*.eot $out/share/fonts/EOT + cp -v ${pname}-${version}/WebFonts/eot/ComicNeue/*.eot $out/share/fonts/EOT + cp -v ${pname}-${version}/WebFonts/woff/ComicNeue-Angular/*.woff $out/share/fonts/WOFF + cp -v ${pname}-${version}/WebFonts/woff/ComicNeue/*.woff $out/share/fonts/WOFF + cp -v ${pname}-${version}/WebFonts/woff2/ComicNeue/*.woff2 $out/share/fonts/WOFF2 + + # Quick fix for conflicting names in upstream + for i in ${pname}-${version}/WebFonts/woff2/ComicNeue-Angular/*.woff2; do + cp -v $i $out/share/fonts/WOFF2/`basename $i|sed -e 's|ComicNeue|ComicNeue-Angular|'` + done ''; - sha256 = "1gs4vhys0m3qsw06qaxzyi81f06w5v66kbyl64yw3pq2rb656779"; - - meta = with lib; { + meta = with stdenv.lib; { homepage = "http://comicneue.com/"; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; longDescription = '' - It is inspired by Comic Sans but more regular. The font was - designed by Craig Rozynski. It is available in two variants: - Comic Neue and Comic Neue Angular. The former having round and - the latter angular terminals. Both variants come in Light, + ComicNeue is inspired by Comic Sans but more regular. It was + designed by Craig Rozynski. It is available in two variants: + Comic Neue and Comic Neue Angular. The former having round and + the latter angular terminals. Both variants come in Light, Regular, and Bold weights with Oblique variants. ''; license = licenses.ofl; diff --git a/third_party/nixpkgs/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf b/third_party/nixpkgs/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf index be5f6cca86..e1362ec4f5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf +++ b/third_party/nixpkgs/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf @@ -1,5 +1,5 @@ - + diff --git a/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix index e4107cd4b9..ed28f6b5e6 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx"; + outputHash = "089d2m9bvaacj36qdq77pcazji0sbbr796shic3k52cpxkjnzbwh"; meta = with stdenv.lib; { homepage = "http://corefonts.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/corefonts/no-op.conf b/third_party/nixpkgs/pkgs/data/fonts/corefonts/no-op.conf index 503e62cfa2..3f8a9b9b54 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/corefonts/no-op.conf +++ b/third_party/nixpkgs/pkgs/data/fonts/corefonts/no-op.conf @@ -1,5 +1,5 @@ - + linux conflicting definition of 'struct sysinfo' ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include +-#include ++# if !SANITIZER_NONGNU ++# include ++# endif + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #if HAVE_RPC_XDR_H + # include + #elif HAVE_TIRPC_RPC_XDR_H +@@ -251,7 +256,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // Use pre-computed size of struct ustat to avoid which + // has been removed from glibc 2.28. + #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ +@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 +@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index de989b780..51a97b554 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -294,7 +294,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.19.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix index e0698e1dcf..e827f76231 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix index 80e298eaf8..629749e10f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix index 86853a97c9..6bb23b7754 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix @@ -4,7 +4,6 @@ , python , llvm , clang-tools-extra_src ? null -, rocm-runtime , lld , version @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - buildInputs = [ llvm rocm-runtime ]; + buildInputs = [ llvm ]; hardeningDisable = [ "all" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix index e90818d850..3e2c3cec0c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.5.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - sha256 = "03k2xp8wf4awf1zcjc2hb3kf9bqp567c3s569gp1q3q1zjg6r2ib"; + sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6"; }; in rec { clang = wrapCCWith rec { diff --git a/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix b/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix new file mode 100644 index 0000000000..f8d31f12cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, fetchFromGitHub +, cmake +, callPackage + +# Linux deps +, libGL +, xorg + +# Darwin deps +, cf-private +, Cocoa +, AudioToolbox +, OpenGL +, Foundation +, ForceFeedback +}: + +stdenv.mkDerivation rec { + pname = "lobster"; + version = "unstable-2020-07-27"; + + src = fetchFromGitHub { + owner = "aardappel"; + repo = pname; + rev = "9d68171494a79c83931426b624a0249a9c51882c"; + sha256 = "0d4gn71jym662i00rdmynv53ng1lgl81s5lw1sdddgn41wzs28dd"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = if stdenv.isDarwin + then [ + cf-private + Cocoa + AudioToolbox + OpenGL + Foundation + ForceFeedback + ] + else [ + libGL + xorg.libX11 + xorg.libXext + ]; + + preConfigure = "cd dev"; + enableParallelBuilding = true; + + passthru.tests = { + can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; + }; + + meta = with stdenv.lib; { + homepage = "http://strlen.com/lobster"; + description = "The Lobster programming language"; + longDescription = '' + Lobster is a programming language that tries to combine the advantages of + very static typing and memory management with a very lightweight, + friendly and terse syntax, by doing most of the heavy lifting for you. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/compilers/lobster/test-can-run-hello-world.nix b/third_party/nixpkgs/pkgs/development/compilers/lobster/test-can-run-hello-world.nix new file mode 100644 index 0000000000..ceb0536b58 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/lobster/test-can-run-hello-world.nix @@ -0,0 +1,13 @@ +{ stdenv, lobster }: + +stdenv.mkDerivation { + name = "lobster-test-can-run-hello-world"; + meta.timeout = 10; + buildCommand = '' + ${lobster}/bin/lobster \ + ${lobster}/share/Lobster/samples/rosettacode/hello_world_test.lobster \ + | grep 'Goodbye, World!' + touch $out + ''; +} + diff --git a/third_party/nixpkgs/pkgs/development/compilers/mcpp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mcpp/default.nix index bf0db4c1f6..023bae48b3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "mcpp"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-mcpplib" ]; + patches = [ + (fetchpatch { + name = "CVE-2019-14274.patch"; + url = "https://github.com/h8liu/mcpp/commit/ea453aca2742be6ac43ba4ce0da6f938a7e5a5d8.patch"; + sha256 = "0svkdr3w9b45v6scgzvggw9nsh6a3k7g19fqk0w3vlckwmk5ydzr"; + }) + ]; + meta = with stdenv.lib; { homepage = "http://mcpp.sourceforge.net/"; description = "A portable c preprocessor"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix index b2fa8fba0d..a3b320c384 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix @@ -2,12 +2,11 @@ enableX11 ? false, xlibsWrapper ? null }: let - version = "9.2"; + version = "10.1.10"; bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); arch = if stdenv.isi686 then "-i386" - else if stdenv.isx86_64 then "-x86-64" - else ""; + else "-x86-64"; in stdenv.mkDerivation { name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}"; @@ -20,14 +19,10 @@ stdenv.mkDerivation { if stdenv.isi686 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; - sha256 = "1fmlpnhf5a75db93phajh4ysbdgrgl72v45lk3kznriprl0a7jc6"; - } else if stdenv.isx86_64 - then fetchurl { + sha256 = "117lf06vcdbaa5432hwqnskpywc6x8ai0gj99h480a4wzkp3vhy6"; + } else fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; - sha256 = "1skzxxhr0iq96bf0j5m7mvf3i4sppfyfa6gpqn34mwgkw1fx8274"; - } else fetchurl { - url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; - sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"; + sha256 = "1rljv6iddrbssm91c0nn08myj92af36hkix88cc6qwq38xsxs52g"; }; buildInputs = if enableX11 then [xlibsWrapper] else []; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlton/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mlton/default.nix index aaf5888514..e438177478 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlton/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlton/default.nix @@ -1,26 +1,21 @@ -{ stdenv, fetchurl, fetchgit, patchelf, gmp }: +{ callPackage }: + rec { - mlton20130715 = import ./20130715.nix { - inherit stdenv fetchurl patchelf gmp; - }; + mlton20130715 = callPackage ./20130715.nix {}; - mlton20180207Binary = import ./20180207-binary.nix { - inherit stdenv fetchurl patchelf gmp; - }; + mlton20180207Binary = callPackage ./20180207-binary.nix {}; - mlton20180207 = import ./from-git-source.nix { + mlton20180207 = callPackage ./from-git-source.nix { mltonBootstrap = mlton20180207Binary; version = "20180207"; rev = "on-20180207-release"; sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a"; - inherit stdenv fetchgit gmp; }; - mltonHEAD = import ./from-git-source.nix { + mltonHEAD = callPackage ./from-git-source.nix { mltonBootstrap = mlton20180207Binary; version = "HEAD"; rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde"; sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d"; - inherit stdenv fetchgit gmp; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix b/third_party/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix index 2585b599ca..ec0b96bbf2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlton/from-git-source.nix @@ -6,6 +6,7 @@ , sha256 , stdenv , version +, which }: stdenv.mkDerivation { @@ -16,10 +17,13 @@ stdenv.mkDerivation { inherit url rev sha256; }; + nativeBuildInputs = [ which ]; + buildInputs = [mltonBootstrap gmp]; preBuild = '' find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@" + sed -i "s|/tmp|$TMPDIR|" bin/regression makeFlagsArray=( MLTON_VERSION="${version} ${rev}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix index b8951c8c80..025652c749 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix @@ -9,7 +9,6 @@ , llvmPackages_5 , gmp , emacs -, emacs25-nox , jre_headless , tcl , tk @@ -61,7 +60,7 @@ in stdenv.mkDerivation rec { # gcc together as compilers and we need clang for the sources generation. # However, clang emits tons of warnings about gcc's atomic-base library. "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init" - ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST"; + ]; fixupPhase = '' wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs @@ -73,7 +72,7 @@ in stdenv.mkDerivation rec { llvmPackages_5.clang llvmPackages_5.clang-unwrapped gmp - emacs25-nox + emacs jre_headless tcl tk diff --git a/third_party/nixpkgs/pkgs/development/compilers/mruby/bison-36-compat.patch b/third_party/nixpkgs/pkgs/development/compilers/mruby/bison-36-compat.patch deleted file mode 100644 index 674a88fe4c..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/mruby/bison-36-compat.patch +++ /dev/null @@ -1,59 +0,0 @@ -From acab088fd6af0b2ef2df1396aeb93bfc2e020fa5 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" -Date: Mon, 27 Apr 2020 18:52:43 +0900 -Subject: [PATCH 1/2] Updating `parse.y for recent `bison` (retry). - ---- - mrbgems/mruby-compiler/core/parse.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y -index 6a1faf4e..2a4f740e 100644 ---- a/mrbgems/mruby-compiler/core/parse.y -+++ b/mrbgems/mruby-compiler/core/parse.y -@@ -1323,7 +1323,7 @@ heredoc_end(parser_state *p) - - %} - --%pure-parser -+%define api.pure - %parse-param {parser_state *p} - %lex-param {parser_state *p} - --- -2.27.0 - -From 3cc682d943b29e84928a847a23f411ddbace74b7 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" -Date: Fri, 15 May 2020 12:30:13 +0900 -Subject: [PATCH 2/2] Remove `YYERROR_VERBOSE` which no longer supported since - `bison 3.6`. - -Instead we added `%define parse.error verbose`. ---- - mrbgems/mruby-compiler/core/parse.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y -index 2a4f740e..eee6a5e5 100644 ---- a/mrbgems/mruby-compiler/core/parse.y -+++ b/mrbgems/mruby-compiler/core/parse.y -@@ -9,7 +9,6 @@ - #ifdef PARSER_DEBUG - # define YYDEBUG 1 - #endif --#define YYERROR_VERBOSE 1 - #define YYSTACK_USE_ALLOCA 1 - - #include -@@ -1323,6 +1322,7 @@ heredoc_end(parser_state *p) - - %} - -+%define parse.error verbose - %define api.pure - %parse-param {parser_state *p} - %lex-param {parser_state *p} --- -2.27.0 - diff --git a/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix index 2589c47c3b..eee4f2c64e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix @@ -2,26 +2,24 @@ stdenv.mkDerivation rec { pname = "mruby"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "gEEb0Vn/G+dNgeY6r0VP8bMSPrEOf5s+0GoOcnIPtEU="; + sha256 = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3"; }; nativeBuildInputs = [ ruby bison rake ]; - patches = [ ./bison-36-compat.patch ]; - # Necessary so it uses `gcc` instead of `ld` for linking. # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 preBuild = if stdenv.isLinux then "unset LD" else null; installPhase = '' mkdir $out - cp -R build/host/{bin,lib} $out + cp -R include build/host/{bin,lib} $out ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index dc8f750c56..5dfefa6122 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.07.08"; + version = "2020.08.22"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "3cafb16aa634d2bc369077d8d36760d23973a35b"; - sha256 = "0z6q8f2f97jr037d51h097vck9jspidjn0pb5irlj0xdnb5si0js"; + rev = "c8ecb8341ca766e1e7565cc2b652b63eaba67508"; + sha256 = "1cf9ad7w5x452qdc6m9c3in6v9yzip3n1as978lbdh76f5mc00fv"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch b/third_party/nixpkgs/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch new file mode 100644 index 0000000000..61e05b791c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch @@ -0,0 +1,23 @@ +diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim +index a470179bd..73cfa1a23 100644 +--- a/compiler/nimconf.nim ++++ b/compiler/nimconf.nim +@@ -225,10 +225,15 @@ proc getUserConfigPath*(filename: RelativeFile): AbsoluteFile = + proc getSystemConfigPath*(conf: ConfigRef; filename: RelativeFile): AbsoluteFile = + # try standard configuration file (installation did not distribute files + # the UNIX way) +- let p = getPrefixDir(conf) +- result = p / RelativeDir"config" / filename ++ let ++ prefix = getPrefixDir(conf) ++ env = getEnv("NIM_CONFIG_PATH") ++ if env != "": ++ result = env.toAbsoluteDir / filename ++ else: ++ result = prefix / RelativeDir"config" / filename + when defined(unix): +- if not fileExists(result): result = p / RelativeDir"etc/nim" / filename ++ if not fileExists(result): result = prefix / RelativeDir"etc/nim" / filename + if not fileExists(result): result = AbsoluteDir"/etc/nim" / filename + + proc loadConfigs*(cfg: RelativeFile; cache: IdentCache; conf: ConfigRef) = diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix index 543a612057..0ec259b660 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -1,69 +1,239 @@ -# based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml +# https://nim-lang.github.io/Nim/packaging.html -{ stdenv, lib, fetchurl, makeWrapper, openssl, pcre, readline, - boehmgc, sfml, sqlite }: +{ stdenv, lib, fetchgit, fetchurl, makeWrapper, gdb, openssl, pcre, readline +, boehmgc, sqlite, nim-unwrapped, nim }: -stdenv.mkDerivation rec { - pname = "nim"; +let version = "1.2.6"; - src = fetchurl { - url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; + url = "https://nim-lang.org/download/nim-${version}.tar.xz"; sha256 = "0zk5qzxayqjw7kq6p92j4008g9bbyilyymhdc5xq9sln5rqym26z"; }; - enableParallelBuilding = true; - - NIX_LDFLAGS = "-lcrypto -lpcre -lreadline -lgc -lsqlite3"; - - # we could create a separate derivation for the "written in c" version of nim - # used for bootstrapping, but koch insists on moving the nim compiler around - # as part of building it, so it cannot be read-only - - nativeBuildInputs = [ - makeWrapper - ]; - - buildInputs = [ - openssl pcre readline boehmgc sfml sqlite - ]; - - buildPhase = '' - runHook preBuild - - # build.sh wants to write to $HOME/.cache - HOME=$TMPDIR - sh build.sh - ./bin/nim c koch - ./koch boot -d:release \ - -d:useGnuReadline \ - ${lib.optionals (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"} - ./koch tools -d:release - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dt $out/bin bin/* koch - ./koch install $out - mv $out/nim/bin/* $out/bin/ && rmdir $out/nim/bin - mv $out/nim/* $out/ && rmdir $out/nim - - # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds. - wrapProgram $out/bin/nim \ - --run 'NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}' \ - --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]} - - runHook postInstall - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "Statically typed, imperative programming language"; homepage = "https://nim-lang.org/"; license = licenses.mit; maintainers = with maintainers; [ ehmry ]; - platforms = with platforms; linux ++ darwin; # arbitrary }; -} + + parseCpu = platform: + with platform; + # Derive a Nim CPU identifier + if isAarch32 then + "arm" + else if isAarch64 then + "arm64" + else if isAlpha then + "alpha" + else if isAvr then + "avr" + else if isMips && is32bit then + "mips" + else if isMips && is64bit then + "mips64" + else if isMsp430 then + "msp430" + else if isPowerPC && is32bit then + "powerpc" + else if isPowerPC && is64bit then + "powerpc64" + else if isRiscV && is64bit then + "riscv64" + else if isSparc then + "sparc" + else if isx86_32 then + "i386" + else if isx86_64 then + "amd64" + else + abort "no Nim CPU support known for ${config}"; + + parseOs = platform: + with platform; + # Derive a Nim OS identifier + if isAndroid then + "Android" + else if isDarwin then + "MacOSX" + else if isFreeBSD then + "FreeBSD" + else if isGenode then + "Genode" + else if isLinux then + "Linux" + else if isNetBSD then + "NetBSD" + else if isNone then + "Standalone" + else if isOpenBSD then + "OpenBSD" + else if isWindows then + "Windows" + else if isiOS then + "iOS" + else + abort "no Nim OS support known for ${config}"; + + parsePlatform = p: { + cpu = parseCpu p; + os = parseOs p; + }; + + nimHost = parsePlatform stdenv.hostPlatform; + nimTarget = parsePlatform stdenv.targetPlatform; + + wrapperInputs = rec { + + bootstrap = stdenv.mkDerivation rec { + pname = "nim-bootstrap"; + version = "0.20.0"; + + src = fetchgit { + # A Git checkout is much smaller than a GitHub tarball. + url = "https://github.com/nim-lang/csources.git"; + rev = "v" + version; + sha256 = "0i6vsfy1sgapx43n226q8m0pvn159sw2mhp50zm3hhb9zfijanis"; + }; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + install -Dt $out/bin bin/nim + runHook postInstall + ''; + }; + + unwrapped = stdenv.mkDerivation { + pname = "nim-unwrapped"; + inherit version src; + + buildInputs = [ boehmgc openssl pcre readline sqlite ]; + + patches = [ + ./NIM_CONFIG_DIR.patch + # Override compiler configuration via an environmental variable + + ./nixbuild.patch + # Load libraries at runtime by absolute path + ]; + + configurePhase = '' + runHook preConfigure + cp ${bootstrap}/bin/nim bin/ + echo 'define:nixbuild' >> config/nim.cfg + runHook postConfigure + ''; + + kochArgs = [ + "--cpu:${nimHost.cpu}" + "--os:${nimHost.os}" + "-d:release" + "-d:useGnuReadline" + ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) + "-d:nativeStacktrace"; + + buildPhase = '' + runHook preBuild + local HOME=$TMPDIR + ./bin/nim c koch + ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES + ./koch tools $kochArgs --parallelBuild:$NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin bin/* + ln -sf $out/nim/bin/nim $out/bin/nim + ./install.sh $out + runHook postInstall + ''; + + inherit meta; + }; + }; + + wrapped = let + nim = nim-unwrapped; + inherit (stdenv) targetPlatform; + in stdenv.mkDerivation { + name = "${targetPlatform.config}-nim-wrapper-${nim.version}"; + inherit (nim) version; + preferLocalBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + runHook preUnpack + tar xf ${nim.src} nim-$version/config/nim.cfg + cd nim-$version + runHook postUnpack + ''; + + dontConfigure = true; + + wrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ stdenv.cc gdb ]}:${ + placeholder "out" + }/bin" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ stdenv.cc.libc openssl ] + }" + "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim" + ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"'' + # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds. + ]; + + buildPhase = with stdenv; + let + ccType = if cc.isGNU then + "gcc" + else if cc.isClang then + "clang" + else + abort "no Nim configuration available for ${cc.name}"; + in '' + runHook preBuild + cat >> config/nim.cfg << EOF + + define:nixbuild + os = ${nimTarget.os} + cpu = ${nimTarget.cpu} + cc = ${ccType} + EOF + + mkdir -p $out/bin $out/etc/nim + export cc=$CC + export cxx=$CXX + substituteAll config/nim.cfg $out/etc/nim/nim.cfg \ + --replace "cc = gcc" "" + + for binpath in ${nim}/bin/nim?*; do + local binname=`basename $binpath` + makeWrapper \ + $binpath $out/bin/${targetPlatform.config}-$binname \ + $wrapperArgs + ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname + done + + makeWrapper \ + ${nim}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ + $wrapperArgs + ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim + + runHook postBuild + ''; + + dontInstall = true; + + meta = meta // { + description = nim.meta.description + + " (${targetPlatform.config} wrapper)"; + platforms = lib.platforms.unix; + }; + + }; + +in wrapped // wrapperInputs diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/nixbuild.patch b/third_party/nixpkgs/pkgs/development/compilers/nim/nixbuild.patch new file mode 100644 index 0000000000..bdfd04744e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/nixbuild.patch @@ -0,0 +1,51 @@ +commit 164ba50fc74b980f77047080b2ae1ea099ae9b27 +Author: Emery Hemingway +Date: Mon Sep 7 14:09:22 2020 +0200 + + Load libaries by absolute path on NixOS + + If "nixbuild" is defined then choose dynamic runtime libraries by + searching $NIX_LDFLAGS at compile-time. + + Fix #15194 + +diff --git a/lib/pure/dynlib.nim b/lib/pure/dynlib.nim +index f31ae94dd..debed9c07 100644 +--- a/lib/pure/dynlib.nim ++++ b/lib/pure/dynlib.nim +@@ -56,6 +56,9 @@ + + import strutils + ++when defined(nixbuild): ++ import os ++ + type + LibHandle* = pointer ## a handle to a dynamically loaded library + +@@ -95,6 +98,25 @@ proc libCandidates*(s: string, dest: var seq[string]) = + libCandidates(prefix & middle & suffix, dest) + else: + add(dest, s) ++ when defined(nixbuild): ++ # Nix doesn't have a global library directory so ++ # load libraries using an absolute path if one ++ # can be derived from NIX_LDFLAGS. ++ # ++ # During Nix/NixOS packaging the line "define:nixbuild" ++ # should be appended to the ../../config/nim.cfg file ++ # to enable this behavior by default. ++ # ++ var libDirs = split(getEnv("LD_LIBRARY_PATH"), ':') ++ for flag in split(getEnv("NIX_LDFLAGS")): ++ if flag.startsWith("-L"): ++ libDirs.add(flag[2..flag.high]) ++ for lib in dest: ++ for dir in libDirs: ++ let abs = dir / lib ++ if existsFile(abs): ++ dest = @[abs] ++ return + + proc loadLibPattern*(pattern: string, globalSymbols = false): LibHandle = + ## loads a library with name matching `pattern`, similar to what `dlimport` diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix index 74e3d354f1..afda859281 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "0+beta3"; - sha256 = "18lpgirxil00pgy805cyi97v6ycmg93sdvbkc60i35ili030v1f7"; + patch_version = "1"; + sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa"; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix index f2b61ab700..1558756e16 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix @@ -10,20 +10,22 @@ let safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in -{ stdenv, fetchurl, ncurses, buildEnv +{ stdenv, fetchurl, ncurses, buildEnv, libunwind , libX11, xorgproto, useX11 ? safeX11 stdenv && !stdenv.lib.versionAtLeast version "4.09" , aflSupport ? false , flambdaSupport ? false +, spaceTimeSupport ? false }: assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; assert aflSupport -> stdenv.lib.versionAtLeast version "4.05"; assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; +assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04"; let useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optional optionals optionalString; - name = "ocaml${optionalString aflSupport "+afl"}${optionalString flambdaSupport "+flambda"}-${version}"; + name = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}-${version}"; in let @@ -53,11 +55,13 @@ stdenv.mkDerivation (args // { [ "-x11lib" x11lib "-x11include" x11inc ]) ++ optional aflSupport (flags "--with-afl" "-afl-instrument") ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") + ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime") ; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; + propagatedBuildInputs = optional spaceTimeSupport libunwind; installTargets = [ "install" ] ++ optional useNativeCompilers "installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix index 04bb1fa562..22b5be7dc6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -96,7 +96,7 @@ in makePackage { postFixup = '' # Remove references to bootstrap. find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11_headless}[^:]*,,')" + new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${lib.escape ["+"] openjdk11_headless.outPath}[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/pforth/default.nix b/third_party/nixpkgs/pkgs/development/compilers/pforth/default.nix index c13d28c6a3..ce228c2f1c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/pforth/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/pforth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { version = "28"; @@ -10,6 +10,14 @@ stdenv.mkDerivation { sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x"; }; + patches = [ + (fetchpatch { + name = "gnumake-4.3-fix.patch"; + url = "https://github.com/philburk/pforth/commit/457cb99f57292bc855e53abcdcb7b12d6681e847.patch"; + sha256 = "0x1bwx3pqb09ddjhmdli47lnk1ys4ny42819g17kfn8nkjs5hbx7"; + }) + ]; + makeFlags = [ "SRCDIR=." ]; makefile = "build/unix/Makefile"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix b/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix index 5c452d6925..4c0e9c2985 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.6.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "2860cc274b1b5b76a71d0e5190bf67a133d6f809"; - sha256 = "05wcg0gfln85spjfgsij818h2sp4y6s8bvdcwmzv0r8jblr8402b"; + rev = "6017d6dd930f4989177c3f7c3c20cffbaabaa49a"; + sha256 = "17wkcl3r0ckhlki9fk0mcwbnd7kpkqm1h0xjw2j2x1097n470df0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix index c72292679e..1a634d3f51 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix @@ -16,8 +16,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.45.0"; - rustcSha256 = "0z6dh0yd3fcm3qh960wi4s6fa6pxz9mh77psycsqfkkx5kqra15s"; + rustcVersion = "1.45.2"; + rustcSha256 = "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp"; # Note: the version MUST be one version prior to the version we're # building diff --git a/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix index 4b1358b724..dcc3457fe1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" in stdenv.mkDerivation rec { pname = "sagittarius-scheme"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr"; + sha256 = "18pjj6f5qvixv5hbl1k4d3jqfcmi9qyx0gz0cjwrzpxa8brpwld8"; }; preBuild = '' # since we lack rpath during build, need to explicitly add build path diff --git a/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix b/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix index d7fc7b114a..dbc5c1fa51 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "1azn32x0xbbk8gagipb34qk3y1srm927j5d34w20isgjxir4xsnz"; + sha256 = "0f7jwmgv83m85lrb2qwvr4cfwzbqww7pik884xd2593fsfqhpnkn"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 7d645da8b4..c3185ca4e0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.07.07"; + version = "2020.08.22"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "000fd08198487cd1d36e65e4470f4b0269c23a2b"; - sha256 = "01s252vwh4g1f4y99nfrkpf6hgvh9k63nz8hvpmjza5z8x6zf4i1"; + rev = "12132b6850747aec99715fdfa3184fe3ebefa015"; + sha256 = "1v6x1y2f3r8vi7pnkgx374rrv02xgmg9yg23f61n7d1v2rd6y5cc"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix index 194a1a0752..3f9f3b1ac9 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix index e97b449990..387e418590 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix index 1fd06a9c55..927cd83245 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index e58e51c63a..230320671a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -2,14 +2,14 @@ let params = { "8.11" = rec { - version = "1.5.0"; + version = "1.6.0_8.11"; rev = "v${version}"; - sha256 = "0dlw869j6ib58i8fhbr7x3hq2cy088arihhfanv8i08djqml6g8x"; + sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; }; "8.12" = rec { - version = "1.5.1"; + version = "1.6.0"; rev = "v${version}"; - sha256 = "1znjc8c8rivsawmz5bgm9ddl69p62p2pwxphvpap1gfmi5cp8lwi"; + sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; }; }; param = params.${coq.coq-version}; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix index a049fa94d4..f16341ddbd 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix @@ -6,6 +6,10 @@ let version = "8.8"; sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; }; + v_8_10 = { + version = "8.10"; + sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz"; + }; in { "8.7" = { @@ -14,10 +18,12 @@ let }; "8.8" = v_8_8; "8.9" = v_8_8; - "8.10" = { - version = "8.10"; - sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz"; - }; + "8.10" = v_8_10; + "8.11" = v_8_10; + "8.12" = { + version = "8.12"; + sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj"; + }; }; param = params.${coq.coq-version}; in diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix index 689745003d..54654f37ba 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq }: let params = { + "8.12" = { + version = "0.6.8"; + sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps"; + }; "8.11" = { version = "0.6.7"; sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix index eb431b9faf..f6109398da 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, which, coq, flocq }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-gappalib-1.4.3"; + name = "coq${coq.coq-version}-gappalib-1.4.4"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz"; - sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370"; + url = "https://gforge.inria.fr/frs/download.php/file/38338/gappalib-coq-1.4.4.tar.gz"; + sha256 = "1ds9qp3ml07w5ali0rsczlwgdx4xcgasgbcnpi2lssgj1xpxgfpn"; }; nativeBuildInputs = [ which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix index a0268a543a..862184c146 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix @@ -1,46 +1,23 @@ -{ stdenv, fetchgit, coq, haskellPackages, which, ott -}: +{ stdenv, fetchFromGitHub, coq }: stdenv.mkDerivation rec { - name = "metalib-${coq.coq-version}-${version}"; - version = "20170713"; + name = "coq${coq.coq-version}-metalib-${version}"; + version = "20200527"; - src = fetchgit { - url = "https://github.com/plclub/metalib.git"; - rev = "44e40aa082452dd333fc1ca2d2cc55311519bd52"; - sha256 = "1pra0nvx69q8d4bvpcvh9ngic1cy6z1chi03x56nisfqnc61b6y9"; + src = fetchFromGitHub { + owner = "plclub"; + repo = "metalib"; + rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; + sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; }; - # The 'lngen' command-line utility is built from Haskell sources - lngen = with haskellPackages; mkDerivation { - pname = "lngen"; - version = "0.0.1"; - src = fetchgit { - url = "https://github.com/plclub/lngen"; - rev = "ea73ad315de33afd25f87ca738c71f358f1cd51c"; - sha256 = "1a0sj8n3lmsl1wlnqfy176k9lb9s8rl422bvg3ihl2i70ql8wisd"; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers mtl parsec syb ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/plclub/lngen"; - description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott"; - license = stdenv.lib.licenses.mit; - }; + sourceRoot = "source/Metalib"; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 which coq lngen ott findlib ]; - propagatedBuildInputs = [ coq ]; + buildInputs = [ coq ]; enableParallelBuilding = true; - buildPhase = '' - (cd Metalib; make) - ''; - - installPhase = '' - (cd Metalib; make -f CoqSrc.mk DSTROOT=/ COQLIB=$out/lib/coq/${coq.coq-version}/ install) - ''; + installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}"; meta = with stdenv.lib; { homepage = "https://github.com/plclub/metalib"; @@ -50,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.10" "8.11" "8.12" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix index 9d8a7a315a..e8958fa1ad 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix @@ -21,6 +21,7 @@ let "8.9" = versions.post_8_6; "8.10" = versions.post_8_6; "8.11" = versions.post_8_6; + "8.12" = versions.post_8_6; }; param = params.${coq.coq-version}; in diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix index 67e420b4e8..12d65bdb3d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix @@ -20,6 +20,9 @@ let params = "8.11" = { sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; }; + "8.12" = { + sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i"; + }; }; param = params.${coq.coq-version}; in diff --git a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix index c47e29b642..6a494e7e52 100644 --- a/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/third_party/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -52,12 +52,6 @@ in [ sha256 = "0k2ry757qhm99xwm0wh4zalxn9nmxhfswd184z1fjr42szr511fb"; }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.0.2"; - sha256 = "0d4r744n3bk4v7ddfjpy5ils150h0693bil3c7v27n84037hqndj"; - }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.0.3"; @@ -66,14 +60,8 @@ in [ (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; - }) - - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.3"; - sha256 = "0kvnzb9xjii48kg30ac63qdf0fn1y8j3nblbrfaqv2aiy6kp0iwn"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; }) (fetchNuGet { @@ -100,12 +88,6 @@ in [ sha256 = "1zwvzp0607irs7irfbq8vnclg5nj2jpyggw9agm4a32la5ngg27m"; }) - (fetchNuGet { - name = "Microsoft.NetCore.App.Host.linux-x64"; - version = "3.0.2"; - sha256 = "0y14y2x3wbi44i23ndmf4323cii8wrqw9s289gcab3s393l71sf5"; - }) - (fetchNuGet { name = "Microsoft.NetCore.App.Host.linux-x64"; version = "3.0.3"; @@ -114,8 +96,8 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Host.linux-x64"; - version = "3.1.3"; - sha256 = "013ibnhsimgqj5l2dqma035xvsvrb47bn65z6xbxgg88383hpgvw"; + version = "3.1.8"; + sha256 = "0iawz5mqaf1c4r5cf0ks4wqhgpbqi185l80q4909axh516xsjnvs"; }) (fetchNuGet { @@ -130,12 +112,6 @@ in [ sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.0.2"; - sha256 = "1h6d0nl495k0bh4my43l578l7m8qwah7ll42aax7jrib2py354f1"; - }) - (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; version = "3.0.3"; @@ -144,14 +120,8 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.3"; - sha256 = "1ynhzsr8a0hfby2wjhzkdiimj18izgfzp7m2yp3pby2iwb4v3xy9"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; }) (fetchNuGet { diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix index 402c3e781a..7db4992d1d 100644 --- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -235,7 +235,7 @@ let ''; preFixup = (args.preFixup or "") + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix index 54d1c743be..5c54e04652 100644 --- a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix @@ -29,6 +29,9 @@ # go2nix dependency file , goDeps ? null +# Whether to delete the vendor folder supplied with the source. +, deleteVendor ? false + , dontRenameImports ? false # Do not enable this without good reason @@ -96,6 +99,18 @@ let mkdir -p "go/src/$(dirname "$goPackagePath")" mv "$sourceRoot" "go/src/$goPackagePath" + '' + lib.optionalString (deleteVendor == true) '' + if [ ! -d "go/src/$goPackagePath/vendor" ]; then + echo "vendor folder does not exist, 'deleteVendor' is not needed" + exit 10 + else + rm -rf "go/src/$goPackagePath/vendor" + fi + '' + lib.optionalString (goDeps != null) '' + if [ -d "go/src/$goPackagePath/vendor" ]; then + echo "vendor folder exists, 'goDeps' is not needed" + exit 10 + fi '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: '' mkdir goPath (cd goPath; unpackFile "${src}") @@ -211,7 +226,7 @@ let ''; preFixup = preFixup + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix index be885d990e..061d3c4a1d 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -5,13 +5,13 @@ let name = "${pname}-${version}"; pname = "guile-sdl2"; - version = "0.4.0"; + version = "0.5.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "https://files.dthompson.us/${pname}/${name}.tar.gz"; - sha256 = "0zcxwgyadwpbhq6h5mv2569c3kalgra26zc186y9fqiyyzmh1v9s"; + sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m"; }; nativeBuildInputs = [ libtool pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 97c12bfeba..8d9feffc5e 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1d24080xh7gl197i0y5bkn3j94hvh8zqyg9gfcnx2qdlxfca1knb"; + sha256 = "19ipaalp9g25zhg44rialwhp2fv5n8q5fzqw72rfcjcca5iy6r72"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -208,11 +208,11 @@ self: super: { # Generating the completions should be activated again, once we default to # ghc 8.10. hnix = dontCheck (super.hnix.override { - # The neat-interpolation package from stack is to old for hnix. - # https://github.com/haskell-nix/hnix/issues/676 - # Once neat-interpolation >= 0.4 is in our stack release, - # (which should happen soon), we can remove this override - neat-interpolation = self.neat-interpolation_0_5_1_1; + # 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage + neat-interpolation = self.neat-interpolation_0_5_1_2; # at least 0.5.1 + data-fix = self.data-fix_0_3_0; # at least 0.3 + prettyprinter = self.prettyprinter_1_7_0; # at least 1.7 + }); # Fails for non-obvious reasons while attempting to use doctest. @@ -296,7 +296,6 @@ self: super: { hs2048 = dontCheck super.hs2048; hsbencher = dontCheck super.hsbencher; hsexif = dontCheck super.hsexif; - hspec-core = if pkgs.stdenv.isi686 then dontCheck super.hspec-core else super.hspec-core; # tests rely on `Int` being 64-bit; https://github.com/hspec/hspec/issues/431 hspec-server = dontCheck super.hspec-server; HTF = dontCheck super.HTF; htsn = dontCheck super.htsn; @@ -315,6 +314,13 @@ self: super: { then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63 else super.math-functions; matplotlib = dontCheck super.matplotlib; + + # Needs the latest version of vty and brick. + matterhorn = super.matterhorn.overrideScope (self: super: { + brick = self.brick_0_55; + vty = self.vty_5_30; + }); + memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; @@ -369,6 +375,7 @@ self: super: { tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; + trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; wai-logger = dontCheck super.wai-logger; @@ -834,6 +841,7 @@ self: super: { then dontCheck else pkgs.lib.id; in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. + snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22 swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Copy hledger man pages from data directory into the proper place. This code @@ -913,7 +921,12 @@ self: super: { # Generate cli completions for dhall. dhall = generateOptparseApplicativeCompletion "dhall" super.dhall; dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json; - dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (super.dhall-nix); + dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" ( + super.dhall-nix.overrideScope (self: super: { + dhall = super.dhall_1_35_0; + repline = self.repline_0_4_0_0; + haskeline = self.haskeline_0_8_1_0; + })); # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc; @@ -965,6 +978,9 @@ self: super: { # Generate shell completions generateOptparseApplicativeCompletion "purs" dontHaddockPurescript; + # Generate shell completion for spago + spago = generateOptparseApplicativeCompletion "spago" super.spago; + # 2020-06-05: HACK: Package can not pass test suite, # Upstream Report: https://github.com/kcsongor/generic-lens/issues/83 generic-lens = dontCheck super.generic-lens; @@ -1001,11 +1017,6 @@ self: super: { })]; }); - # 2020-06-05: HACK: In Nixpkgs currently this is - # old pandoc version 2.7.4 to current 2.9.2.1, - # test suite failures: https://github.com/jgm/pandoc/issues/5582 - pandoc = dontCheck super.pandoc; - # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; @@ -1145,13 +1156,6 @@ self: super: { # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 binary-instances = dontCheck super.binary-instances; - # Disabling the test suite lets the build succeed on older CPUs - # that are unable to run the generated library because they - # lack support for AES-NI, like some of our Hydra build slaves - # do. See https://github.com/NixOS/nixpkgs/issues/81915 for - # details. - cryptonite = dontCheck super.cryptonite; - # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; @@ -1205,7 +1209,10 @@ self: super: { # this will probably need to get updated with every ghcide update, # we need an override because ghcide is tracking haskell-lsp closely. - ghcide = dontCheck (super.ghcide.override { ghc-check = self.ghc-check_0_3_0_1; }); + ghcide = dontCheck (super.ghcide.overrideScope (self: super: { + hie-bios = dontCheck super.hie-bios_0_7_1; + lsp-test = dontCheck self.lsp-test_0_11_0_5; + })); # hasn‘t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 @@ -1227,13 +1234,6 @@ self: super: { x509-validation = dontCheck super.x509-validation; tls = dontCheck super.tls; - # Upstream PR: https://github.com/bgamari/monoidal-containers/pull/62 - # Bump these version bound - monoidal-containers = appendPatch super.monoidal-containers (pkgs.fetchpatch { - url = "https://github.com/bgamari/monoidal-containers/commit/715093b22a015398a1390f636be6f39a0de83254.patch"; - sha256="1lfxvwp8g55ljxvj50acsb0wjhrvp2hvir8y0j5pfjkd1kq628ng"; - }); - patch = appendPatches super.patch [ # Upstream PR: https://github.com/reflex-frp/patch/pull/20 # Makes tests work with hlint 3 @@ -1323,41 +1323,11 @@ self: super: { # https://github.com/ennocramer/monad-dijkstra/issues/4 monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); - # haskell-language-server uses its own fork of ghcide - # Test disabled: it seems to freeze (is it just that it takes a long time ?) - hls-ghcide = - dontCheck (( - overrideCabal super.hls-ghcide - (old: { - # The integration test run by lsp-test requires the executable to be in the PATH - preCheck = '' - export PATH=$PATH:dist/build/ghcide - ''; - })).override { - # we are faster than stack here - hie-bios = dontCheck self.hie-bios_0_6_2; - lsp-test = dontCheck self.lsp-test_0_11_0_4; - }); - - haskell-language-server = (overrideCabal super.haskell-language-server - (old: { - # The integration test run by lsp-test requires the executable to be in the PATH - preCheck = '' - export PATH=$PATH:dist/build/haskell-language-server - ''; - # The wrapper test does not work for now. - testTarget = "func-test"; - - # test needs the git tool - testToolDepends = old.testToolDepends - ++ [ pkgs.git ]; - })).override { - # use a fork of ghcide - ghcide = self.hls-ghcide; - # we are faster than stack here - hie-bios = dontCheck self.hie-bios_0_6_2; - lsp-test = dontCheck self.lsp-test_0_11_0_4; - }; + # Fixed upstream but not released to Hackage yet: + # https://github.com/k0001/hs-libsodium/issues/2 + libsodium = overrideCabal super.libsodium (drv: { + libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.c2hs]; + }); # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; @@ -1365,7 +1335,7 @@ self: super: { # 2020-08-14: gi-pango from stackage is to old for the C libs it links against in nixpkgs. # That's why we need to bump a ton of dependency versions to unbreak them. gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23; - haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_2) [ pkgs.gobject-introspection ]; + haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_3) [ pkgs.gobject-introspection ]; haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_4; gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24; gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24; @@ -1406,67 +1376,124 @@ self: super: { # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; - # The overrides in the following lines all have the following causes: - # * neuron needs commonmark-pandoc - # * which needs a newer pandoc-types (>= 1.21) - # * which means we need a newer pandoc (>= 2.10) - # * which needs a newer hslua (1.1.2) and a newer jira-wiki-markup (1.3.2) - # Then we need to apply those overrides to all transitive dependencies - # All of this will be obsolete, when pandoc 2.10 hits stack lts. - commonmark-pandoc = super.commonmark-pandoc.override { - pandoc-types = self.pandoc-types_1_21; - }; - reflex-dom-pandoc = super.reflex-dom-pandoc.override { - pandoc-types = self.pandoc-types_1_21; - }; - pandoc_2_10_1 = super.pandoc_2_10_1.override { - pandoc-types = self.pandoc-types_1_21; - hslua = self.hslua_1_1_2; - texmath = self.texmath.override { - pandoc-types = self.pandoc-types_1_21; - }; - tasty-lua = self.tasty-lua.override { - hslua = self.hslua_1_1_2; - }; - hslua-module-text = self.hslua-module-text.override { - hslua = self.hslua_1_1_2; - }; - hslua-module-system = self.hslua-module-system.override { - hslua = self.hslua_1_1_2; - }; - jira-wiki-markup = self.jira-wiki-markup_1_3_2; - }; - # Apply version-bump patch that is not contained in released version yet. # Upstream PR: https://github.com/srid/neuron/pull/304 - neuron = (appendPatch super.neuron (pkgs.fetchpatch { + neuron = appendPatch super.neuron (pkgs.fetchpatch { url= "https://github.com/srid/neuron/commit/9ddcb7e9d63b8266d1372ef7c14c13b6b5277990.patch"; sha256 = "01f9v3jnl05fnpd624wv3a0j5prcbnf62ysa16fbc0vabw19zv1b"; excludes = [ "commonmark-hs/github.json" ]; stripLen = 2; extraPrefix = ""; - })) - # See comment about overrides above commonmark-pandoc - .override { - pandoc = self.pandoc_2_10_1; - pandoc-types = self.pandoc-types_1_21; - rib = super.rib.override { - pandoc = self.pandoc_2_10_1; - pandoc-types = self.pandoc-types_1_21; - }; - }; + }); # Testsuite trying to run `which haskeline-examples-Test` - haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0; + haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; + + # Tests for list-t, superbuffer, and stm-containers + # depend on HTF and it is broken, 2020-08-23 + list-t = dontCheck super.list-t; + superbuffer = dontCheck super.superbuffer; + stm-containers = dontCheck super.stm-containers; + + # Fails with "supports custom headers" + Spock-core = dontCheck super.Spock-core; + + # Needed by Hasura 1.3.1 + dependent-map_0_2_4_0 = super.dependent-map_0_2_4_0.override { + dependent-sum = self.dependent-sum_0_4; + }; + + # Hasura 1.3.1 + # Because of ghc-heap-view, profiling needs to be disabled. + graphql-engine = disableLibraryProfiling( overrideCabal (super.graphql-engine.override { + immortal = self.immortal_0_2_2_1; + dependent-map = self.dependent-map_0_2_4_0; + dependent-sum = self.dependent-sum_0_4; + witherable = self.witherable_0_3_2; + }) (drv: { + # version in cabal file is invalid + version = "1.3.1-beta1"; + # hasura needs VERSION env exported during build + preBuild = "export VERSION=1.3.1-beta1"; + })); + + graphql-parser = super.graphql-parser.override { + protolude = self.protolude_0_3_0; + }; # Requires repline 0.4 which is the default only for ghc8101, override for the rest zre = super.zre.override { repline = self.repline_0_4_0_0.override { - haskeline = self.haskeline_0_8_0_0; + haskeline = self.haskeline_0_8_1_0; }; }; # https://github.com/bos/statistics/issues/170 statistics = dontCheck super.statistics; -} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super + hcoord = overrideCabal super.hcoord (drv: { + # Remove when https://github.com/danfran/hcoord/pull/8 is merged. + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/danfran/hcoord/pull/8/commits/762738b9e4284139f5c21f553667a9975bad688e.patch"; + sha256 = "03r4jg9a6xh7w3jz3g4bs7ff35wa4rrmjgcggq51y0jc1sjqvhyz"; + }) + ]; + # Remove when https://github.com/danfran/hcoord/issues/9 is closed. + doCheck = false; + }); + + # Tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431. + # Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x. + # So let's not go there and just disable the tests altogether. + hspec-core = dontCheck super.hspec-core; + + # github.com/ucsd-progsys/liquidhaskell/issues/1729 + liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; + Diff_0_3_4 = dontCheck super.Diff_0_3_4; + + # We want the latest version of cryptonite. This is a first step towards + # resolving https://github.com/NixOS/nixpkgs/issues/81915. + cryptonite = doDistribute self.cryptonite_0_27; + + # We want the latest version of Pandoc. + hslua = doDistribute self.hslua_1_1_2; + jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; + pandoc = doDistribute self.pandoc_2_10_1; + pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2; + pandoc-types = doDistribute self.pandoc-types_1_21; + rfc5051 = doDistribute self.rfc5051_0_2; + + # Upstream forgot to change the Cabal version bounds in the test suite. + # See: https://github.com/jaspervdj/stylish-haskell/pull/297 + # Will be fixed whenever they next bump the version number + stylish-haskell = appendPatch super.stylish-haskell (pkgs.fetchpatch { + url = "https://github.com/jaspervdj/stylish-haskell/commit/9550aa1cd177aa6fe271d075177109d66a79e67f.patch"; + sha256 = "1ffnbd2s4fx0ylnnlcyyag119yxb32p5r20b38l39lsa0jwv229f"; + }); + # INSERT NEW OVERRIDES ABOVE THIS LINE + +} // (let + inherit (self) hls-ghcide hls-brittany; + hlsScopeOverride = self: super: { + # haskell-language-server uses its own fork of ghcide + # Test disabled: it seems to freeze (is it just that it takes a long time ?) + ghcide = dontCheck hls-ghcide; + # we are faster than stack here + hie-bios = dontCheck super.hie-bios_0_7_1; + lsp-test = dontCheck super.lsp-test_0_11_0_5; + # fourmolu can‘t compile with an older aeson + aeson = dontCheck super.aeson_1_5_2_0; + # brittany has an aeson upper bound of 1.5 + brittany = hls-brittany; + data-tree-print = doJailbreak super.data-tree-print; + ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2; + }; + in { + # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) + haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride)); + hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); + hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride); + fourmolu = dontCheck (super.fourmolu.overrideScope hlsScopeOverride); + } +) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index f2dd8942b8..5b47688294 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -62,18 +62,30 @@ self: super: { # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; - pandoc = doJailbreak super.pandoc; system-fileio = doJailbreak super.system-fileio; unliftio-core = doJailbreak super.unliftio-core; # Use the latest version to fix the build. - dhall = self.dhall_1_34_0; + dhall = self.dhall_1_35_0; lens = self.lens_4_19_2; + optics = self.optics_0_3; optics-core = self.optics-core_0_3_0_1; + optics-extra = self.optics-extra_0_3; + optics-th = self.optics-th_0_3_0_2; repline = self.repline_0_4_0_0; singletons = self.singletons_2_7; th-desugar = self.th-desugar_1_11; + insert-ordered-containers = super.insert-ordered-containers.override { + optics-core = self.optics-core_0_3_0_1; + optics-extra = self.optics-extra_0_3.override { + optics-core = self.optics-core_0_3_0_1; + }; + }; + + # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10. + monoidal-containers = doJailbreak super.monoidal-containers; + # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need # the `ghc-lib-parser` dependency on GHC >= 8.8. However, because we have # multiple verions of `ghc-lib-parser(-ex)` available, and the default ones diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 204b5d5a08..a2562e4452 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,6 +41,13 @@ self: super: { unix = null; xhtml = null; + # Hasura 1.3.1 + # Because of ghc-heap-view, profiling needs to be disabled. + graphql-engine = overrideCabal (super.graphql-engine) (drv: { + # GHC 8.8.x needs a revert of https://github.com/hasura/graphql-engine/commit/a77bb0570f4210fb826985e17a84ddcc4c95d3ea + patches = [ ./patches/hasura-884-compat.patch ]; + }); + # GHC 8.8.x can build haddock version 2.23.* haddock = self.haddock_2_23_1; haddock-api = self.haddock-api_2_23_1; @@ -107,4 +114,16 @@ self: super: { # cabal-fmt requires Cabal3 cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; }; + # liquidhaskell does not support ghc version 8.8.x. + liquid = markBroken super.liquid; + liquid-base = markBroken super.liquid-base; + liquid-bytestring = markBroken super.liquid-bytestring; + liquid-containers = markBroken super.liquid-containers; + liquid-ghc-prim = markBroken super.liquid-ghc-prim; + liquid-parallel = markBroken super.liquid-parallel; + liquid-platform = markBroken super.liquid-platform; + liquid-prelude = markBroken super.liquid-prelude; + liquid-vector = markBroken super.liquid-vector; + liquidhaskell = markBroken super.liquidhaskell; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix index 8d08416278..cbfd4b84b2 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -48,6 +48,7 @@ self: super: { transformers = null; unix = null; xhtml = null; + exceptions = null; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c76574ccce..541356d9b3 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -64,7 +64,7 @@ core-packages: # # WARNING: This list is generated semiautomatically based on the most recent # LTS package set. If you want to add entries to it, you must do so before the -# comment saying "# LTS Haskell x.y". Any changes after that commend will be +# comment saying "# LTS Haskell x.y". Any changes after that comment will be # lost the next time `update-stackage.sh` runs. default-package-overrides: # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.9 + # LTS Haskell 16.15 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -207,7 +207,7 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.20.0 - - amqp-utils ==0.4.4.0 + - amqp-utils ==0.4.4.1 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 @@ -243,7 +243,7 @@ default-package-overrides: - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 - - assert-failure ==0.1.2.3 + - assert-failure ==0.1.2.5 - assoc ==1.0.2 - astro ==0.4.2.1 - async ==2.2.2 @@ -261,12 +261,12 @@ default-package-overrides: - attoparsec-iso8601 ==1.0.1.0 - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - - aur ==7.0.3 - - aura ==3.1.6 + - aur ==7.0.4 + - aura ==3.1.9 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.18 + - autoexporter ==1.1.19 - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.5.2.0 @@ -366,7 +366,7 @@ default-package-overrides: - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 - - byte-count-reader ==0.10.0.1 + - byte-count-reader ==0.10.1.1 - bytedump ==1.0 - byte-order ==0.1.2.0 - byteorder ==1.0.4 @@ -402,7 +402,7 @@ default-package-overrides: - casing ==0.1.4.1 - cassava ==0.5.2.0 - cassava-conduit ==0.5.1 - - cassava-megaparsec ==2.0.1 + - cassava-megaparsec ==2.0.2 - cast ==0.1.0.2 - category ==0.2.5.0 - cayley-client ==0.4.13 @@ -454,7 +454,7 @@ default-package-overrides: - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 - cmark ==0.6 - - cmark-gfm ==0.2.1 + - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 - codec-beam ==0.2.0 @@ -489,7 +489,7 @@ default-package-overrides: - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.3.2 + - conduit ==1.3.2.1 - conduit-algorithms ==0.0.11.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 @@ -504,7 +504,7 @@ default-package-overrides: - config-ini ==0.2.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - - configurator-pg ==0.2.3 + - configurator-pg ==0.2.4 - connection ==0.3.1 - connection-pool ==0.2.2 - console-style ==0.0.2.1 @@ -512,7 +512,7 @@ default-package-overrides: - constraints ==0.12 - constraint-tuples ==0.1.2 - contravariant ==1.5.2 - - contravariant-extras ==0.3.5.1 + - contravariant-extras ==0.3.5.2 - control-bool ==0.2.1 - control-monad-free ==0.6.2 - control-monad-omega ==0.3.2 @@ -657,7 +657,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2 - - dl-fedora ==0.7.4 + - dl-fedora ==0.7.5 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -671,7 +671,7 @@ default-package-overrides: - doldol ==0.4.1.2 - do-list ==1.0.1 - do-notation ==0.1.0.2 - - dotenv ==0.8.0.4 + - dotenv ==0.8.0.7 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -733,7 +733,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.8 - - esqueleto ==3.3.3.2 + - esqueleto ==3.3.4.0 - essence-of-live-coding ==0.1.0.3 - essence-of-live-coding-gloss ==0.1.0.3 - essence-of-live-coding-pulse ==0.1.0.3 @@ -760,7 +760,7 @@ default-package-overrides: - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.4 + - extra ==1.7.8 - extractable-singleton ==0.0.1 - extrapolate ==0.4.2 - fail ==4.9.0.0 @@ -808,7 +808,7 @@ default-package-overrides: - floatshow ==0.2.4 - flow ==1.0.21 - flush-queue ==1.0.0 - - fmlist ==0.9.3 + - fmlist ==0.9.4 - fmt ==0.6.1.2 - fn ==0.3.0.2 - focus ==1.0.1.3 @@ -902,8 +902,8 @@ default-package-overrides: - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.2.20200808 - - ghc-lib-parser ==8.10.2.20200808 + - ghc-lib ==8.10.2.20200916 + - ghc-lib-parser ==8.10.2.20200916 - ghc-lib-parser-ex ==8.10.0.16 - ghc-parser ==0.2.2.0 - ghc-paths ==0.1.0.12 @@ -931,7 +931,7 @@ default-package-overrides: - gi-graphene ==1.0.1 - gi-gtk ==3.0.33 - gi-gtk-hs ==0.3.8.1 - - ginger ==0.10.0.5 + - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - gi-pango ==1.0.22 - giphy-api ==0.7.0.0 @@ -979,7 +979,7 @@ default-package-overrides: - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - - hapistrano ==0.4.1.0 + - hapistrano ==0.4.1.2 - happstack-server ==7.6.1 - happy ==1.19.12 - HasBigDecimal ==0.1.1 @@ -988,7 +988,7 @@ default-package-overrides: - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - hashmap ==1.3.3 - - hashtables ==1.2.3.4 + - hashtables ==1.2.4.1 - haskeline ==0.7.5.0 - haskell-gi ==0.23.1 - haskell-gi-base ==0.23.0 @@ -1007,7 +1007,7 @@ default-package-overrides: - haskoin-core ==0.13.4 - haskoin-node ==0.13.0 - hasql ==1.4.3 - - hasql-optparse-applicative ==0.3.0.5 + - hasql-optparse-applicative ==0.3.0.6 - hasql-pool ==0.5.2 - hasql-transaction ==1.0.0.1 - hasty-hamiltonian ==1.3.3 @@ -1088,18 +1088,18 @@ default-package-overrides: - HSlippyMap ==3.0.1 - hslogger ==1.3.1.0 - hslua ==1.0.3.2 - - hslua-aeson ==1.0.2 + - hslua-aeson ==1.0.3 - hslua-module-doclayout ==0.1.0 - - hslua-module-system ==0.2.1 + - hslua-module-system ==0.2.2 - hslua-module-text ==0.2.1 - - HsOpenSSL ==0.11.4.18 + - HsOpenSSL ==0.11.4.19 - hsp ==0.10.0 - - hspec ==2.7.1 + - hspec ==2.7.4 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.1 - - hspec-core ==2.7.1 - - hspec-discover ==2.7.1 + - hspec-core ==2.7.4 + - hspec-discover ==2.7.4 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 @@ -1130,7 +1130,7 @@ default-package-overrides: - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - http2 ==2.0.5 - - HTTP ==4000.3.14 + - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 - http-client-openssl ==0.3.1.0 @@ -1190,7 +1190,7 @@ default-package-overrides: - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 - - ihaskell ==0.10.1.1 + - ihaskell ==0.10.1.2 - ihs ==0.1.0.3 - ilist ==0.4.0.1 - imagesize-conduit ==1.1 @@ -1205,7 +1205,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1 - infer-license ==0.2.0 - - inflections ==0.4.0.5 + - inflections ==0.4.0.6 - influxdb ==1.7.1.6 - ini ==0.4.1 - inj ==1.0 @@ -1232,17 +1232,17 @@ default-package-overrides: - invertible ==0.2.0.7 - invertible-grammar ==0.1.3 - io-machine ==0.2.0.0 - - io-manager ==0.1.0.2 + - io-manager ==0.1.0.3 - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.5.1.0 + - io-streams ==1.5.2.0 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.1 - iproute ==1.7.9 - IPv6Addr ==1.1.5 - ipynb ==0.1.0.1 - - ipython-kernel ==0.10.2.0 + - ipython-kernel ==0.10.2.1 - irc ==0.6.1.0 - irc-client ==1.1.1.1 - irc-conduit ==0.3.0.4 @@ -1258,7 +1258,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jira-wiki-markup ==1.1.4 - - jose ==0.8.3 + - jose ==0.8.3.1 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1277,7 +1277,7 @@ default-package-overrides: - jwt ==0.10.0 - kan-extensions ==5.2 - kanji ==3.4.1 - - katip ==0.8.4.0 + - katip ==0.8.5.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 - kdt ==0.2.4 @@ -1289,7 +1289,7 @@ default-package-overrides: - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - krank ==0.2.2 - - kubernetes-webhook-haskell ==0.2.0.2 + - kubernetes-webhook-haskell ==0.2.0.3 - l10n ==0.1.0.1 - labels ==0.3.3 - lackey ==1.0.13 @@ -1348,7 +1348,7 @@ default-package-overrides: - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.7.1 + - ListLike ==4.7.2 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - list-singleton ==1.0.0.4 @@ -1369,7 +1369,7 @@ default-package-overrides: - logging ==3.0.5 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - - logict ==0.7.0.2 + - logict ==0.7.0.3 - loop ==0.3.0 - loopbreaker ==0.1.1.1 - lrucache ==1.2.0.1 @@ -1385,16 +1385,16 @@ default-package-overrides: - mainland-pretty ==0.7.0.1 - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - - managed ==1.0.7 + - managed ==1.0.8 - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.5.3.2 + - massiv ==0.5.4.0 - massiv-io ==0.2.1.0 - - massiv-test ==0.1.3.1 + - massiv-test ==0.1.4 - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - - math-functions ==0.3.4.0 + - math-functions ==0.3.4.1 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1433,7 +1433,7 @@ default-package-overrides: - midi ==0.2.2.2 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.0 - - mime-mail-ses ==0.4.1 + - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 @@ -1466,7 +1466,7 @@ default-package-overrides: - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - - monad-logger ==0.3.34 + - monad-logger ==0.3.35 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.11 - monad-loops ==0.4.3 @@ -1558,7 +1558,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.2 - - nonempty-containers ==0.3.4.0 + - nonempty-containers ==0.3.4.1 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.0.2 @@ -1589,7 +1589,7 @@ default-package-overrides: - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.6.7005.0 + - opaleye ==0.6.7006.1 - OpenAL ==1.7.0.5 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 @@ -1597,7 +1597,7 @@ default-package-overrides: - OpenGLRaw ==3.3.4.0 - openpgp-asciiarmor ==0.1.2 - opensource ==0.1.1.0 - - openssl-streams ==1.2.2.0 + - openssl-streams ==1.2.3.0 - opentelemetry ==0.4.2 - opentelemetry-extra ==0.4.2 - opentelemetry-lightstep ==0.4.2 @@ -1613,7 +1613,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.15.1.0 - optparse-generic ==1.3.1 - - optparse-simple ==0.1.1.2 + - optparse-simple ==0.1.1.3 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - ormolu ==0.1.2.0 @@ -1782,18 +1782,18 @@ default-package-overrides: - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==1.5.1.14 - pvar ==0.2.0.0 - - PyF ==0.9.0.1 + - PyF ==0.9.0.2 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.4 - - qrcode-juicypixels ==0.8.1 + - qrcode-juicypixels ==0.8.2 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 - QuickCheck ==2.13.2 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.4.0 - - quickcheck-classes-base ==0.6.0.0 + - quickcheck-classes-base ==0.6.1.0 - quickcheck-instances ==0.3.23 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 @@ -1835,7 +1835,7 @@ default-package-overrides: - reanimate ==0.3.3.0 - reanimate-svg ==0.9.8.0 - rebase ==1.6.1 - - record-dot-preprocessor ==0.2.5 + - record-dot-preprocessor ==0.2.6 - record-hasfield ==1.0 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 @@ -1859,7 +1859,7 @@ default-package-overrides: - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 - - registry ==0.1.9.1 + - registry ==0.1.9.3 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.3 @@ -1886,7 +1886,7 @@ default-package-overrides: - rhine ==0.6.0 - rhine-gloss ==0.6.0.1 - rigel-viz ==0.2.0.0 - - rio ==0.1.18.0 + - rio ==0.1.19.0 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.1.0 - roc-id ==0.1.0.0 @@ -1902,11 +1902,11 @@ default-package-overrides: - safe ==0.3.19 - safecopy ==0.10.3 - safe-decimal ==0.2.0.0 - - safe-exceptions ==0.1.7.0 + - safe-exceptions ==0.1.7.1 - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - - safe-json ==1.1.0 + - safe-json ==1.1.1 - safe-money ==0.9 - SafeSemaphore ==0.10.1 - salak ==0.3.6 @@ -1963,7 +1963,7 @@ default-package-overrides: - servant-checked-exceptions-core ==2.2.0.0 - servant-client ==0.16.0.1 - servant-client-core ==0.16 - - servant-conduit ==0.15 + - servant-conduit ==0.15.1 - servant-docs ==0.11.4 - servant-docs-simple ==0.2.0.1 - servant-elm ==0.7.2 @@ -1972,13 +1972,13 @@ default-package-overrides: - servant-js ==0.9.4.2 - servant-JuicyPixels ==0.3.0.5 - servant-lucid ==0.9 - - servant-machines ==0.15 + - servant-machines ==0.15.1 - servant-mock ==0.8.5 - - servant-pipes ==0.15.1 + - servant-pipes ==0.15.2 - servant-purescript ==0.10.0.0 - servant-rawm ==0.3.2.0 - servant-server ==0.16.2 - - servant-static-th ==0.2.3.0 + - servant-static-th ==0.2.4.0 - servant-subscriber ==0.7.0.0 - servant-swagger ==1.1.7.1 - servant-swagger-ui ==0.3.4.3.23.11 @@ -1996,7 +1996,7 @@ default-package-overrides: - sexp-grammar ==2.1.0 - SHA ==1.6.4.4 - shake-plus ==0.1.10.0 - - shakespeare ==2.0.24.1 + - shakespeare ==2.0.25 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 @@ -2039,7 +2039,7 @@ default-package-overrides: - smallcheck ==1.1.7 - smash ==0.1.1.0 - smash-aeson ==0.1.0.0 - - smash-lens ==0.1.0.0 + - smash-lens ==0.1.0.1 - smash-microlens ==0.1.0.0 - smoothie ==0.4.2.11 - snap-blaze ==0.2.1.5 @@ -2118,7 +2118,7 @@ default-package-overrides: - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - stripe-concepts ==1.0.2.4 - - stripe-signature ==1.0.0.4 + - stripe-signature ==1.0.0.6 - strive ==5.0.12 - structs ==0.1.3 - structured ==0.1 @@ -2145,7 +2145,7 @@ default-package-overrides: - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 - - tabular ==0.2.2.7 + - tabular ==0.2.2.8 - taffybar ==3.2.2 - tagchup ==0.4.1.1 - tagged ==0.8.6 @@ -2170,7 +2170,7 @@ default-package-overrides: - tasty-hunit ==0.10.0.2 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 - - tasty-lua ==0.2.2 + - tasty-lua ==0.2.3 - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.1 - tasty-rerun ==1.1.17 @@ -2182,7 +2182,7 @@ default-package-overrides: - TCache ==0.12.1 - tce-conf ==1.3 - tdigest ==0.2.1 - - template-haskell-compat-v0208 ==0.1.2.1 + - template-haskell-compat-v0208 ==0.1.5 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 @@ -2294,7 +2294,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.19 + - turtle ==1.5.20 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 @@ -2328,7 +2328,7 @@ default-package-overrides: - unexceptionalio-trans ==0.5.1 - unicode ==0.0.1.1 - unicode-show ==0.1.0.4 - - unicode-transforms ==0.3.6 + - unicode-transforms ==0.3.7 - unification-fd ==0.10.0.1 - union-find ==0.2 - uniplate ==1.6.12 @@ -2395,7 +2395,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.1.0 + - vector-sized ==1.4.2 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 @@ -2408,12 +2408,12 @@ default-package-overrides: - void ==0.7.3 - vty ==5.28.2 - wai ==3.2.2.1 - - wai-app-static ==3.1.7.1 + - wai-app-static ==3.1.7.2 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.7 - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.29.2 + - wai-extra ==3.0.31 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 - wai-middleware-caching ==0.1.0.2 @@ -2463,7 +2463,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - wuss ==1.1.17 - - X11 ==1.9.1 + - X11 ==1.9.2 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 - x509 ==1.7.5 @@ -2474,7 +2474,7 @@ default-package-overrides: - xdg-basedir ==0.2.2 - xdg-desktop-entry ==0.1.1.1 - xdg-userdirs ==0.1.0.2 - - xeno ==0.4.1 + - xeno ==0.4.2 - xls ==0.1.3 - xlsx ==0.8.1 - xlsx-tabular ==0.2.2.1 @@ -2498,7 +2498,7 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xturtle ==0.2.0.0 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.4.0 + - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.1 - yesod ==1.6.1.0 - yesod-auth ==1.6.10 @@ -2512,7 +2512,7 @@ default-package-overrides: - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 - yesod-persistent ==1.6.0.4 - - yesod-recaptcha2 ==1.0.0 + - yesod-recaptcha2 ==1.0.1 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - yesod-test ==1.6.10 @@ -2540,6 +2540,7 @@ default-package-overrides: extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier + - aeson == 1.5.2.0 # needed for fourmolu 0.1.0.0, but 1.5.3 is to new for our purpose - aeson-pretty < 0.8 # required by elm compiler - Agda == 2.6.1 # allows the agdaPackage set to be fixed to this version so that it won't break when another agda version is released. - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x @@ -2559,12 +2560,12 @@ extra-packages: - dbus <1 # for xmonad-0.26 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - dhall == 1.29.0 # required for spago 0.14.0. + - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - doctemplates == 0.8 # required by pandoc-2.9.x + - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x + - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - gi-gdk == 3.0.23 # required for gi-pango 1.0.23 - gi-gtk == 3.0.35 # required for gi-pango 1.0.23 - - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - - ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0 - - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock == 2.22.* # required on GHC 8.0.x - haddock == 2.23.* # required on GHC < 8.10.x @@ -2573,11 +2574,10 @@ extra-packages: - happy <1.19.6 # newer versions break Agda - happy == 1.19.9 # for purescript - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - - haskell-lsp == 0.22.* # required for ghcide 0.2.0 - - haskell-lsp-types == 0.22.* # required for ghcide 0.2.0 - 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 + - hslua == 1.1.2 # required for pandoc 2.10 - 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 @@ -2602,6 +2602,7 @@ extra-packages: - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x + - shelly ==1.8.1 # ghcjs depends on shelly < 1.9 - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet @@ -2613,6 +2614,13 @@ extra-packages: - yesod-persistent < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 - yesod-static ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 - yesod-test ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 + - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 + - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 + - witherable == 0.3.2 # required by Hasura 1.3.1, 2020-08-20 + - protolude == 0.3.0 # required by Hasura 1.3.1, 2020-08-20 + - optics-core == 0.3.0.1 # required by Hasura 1.3.1, 2020-08-20 + - base-compat == 0.11.1 # required by Hasura 1.3.1, 2020-08-20 package-maintainers: peti: @@ -2754,16 +2762,26 @@ dont-distribute-packages: - accelerate-examples - accelerate-fft - accelerate-fourier-benchmark + - accelerate-io-array + - accelerate-io-bmp + - accelerate-io-bytestring + - accelerate-io-cereal + - accelerate-io-JuicyPixels + - accelerate-io-repa + - accelerate-io-vector - accelerate-llvm-ptx - bindings-yices - boolector - ccelerate-cuda + - containers-accelerate - cplex-hs - cublas + - cuda # 2020-08-18 because of dependency nvidia-x11 - cufft - cusolver - cusparse - gloss-raster-accelerate + - hashable-accelerate - libnvvm - matlab - nvvm @@ -3423,6 +3441,7 @@ broken-packages: - bitcoin-api - bitcoin-api-extra - bitcoin-block + - bitcoin-compact-filters - bitcoin-hs - bitcoin-rpc - bitcoin-script @@ -3667,6 +3686,7 @@ broken-packages: - cap - Capabilities - capability + - capataz - capnp - capped-list - capri @@ -3744,6 +3764,7 @@ broken-packages: - cgen - cgi-utils - cgrep + - chainweb-mining-client - chalkboard - chalkboard-viewer - charade @@ -3896,6 +3917,7 @@ broken-packages: - codemonitor - codepad - codeworld-api + - codex - codo-notation - coin - coinbase-exchange @@ -3950,13 +3972,16 @@ broken-packages: - compdata-automata - compdata-dags - compdata-param + - compdoc - competition - compilation - complexity - compose-trans - composite-aeson + - composite-aeson-path - composite-aeson-refined - - composite-base + - composite-aeson-throw + - composite-binary - composite-ekg - composite-opaleye - composite-swagger @@ -4069,6 +4094,7 @@ broken-packages: - Control-Monad-ST2 - contstuff-monads-tf - contstuff-transformers + - conversions - convert - convert-annotation - convertible-ascii @@ -4164,6 +4190,7 @@ broken-packages: - cryptocipher - cryptocompare - cryptoconditions + - cryptoids - cryptol - cryptsy-api - crystalfontz @@ -4288,6 +4315,7 @@ broken-packages: - data-transform - data-type - data-util + - data-validation - data-variant - database-id-groundhog - database-study @@ -4411,7 +4439,6 @@ broken-packages: - dhall-check - dhall-docs - dhall-fly - - dhall-nix - dhall-text - dhall-to-cabal - dhall-yaml @@ -4706,6 +4733,7 @@ broken-packages: - enchant - encoding - encoding-io + - encryptable - engine-io - engine-io-growler - engine-io-snap @@ -4759,6 +4787,9 @@ broken-packages: - EsounD - espial - ess + - essence-of-live-coding-gloss-example + - essence-of-live-coding-pulse-example + - essence-of-live-coding-warp - estimators - EstProgress - estreps @@ -4949,6 +4980,7 @@ broken-packages: - FileManip - FileManipCompat - fileneglect + - filepath-crypto - filepath-io-access - FilePather - filepather @@ -5074,7 +5106,6 @@ broken-packages: - foscam-filename - foscam-sort - Foster - - fourmolu - fpco-api - fplll - fpnla-examples @@ -5319,6 +5350,23 @@ broken-packages: - ghcprofview - ght - gi-cairo-again + - gi-cairo-connector + - gi-cairo-render + - gi-dbusmenu + - gi-dbusmenugtk3 + - gi-gdkx11 + - gi-graphene + - gi-gsk + - gi-gstpbutils + - gi-gsttag + - gi-gtk-declarative + - gi-gtk-declarative-app-simple + - gi-gtk-hs + - gi-gtkosxapplication + - gi-handy + - gi-poppler + - gi-wnck + - gi-xlib - giak - Gifcurry - ginsu @@ -5399,6 +5447,7 @@ broken-packages: - gloss-sodium - glpk-headers - glpk-hs + - gltf-codec - glue - GLUtil - gmap @@ -5422,10 +5471,12 @@ broken-packages: - google-drive - google-html5-slide - google-mail-filters + - google-maps-geocoding - google-oauth2 - google-oauth2-easy - google-search - google-server-api + - google-static-maps - google-translate - GoogleCodeJam - GoogleDirections @@ -5493,6 +5544,7 @@ broken-packages: - graphicstools - graphmod-plugin - graphql + - graphql-utils - graphql-w-persistent - graphted - graphtype @@ -5618,18 +5670,25 @@ broken-packages: - hakismet - hakka - hako + - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib - hakyll-contrib-csv - hakyll-contrib-elm + - hakyll-contrib-hyphenation - hakyll-contrib-links - hakyll-convert + - hakyll-dhall - hakyll-dir-list + - hakyll-favicon - hakyll-filestore + - hakyll-images - hakyll-ogmarkup - hakyll-R + - hakyll-sass - hakyll-series + - hakyll-shakespeare - hakyll-shortcode - hakyll-shortcut-links - hakyll-typescript @@ -5790,6 +5849,7 @@ broken-packages: - haskell-src-exts-prisms - haskell-src-exts-qq - haskell-src-exts-sc + - haskell-src-match - haskell-src-meta-mwotton - haskell-stack-trace-plugin - haskell-token-utils @@ -5873,6 +5933,7 @@ broken-packages: - haskore-supercollider - haskore-synthesizer - HaskRel + - haskseg - hasktorch - hasktorch-codegen - hasktorch-ffi-th @@ -5904,6 +5965,7 @@ broken-packages: - hasql-queue - hasql-simple - hasql-th + - hasqly-mysql - hastache - hastache-aeson - haste @@ -5956,7 +6018,6 @@ broken-packages: - hcltest - hcoap - hcom - - hcoord - hcron - hCsound - hcube @@ -6189,6 +6250,7 @@ broken-packages: - HLogger - hlogger - hlongurl + - hlrdb - hls - hlwm - hly @@ -6229,7 +6291,6 @@ broken-packages: - hobbes - hobbits - hocilib - - hocker - hodatime - HODE - hoe @@ -6778,7 +6839,6 @@ broken-packages: - inject-function - inline-asm - inline-java - - inline-r - inserts - inspector-wrecker - instana-haskell-trace-sdk @@ -6970,6 +7030,7 @@ broken-packages: - jsonsql - jsontsv - jsonxlsx + - jsop - jspath - juandelacosa - judge @@ -7071,6 +7132,7 @@ broken-packages: - ks-test - KSP - ktx + - ktx-codec - kubernetes-client - kubernetes-client-core - kuifje @@ -7187,6 +7249,8 @@ broken-packages: - latest-npm-version - latex-formulae-hakyll - latex-formulae-pandoc + - latex-svg-hakyll + - latex-svg-pandoc - LATS - launchdarkly-server-sdk - launchpad-control @@ -7259,6 +7323,7 @@ broken-packages: - libconfig - libcspm - libexpect + - libfuse3 - libGenI - libhbb - libinfluxdb @@ -7276,7 +7341,6 @@ broken-packages: - libraft - librandomorg - librato - - libsodium - libssh2 - libssh2-conduit - libsystemd-daemon @@ -7335,24 +7399,12 @@ broken-packages: - lio-fs - lio-simple - lipsum-gen - - liquid - - liquid-base - - liquid-bytestring - - liquid-containers - - liquid-fixpoint - - liquid-ghc-prim - - liquid-parallel - - liquid-platform - - liquid-prelude - - liquid-vector - - liquidhaskell - liquidhaskell-cabal - Liquorice - list-fusion-probe - list-mux - list-prompt - list-remote-forwards - - list-t - list-t-attoparsec - list-t-html-parser - list-t-http-client @@ -7414,6 +7466,7 @@ broken-packages: - log4hs - logentries - logger + - logging-effect - logging-effect-extra - logging-effect-extra-file - logging-effect-extra-handler @@ -7458,11 +7511,13 @@ broken-packages: - lp-diagrams - lp-diagrams-svg - LRU + - lrucaching-haxl - ls-usb - lscabal - LslPlus - lsystem - ltext + - lti13 - ltk - LTS - lua-bc @@ -7486,6 +7541,7 @@ broken-packages: - lye - Lykah - lz4-conduit + - lz4-frame-conduit - lzma-enumerator - lzma-streams - lzo @@ -7702,6 +7758,7 @@ broken-packages: - ministg - minst-idx - mios + - MIP - mirror-tweet - misfortune - miso-action-logger @@ -7744,6 +7801,7 @@ broken-packages: - monad-atom - monad-atom-simple - monad-branch + - monad-classes-logging - monad-exception - monad-finally - monad-fork @@ -7933,6 +7991,7 @@ broken-packages: - mvc - mvc-updates - mvclient + - mwc-probability-transition - mwc-random-accelerate - mxnet - mxnet-dataiter @@ -8314,10 +8373,11 @@ broken-packages: - pam - pan-os-syslog - panda - - pandoc-crossref + - pandoc-csv2table - pandoc-emphasize-code - pandoc-filter-graphviz - pandoc-include + - pandoc-include-code - pandoc-japanese-filters - pandoc-lens - pandoc-markdown-ghci-filter @@ -8327,6 +8387,7 @@ broken-packages: - pandoc-pyplot - pandoc-sidenote - pandoc-unlit + - pandoc-utils - PandocAgda - pang-a-lambda - pangraph @@ -8616,8 +8677,10 @@ broken-packages: - polydata - polydata-core - polynomial + - polysemy-http - polysemy-optics - polysemy-RandomFu + - polysemy-test - polysemy-webserver - polysemy-zoo - polyseq @@ -8713,13 +8776,15 @@ broken-packages: - pretty-ghci - pretty-ncols - prettyprinter-graphviz + - prettyprinter-lucid - prettyprinter-vty - preview - prim - prim-array - prim-ref + - primal + - primal-memory - primes-type - - primitive-extras - primitive-indexed - primitive-maybe - primitive-simd @@ -9019,6 +9084,7 @@ broken-packages: - redis-hs - redis-io - redis-simple + - rediscaching-haxl - redland - Redmine - reduce-equations @@ -9165,7 +9231,6 @@ broken-packages: - rethinkdb-client-driver - rethinkdb-model - rethinkdb-wereHamster - - retrie - retryer - reverse-geocoding - reversi @@ -9269,6 +9334,7 @@ broken-packages: - ruler - ruler-core - rungekutta + - runhs - runmany - runtime-arbitrary - rvar @@ -9370,6 +9436,7 @@ broken-packages: - scotty-fay - scotty-format - scotty-hastache + - scotty-haxl - scotty-resource - scotty-rest - scotty-session @@ -9542,6 +9609,7 @@ broken-packages: - shadower - shake-bindist - shake-cabal-build + - shake-dhall - shake-extras - shake-minify - shake-pack @@ -9649,6 +9717,7 @@ broken-packages: - siphon - siren-json - sirkel + - sitepipe - sixfiguregroup - sized-grid - sized-types @@ -9724,7 +9793,6 @@ broken-packages: - snap-loader-static - snap-routes - snap-stream - - snap-templates - snap-testing - snap-utils - snap-web-routes @@ -9818,6 +9886,7 @@ broken-packages: - spanout - sparkle - sparrow + - spars - sparse - sparse-lin-alg - sparsebit @@ -9851,7 +9920,6 @@ broken-packages: - Spock-api-ghcjs - Spock-api-server - Spock-auth - - Spock-core - Spock-digestive - Spock-lucid - Spock-worker @@ -9959,9 +10027,7 @@ broken-packages: - STL - STLinkUSB - stm-chunked-queues - - stm-containers - stm-firehose - - stm-hamt - stm-promise - stm-stats - stm-supply @@ -10017,6 +10083,8 @@ broken-packages: - stripe-haskell - stripe-http-client - stripe-http-streams + - stripe-scotty + - stripe-signature - stripe-tests - strongswan-sql - structural-induction @@ -10052,12 +10120,12 @@ broken-packages: - sunroof-server - super-user-spark - superbubbles - - superbuffer - supercollider-ht - supercollider-midi - superconstraints - superevent - supermonad + - supernova - supero - supervisor - supervisors @@ -10091,6 +10159,7 @@ broken-packages: - sym - sym-plot - symantic + - symantic-atom - symantic-http-test - symantic-lib - symantic-xml @@ -10170,7 +10239,6 @@ broken-packages: - tart - task - task-distribution - - taskell - TaskMonad - tasty-auto - tasty-bdd @@ -10211,6 +10279,7 @@ broken-packages: - tellbot - tempi - template-default + - template-haskell-optics - template-haskell-util - template-hsml - template-yj @@ -10231,7 +10300,6 @@ broken-packages: - termbox-bindings - terminal-text - termination-combinators - - termonad - termplot - terntup - terrahs @@ -10360,6 +10428,7 @@ broken-packages: - timeseries - timespan - timeutils + - timezone-detect - timezone-olson-th - timezone-unix - tini @@ -10669,6 +10738,7 @@ broken-packages: - uri-parse - uri-template - uri-templater + - url-bytes - url-decoders - url-generic - URLb @@ -10709,6 +10779,7 @@ broken-packages: - uuagc-diagrams - uuid-aeson - uuid-bytes + - uuid-crypto - uvector - uvector-algorithms - uxadt @@ -11159,6 +11230,7 @@ broken-packages: - yesod-auth-ldap - yesod-auth-ldap-mediocre - yesod-auth-ldap-native + - yesod-auth-lti13 - yesod-auth-nopassword - yesod-auth-oauth2 - yesod-auth-pam diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 7016192e91..a1938de0ab 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -571,9 +571,20 @@ self: super: builtins.intersectAttrs super { })); # Expects z3 to be on path so we replace it with a hard + # + # The tests expect additional solvers on the path, replace the + # available ones also with hard coded paths, and remove the missing + # ones from the test. sbv = overrideCabal super.sbv (drv: { postPatch = '' - sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs''; + sed -i -e 's|"abc"|"${pkgs.abc-verifier}/bin/abc"|' Data/SBV/Provers/ABC.hs + sed -i -e 's|"boolector"|"${pkgs.boolector}/bin/boolector"|' Data/SBV/Provers/Boolector.hs + sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs + sed -i -e 's|"yices-smt2"|"${pkgs.yices}/bin/yices-smt2"|' Data/SBV/Provers/Yices.hs + sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs + + sed -i -e 's|\[abc, boolector, cvc4, mathSAT, yices, z3, dReal\]|[abc, boolector, cvc4, yices, z3]|' SBVTestSuite/SBVConnectionTest.hs + ''; }); # The test-suite requires a running PostgreSQL server. @@ -655,16 +666,16 @@ self: super: builtins.intersectAttrs super { # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. - docsSearchVersion = "v0.0.8"; + docsSearchVersion = "v0.0.10"; docsSearchAppJsFile = pkgs.fetchurl { url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/docs-search-app.js"; - sha256 = "00pzi7pgjicpa0mg0al80gh2q1q2lqiyb3kjarpydlmn8dfjny7v"; + sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5"; }; purescriptDocsSearchFile = pkgs.fetchurl { url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/purescript-docs-search"; - sha256 = "1hsi1hc4p1z2xbw82w2jxmmczw6mravli1r89vrkivb72sqdjya7"; + sha256 = "0wc1zyhli4m2yykc6i0crm048gyizxh7b81n8xc4yb7ibjqwhyj3"; }; spagoFixHpack = overrideCabal spagoWithOverrides (drv: { @@ -767,4 +778,8 @@ self: super: builtins.intersectAttrs super { postgresql-libpq-notify = dontCheck super.postgresql-libpq-notify; postgresql-pure = dontCheck super.postgresql-pure; + retrie = overrideCabal super.retrie (drv: { + testToolDepends = [ pkgs.git pkgs.mercurial ]; + }); + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index 20fa2c8406..afb0087a02 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -21,7 +21,7 @@ in , configureFlags ? [] , buildFlags ? [] , haddockFlags ? [] -, description ? "" +, description ? null , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true @@ -35,7 +35,7 @@ in , enableSharedExecutables ? false , enableSharedLibraries ? (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin -, enableStaticLibraries ? !stdenv.hostPlatform.isWindows +, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] # On macOS, statically linking against system frameworks is not supported; @@ -50,7 +50,7 @@ in , jailbreak ? false , license , enableParallelBuilding ? true -, maintainers ? [] +, maintainers ? null , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} @@ -59,14 +59,14 @@ in , benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? [] , testTarget ? "" , broken ? false -, preCompileBuildDriver ? "", postCompileBuildDriver ? "" -, preUnpack ? "", postUnpack ? "" -, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" -, preConfigure ? "", postConfigure ? "" -, preBuild ? "", postBuild ? "" -, installPhase ? "", preInstall ? "", postInstall ? "" -, checkPhase ? "", preCheck ? "", postCheck ? "" -, preFixup ? "", postFixup ? "" +, preCompileBuildDriver ? null, postCompileBuildDriver ? null +, preUnpack ? null, postUnpack ? null +, patches ? null, patchPhase ? null, prePatch ? "", postPatch ? "" +, preConfigure ? null, postConfigure ? null +, preBuild ? null, postBuild ? null +, installPhase ? null, preInstall ? null, postInstall ? null +, checkPhase ? null, preCheck ? null, postCheck ? null +, preFixup ? null, postFixup ? null , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false @@ -90,6 +90,7 @@ assert editedCabalFile != null -> revision != null; # --enable-static does not work on windows. This is a bug in GHC. # --enable-static will pass -staticlib to ghc, which only works for mach-o and elf. assert stdenv.hostPlatform.isWindows -> enableStaticLibraries == false; +assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false; let @@ -636,34 +637,34 @@ stdenv.mkDerivation ({ }; meta = { inherit homepage license platforms; } - // optionalAttrs broken { inherit broken; } - // optionalAttrs (description != "") { inherit description; } - // optionalAttrs (maintainers != []) { inherit maintainers; } - // optionalAttrs (hydraPlatforms != null) { inherit hydraPlatforms; } + // optionalAttrs (args ? broken) { inherit broken; } + // optionalAttrs (args ? description) { inherit description; } + // optionalAttrs (args ? maintainers) { inherit maintainers; } + // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } ; } -// optionalAttrs (preCompileBuildDriver != "") { inherit preCompileBuildDriver; } -// optionalAttrs (postCompileBuildDriver != "") { inherit postCompileBuildDriver; } -// optionalAttrs (preUnpack != "") { inherit preUnpack; } -// optionalAttrs (postUnpack != "") { inherit postUnpack; } -// optionalAttrs (patches != []) { inherit patches; } -// optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (preConfigure != "") { inherit preConfigure; } -// optionalAttrs (postConfigure != "") { inherit postConfigure; } -// optionalAttrs (preBuild != "") { inherit preBuild; } -// optionalAttrs (postBuild != "") { inherit postBuild; } -// optionalAttrs (doBenchmark) { inherit doBenchmark; } -// optionalAttrs (checkPhase != "") { inherit checkPhase; } -// optionalAttrs (preCheck != "") { inherit preCheck; } -// optionalAttrs (postCheck != "") { inherit postCheck; } -// optionalAttrs (preInstall != "") { inherit preInstall; } -// optionalAttrs (installPhase != "") { inherit installPhase; } -// optionalAttrs (postInstall != "") { inherit postInstall; } -// optionalAttrs (preFixup != "") { inherit preFixup; } -// optionalAttrs (postFixup != "") { inherit postFixup; } -// optionalAttrs (dontStrip) { inherit dontStrip; } -// optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } +// optionalAttrs (args ? preCompileBuildDriver) { inherit preCompileBuildDriver; } +// optionalAttrs (args ? postCompileBuildDriver) { inherit postCompileBuildDriver; } +// optionalAttrs (args ? preUnpack) { inherit preUnpack; } +// optionalAttrs (args ? postUnpack) { inherit postUnpack; } +// optionalAttrs (args ? patches) { inherit patches; } +// optionalAttrs (args ? patchPhase) { inherit patchPhase; } +// optionalAttrs (args ? preConfigure) { inherit preConfigure; } +// optionalAttrs (args ? postConfigure) { inherit postConfigure; } +// optionalAttrs (args ? preBuild) { inherit preBuild; } +// optionalAttrs (args ? postBuild) { inherit postBuild; } +// optionalAttrs (args ? doBenchmark) { inherit doBenchmark; } +// optionalAttrs (args ? checkPhase) { inherit checkPhase; } +// optionalAttrs (args ? preCheck) { inherit preCheck; } +// optionalAttrs (args ? postCheck) { inherit postCheck; } +// optionalAttrs (args ? preInstall) { inherit preInstall; } +// optionalAttrs (args ? installPhase) { inherit installPhase; } +// optionalAttrs (args ? postInstall) { inherit postInstall; } +// optionalAttrs (args ? preFixup) { inherit preFixup; } +// optionalAttrs (args ? postFixup) { inherit postFixup; } +// optionalAttrs (args ? dontStrip) { inherit dontStrip; } +// optionalAttrs (args ? hardeningDisable) { inherit hardeningDisable; } // optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) ) diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index f295370582..4bdd247170 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -791,7 +791,7 @@ self: { broken = true; }) {}; - "Agda" = callPackage + "Agda_2_6_1" = callPackage ({ mkDerivation, aeson, alex, array, async, base, binary , blaze-html, boxes, bytestring, Cabal, containers, data-hash , deepseq, directory, edit-distance, emacs, equivalence, exceptions @@ -825,6 +825,40 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; + "Agda" = callPackage + ({ mkDerivation, aeson, alex, array, async, base, binary + , blaze-html, boxes, bytestring, Cabal, containers, data-hash + , deepseq, directory, edit-distance, emacs, equivalence, exceptions + , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable + , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process + , regex-tdfa, split, stm, strict, template-haskell, text, time + , transformers, unordered-containers, uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.6.1.1"; + sha256 = "0d4j3n96wyc2crz238q49sb31ll6dfddllb82ry0jnsk8f0ypx2p"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + aeson array async base binary blaze-html boxes bytestring + containers data-hash deepseq directory edit-distance equivalence + exceptions filepath geniplate-mirror ghc-compact gitrev hashable + hashtables haskeline ieee754 mtl murmur-hash pretty process + regex-tdfa split stm strict template-haskell text time transformers + unordered-containers uri-encode zlib + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + 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;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -4559,6 +4593,24 @@ self: { broken = true; }) {}; + "Diff_0_3_4" = callPackage + ({ mkDerivation, array, base, directory, pretty, process + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Diff"; + version = "0.3.4"; + sha256 = "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp"; + libraryHaskellDepends = [ array base pretty ]; + testHaskellDepends = [ + array base directory pretty process QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "O(ND) diff algorithm in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Diff" = callPackage ({ mkDerivation, array, base, directory, pretty, process , QuickCheck, test-framework, test-framework-quickcheck2 @@ -6133,6 +6185,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "FloatingHex_0_5" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "FloatingHex"; + version = "0.5"; + sha256 = "0c38062vnjmy3fc5nxwg7sgbfabikaakgdsl34ka229s6w7pm8x3"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Read and write hexadecimal floating point numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Focus" = callPackage ({ mkDerivation, base, MissingH, split }: mkDerivation { @@ -8874,8 +8938,8 @@ self: { }: mkDerivation { pname = "HPDF"; - version = "1.5.0"; - sha256 = "0bwj0haxw9a061xzn5zh2qc5d958n0g9izbnn0w08dazfjyl8v46"; + version = "1.5.1"; + sha256 = "0kqbfzcqapxvkg52mixqjhxb79ziyfsfvazbzrwjvhp9nqhikn6y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -9374,10 +9438,8 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.14"; - sha256 = "0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6"; - revision = "1"; - editedCabalFile = "1inz9grpl9605bbymy6n5y4as54mlykbsiw8wpm5gl6qvxgrf69w"; + version = "4000.3.15"; + sha256 = "150m5v125s4jrxzl85jhnh69kp4mjyzhkqp0c1k087008f73csqd"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -10753,8 +10815,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.18"; - sha256 = "1nz4d6pwcnv775ncyg85ckx8kkzj2y3h17i40jc0yna8ai7driyx"; + version = "0.11.4.19"; + sha256 = "0iy3qrir13kp1c7a0xwj2ngfwhqxqbc5j0vj5mi0w3arv7w0x6ds"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -10767,8 +10829,8 @@ self: { ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { pname = "HsOpenSSL-x509-system"; - version = "0.1.0.3"; - sha256 = "14hzjdpv8ld3nw5fcx451w49vq0s8fhs1zh984vpm85b5ypbgp2v"; + version = "0.1.0.4"; + sha256 = "15mp70bqg1lzp971bzp6wym3bwzvxb76hzbgckygbfa722xyymhr"; libraryHaskellDepends = [ base bytestring HsOpenSSL unix ]; description = "Use the system's native CA certificate store with HsOpenSSL"; license = stdenv.lib.licenses.bsd3; @@ -12678,8 +12740,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.7.1"; - sha256 = "1gccb84fma0plkwjdz8hgqa70a5lr6d9gnw6pfky993555ig29mp"; + version = "4.7.2"; + sha256 = "15c1q4rl4kwpgpsdf4x7k17m2fgzimm9915k71cpjiv0sq9b2rn2"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -12752,8 +12814,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "LiterateMarkdown"; - version = "0.1.0.0"; - sha256 = "0v9j7kqjvkrafxl4ahfqj1xvigim9vnd3kflgqagzccrgx9kz5gv"; + version = "0.1.0.1"; + sha256 = "0rgjf6blrg8rq75872bpwp6cn3bg89718cy6ik2m22881zfvr2m7"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -13056,6 +13118,33 @@ self: { broken = true; }) {}; + "MIP" = callPackage + ({ mkDerivation, base, bytestring, bytestring-encoding + , case-insensitive, containers, data-default-class, extended-reals + , filepath, intern, lattices, megaparsec, mtl, OptDir, process + , scientific, stm, tasty, tasty-hunit, tasty-quickcheck, tasty-th + , temporary, text, xml-conduit, zlib + }: + mkDerivation { + pname = "MIP"; + version = "0.1.0.0"; + sha256 = "0790jcwqjd33i8sqhzxarda8ihhv5iapj0apjmlqjppbipwa6awa"; + libraryHaskellDepends = [ + base bytestring bytestring-encoding case-insensitive containers + data-default-class extended-reals filepath intern lattices + megaparsec mtl OptDir process scientific stm temporary text + xml-conduit zlib + ]; + testHaskellDepends = [ + base containers data-default-class lattices tasty tasty-hunit + tasty-quickcheck tasty-th + ]; + description = "Library for using Mixed Integer Programming (MIP)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "MSQueue" = callPackage ({ mkDerivation, base, ghc-prim, monad-loops, ref-mtl, stm }: mkDerivation { @@ -13141,8 +13230,8 @@ self: { }: mkDerivation { pname = "Map"; - version = "0.1.3.2"; - sha256 = "03bc7mswiw5n76g34pll6dgz7f46l9gafl1bfanv74p21xjr829g"; + version = "0.1.3.3"; + sha256 = "060b50hjl79ikzff1i65xakq8vkqr6pssc5kvw5j6vrd46y4ami4"; libraryHaskellDepends = [ base containers either-both filtrable util ]; @@ -13155,14 +13244,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "MapWith"; - version = "0.1.0.0"; - sha256 = "1dk5b9bi29917sf3mk3q85iqjkfc7vczwb8x8cg6w6gxfqn0444v"; - revision = "1"; - editedCabalFile = "1zkpqgxh2d1zg087766vixw5j9xh9i9z4vdp5gv87xzhc4ig9qbs"; + version = "0.2.0.0"; + sha256 = "1xkyaj83yblf42qawv4nyi8miaynydd8b3ysx62f9y10bqxk7dja"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; - description = "mapWith: like fmap, but with additional arguments (isFirst, isLast, etc)"; + description = "mapWith: like fmap, but with additional parameters (isFirst, isLast, etc)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -16209,13 +16296,13 @@ self: { "PyF" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec - , HUnit, megaparsec, mtl, process, python3, template-haskell - , temporary, text + , HUnit, megaparsec, mtl, process, template-haskell, temporary + , text }: mkDerivation { pname = "PyF"; - version = "0.9.0.1"; - sha256 = "00pmpm2g7161bksc1l5clkghi0sbzh8y0f6xd52gwx9h6zxacns3"; + version = "0.9.0.2"; + sha256 = "186kxid40nsxhc4yas6a1jk6ndsycsfrc5k9pfvyhgw720rx2p2c"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec mtl template-haskell text @@ -16224,10 +16311,9 @@ self: { base bytestring deepseq directory filepath hashable hspec HUnit process template-haskell temporary text ]; - testToolDepends = [ python3 ]; description = "Quasiquotations for a python like interpolated string formater"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) python3;}; + }) {}; "QIO" = callPackage ({ mkDerivation, base, containers, mtl, old-time, random }: @@ -16956,8 +17042,8 @@ self: { }: mkDerivation { pname = "Rattus"; - version = "0.3"; - sha256 = "1ks05nn9g6gp3l61bzmphxm9d0ajvlkzaws04fzz73rfv4nb97wg"; + version = "0.3.1"; + sha256 = "1sfjnfd3jsr095gkzxldb65ivxpyzsaphw2bv2f6svczhjc5b414"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base containers ghc simple-affine-space @@ -17213,16 +17299,24 @@ self: { }) {}; "RtMidi" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, alsaLib, base, deepseq, pretty-simple, tasty + , tasty-hunit, unliftio-core, vector + }: mkDerivation { pname = "RtMidi"; - version = "0.1.1.0"; - sha256 = "09vs2y6zry4xak0gc6pc6xqinr9sv9z53hdiydxpn6ixam9s0g5r"; - libraryHaskellDepends = [ base ]; + version = "0.4.0.0"; + sha256 = "075j6d7vmihyz33b5ikv2l0c0alnhjzy1wpnzdrca6l201vab2mw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq unliftio-core vector ]; + librarySystemDepends = [ alsaLib ]; + executableHaskellDepends = [ base pretty-simple vector ]; + testHaskellDepends = [ base tasty tasty-hunit vector ]; + description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {inherit (pkgs) alsaLib;}; "RxHaskell" = callPackage ({ mkDerivation, base, containers, stm, transformers }: @@ -18918,8 +19012,6 @@ self: { ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Spock-digestive" = callPackage @@ -20590,8 +20682,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.6"; - sha256 = "1zclpawaa1cx1p58asn7lla4lakkr869qnkdvrypxxqki3406hsz"; + version = "0.3.7"; + sha256 = "1y2dmk60dvk8d9n16in98cmin5ckvdx3knwlfzcs0jl6vyh8n51n"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21266,8 +21358,8 @@ self: { }: mkDerivation { pname = "X11"; - version = "1.9.1"; - sha256 = "0gg6852mrlgl8zng1j84fismz7k81jr5fk92glgkscf8q6ryg0bm"; + version = "1.9.2"; + sha256 = "013yny4dwbs98kp7245j8dv81h4p1cdwn2rsf2hvhsplg6ixkc05"; libraryHaskellDepends = [ base data-default ]; librarySystemDepends = [ libX11 libXext libXinerama libXrandr libXrender libXScrnSaver @@ -21729,6 +21821,30 @@ self: { broken = true; }) {inherit (pkgs) readline;}; + "Z-Data" = callPackage + ({ mkDerivation, base, case-insensitive, deepseq, ghc-prim + , hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive + , QuickCheck, quickcheck-instances, scientific, tagged + , template-haskell, unordered-containers, word8 + }: + mkDerivation { + pname = "Z-Data"; + version = "0.1.1.0"; + sha256 = "0z7cri6mkmj22ffwg3mz8yyjr81z4ww7kkmi7m9ilmbbpssma5fw"; + libraryHaskellDepends = [ + base case-insensitive deepseq ghc-prim hashable integer-gmp + primitive QuickCheck scientific tagged template-haskell + unordered-containers + ]; + libraryToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base hashable hspec HUnit integer-gmp primitive QuickCheck + quickcheck-instances scientific word8 + ]; + description = "array, vector and text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ZEBEDDE" = callPackage ({ mkDerivation, base, vect }: mkDerivation { @@ -22078,25 +22194,26 @@ self: { }) {}; "accelerate" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, base-orphans - , bytestring, Cabal, cabal-doctest, constraints, containers - , cryptonite, deepseq, directory, doctest, exceptions, filepath - , ghc-prim, half, hashable, hashtables, hedgehog, lens, mtl, tasty - , tasty-expected-failure, tasty-hedgehog, tasty-hunit - , template-haskell, terminal-size, transformers, unique, unix + ({ mkDerivation, ansi-terminal, base, base-orphans, bytestring + , Cabal, cabal-doctest, containers, cryptonite, deepseq, directory + , doctest, exceptions, filepath, ghc-prim, half, hashable + , hashtables, hedgehog, lens, mtl, prettyprinter + , prettyprinter-ansi-terminal, primitive, tasty, template-haskell + , terminal-size, text, transformers, unique, unix , unordered-containers, vector }: mkDerivation { pname = "accelerate"; - version = "1.2.0.1"; - sha256 = "0vglmasqgq0h8fvm9z8l2b3sygqvix8vr6c3n357gkr2mpz6gq8h"; + version = "1.3.0.0"; + sha256 = "14md9fbxckgwpbkm7hdj95ny11w5b5cj103r8razg0aw2hgid5sb"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-orphans bytestring - constraints containers cryptonite deepseq directory exceptions - filepath ghc-prim half hashable hashtables hedgehog lens mtl tasty - tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell - terminal-size transformers unique unix unordered-containers vector + ansi-terminal base base-orphans bytestring containers cryptonite + deepseq directory exceptions filepath ghc-prim half hashable + hashtables hedgehog lens mtl prettyprinter + prettyprinter-ansi-terminal primitive tasty template-haskell + terminal-size text transformers unique unix unordered-containers + vector ]; testHaskellDepends = [ base doctest ]; description = "An embedded language for accelerated array processing"; @@ -22126,7 +22243,7 @@ self: { }) {}; "accelerate-bignum" = callPackage - ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm + ({ mkDerivation, accelerate, accelerate-io-vector, accelerate-llvm , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion , ghc-prim, hedgehog, llvm-hs-pure, mwc-random, tasty , tasty-hedgehog, template-haskell, vector, vector-th-unbox @@ -22134,10 +22251,8 @@ self: { }: mkDerivation { pname = "accelerate-bignum"; - version = "0.2.0.0"; - sha256 = "0xhnd39fb17kb7q5z9z8svn8zlv6j1wxrbkv3vij4f1q2hkqkl0p"; - revision = "1"; - editedCabalFile = "0lfsmhky8shyy9xhm0j2as91vrmqqrrn9r0fsv2ljc4xjklg723r"; + version = "0.3.0.0"; + sha256 = "1xwqg3d2qilkfx8wmmhp2qq5cas3pnsrpyli3a9z0yxqamibxh33"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell @@ -22147,8 +22262,9 @@ self: { tasty tasty-hedgehog ]; benchmarkHaskellDepends = [ - accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx - base criterion mwc-random vector vector-th-unbox wide-word + accelerate accelerate-io-vector 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; @@ -22164,8 +22280,8 @@ self: { }: mkDerivation { pname = "accelerate-blas"; - version = "0.2.0.1"; - sha256 = "00869y2zrh43sl0rap8bbgnzqdvrrxpc2qhzz0zdfasr3440py6k"; + version = "0.3.0.0"; + sha256 = "1ydym6fxvg1b5vx49r8dnn80spsq42ssbg4v01s1djklks054g7y"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -22258,37 +22374,39 @@ self: { "accelerate-examples" = callPackage ({ mkDerivation, accelerate, accelerate-fft, accelerate-io - , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, base - , binary, bmp, bytestring, bytestring-lexing, cereal + , accelerate-io-bmp, accelerate-io-repa, accelerate-io-vector + , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint + , array, base, binary, bmp, bytestring, bytestring-lexing, cereal , colour-accelerate, containers, criterion, criterion-measurement , directory, fclabels, filepath, gloss, gloss-accelerate , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate - , linear, linear-accelerate, matrix-market-attoparsec, mwc-random - , normaldistribution, QuickCheck, random, repa, repa-io, scientific - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-algorithms + , linear-accelerate, matrix-market-attoparsec, mwc-random + , mwc-random-accelerate, normaldistribution, QuickCheck, random + , repa, repa-io, scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "1.2.0.1"; - sha256 = "0hzk6zas03yhh8xjjrh772knhbvisl0r6q10y4mcq552bcfd8yvj"; + version = "1.3.0.0"; + sha256 = "145m2bi8bini6z2jg6g99vnsc3m7pqz4dc9l34j8fg40fw65rwi0"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ accelerate accelerate-llvm-native accelerate-llvm-ptx ansi-wl-pprint base containers criterion directory fclabels HUnit - linear mwc-random QuickCheck test-framework test-framework-hunit + QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; executableHaskellDepends = [ - accelerate accelerate-fft accelerate-io base binary bmp bytestring - bytestring-lexing cereal colour-accelerate containers criterion - criterion-measurement directory fclabels filepath gloss + accelerate accelerate-fft accelerate-io accelerate-io-bmp + accelerate-io-repa accelerate-io-vector array base binary bmp + bytestring bytestring-lexing cereal colour-accelerate containers + criterion criterion-measurement directory fclabels filepath gloss gloss-accelerate gloss-raster-accelerate gloss-rendering lens-accelerate linear-accelerate matrix-market-attoparsec - mwc-random normaldistribution random repa repa-io scientific vector - vector-algorithms + mwc-random mwc-random-accelerate normaldistribution random repa + repa-io scientific vector vector-algorithms ]; description = "Examples using the Accelerate library"; license = stdenv.lib.licenses.bsd3; @@ -22304,10 +22422,8 @@ self: { }: mkDerivation { pname = "accelerate-fft"; - version = "1.2.0.0"; - sha256 = "19p9d59vdd3nq97xjprlb6fz2ajlk6gl37cdyvrm9inag4nnk6lp"; - revision = "2"; - editedCabalFile = "096vhbwbkyvjx8znjqnb3lz43kzqq0x7kcfv1gmmbjjrcmwaj2y5"; + version = "1.3.0.0"; + sha256 = "1a7cwzbs8r3rvaymrq2kfx83lqb3i7wz0gmz3ppz59f40rxn974x"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base bytestring carray containers cuda cufft @@ -22386,27 +22502,121 @@ self: { }) {}; "accelerate-io" = callPackage - ({ mkDerivation, accelerate, array, base, bmp, bytestring, hedgehog - , primitive, repa, tasty, tasty-hedgehog, vector - }: + ({ mkDerivation, accelerate, base }: mkDerivation { pname = "accelerate-io"; - version = "1.2.0.0"; - sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf"; - revision = "2"; - editedCabalFile = "0w8y40p71c6c7cj49n4kanwmsa53s2nydigiiidqp93yxhw0virq"; - libraryHaskellDepends = [ - accelerate array base bmp bytestring primitive repa vector - ]; - testHaskellDepends = [ - accelerate array base hedgehog tasty tasty-hedgehog vector - ]; - description = "Read and write Accelerate arrays in various formats"; + version = "1.3.0.0"; + sha256 = "048md40pfacxa1mbzncybxzwp9fzmsaq8i94pd8ai677n2zyw5cg"; + libraryHaskellDepends = [ accelerate base ]; + description = "Convert between Accelerate arrays and raw pointers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "accelerate-io-JuicyPixels" = callPackage + ({ mkDerivation, accelerate, accelerate-io-vector, base + , JuicyPixels, vector + }: + mkDerivation { + pname = "accelerate-io-JuicyPixels"; + version = "0.1.0.0"; + sha256 = "0rr43lwmc16r99si1s4nimxxydlsxb6ck45absrxy6vnkln7x185"; + libraryHaskellDepends = [ + accelerate accelerate-io-vector base JuicyPixels vector + ]; + description = "Convert between Accelerate arrays and JuicyPixels images"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-array" = callPackage + ({ mkDerivation, accelerate, array, base, hedgehog, primitive + , tasty, tasty-hedgehog + }: + mkDerivation { + pname = "accelerate-io-array"; + version = "0.1.0.0"; + sha256 = "1gcxd4m3h1xr8ia8z7c8sxznm90h2q3mzwhi5vsv8s1gh7sdym9m"; + libraryHaskellDepends = [ accelerate array base primitive ]; + testHaskellDepends = [ + accelerate array base hedgehog tasty tasty-hedgehog + ]; + description = "Convert between Accelerate and array"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-bmp" = callPackage + ({ mkDerivation, accelerate, accelerate-io-bytestring, base, bmp }: + mkDerivation { + pname = "accelerate-io-bmp"; + version = "0.1.0.0"; + sha256 = "0x7bkn4j7s9dzlfk4q1lh6fyd4bir1zkm4x37c65nl9g86154sc8"; + libraryHaskellDepends = [ + accelerate accelerate-io-bytestring base bmp + ]; + description = "Convert between Accelerate arrays and BMP images"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-bytestring" = callPackage + ({ mkDerivation, accelerate, base, bytestring }: + mkDerivation { + pname = "accelerate-io-bytestring"; + version = "0.1.0.0"; + sha256 = "15j42ahdcqpy4xbpp1xibfbjcrijy0hpfxp4k53qkb9bcqaknyq1"; + libraryHaskellDepends = [ accelerate base bytestring ]; + description = "Convert between Accelerate and ByteString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-cereal" = callPackage + ({ mkDerivation, accelerate, accelerate-io-bytestring, base, cereal + }: + mkDerivation { + pname = "accelerate-io-cereal"; + version = "0.1.0.0"; + sha256 = "13im1kmrd2yjxxrmpzp2030jhhq9fm9xa76yl11xwpd82z10a2pl"; + libraryHaskellDepends = [ + accelerate accelerate-io-bytestring base cereal + ]; + description = "Binary serialisation of Accelerate arrays using cereal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-repa" = callPackage + ({ mkDerivation, accelerate, base, repa }: + mkDerivation { + pname = "accelerate-io-repa"; + version = "0.1.0.0"; + sha256 = "084gzvfwz6prwra5393lfm5hgvssxwij0cdf24fq5nahzn7x2wrp"; + libraryHaskellDepends = [ accelerate base repa ]; + description = "Convert between Accelerate and Repa arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-vector" = callPackage + ({ mkDerivation, accelerate, base, hedgehog, primitive, tasty + , tasty-hedgehog, vector + }: + mkDerivation { + pname = "accelerate-io-vector"; + version = "0.1.0.0"; + sha256 = "1nh7n3qj4csxyzvkhkvfr9bii2vmqky51f32pz3bphrwfvhzdrri"; + libraryHaskellDepends = [ accelerate base primitive vector ]; + testHaskellDepends = [ + accelerate base hedgehog tasty tasty-hedgehog vector + ]; + description = "Convert between Accelerate and vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-kullback-liebler" = callPackage ({ mkDerivation, accelerate, accelerate-llvm-native , accelerate-llvm-ptx, base, composition-prelude, cpphs, criterion @@ -22414,8 +22624,10 @@ self: { }: mkDerivation { pname = "accelerate-kullback-liebler"; - version = "0.1.2.0"; - sha256 = "16psmn0wakrrym8m98ing4nrh8r7qvbn04b28sicl5jdbfhg1fdn"; + version = "0.1.2.1"; + sha256 = "1pvgm5w8m7226wa139h49fd0f5bsrz3a7x30wx3mzjn80acgsm63"; + revision = "1"; + editedCabalFile = "1255a274j1ssiy934kl507giyv6zjmwiipqfj72gjik6ss0ih2vz"; libraryHaskellDepends = [ accelerate base mwc-random-accelerate ]; testHaskellDepends = [ accelerate accelerate-llvm-native accelerate-llvm-ptx base @@ -22434,20 +22646,19 @@ self: { }) {}; "accelerate-llvm" = 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 + ({ mkDerivation, accelerate, base, bytestring, constraints + , containers, data-default-class, deepseq, directory, dlist + , exceptions, filepath, llvm-hs, llvm-hs-pure, mtl, primitive + , template-haskell, unordered-containers, vector }: mkDerivation { pname = "accelerate-llvm"; - version = "1.2.0.1"; - sha256 = "1cv5s7fgkdd3m95vy2rrq2kvzyzxx6vwgsc5nqcmfdp00z8znjhk"; + version = "1.3.0.0"; + sha256 = "1fjjfjav11s6grwl6ihqdrzx738bwki0l25qlp4zzz2hi2440qbp"; libraryHaskellDepends = [ - abstract-deque accelerate base bytestring chaselev-deque containers + accelerate base bytestring constraints containers data-default-class deepseq directory dlist exceptions filepath - llvm-hs llvm-hs-pure mtl mwc-random primitive template-haskell + llvm-hs llvm-hs-pure mtl primitive template-haskell unordered-containers vector ]; description = "Accelerate backend component generating LLVM IR"; @@ -22458,19 +22669,19 @@ self: { "accelerate-llvm-native" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring - , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc - , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, lockfree-queue - , mtl, template-haskell, time, unique, unix, vector + , c2hs, cereal, containers, deepseq, directory, dlist, filepath + , ghc, ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure + , lockfree-queue, mtl, template-haskell, unique, unix, vector }: mkDerivation { pname = "accelerate-llvm-native"; - version = "1.2.0.1"; - sha256 = "0sml5rj3dnxlv14i4xbs1sadnprjga1iws7fl7sxkyjzxqc04vrj"; + version = "1.3.0.0"; + sha256 = "1x4wfbp83ppzknd98k2ad160a8kdqh96qqmyfzdqyvy44iskxcn6"; libraryHaskellDepends = [ - accelerate accelerate-llvm base bytestring Cabal cereal containers - directory dlist filepath ghc ghc-prim hashable libffi llvm-hs - llvm-hs-pure lockfree-queue mtl template-haskell time unique unix - vector + accelerate accelerate-llvm base bytestring cereal containers + deepseq directory dlist filepath ghc ghc-prim hashable libffi + llvm-hs llvm-hs-pure lockfree-queue mtl template-haskell unique + unix vector ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ accelerate base ]; @@ -22483,17 +22694,18 @@ self: { "accelerate-llvm-ptx" = 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 + , ghc-heap, hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty + , process, template-haskell, unordered-containers }: mkDerivation { pname = "accelerate-llvm-ptx"; - version = "1.2.0.1"; - sha256 = "0c9hl19v4si0lnah4l63kqhpxz16zy0wi3cg28gz00mxzgqilivs"; + version = "1.3.0.0"; + sha256 = "0bb7p67dv5csbblnaxbm7hkq8y2qknz0yd1f0rav29igsv3a9rfx"; libraryHaskellDepends = [ 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 + directory dlist file-embed filepath ghc-heap hashable llvm-hs + llvm-hs-pure mtl nvvm pretty process template-haskell + unordered-containers ]; testHaskellDepends = [ accelerate base ]; description = "Accelerate backend for NVIDIA GPUs"; @@ -23913,7 +24125,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_5_3_0" = callPackage + "aeson_1_5_2_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat + , base-compat-batteries, base-orphans, base16-bytestring + , bytestring, containers, deepseq, Diff, directory, dlist, filepath + , generic-deriving, ghc-prim, hashable, hashable-time + , integer-logarithms, primitive, QuickCheck, quickcheck-instances + , scientific, tagged, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-abstraction, these + , time, time-compat, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.5.2.0"; + sha256 = "0awk3dss79mmcxpy147mijnd9icvlnm77bq248ibbbzx9y99hdfd"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries bytestring containers deepseq + dlist ghc-prim hashable primitive scientific tagged + template-haskell text th-abstraction these time time-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers Diff directory dlist filepath + generic-deriving ghc-prim hashable hashable-time integer-logarithms + QuickCheck quickcheck-instances scientific tagged tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + these time time-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "aeson_1_5_4_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring , bytestring, containers, data-fix, deepseq, Diff, directory, dlist @@ -23925,8 +24170,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.5.3.0"; - sha256 = "0slqxmm4rikndzq2rmgydaqgf9qqnni62bgr0zihf25d65mgk3lm"; + version = "1.5.4.0"; + sha256 = "17qgrli6xy3cds5k9ijdsmnl89h48w89mgqqy6kfah1bjlzs3l40"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -24334,8 +24579,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.1.3.0"; - sha256 = "0188g4z204dw8gyza5hn3xljwmvfk9jq1wq4gnh43894nbrcm4ji"; + version = "1.1.4.0"; + sha256 = "1q8wv9xdw8nw504dxplb3ibskfjqbawmv2694sjwg5cvi8d7fvkn"; libraryHaskellDepends = [ aeson base bifunctors deepseq hashable lens servant-docs swagger2 text unordered-containers @@ -24649,6 +24894,8 @@ self: { pname = "aeson-schemas"; version = "1.2.0"; sha256 = "1fc8zzpkq6alkbl0v473h8diin8lqpliq6d3bsrh5bfny8yapvpk"; + revision = "1"; + editedCabalFile = "1kcsnpb4img9a122yz9lf7s0ils7ppbjyknbck2m8ip977kv04dp"; libraryHaskellDepends = [ aeson base bytestring first-class-families megaparsec template-haskell text unordered-containers @@ -24811,8 +25058,8 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.19"; - sha256 = "1v8s1f0zxhvf0r0cr800x363361g7il2wmbah04kr1vl376ydcjy"; + version = "0.19.2.1"; + sha256 = "1hv1h0kckjy98l1vd21z1mr6cyg23xzilzs8ppri8b6k731w1bwx"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable megaparsec mtl scientific text text-builder transformers unordered-containers vector @@ -25794,15 +26041,18 @@ self: { }) {}; "algebra-driven-design" = callPackage - ({ mkDerivation, base, containers, file-embed, JuicyPixels, mtl - , QuickCheck, quickspec + ({ mkDerivation, base, bytestring, containers, dlist, file-embed + , generic-data, hashable, JuicyPixels, monoid-subclasses + , monoidal-containers, mtl, multiset, QuickCheck, quickspec }: mkDerivation { pname = "algebra-driven-design"; - version = "0.1.0.1"; - sha256 = "0jydvrmrz6kvrbk8hv0mb01g67j0bdxi519s7blwf3gfkxfjvyyv"; + version = "0.1.1.1"; + sha256 = "0dp622a70biscjh1r0yyr9mz65g8p2wz60jrzrq8yhs1y4gsigs0"; libraryHaskellDepends = [ - base containers file-embed JuicyPixels mtl QuickCheck quickspec + base bytestring containers dlist file-embed generic-data hashable + JuicyPixels monoid-subclasses monoidal-containers mtl multiset + QuickCheck quickspec ]; description = "Companion library for the book Algebra-Driven Design by Sandy Maguire"; license = stdenv.lib.licenses.bsd3; @@ -26033,6 +26283,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ally-invest" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, bytestring + , http-client, http-client-tls, safe, text, time + }: + mkDerivation { + pname = "ally-invest"; + version = "0.1.0.0"; + sha256 = "0n6vz0xd4y4div0p63mnbpng2dqwrsmrdhs25r10xw2wc2bznl79"; + libraryHaskellDepends = [ + aeson authenticate-oauth base bytestring http-client + http-client-tls safe text time + ]; + testHaskellDepends = [ + aeson authenticate-oauth base bytestring http-client + http-client-tls safe text time + ]; + description = "Ally Invest integration library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "almost-fix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29057,8 +29327,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.4.4.0"; - sha256 = "07zpmq9sx6lmnma4dxxph0jficghrlfbb568frh3d6fbdiqgmfgl"; + version = "0.4.4.1"; + sha256 = "1vs0p7pc6z9mfjd2vns66wnhl8v1n9rbgabyjw0v832m2pwizzmj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29066,7 +29336,7 @@ self: { directory hinotify magic network process text time tls unix utf8-string x509-system ]; - description = "Generic Haskell AMQP tools"; + description = "AMQP toolset for the command line"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -31649,6 +31919,8 @@ self: { pname = "arbtt"; version = "0.10.2"; sha256 = "02izfga7nv2saq4d1xwigq41hhbc02830sjppqsqw6vcb8082vs1"; + revision = "1"; + editedCabalFile = "10b6ax854a4ig33iwcg21vad4gpgibfpb6xqkxd80hvkrj4gqd62"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -31726,10 +31998,8 @@ self: { }: mkDerivation { pname = "archive-libarchive"; - version = "1.0.0.0"; - sha256 = "0pqq76gnk6y71c5wwjhq99y2695v6bfyzjb8gakp6h3jivcpd2gb"; - revision = "1"; - editedCabalFile = "12wq8nisyr2i1861v2377llha63nqpiys9vk6dvg9rfz7f6qqdch"; + version = "1.0.0.1"; + sha256 = "079wm4c9bahvi693g6655ag9rz9l5g7i4b82q7zm0hz383f94zsl"; libraryHaskellDepends = [ base bytestring composition-prelude libarchive ]; @@ -33261,27 +33531,14 @@ self: { ({ mkDerivation, base, pretty-show, text }: mkDerivation { pname = "assert-failure"; - version = "0.1.2.3"; - sha256 = "1cjl9xa8d4rmzafydcnjl7pnv40hl6q663k37kyx22dyg9frgc68"; + version = "0.1.2.5"; + sha256 = "0k8a7g82dsj50djpy2kvhnfljb3y9w9dx9mpymvn6hxd6rir4bpm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base pretty-show text ]; description = "Syntactic sugar improving 'assert' and 'error'"; license = stdenv.lib.licenses.bsd3; }) {}; - "assert-failure_0_1_2_4" = callPackage - ({ mkDerivation, base, pretty-show, text }: - mkDerivation { - pname = "assert-failure"; - version = "0.1.2.4"; - sha256 = "0q4kaaxvz89qrw7j9kgh57nzyn6a8rh2w1hjb1h7ymdnznhr3cj4"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base pretty-show text ]; - description = "Syntactic sugar improving 'assert' and 'error'"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "assertions" = callPackage ({ mkDerivation, ansi-terminal, base, containers, interpolate , process @@ -34188,8 +34445,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.5.0.1"; - sha256 = "09vv8cmag4189sv0nv213vhxp4pak5swk3gi4pnl777lmm0qgxxh"; + version = "3.5.0.2"; + sha256 = "1whx2yyjxc3b4s7nrwrxvyz9bwy7n15gmr9m6lcs3zxr7dvwvlmk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -34758,8 +35015,8 @@ self: { }: mkDerivation { pname = "aur"; - version = "7.0.3"; - sha256 = "0q54p9lb65k8n41gya09k8232y1piyfmks71c2z38kybh783mgg2"; + version = "7.0.4"; + sha256 = "0zq1p255qpi1alnhm7k4aj9w4v8y4ybdywbw5w9jbx47imfqqp9y"; libraryHaskellDepends = [ aeson base bytestring http-client http-types text ]; @@ -34800,44 +35057,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.1.6"; - sha256 = "14qix9zpw6hanj3hrqnwl13fjfjrw0klkm7wm91lh8zpj5amjzcc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson algebraic-graphs aur base bytestring containers filepath - hashable http-client http-types language-bash megaparsec - network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler - stm text time transformers typed-process versions - ]; - executableHaskellDepends = [ - aeson aur base bytestring containers http-client http-client-tls - megaparsec optparse-applicative prettyprinter - prettyprinter-ansi-terminal rio scheduler text transformers - typed-process versions - ]; - testHaskellDepends = [ - base bytestring containers megaparsec rio tasty tasty-hunit text - versions - ]; - description = "A secure package manager for Arch Linux and the AUR"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aura_3_1_7" = callPackage - ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring - , containers, filepath, hashable, http-client, http-client-tls - , http-types, language-bash, megaparsec, network-uri - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers - , typed-process, versions - }: - mkDerivation { - pname = "aura"; - version = "3.1.7"; - sha256 = "0w7m65bh38gdq186b16pcnq7k2nakiy749m7z092cv4k5w72gal5"; + version = "3.1.9"; + sha256 = "1q248qh2wpm0gq07pihw3gshd3ixjdl1l3bf1cpxabn0gjss4hma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34993,8 +35214,8 @@ self: { }: mkDerivation { pname = "autoapply"; - version = "0.4"; - sha256 = "0b7la51399kcj9a4z9j49xd9v2zs172vygs3djz5qid7fsl37pgm"; + version = "0.4.1"; + sha256 = "1jgzfdi5p0pns6w7543yp2ljglnmym9qplyb4vafynzg3bjhzvz0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base logict mtl template-haskell th-desugar transformers @@ -35011,8 +35232,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.18"; - sha256 = "0pzszi5q7h1qxqh2fpds8d43miq0cf4mfzcwggi8409s72pyf9xl"; + version = "1.1.19"; + sha256 = "0hgxfd5pykl6y1v3asnh46abfmi5fsdp0hs1kf6a2acqsnx9vad7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -35416,6 +35637,8 @@ self: { pname = "avro-piper"; version = "1.0.3"; sha256 = "1vi0mgpqpr74ankl8418npklyfxacxg001vppps22p2da97s3pk1"; + revision = "1"; + editedCabalFile = "1405kfnndnh6w4hslahg74rdhk8jmh48j64ps7mval3py8cl5qiv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35911,8 +36134,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "3.0.3"; - sha256 = "0dxzdc4ixl33njind48g014rfk6wxyg0pdcwiarn4vgb30h6h4kq"; + version = "3.0.4"; + sha256 = "1rbgi7f1vymh8q6b074z64jlww5gssbzhpam8k8lcgp0zlvm13n1"; libraryHaskellDepends = [ aeson base bytestring case-insensitive http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -37385,15 +37608,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "base16_0_3_0_0" = callPackage + "base16_0_3_0_1" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , deepseq, primitive, QuickCheck, random-bytestring, tasty , tasty-hunit, tasty-quickcheck, text, text-short }: mkDerivation { pname = "base16"; - version = "0.3.0.0"; - sha256 = "151g3lxma65z0hqi3pqy57bidkhibvdsppkl37p1cldg7whvc708"; + version = "0.3.0.1"; + sha256 = "10id9h9mas4kb4kfiz7hhp2hhwnb9mh92pr327c53jqxi4hazgnd"; + revision = "2"; + editedCabalFile = "1ryc4228j4v9mcfjkgallfmww7g19y4awkqyq4j4734rgvkvgslw"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -37416,12 +37641,36 @@ self: { pname = "base16-bytestring"; version = "0.1.1.7"; sha256 = "1fk9zvkx005sy4adbyil86svnqhgrvmczmf16ajhzj2wkmkqjmjj"; + revision = "3"; + editedCabalFile = "1lrxqhbjsml0q1ahpcx7p0xjy6bj1m6qzjwmv841r5r8jrm2a880"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring ]; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; license = stdenv.lib.licenses.bsd3; }) {}; + "base16-bytestring_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "base16-bytestring"; + version = "1.0.0.0"; + sha256 = "12bnl2fs0h4hcjpr69xqqngjh0117dlvkv56lxski6g6fnbwps2r"; + revision = "1"; + editedCabalFile = "0k47j9csaqizvbk3v7zm05l3z23v359h3w079chzbf44z99hkphc"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "RFC 4648-compliant Base16 encodings for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base16-lens" = callPackage ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest , doctest, lens, text @@ -37485,6 +37734,8 @@ self: { pname = "base32"; version = "0.2.0.0"; sha256 = "0xvilxcdcvz07f3qpad35whjd35c9ykicip2cdsd54ysxg71mwzm"; + revision = "1"; + editedCabalFile = "0vsc0fq4rihhx4hicfgy1xpfm1bbq4rnwgfs9qzgmwhslffqy2x5"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -37654,6 +37905,8 @@ self: { pname = "base64"; version = "0.4.2.2"; sha256 = "05ins0i1561d4gfz6h7fxx8pj8i1qkskz8dgh8pfxa1llzmr856i"; + revision = "1"; + editedCabalFile = "1rlvmg18f2d2rdyzvvzk0is4073j5arx9qirgvshjx67kic2lzqm"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -37747,8 +38000,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "6"; - editedCabalFile = "05z53pc1gi62lzl262mc1qx12qqrds6ab6rflwpfcxbp0a67c825"; + revision = "7"; + editedCabalFile = "1vry5qh9w1adwyfrlx8x2772knwmdvxgq2nfzng7vybll2cqph4c"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -38861,8 +39114,8 @@ self: { pname = "bench"; version = "1.0.12"; sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6"; - revision = "1"; - editedCabalFile = "0sk6vkjwk7g1diwah67ifj7s69qvwi52ngaijkfx5prn0vz24ldn"; + revision = "2"; + editedCabalFile = "055482m81h7pijiszdkk2k65p208i3c3pxs955pv6h0gwrialcsh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40205,8 +40458,8 @@ self: { ({ mkDerivation, base, binaryen }: mkDerivation { pname = "binaryen"; - version = "0.0.2.0"; - sha256 = "111laqm68cs5ck4nc1cj8hy5anw6gkxv5yc1jrw87gn3i3va5046"; + version = "0.0.3.0"; + sha256 = "08pdk57q4n49l3wyd9zbda4w5ci65ifq4yxscq61kkdqz8i4ggjs"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ binaryen ]; description = "Haskell bindings to binaryen"; @@ -40871,8 +41124,8 @@ self: { ({ mkDerivation, base, bindings-DSL, portaudio, vector }: mkDerivation { pname = "bindings-portaudio"; - version = "0.2.1"; - sha256 = "1i2r01jhf8k7820zzwqbss0z3kxd15pvdz7ss8s9gczv88nwxvxk"; + version = "0.3"; + sha256 = "0s8qmkx7psg6b5dbjdb90lz91rkbhfagss1c6idlhqvjjnipps90"; libraryHaskellDepends = [ base bindings-DSL vector ]; libraryPkgconfigDepends = [ portaudio ]; description = "Low-level bindings to portaudio library"; @@ -41744,6 +41997,30 @@ self: { broken = true; }) {}; + "bitcoin-compact-filters" = callPackage + ({ mkDerivation, aeson, base, bitstream, bytestring, cereal + , haskoin-core, memory, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "bitcoin-compact-filters"; + version = "0.1.0.0"; + sha256 = "0ikirjf0n0np0l6mjfyfxvp367imbmb3g092m4mq457ja8yp7r8m"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bitstream bytestring cereal haskoin-core memory text + transformers + ]; + testHaskellDepends = [ + aeson base bytestring cereal haskoin-core tasty tasty-hunit + tasty-quickcheck text + ]; + description = "BIP 158 compact block filters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bitcoin-hash" = callPackage ({ mkDerivation, base, bytestring, cryptonite, memory, tasty , tasty-hunit, time @@ -42220,8 +42497,8 @@ self: { }: mkDerivation { pname = "bitstream"; - version = "0.3.0.0"; - sha256 = "12cyvrd7za5zh1idi5q4w0qbv0l4kjlsjascz6z4w2877zji7bvh"; + version = "0.3.0.1"; + sha256 = "0hkgjmhw7gc6m3yyva097q0z7f1wixlmm1ja0gpg9qkgzx6piyf0"; libraryHaskellDepends = [ base base-unicode-symbols bytestring vector ]; @@ -43955,8 +44232,8 @@ self: { }: mkDerivation { pname = "boolector"; - version = "0.0.0.11"; - sha256 = "1mj6pjh4vg7dziil68p8k60sn6s721jxdgpsq9kk1h05v67lh5fz"; + version = "0.0.0.13"; + sha256 = "0by1pw9i0f9kb81pd3ivi0rz9yxxzvmlg338p45wqf1k583c6jrg"; libraryHaskellDepends = [ base containers directory mtl temporary time ]; @@ -46050,8 +46327,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "1.1.0.2"; - sha256 = "1k625j5syyiq66i88zy6q0mvwkjl5jsj79sxdmd1rbam3m39whx1"; + version = "1.2.0.0"; + sha256 = "1nrb08czlnfcgb7v59vzkffik2w5yp833la4mq6sp6sgnm0ylgya"; libraryHaskellDepends = [ base bytestring containers parsec template-haskell text transformers @@ -46307,8 +46584,8 @@ self: { }: mkDerivation { pname = "bv-sized"; - version = "1.0.1"; - sha256 = "12l69p95z1ihwbfhlm0wyr1bdhs52ng4fvdsqxhgn0bpx9skzw73"; + version = "1.0.2"; + sha256 = "0lx7cm7404r71ciksv8g58797k6x02zh337ra88syhj7nzlnij5w"; libraryHaskellDepends = [ base bitwise bytestring panic parameterized-utils th-lift ]; @@ -46363,8 +46640,8 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.0.1"; - sha256 = "0ibckpy0wz2f8590z92lvkmwcf29lv6sby1y3cz3cihxvp3bw3il"; + version = "0.10.1.1"; + sha256 = "0amzhcy60rmiyfp7cgdg7g1xcf7z5zz43kg18i1bwwj565ipb6p8"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -46596,6 +46873,8 @@ self: { pname = "bytestring"; version = "0.10.12.0"; sha256 = "1s1kgnqb8ybz223sf2838mmxnlhwsd3lnakng6ap38m058bzzj7d"; + revision = "1"; + editedCabalFile = "10d0n2k8zhlw0bbrm2na9zchlggm8ix2wi2lav6vkbd98sg96mip"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; @@ -47505,6 +47784,17 @@ self: { broken = true; }) {}; + "cabal-auto-expose" = callPackage + ({ mkDerivation, base, Cabal, directory, extra, filepath }: + mkDerivation { + pname = "cabal-auto-expose"; + version = "0.1.0.0"; + sha256 = "1dynrsp1j2y1ylmqc3fkz5nfa5slljxgg0x322j64rljgjqglfy2"; + libraryHaskellDepends = [ base Cabal directory extra filepath ]; + description = "Build time library that autodetects exposed modules"; + license = stdenv.lib.licenses.mit; + }) {}; + "cabal-bounds" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-lenses , cmdargs, directory, filepath, Glob, lens, lens-aeson, process @@ -47572,8 +47862,8 @@ self: { pname = "cabal-cache"; version = "1.0.1.8"; sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw"; - revision = "1"; - editedCabalFile = "1rikn1g6v8yga0cs031ckxywfcf9g21ww9s5rkjf6lr4xvfqps2s"; + revision = "2"; + editedCabalFile = "1y4zfnr2a5w8kvwvk1dbzv0ik5b2wdlx8z2p6n9k5mzax952s689"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47844,8 +48134,8 @@ self: { pname = "cabal-flatpak"; version = "0.1.0.2"; sha256 = "1h7yklhqrsgxk841fryxz0sk03zb02p34g1nvwdz6c6mfpwc8y54"; - revision = "1"; - editedCabalFile = "0ba63swfx2xd6aw2iq1nkrl9932hvkn3lf7x74wqimcykm4vbws7"; + revision = "2"; + editedCabalFile = "0mf387hkxshcbss739c66j0hc1143r9lns3p3aw1l76as9lbdlwj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47865,8 +48155,8 @@ self: { }: mkDerivation { pname = "cabal-fmt"; - version = "0.1.3"; - sha256 = "1d91kmx2q6ygx2avwgi9ihkdazngjf7i3ajyp3cmry5ahvv62x7z"; + version = "0.1.4"; + sha256 = "0akc63g7h21nyyr9m0dwjlnxqw8k26zx5s2mzn8zak2q9i88ds1b"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -47877,7 +48167,8 @@ self: { base bytestring directory filepath optparse-applicative ]; testHaskellDepends = [ - base bytestring Cabal filepath process tasty tasty-golden + base bytestring Cabal containers filepath process tasty + tasty-golden ]; doHaddock = false; description = "Format .cabal files"; @@ -48223,10 +48514,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.7.0.0"; - sha256 = "1wv375dq50fibzg6xa9vrr8q4lhaqcl254b9a2vc42rrjvhxxmzc"; - revision = "1"; - editedCabalFile = "0gc64mgk11nszilkbid351zxh5cpy85kqcc3mrkrw2fsbcga08as"; + version = "0.7.1.0"; + sha256 = "01hd6wl80j6njlg3h4rxsf5izyx49bs6v1j5756g2pyxc9h4hrs4"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -48604,8 +48893,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.6.1"; - sha256 = "19azvrg20rsk95nfvwlamlz007ihpkra1wgvqpjkdimwr5q7837h"; + version = "2.6.2"; + sha256 = "0x1r01fk5mch76zindalvmlkfaca4y1x89zw2dm0d46fncsfgdrv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -48857,6 +49146,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "caching" = callPackage + ({ mkDerivation, base, dlist, hashable, mtl, psqueues, ref-tf + , transformers + }: + mkDerivation { + pname = "caching"; + version = "0"; + sha256 = "0rd8ipnycf1vcxxic99d2swcpcdhaljwvbbr4vlagchl3vifxr56"; + libraryHaskellDepends = [ + base dlist hashable mtl psqueues ref-tf transformers + ]; + testHaskellDepends = [ + base dlist hashable mtl psqueues ref-tf transformers + ]; + description = "Cache combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cachix" = callPackage ({ mkDerivation, async, base, base64-bytestring, boost, bytestring , cachix-api, conduit, conduit-extra, containers, cookie @@ -49223,7 +49530,7 @@ self: { "calamity" = callPackage ({ mkDerivation, aeson, async, base, bytestring, colour , concurrent-extra, containers, data-default-class, data-flags - , deepseq, deque, df1, di-polysemy, exceptions, fmt, focus + , deepseq, deque, df1, di-core, di-polysemy, exceptions, fmt, focus , generic-lens, generic-override, generic-override-aeson, hashable , http-date, http-types, lens, lens-aeson, megaparsec, mime-types , mtl, polysemy, polysemy-plugin, reflection, safe-exceptions @@ -49233,11 +49540,11 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.19.2"; - sha256 = "14vw42zsyzcdi5nmgfl2mi4zxqbkvmd525ybsx324qj3cp3k8mn6"; + version = "0.1.20.1"; + sha256 = "0nh9x2w8xrmbrkadawq0ab6pvp4v14pr49x18sq9qhi0m922b0p0"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers - data-default-class data-flags deepseq deque df1 di-polysemy + data-default-class data-flags deepseq deque df1 di-core di-polysemy exceptions fmt focus generic-lens generic-override generic-override-aeson hashable http-date http-types lens lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin @@ -49799,6 +50106,8 @@ self: { ]; description = "OTP-like supervision trees in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capnp" = callPackage @@ -49815,6 +50124,8 @@ self: { pname = "capnp"; version = "0.6.0.0"; sha256 = "1w5cp3jp0dm8vf3zmkfpvpz7jl3pamlnxsl75ds3f4xxyx907qcg"; + revision = "1"; + editedCabalFile = "158y76rna3z40fwi661fyvmxyfdgs34zi3bxfqc79nc01l7ri8iw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50798,8 +51109,8 @@ self: { }: mkDerivation { pname = "cassava-megaparsec"; - version = "2.0.1"; - sha256 = "0q4skw98nzy6icmgpwqvgw0c5pqcgi25rf7nmwh2pksvv94pi3p3"; + version = "2.0.2"; + sha256 = "03x1462agrfdagklp8c89b8p4z2hd8nbf6d3895sz770zjkawda7"; libraryHaskellDepends = [ base bytestring cassava megaparsec unordered-containers vector ]; @@ -52026,6 +52337,34 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "chainweb-mining-client" = callPackage + ({ mkDerivation, aeson, async, base, bytes, bytestring, Cabal + , configuration-tools, connection, containers, cryptonite + , exceptions, hashable, hostaddress, http-client, http-client-tls + , http-types, lens, loglevel, memory, mwc-random, process, retry + , stm, streaming, streaming-events, text, time + , unordered-containers, wai-extra + }: + mkDerivation { + pname = "chainweb-mining-client"; + version = "0.2"; + sha256 = "1zbqbc3icgz1fb0fgpfi1cf1i7pz2lf3wd82671ks1yixf893ypm"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal configuration-tools ]; + executableHaskellDepends = [ + aeson async base bytes bytestring configuration-tools connection + containers cryptonite exceptions hashable hostaddress http-client + http-client-tls http-types lens loglevel memory mwc-random process + retry stm streaming streaming-events text time unordered-containers + wai-extra + ]; + description = "Mining Client for Kadena Chainweb"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "chalk" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -54577,8 +54916,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.26.0"; - sha256 = "0yjw0kk241qbh2z6248savy3a99asd3smva1qbplga31232a8025"; + version = "0.26.1"; + sha256 = "1n37gllcgq05wgvq4f10vwz7lll6q8an1gak69m50n6fwx8zpb5i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring @@ -55750,8 +56089,8 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.2.1"; - sha256 = "1qbhcirg7a0r68l3ifq8q9clnkai5hyhk62jb232bjplrl6y4c23"; + version = "0.2.2"; + sha256 = "1skzdg1icmhn0zrkhbnba4200ymah8sd5msk4qfgawrk77zilw7f"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -56553,6 +56892,8 @@ self: { ]; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codo-notation" = callPackage @@ -57217,10 +57558,8 @@ self: { ({ mkDerivation, accelerate, base }: mkDerivation { pname = "colour-accelerate"; - version = "0.3.0.0"; - sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz"; - revision = "1"; - editedCabalFile = "1mbz9wdx396q8gdy6yqsc5vsxrkky9zkxczjblvc9zy542v252cn"; + version = "0.4.0.0"; + sha256 = "1j7ff2wb58yf346z2abr1v1yq498fxm498rdf1g62ppf6vkdplw8"; libraryHaskellDepends = [ accelerate base ]; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -58003,14 +58342,16 @@ self: { }) {}; "compact-sequences" = callPackage - ({ mkDerivation, base, containers, primitive, transformers }: + ({ mkDerivation, base, mtl, primitive, QuickCheck, tasty + , tasty-quickcheck, transformers + }: mkDerivation { pname = "compact-sequences"; - version = "0.1.0.0"; - sha256 = "148zjnnnn82vgn4ybs5z6nx9xv2wd73q2cavaa2nyjn1kcqqw7a8"; - libraryHaskellDepends = [ base containers primitive transformers ]; - testHaskellDepends = [ base ]; - description = "Stacks and queues with compact representations"; + version = "0.2.0.0"; + sha256 = "0v7s99d7syspgc8z8mhdykyrsjyx0r0vjyf64plidndld2zg0swn"; + libraryHaskellDepends = [ base mtl primitive transformers ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + description = "Stacks, queues, and deques with compact representations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -58220,6 +58561,25 @@ self: { broken = true; }) {}; + "compdoc" = callPackage + ({ mkDerivation, aeson, base, composite-aeson + , composite-aeson-throw, composite-base, pandoc, pandoc-throw, path + , rio, vinyl + }: + mkDerivation { + pname = "compdoc"; + version = "0.1.0.0"; + sha256 = "0m7xrl1ki3agp69yczgy396xlb84kggslmqnjglziyg6sziv58ak"; + libraryHaskellDepends = [ + aeson base composite-aeson composite-aeson-throw composite-base + pandoc pandoc-throw path rio vinyl + ]; + description = "Parse a Pandoc to a composite value"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "compendium-client" = callPackage ({ mkDerivation, aeson, base, http-client, language-protobuf , megaparsec, servant, servant-client, text @@ -58441,8 +58801,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.7.3.0"; - sha256 = "0wb15vq95kf6jigfy0n3jampnx8xmkxmh2lnxgfsc8zac9hwls55"; + version = "0.7.4.0"; + sha256 = "1k8m89cff8b3yc1af0l9vd13pav2hjy51gcadahn07zpwv1bszfj"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -58461,14 +58821,27 @@ self: { broken = true; }) {}; + "composite-aeson-path" = callPackage + ({ mkDerivation, base, composite-aeson, path }: + mkDerivation { + pname = "composite-aeson-path"; + version = "0.7.4.0"; + sha256 = "08p988iq7y76px61dlj5jq35drmnrf4khi27wpqgh3pg9d96yihx"; + libraryHaskellDepends = [ base composite-aeson path ]; + description = "Formatting data for the path library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "composite-aeson-refined" = callPackage ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl , refined }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.7.3.0"; - sha256 = "0g0i8zwky1ygniyxpvgl1r78b4qak1mx1wpy2pj815zrd43x1y60"; + version = "0.7.4.0"; + sha256 = "049lrm5iip5y3c9m9x4sjangaigdprj1553sw2vrcvnvn8xfq57s"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -58478,26 +58851,55 @@ self: { broken = true; }) {}; + "composite-aeson-throw" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, base, composite-aeson + , exceptions + }: + mkDerivation { + pname = "composite-aeson-throw"; + version = "0.1.0.0"; + sha256 = "0724mf1visv7ay306qngsz41blb28ykw074r6wfki17mfss1kh8y"; + libraryHaskellDepends = [ + aeson aeson-better-errors base composite-aeson exceptions + ]; + description = "MonadThrow behaviour for composite-aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "composite-base" = callPackage - ({ mkDerivation, base, exceptions, hspec, lens, monad-control, mtl - , profunctors, QuickCheck, template-haskell, text, transformers - , transformers-base, unliftio-core, vinyl + ({ mkDerivation, base, deepseq, exceptions, hspec, lens + , monad-control, mtl, profunctors, QuickCheck, template-haskell + , text, transformers, transformers-base, unliftio-core, vinyl }: mkDerivation { pname = "composite-base"; - version = "0.7.3.0"; - sha256 = "07zbs89cqm7b78jfh2lwma3spsklc6wq0f58g14p27wgm253xkwp"; + version = "0.7.4.0"; + sha256 = "1ml1y1zh8znvaqydwcnv8n69rzmx7zy2bpzr65gy79xbczz3dxwz"; libraryHaskellDepends = [ - base exceptions lens monad-control mtl profunctors template-haskell - text transformers transformers-base unliftio-core vinyl - ]; - testHaskellDepends = [ - base exceptions hspec lens monad-control mtl profunctors QuickCheck + base deepseq exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core vinyl ]; + testHaskellDepends = [ + base deepseq exceptions hspec lens monad-control mtl profunctors + QuickCheck template-haskell text transformers transformers-base + unliftio-core vinyl + ]; description = "Shared utilities for composite-* packages"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "composite-binary" = callPackage + ({ mkDerivation, base, binary, composite-base }: + mkDerivation { + pname = "composite-binary"; + version = "0.7.4.0"; + sha256 = "07d88krkpplprnw57j4bqi71p8bmj0wz28yw41wgl2p5g2h7zccp"; + libraryHaskellDepends = [ base binary composite-base ]; + description = "Orphan binary instances"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -58507,8 +58909,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.7.3.0"; - sha256 = "1402ay8gxqp1fh2ija9ry5g366p5vx64ikmfal9hr2c42c2kmcf9"; + version = "0.7.4.0"; + sha256 = "0y8wnp6n1fvqfrkm1lqv8pdfq7a4k7gaxl3i9dh6xfzyamlghg82"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; @@ -58518,6 +58920,17 @@ self: { broken = true; }) {}; + "composite-hashable" = callPackage + ({ mkDerivation, base, composite-base, hashable }: + mkDerivation { + pname = "composite-hashable"; + version = "0.7.4.0"; + sha256 = "0zwv6m9nzz0g3ngmfznxh6wmprhcgdbfxrsgylnr6990ppk0bmg1"; + libraryHaskellDepends = [ base composite-base hashable ]; + description = "Orphan hashable instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composite-opaleye" = callPackage ({ mkDerivation, base, bytestring, composite-base, hspec, lens , opaleye, postgresql-simple, product-profunctors, profunctors @@ -58525,8 +58938,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.7.3.0"; - sha256 = "0b9h0z4v0268qgcwq53p59nkwbbg77dqm9snr4zif71xhmlfscpx"; + version = "0.7.4.0"; + sha256 = "0nzyslqgh7m9ryqw4rajq2m4kfknqzdq0aqnygyz0sblmgixn4hm"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -58549,8 +58962,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.7.3.0"; - sha256 = "1gzmksq2dfywird7gyjc95v3spgxsab3jbakg5il2fmkx35cc1za"; + version = "0.7.4.0"; + sha256 = "0a7pcs06m0w0mq60y3hhgn4a36gx5daypc1nh1ndsm6x3q3d99q8"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -58565,6 +58978,28 @@ self: { broken = true; }) {}; + "composite-tuple" = callPackage + ({ mkDerivation, base, composite-base }: + mkDerivation { + pname = "composite-tuple"; + version = "0.1.1.0"; + sha256 = "0ykxf17zlyjrs8nhj02r0k3l20x7ih1k1z5byxdvw7gxjwsqwq2d"; + libraryHaskellDepends = [ base composite-base ]; + description = "Tuple functions for composite records"; + license = stdenv.lib.licenses.mit; + }) {}; + + "composite-xstep" = callPackage + ({ mkDerivation, base, composite-base, vinyl }: + mkDerivation { + pname = "composite-xstep"; + version = "0.1.0.0"; + sha256 = "18q75ynlywr6yap6nn11x5kzxncn0b6ghmvbg642617pznznpfm9"; + libraryHaskellDepends = [ base composite-base vinyl ]; + description = "ReaderT transformer pattern for higher kinded composite data"; + license = stdenv.lib.licenses.mit; + }) {}; + "composition" = callPackage ({ mkDerivation }: mkDerivation { @@ -59519,8 +59954,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.2"; - sha256 = "0vmcyi3f280b6ll6pcyma4aqrl6m69n6y6x7wplxgsmxz5q7kng3"; + version = "1.3.2.1"; + sha256 = "0kyl1zspkp14vrgxgc2zpy9rd9h6aa7m9f385sgshysnhbc7hbg5"; libraryHaskellDepends = [ base bytestring directory exceptions filepath mono-traversable mtl primitive resourcet text transformers unix unliftio-core vector @@ -60497,6 +60932,8 @@ self: { pname = "configuration-tools"; version = "0.5.0"; sha256 = "0pgx2wzzqxgafgf3qjys05hp89lz4fwczsx0i581n8ngs3p4i0wh"; + revision = "1"; + editedCabalFile = "0srscnmj5dhaq0djx0lhcggl53ipn6pw8vgsvgzhhjrbmnn2zb2p"; setupHaskellDepends = [ base bytestring Cabal directory filepath process ]; @@ -60588,8 +61025,8 @@ self: { }: mkDerivation { pname = "configurator-pg"; - version = "0.2.3"; - sha256 = "0vbs52za4smxy8nag08ag2c9mjbpiw1a7ai5vd8is7db9732skfa"; + version = "0.2.4"; + sha256 = "07zhvfky3p4wv6hc48hclmgkz465wpbqwx4yfljby82hgnrkdarh"; libraryHaskellDepends = [ base containers megaparsec protolude scientific text ]; @@ -61072,8 +61509,10 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.1.1.0"; - sha256 = "1phgcib4bxbci2n4kh3r1iyp31bbzs6qpnvmxf373hglwyvj9pjy"; + version = "1.1.1.1"; + sha256 = "06crlqgr5dswjpb9k0d5wizfl8anyrnapqfvp10amq3lgfg3sriz"; + revision = "1"; + editedCabalFile = "1fqk2bd5n52yvqx54ck2ypq9a79m8ihp7057j22rglg3b363k8j0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -61224,8 +61663,8 @@ self: { pname = "consumers"; version = "2.2.0.2"; sha256 = "0nml5hn6n95ngy1qvj6w4rkwa8r6qax0nc2vgimk68bawv4z97qd"; - revision = "1"; - editedCabalFile = "150f62zfb5kpa8iwp08fq9gdmv142swfldkjrrjyx0jpvf6qcjxc"; + revision = "2"; + editedCabalFile = "0fa67waf0af62kpljdksm00lvh29vm1rddfpjvy5c7lcy2a9ll97"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -61305,6 +61744,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "containers-accelerate" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm-native, base + , containers, half, hashable-accelerate, hedgehog, tasty + , tasty-hedgehog + }: + mkDerivation { + pname = "containers-accelerate"; + version = "0.1.0.0"; + sha256 = "1bfw5k6nq15szgwjkzd17inmlk0ii0pd6a4lrixi8gyjf6ksm6n1"; + libraryHaskellDepends = [ accelerate base hashable-accelerate ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native base containers half + hashable-accelerate hedgehog tasty tasty-hedgehog + ]; + description = "Hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "containers-benchmark" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , ghc-prim, random @@ -61671,8 +62129,8 @@ self: { }: mkDerivation { pname = "contravariant-extras"; - version = "0.3.5.1"; - sha256 = "0r9bg6mrm5whv7inpp9m2agwbnk70vg0v7nrflpxkif81scpq0z9"; + version = "0.3.5.2"; + sha256 = "0ikwzg0992j870yp0x2ssf4mv2hw2nml979apg493m72xnvr1jz9"; libraryHaskellDepends = [ base contravariant template-haskell template-haskell-compat-v0208 ]; @@ -62037,6 +62495,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conversions" = callPackage + ({ mkDerivation, base, bytestring, control-bool, devtools + , exceptions, mtl, source-constraints, template-haskell, text + , unliftio-core + }: + mkDerivation { + pname = "conversions"; + version = "0.0.3"; + sha256 = "1fn7ras17maswl7fw5hdbw02b8wjlzs2gcfwdxrw9xipjbw81hir"; + libraryHaskellDepends = [ + base bytestring control-bool devtools exceptions mtl + source-constraints template-haskell text unliftio-core + ]; + testHaskellDepends = [ + base bytestring control-bool devtools exceptions mtl + source-constraints template-haskell text unliftio-core + ]; + description = "Injective explicit total and partial conversions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "convert" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , data-default, impossible, lens, template-haskell, text @@ -63405,6 +63886,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crackNum_2_4" = callPackage + ({ mkDerivation, array, base, FloatingHex }: + mkDerivation { + pname = "crackNum"; + version = "2.4"; + sha256 = "1fa9rlknmilc8rnm7yvmjrbc9jydpvk30gj7lq79nqbifig6229a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base FloatingHex ]; + executableHaskellDepends = [ array base FloatingHex ]; + description = "Crack various integer, floating-point data formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "craft" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-combinators, conduit-extra @@ -64282,8 +64778,8 @@ self: { pname = "crypto-enigma"; version = "0.1.1.6"; sha256 = "07qxrpwg9r2w2l0d2nrvn703vzsfhchznly93bnr2pfpbwj4iv2z"; - revision = "3"; - editedCabalFile = "0djn9pyvhlk964mzqdw0fpczwsvzadcp6jkkryhi8vbvkb88i9rn"; + revision = "4"; + editedCabalFile = "0436kl0gsy0hj7dfrqmwz95q3k31af731q484yx2gj9zcma1h1vp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers split text ]; @@ -64757,6 +65253,8 @@ self: { ]; description = "Reversable and secure encoding of object ids as a bytestring"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cryptoids-class" = callPackage @@ -64800,8 +65298,8 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "2.9.0"; - sha256 = "0bxx4pslmyjaqhskbi95a67fmpjhnbmgcys68xzs2y8ndjnz9jrb"; + version = "2.9.1"; + sha256 = "0c484pla89igj77x5n2n50a1la8j4jaqpc0pc58c1pcijffxac5l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -65520,8 +66018,8 @@ self: { }: mkDerivation { pname = "cublas"; - version = "0.5.0.0"; - sha256 = "0s47wrmlb35dpym4dz3688qx8m166i2a9d8pqnfdzxy67zv98g1f"; + version = "0.6.0.0"; + sha256 = "0yxyynvf9zlkc8yhra5j1sk1d8hbiqvzbsh02mc1y8hcf8nzyp61"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cuda half storable-complex template-haskell @@ -65603,10 +66101,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.10.1.0"; - sha256 = "10lyyc652ic3m4r5agszpv2r99y9fnsdwahb5pd4qiga770v45vp"; - revision = "2"; - editedCabalFile = "1nw135pd2ab3mmyq3xmkxynzfb54qr7a8xssq5ivrk83yzvs87im"; + version = "0.10.2.0"; + sha256 = "0fkjibnnxradhsbasx1mw0c088cfwypnk6a5002rxpzxid5qrp9l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -65617,6 +66113,7 @@ self: { executableHaskellDepends = [ base pretty ]; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cudd" = callPackage @@ -65643,8 +66140,8 @@ self: { pname = "cue-sheet"; version = "2.0.1"; sha256 = "0papll3xcq2ipmya61jr71gf3zx2swmys829x5sbz7lv6abj9r3i"; - revision = "1"; - editedCabalFile = "0md9051a0jp4vkss15dyyf1w7ylpqmvzfdj9xb1rgj95s1x7cx2g"; + revision = "2"; + editedCabalFile = "0kblqr8mjmps56a7pbjwnby5ik8grmj15l1qir7q9kbn44x4s8l3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -65665,8 +66162,8 @@ self: { }: mkDerivation { pname = "cufft"; - version = "0.9.0.1"; - sha256 = "1cf11ia4i19bpbs0wzkz2hqzc22hh2dvbn8m5frnwild83zal4n3"; + version = "0.10.0.0"; + sha256 = "1prma5srgfnhjvf1rvxd1kznv42k4svhk05j93mx1pcx7jd1cmvz"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; @@ -66084,8 +66581,8 @@ self: { }: mkDerivation { pname = "cusolver"; - version = "0.2.0.0"; - sha256 = "0v30wm32jcz7jy940y26zcqvjy1058bqf0v44xf73v53dlwkd07a"; + version = "0.3.0.0"; + sha256 = "0xskvpjqlckpfrfvnb2afj29p2gnzafq2v98pbvwsprmn60np9mq"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cublas cuda cusparse half storable-complex template-haskell @@ -66102,8 +66599,8 @@ self: { }: mkDerivation { pname = "cusparse"; - version = "0.2.0.0"; - sha256 = "1y6qnxfdcw3ik3mjp4410846pq1l628d02bdasll1xd4r4r87vh6"; + version = "0.3.0.0"; + sha256 = "0x2ab7sd7j1mmjns8332mm2nzikprq3w6fbrnbcfk5lz2x0bgir2"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cuda half storable-complex ]; libraryToolDepends = [ c2hs ]; @@ -66126,15 +66623,15 @@ self: { }) {}; "cut-the-crap" = callPackage - ({ mkDerivation, base, exceptions, generic-lens, hspec, hspec-core - , lens, optparse-applicative, pocketsphinx, QuickCheck + ({ mkDerivation, base, c2hs, exceptions, generic-lens, hspec + , hspec-core, lens, optparse-applicative, pocketsphinx, QuickCheck , quickcheck-classes, regex-tdfa, shelly, sphinxbase , system-filepath, temporary, text, time, unliftio-core }: mkDerivation { pname = "cut-the-crap"; - version = "1.4.0"; - sha256 = "03xip8a9inqir8zm244ffv92ag5r7z8hlh0qz7z4vfdmg54mhhnq"; + version = "1.4.2"; + sha256 = "16l8ar38nl2sgsbwjslhxd8z2wyjmdgmi51sic3vvyv7n6b9mr51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66142,17 +66639,20 @@ self: { shelly system-filepath temporary text time unliftio-core ]; libraryPkgconfigDepends = [ pocketsphinx sphinxbase ]; + libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base exceptions generic-lens lens optparse-applicative regex-tdfa shelly system-filepath temporary text time unliftio-core ]; executablePkgconfigDepends = [ pocketsphinx sphinxbase ]; + executableToolDepends = [ c2hs ]; testHaskellDepends = [ base exceptions generic-lens hspec hspec-core lens optparse-applicative QuickCheck quickcheck-classes regex-tdfa shelly system-filepath temporary text time unliftio-core ]; testPkgconfigDepends = [ pocketsphinx sphinxbase ]; + testToolDepends = [ c2hs ]; description = "Cuts out uninteresting parts of videos by detecting silences"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -66496,20 +66996,21 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, Cabal, cmdargs, conduit, constraints - , containers, cryptonite, data-ordlist, directory, fgl, filepath - , FindBin, hashable, haskeline, html, http-conduit, http-types - , HUnit, leancheck, memory, mmap, mtl, network, network-uri - , old-time, parsec, process, QuickCheck, regex-applicative - , regex-compat-tdfa, sandi, shelly, split, stm, tar, temporary - , terminfo, test-framework, test-framework-hunit - , test-framework-leancheck, test-framework-quickcheck2, text, time - , transformers, unix, unix-compat, utf8-string, vector, zip-archive - , zlib + , containers, cryptonite, data-ordlist, directory, exceptions, fgl + , filepath, FindBin, hashable, haskeline, html, http-conduit + , http-types, HUnit, leancheck, memory, mmap, monad-control, mtl + , network, network-uri, old-time, parsec, process, QuickCheck + , regex-applicative, regex-compat-tdfa, sandi, split, stm + , system-fileio, system-filepath, tar, temporary, terminfo + , test-framework, test-framework-hunit, test-framework-leancheck + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unix, unix-compat, utf8-string, vector + , zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.16.1"; - sha256 = "1q837ibf97f3fm6gcr5l6cc4kb554gm1fhzc2a22fkkj15axivq0"; + version = "2.16.2"; + sha256 = "1nsmaai4l5zas4v1vk92nvh721dykcxrpd4c2v9bh3wi3n2m45qn"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -66525,10 +67026,12 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - array base bytestring cmdargs constraints containers directory - filepath FindBin HUnit leancheck mtl QuickCheck shelly split + array async base bytestring cmdargs constraints containers + directory exceptions filepath FindBin HUnit leancheck monad-control + mtl process QuickCheck split system-fileio system-filepath test-framework test-framework-hunit test-framework-leancheck - test-framework-quickcheck2 text transformers vector zip-archive + test-framework-quickcheck2 text time transformers transformers-base + unix-compat vector zip-archive ]; doCheck = false; postInstall = '' @@ -68660,6 +69163,20 @@ self: { broken = true; }) {}; + "data-validation" = callPackage + ({ mkDerivation, base, containers, hspec, template-haskell }: + mkDerivation { + pname = "data-validation"; + version = "0.1.0.2"; + sha256 = "15mc3m48jnn5fjr3bm02j9raxclqwd8qnb0bx0w2jz5y3asnfx5f"; + libraryHaskellDepends = [ base containers template-haskell ]; + testHaskellDepends = [ base containers hspec template-haskell ]; + description = "A library for creating type safe validations"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "data-variant" = callPackage ({ mkDerivation, base, safe }: mkDerivation { @@ -68875,8 +69392,8 @@ self: { }: mkDerivation { pname = "dataflower"; - version = "0.2.2.0"; - sha256 = "169m0yngaslc2pysdpf65pmf9zr037ij7y95rqi6bp3dxcxfcwlg"; + version = "0.3.0.0"; + sha256 = "0nxir4syhbw5spqks3pxj71w781vn8mqxdiig9dqnrv5ks02bqp6"; libraryHaskellDepends = [ base hashable mtl pretty-show stm time transformers vector ]; @@ -70033,8 +70550,8 @@ self: { }: mkDerivation { pname = "debug-me"; - version = "1.20190926"; - sha256 = "0qy2ianwal4v4s0m13yjszk032dp3y6k4p61whwmlp49xmqvwjyb"; + version = "1.20200820"; + sha256 = "1pxcycgdd0gmiqabpbjkish31yb2n7bqgwd1fm1na6w6xmjlh58a"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -70954,6 +71471,20 @@ self: { broken = true; }) {}; + "dependent-map_0_2_4_0" = callPackage + ({ mkDerivation, base, containers, dependent-sum }: + mkDerivation { + pname = "dependent-map"; + version = "0.2.4.0"; + sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx"; + revision = "1"; + editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1"; + libraryHaskellDepends = [ base containers dependent-sum ]; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dependent-map" = callPackage ({ mkDerivation, base, constraints-extras, containers , dependent-sum @@ -71001,6 +71532,18 @@ self: { broken = true; }) {}; + "dependent-sum_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dependent-sum"; + version = "0.4"; + sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8"; + libraryHaskellDepends = [ base ]; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dependent-sum" = callPackage ({ mkDerivation, base, constraints-extras, some }: mkDerivation { @@ -71332,6 +71875,8 @@ self: { pname = "derive-storable-plugin"; version = "0.2.3.0"; sha256 = "0yr9s33drw5l4ckqipqpmgrsrnm18yr4742mmyjqm3x7wai7d99q"; + revision = "1"; + editedCabalFile = "0wrynvd305bk3mvm9rbs9vrfb65yhiy2s83r8hs690r1vsw4mdkj"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghci hspec QuickCheck @@ -71708,8 +72253,8 @@ self: { }: mkDerivation { pname = "devtools"; - version = "0.0.2"; - sha256 = "1p5695sgp48mznk9pb9kl24j9wa9gwq344hr3cdzzsvabfi1pkz2"; + version = "0.0.3"; + sha256 = "09lwvi4mbwkhazzmngpblxh2bvvxz1j4ndzsh3bp3nwwwa0xiihm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71986,7 +72531,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_34_0" = callPackage + "dhall_1_35_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -71996,18 +72541,19 @@ self: { , mmorph, mockery, mtl, network-uri, optparse-applicative , parser-combinators, parsers, pretty-simple, prettyprinter , prettyprinter-ansi-terminal, profunctors, QuickCheck - , quickcheck-instances, repline, scientific, semigroups, serialise + , quickcheck-instances, repline, scientific, serialise , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, template-haskell, text, text-manipulate - , th-lift-instances, transformers, transformers-compat, turtle - , unordered-containers, uri-encode, vector + , tasty-quickcheck, tasty-silver, template-haskell, text + , text-manipulate, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector }: mkDerivation { pname = "dhall"; - version = "1.34.0"; - sha256 = "0rqvzvcqbhs9gvga7api6jjblnypm4a33z8kxi578ps63mhn3g0d"; + version = "1.35.0"; + sha256 = "19h0afgxqq9da1apx4xx9p4p0f2r6miivc4l1dkhbbvfk2r5wkw3"; revision = "1"; - editedCabalFile = "0d5rqjalz6clvbmnqmpsy4dl9zj1magwmd1gdl2vzkf5qnhp6n7r"; + editedCabalFile = "16hlc738l0w58g5fj6kyr7il24n23a6jbwd6m0xc1sncv74pxh8w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72028,13 +72574,12 @@ self: { base bytestring cborg containers data-fix deepseq directory doctest either filepath foldl generic-random lens-family-core megaparsec mockery prettyprinter QuickCheck quickcheck-instances scientific - semigroups serialise special-values spoon tasty - tasty-expected-failure tasty-hunit tasty-quickcheck - template-haskell text transformers turtle unordered-containers - vector + serialise special-values spoon tasty tasty-expected-failure + tasty-hunit tasty-quickcheck tasty-silver template-haskell text + transformers turtle unordered-containers vector ]; benchmarkHaskellDepends = [ - base bytestring containers directory gauge serialise text + base bytestring containers directory gauge text ]; doCheck = false; description = "A configuration language guaranteed to terminate"; @@ -72065,14 +72610,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_32" = callPackage + "dhall-bash_1_0_33" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.32"; - sha256 = "0y4pjrknbq48j1cnj25zf31k02j5ivjm3h6ffizr3vgr24whfxih"; + version = "1.0.33"; + sha256 = "0b920cscim2mqcav0yy4s00gcgjqfybvbmfvnnbvarxswknw8z1v"; + revision = "1"; + editedCabalFile = "1r01himc5n19q9675i6i27yrfrx9l362ycsnvk48mcbrbmv1z5lf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72107,23 +72654,23 @@ self: { }) {}; "dhall-docs" = callPackage - ({ mkDerivation, base, bytestring, containers, dhall, directory - , doctest, file-embed, filepath, foldl, HaXml, lens-family-core - , lucid, megaparsec, mmark, mtl, optparse-applicative, path - , path-io, pretty, prettyprinter, tar, tasty, tasty-hunit - , tasty-silver, text, turtle + ({ mkDerivation, base, bytestring, containers, cryptonite, dhall + , directory, doctest, file-embed, filepath, foldl, HaXml + , lens-family-core, lucid, megaparsec, memory, mmark, mtl + , optparse-applicative, path, path-io, pretty, prettyprinter, tasty + , tasty-hunit, tasty-silver, text, transformers, turtle }: mkDerivation { pname = "dhall-docs"; - version = "1.0.0"; - sha256 = "0kfn3nr0g4x5bpdrkg5lh8qma2536k3gx7bvrsrkn53lyyxnbnvi"; + version = "1.0.1"; + sha256 = "0632l4h72zrddknhha8lz53ynzbdrhb11mvj09qfmr4b1rd01amz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers dhall directory file-embed filepath - lens-family-core lucid megaparsec mmark mtl optparse-applicative - path path-io prettyprinter tar text + base bytestring containers cryptonite dhall directory file-embed + filepath lens-family-core lucid megaparsec memory mmark mtl + optparse-applicative path path-io prettyprinter text transformers ]; executableHaskellDepends = [ base dhall ]; testHaskellDepends = [ @@ -72202,7 +72749,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_7_1" = callPackage + "dhall-json_1_7_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , lens-family-core, optparse-applicative, prettyprinter @@ -72211,10 +72758,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.7.1"; - sha256 = "158c9vhxa124r1xqn365wvwqhby5rngkip08ghy8rnjs5ijcxzgf"; - revision = "2"; - editedCabalFile = "12piijva2szd08c6pgr6qca4kmf48il8934iv0k51jfyfd1m01ic"; + version = "1.7.2"; + sha256 = "189mpnh2fnm1gwc1lvqa3wy9wk2wh8jj3216dvidik545008yvcj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72282,7 +72827,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dhall-lsp-server_1_0_9" = callPackage + "dhall-lsp-server_1_0_10" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , data-default, dhall, dhall-json, directory, doctest, filepath , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core @@ -72292,10 +72837,8 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.9"; - sha256 = "0zf53pc8rxapmdm9fvp04gfnw2910yv1gm5sm5v5wb606njzk0xn"; - revision = "1"; - editedCabalFile = "1ml2yhwwbwwdv13266fgjk39pk04hg0ak82y08aixcryaldfhgwi"; + version = "1.0.10"; + sha256 = "0z6b3yq8fijxycabwrbqn2z94lb2ak2fmajlxgawyd1723cl2wsb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72320,8 +72863,10 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.16"; - sha256 = "1p9aizzf7zx92ns292zyzvg01r85dpl3wa61nh6g3q16qjs35bcx"; + version = "1.1.17"; + sha256 = "1c696f0if218pbmir4rmkb6shcgk9acw5g1iwcb2mslshmncbyfd"; + revision = "1"; + editedCabalFile = "0vdni3cmx3p6a0p587avja4zg6278fmdfv6jh5h4wfx0b7z1sphg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72333,8 +72878,6 @@ self: { ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhall-nixpkgs" = callPackage @@ -72345,8 +72888,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.0"; - sha256 = "1bymafh0p0avfsdpcijj76075pgkn81sf6f3y17m7p0lmp8hhh75"; + version = "1.0.1"; + sha256 = "1dw3bygs3da7yfcm5h376ppswv3dcny42yqjy7fabyzw72d4586z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72439,7 +72982,7 @@ self: { broken = true; }) {}; - "dhall-yaml_1_2_1" = callPackage + "dhall-yaml_1_2_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -72447,10 +72990,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.2.1"; - sha256 = "18p8a92wiz2zi4q7v5fjvdallxrl21scmwwv706g3mm5dgfgcs5a"; - revision = "1"; - editedCabalFile = "037zg3ick95pwsk2g0znhfdvwphw3yxv5kp8zj5czc6df97id8xj"; + version = "1.2.2"; + sha256 = "1mswyac77p0zpjdfr86x4ddwlnvqz0ibf98hr8q0zm1a9ibds982"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72611,8 +73152,8 @@ self: { ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { pname = "di-polysemy"; - version = "0.1.4.0"; - sha256 = "0p9wyli73skjbdbb0dgqb3p37rbijpadywsi0dwjdwdzpddjarcm"; + version = "0.2.0.0"; + sha256 = "09n9kjfv6zx016zkglr0ya0gmi18xdgl08iv7pvh41h0mp435aaq"; libraryHaskellDepends = [ base df1 di-core di-df1 di-handle polysemy ]; @@ -74087,6 +74628,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diohsc" = callPackage + ({ mkDerivation, asn1-types, base, bytestring, containers + , cryptonite, data-default-class, data-hash, directory + , drunken-bishop, exceptions, filepath, haskeline, hourglass, iconv + , mime, mtl, network, network-uri, parsec, pem, process + , regex-compat, safe, temporary, terminal-size, text, tls + , transformers, unix, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "diohsc"; + version = "0.1.2"; + sha256 = "0ksawn7wspw1f3yaaqyz4sgbl0p9fnidn1jjfwmjs9zrna1cb084"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + asn1-types base bytestring containers cryptonite data-default-class + data-hash directory drunken-bishop exceptions filepath haskeline + hourglass iconv mime mtl network network-uri parsec pem process + regex-compat safe temporary terminal-size text tls transformers + unix x509 x509-store x509-validation + ]; + description = "Gemini client"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "diophantine" = callPackage ({ mkDerivation, array, base, happy }: mkDerivation { @@ -74509,8 +75075,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.7.0"; - sha256 = "1hb2qfljj0xq427657ml8qasg99fhwh0zfsrmryqpaq5ch8aqn20"; + version = "1.8.0"; + sha256 = "1zh4xf5a8ppfhcnkhai4mi0a7aj7m8qp8hcnyfi6s3nc86k7wj2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75722,8 +76288,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.7.4"; - sha256 = "092fmla7a0xbnfac6izcj08wsyxbd04n23cjy33c132lqhs5k6w5"; + version = "0.7.5"; + sha256 = "1x4gdnb2k1ywvaniif7j2lsbavadaghvcpbdnms3x13s4cg18lyh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76069,38 +76635,72 @@ self: { }) {}; "dobutokO-poetry" = callPackage - ({ mkDerivation, base, mmsyn3, mmsyn6ukr, mmsyn7s, vector }: + ({ mkDerivation, base, dobutokO-poetry-general, mmsyn3, mmsyn6ukr + , mmsyn7s, uniqueness-periods, vector + }: mkDerivation { pname = "dobutokO-poetry"; - version = "0.10.0.0"; - sha256 = "1lrdlgn49im8rgvsj61k2n3g2ham2gizbv0r95nv4ga71z54lyhj"; + version = "0.17.0.0"; + sha256 = "0swngd363lgyya80jvsyqj5a3mp8lkiirnbvy6kxdrharcqj2ahd"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ]; + libraryHaskellDepends = [ + base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s + uniqueness-periods vector + ]; executableHaskellDepends = [ - base mmsyn3 mmsyn6ukr mmsyn7s vector + base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s + uniqueness-periods vector ]; description = "Helps to order the 7 or less Ukrainian words to obtain somewhat suitable for poetry or music text"; license = stdenv.lib.licenses.mit; }) {}; + "dobutokO-poetry-general" = callPackage + ({ mkDerivation, base, mmsyn3, mmsyn6ukr, mmsyn7s, vector }: + mkDerivation { + pname = "dobutokO-poetry-general"; + version = "0.1.0.0"; + sha256 = "0gdhihblshxq70av2x8ni7vywdfic750kwq7qsbhagrqr71fvqb1"; + libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ]; + description = "Helps to order the 7 or less words (first of all the Ukrainian ones) to obtain somewhat suitable for poetry or music text"; + license = stdenv.lib.licenses.mit; + }) {}; + + "dobutokO-poetry-general-languages" = callPackage + ({ mkDerivation, base, dobutokO-poetry-general, mmsyn3, mmsyn6ukr + , uniqueness-periods-general, vector + }: + mkDerivation { + pname = "dobutokO-poetry-general-languages"; + version = "0.2.0.0"; + sha256 = "0gw89nagj1adb70k1li1p1syzgmc6g4lb0yfnjr9caiddq9mi9x5"; + libraryHaskellDepends = [ + base dobutokO-poetry-general mmsyn3 mmsyn6ukr + uniqueness-periods-general vector + ]; + description = "Helps to order the 7 or less words to obtain somewhat suitable for poetry or music text"; + license = stdenv.lib.licenses.mit; + }) {}; + "dobutokO2" = callPackage ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 - , mmsyn6ukr, mmsyn7l, mmsyn7s, mmsyn7ukr, process, vector + , mmsyn6ukr, mmsyn7l, mmsyn7s, mmsyn7ukr, process + , uniqueness-periods, vector }: mkDerivation { pname = "dobutokO2"; - version = "0.42.0.0"; - sha256 = "12bjaa9kw1ks9f64zl0lg4447hs1bjjy5g3q3yhmabwzp5yyy014"; + version = "0.43.0.0"; + sha256 = "0f17ff77m16p951laijqf5w4pfw4pgc6x2ha13472h62dzg8gm2f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s - mmsyn7ukr process vector + mmsyn7ukr process uniqueness-periods vector ]; executableHaskellDepends = [ base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s - mmsyn7ukr process vector + mmsyn7ukr process uniqueness-periods vector ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = stdenv.lib.licenses.mit; @@ -76112,8 +76712,8 @@ self: { }: mkDerivation { pname = "dobutokO3"; - version = "0.2.1.0"; - sha256 = "0xh6685v01j1r9fg8r7ldd8vqxlir2fylryb0z71ndpdi4ajvkih"; + version = "0.3.0.0"; + sha256 = "1dbax6j2sdn6cd6crskwr0r90ymxmjk596a9ak8gvlkrwpk1cbdm"; libraryHaskellDepends = [ base bytestring directory dobutokO2 mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s mmsyn7ukr process vector @@ -76128,8 +76728,8 @@ self: { }: mkDerivation { pname = "dobutokO4"; - version = "0.7.0.0"; - sha256 = "16im8ki3jbc7jgvr8nwnr4mb19is1vf3pz6pdfrj4q9jfmrv82d2"; + version = "0.8.0.0"; + sha256 = "073kjv1m3qcrfyk8j8zs5hrc8x0bkyqnw6pa72afhkxq08dzj9y9"; libraryHaskellDepends = [ base directory dobutokO2 mmsyn3 mmsyn7l process vector vector-doublezip @@ -76771,8 +77371,8 @@ self: { }: mkDerivation { pname = "dom-lt"; - version = "0.2.1"; - sha256 = "16pf0lzzg0wwk5q44ybbc2hbrjs5hzsai0ssm836xiywsqwp61a7"; + version = "0.2.2"; + sha256 = "0hf0wf4fl671awf87f0r7r4a57cgm88x666081c0wy16qchahffw"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; @@ -76937,8 +77537,8 @@ self: { }: mkDerivation { pname = "dotenv"; - version = "0.8.0.4"; - sha256 = "05dqa91zmxkzkz1dcpx2jxkzhdr4f51gw0qql47da9bllavl0jj4"; + version = "0.8.0.7"; + sha256 = "11x7aiflf45rdbbzk33pg8v2x5a4bnbhi6845bi3wpgq7y27210v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -76958,35 +77558,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dotenv_0_8_0_6" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-megaparsec, megaparsec - , optparse-applicative, process, text, transformers, yaml - }: - mkDerivation { - pname = "dotenv"; - version = "0.8.0.6"; - sha256 = "0ndgsjjcpmhxaxjn4mmw4cyd6i2y67zpx9ap099k5jw9ad0lbwb0"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - text transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process text transformers yaml - ]; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -80146,8 +80717,8 @@ self: { }: mkDerivation { pname = "either-result"; - version = "0.3.0.0"; - sha256 = "1cj6g6b90cpfzfsrkja35bs6qfnqnx9fqxwfrkm5985pp0ii546d"; + version = "0.3.1.0"; + sha256 = "1l4539j0ynn5jl0rh9bhjxlgvr0sn3bf8ws1zrlbfk15524znqhm"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base doctest hspec transformers ]; testToolDepends = [ doctest-discover hspec-discover ]; @@ -81154,8 +81725,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.3.1"; - sha256 = "00fm1aixj31djlrmkzvhsk119w00jch6l1alaxmy97gjcg8kk6hd"; + version = "0.4.0"; + sha256 = "0qhq3h1va7pfcz58mkdw690v88jr3ynk2rrwl0s5qdz8xxvs5n3a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81175,8 +81746,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.3.1"; - sha256 = "05wjnlz5x6j74m9dc524yagwhj8w3vmxp3x55hkbfq89j44fb6n1"; + version = "0.4.0"; + sha256 = "0ikk9xk71xyn1fmhzx59lfyk9skjkvhg19xb2afhcylnbg41f3wz"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random parallel primitive statistics @@ -81195,8 +81766,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.3.1"; - sha256 = "0rqhzwfr8zz7nzvc7kkp6n2jxvq4qn3pv9ipk7mfdpxsfcm46550"; + version = "0.4.0"; + sha256 = "02g67w8xracbasnkha383vz0ls1haxr78ia27k292lx572l17dvv"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -81212,8 +81783,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.3.1"; - sha256 = "0wvp13kcx0fbhhk45ahs18p24dqn4n7wg1194hfj4v3qxg7pqy7q"; + version = "0.4.0"; + sha256 = "03dh4rjdgn580niljgrl0cfw5h2mah8q1252jq3jx8349jxgpcmh"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -81236,8 +81807,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.3.1"; - sha256 = "1h7vg6dh45mc5snk4c9q0xplb3q68gklxhj295pa20d83jarki0x"; + version = "0.4.0"; + sha256 = "0n8rf7y4qxhx35fhbhj4yc541ydsx8qvy66d11sl5a836gmsv0rr"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory fast-logger hmatrix @@ -81259,8 +81830,8 @@ self: { }: mkDerivation { pname = "elynx-tree"; - version = "0.3.1"; - sha256 = "0ppah6lkzg39z80w30wicz88y4jpfj0z38py9y73srwvqy6a45l3"; + version = "0.4.0"; + sha256 = "1j22gkg1971wrih4gs4bxzkghvd3ddj85s6s5mcqhrfxmdnpsn2c"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq double-conversion elynx-nexus math-functions mwc-random primitive @@ -81725,6 +82296,31 @@ self: { broken = true; }) {}; + "encryptable" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, esqueleto + , generic-arbitrary, hspec, persistent, persistent-template + , QuickCheck, quickcheck-instances, text, universum + }: + mkDerivation { + pname = "encryptable"; + version = "0.1"; + sha256 = "0svvzk2js91qzcmbsfjcs2qs65a2b5ywgbpnyqidz53dlnbbk2r1"; + libraryHaskellDepends = [ + base bytestring cryptonite esqueleto generic-arbitrary hspec + persistent persistent-template QuickCheck quickcheck-instances text + universum + ]; + testHaskellDepends = [ + base bytestring cryptonite esqueleto generic-arbitrary hspec + persistent persistent-template QuickCheck quickcheck-instances text + universum + ]; + description = "Typed encryption with persistent support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "endo" = callPackage ({ mkDerivation, base, between, data-default-class, mtl , transformers @@ -82731,6 +83327,20 @@ self: { broken = true; }) {}; + "errata" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "errata"; + version = "0.1.0.0"; + sha256 = "193m9c0409jvk6s8acqad3dg5x97mr6814gq0diyc3yc7b7mdmvf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers text ]; + executableHaskellDepends = [ base containers text ]; + description = "Source code error pretty printing"; + license = stdenv.lib.licenses.mit; + }) {}; + "errno" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -83180,8 +83790,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.3.3.2"; - sha256 = "0488vrv85gzv190j4npyjll5v1fchqlxlg5346j4p90zb9vl2pzl"; + version = "3.3.4.0"; + sha256 = "1w46sfh4rrj7lvsdyzwphcv8n00v6kr3padkk8v5lr0r40w5n60r"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -83233,19 +83843,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding_0_2_1" = callPackage + "essence-of-live-coding_0_2_4" = callPackage ({ mkDerivation, base, containers, foreign-store, mtl, QuickCheck - , syb, test-framework, test-framework-quickcheck2, transformers - , vector-sized + , syb, test-framework, test-framework-quickcheck2, time + , transformers, vector-sized }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.2.1"; - sha256 = "1bjpzz5ph2n4ljhckn2p88pg6c49phigw2f1y9l83wgnvdavdz83"; + version = "0.2.4"; + sha256 = "04rbbq58ska6qldah0d7s8kdn5hkxka7bap7ca1wksbwbkph6qj1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers foreign-store syb transformers vector-sized + base containers foreign-store syb time transformers vector-sized ]; executableHaskellDepends = [ base transformers ]; testHaskellDepends = [ @@ -83272,14 +83882,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-gloss_0_2_1" = callPackage + "essence-of-live-coding-gloss_0_2_4" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss , syb, transformers }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.2.1"; - sha256 = "0pgkzfy7w8lylx0bb3vs1d8a2hgaavn2m9rj0v1f6hl193hnimz7"; + version = "0.2.4"; + sha256 = "11hnzax39g7yaqwaaxi3niipamd65mcrdi431fxrspkhgcm1nx2y"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; @@ -83294,8 +83904,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss-example"; - version = "0.2.1"; - sha256 = "0rfpl2y6dga86qpq3sfc1kvwsb55d3aw0ckkfn8yflfnad6k884l"; + version = "0.2.4"; + sha256 = "1npn9973jm8y21gh0cfdiqldmx5s7jb1iw6ka734mpjnx2nr9jzw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83304,6 +83914,8 @@ self: { ]; description = "General purpose live coding framework - Gloss example"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "essence-of-live-coding-pulse" = callPackage @@ -83321,14 +83933,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-pulse_0_2_1" = callPackage + "essence-of-live-coding-pulse_0_2_4" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store , pulse-simple, transformers }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.2.1"; - sha256 = "02my8bprwij9rxl0x0yb8q9zr137alzl77j5lvd1gl5r5sbvm8pj"; + version = "0.2.4"; + sha256 = "0lhnq85bi22mwnw4fcg9hzr18mdifxlr833pwsc7ch401y2mf1kz"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; @@ -83343,8 +83955,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse-example"; - version = "0.2.1"; - sha256 = "118xlqx67lgyrqi9r581ad2xsqs5x5d19afbfh6200bi618sr8af"; + version = "0.2.4"; + sha256 = "0jjafsrjpcprfcly4z4ld98y25lx3gc1faqbd6ms56kyrhs3q1p3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83353,6 +83965,8 @@ self: { ]; description = "General purpose live coding framework - pulse backend example"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "essence-of-live-coding-quickcheck" = callPackage @@ -83371,14 +83985,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-quickcheck_0_2_1" = callPackage + "essence-of-live-coding-quickcheck_0_2_4" = callPackage ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding , QuickCheck, syb, transformers }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.2.1"; - sha256 = "144840ck2a0wk8pd62c6l9iw6jlvva3yif30mba9m8r1zylaanyj"; + version = "0.2.4"; + sha256 = "1ic2wvk4fc7jb6dkfy6fypmyw7hfbn79m51gn4z4c35ddhsfpngd"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers @@ -83388,6 +84002,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "essence-of-live-coding-warp" = callPackage + ({ mkDerivation, base, essence-of-live-coding, http-client + , http-types, wai, warp + }: + mkDerivation { + pname = "essence-of-live-coding-warp"; + version = "0.2.4"; + sha256 = "1p6wcpkx19kspssw34ymp9gsfczzr5b11qghp2ha5gkrp6dw6z9w"; + libraryHaskellDepends = [ + base essence-of-live-coding http-types wai warp + ]; + testHaskellDepends = [ base essence-of-live-coding http-client ]; + description = "General purpose live coding framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "estimator" = callPackage ({ mkDerivation, ad, base, distributive, lens, linear, reflection }: @@ -83930,6 +84562,17 @@ self: { broken = true; }) {}; + "eveff" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "eveff"; + version = "0.1.0.0"; + sha256 = "1d0bxg1dg66g1yv291cp4jh3xv3caxrddqrwb0g6g1929dl019fa"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + description = "Efficient effect handlers based on evidence translation"; + license = stdenv.lib.licenses.mit; + }) {}; + "event" = callPackage ({ mkDerivation, base, containers, semigroups, transformers }: mkDerivation { @@ -84317,6 +84960,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventsourcing" = callPackage + ({ mkDerivation, base, deepseq, free, hashable, hedgehog, mtl + , pipes, psqueues, stm, tasty, tasty-hedgehog, time + , unordered-containers + }: + mkDerivation { + pname = "eventsourcing"; + version = "0.9.0"; + sha256 = "0rg9nd0sbqd132a4jzaq0065c5wjaib7iya305j2ql63gilfnjy3"; + libraryHaskellDepends = [ + base deepseq free hashable mtl pipes psqueues stm time + unordered-containers + ]; + testHaskellDepends = [ + base deepseq hedgehog mtl pipes stm tasty tasty-hedgehog + unordered-containers + ]; + description = "CQRS/ES library"; + license = stdenv.lib.licenses.isc; + }) {}; + + "eventsourcing-postgresql" = callPackage + ({ mkDerivation, base, bytestring, eventsourcing, hashable, mtl + , pipes, postgresql-simple, stm, unordered-containers + }: + mkDerivation { + pname = "eventsourcing-postgresql"; + version = "0.9.0"; + sha256 = "0dxa5lgf3lndhqgsmciyv9a6a6qwmwppq4qriasipnp656rcgyf8"; + libraryHaskellDepends = [ + base bytestring eventsourcing hashable mtl pipes postgresql-simple + stm unordered-containers + ]; + description = "PostgreSQL adaptor for eventsourcing"; + license = stdenv.lib.licenses.isc; + }) {}; + "eventstore" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan @@ -84840,6 +85520,25 @@ self: { broken = true; }) {inherit (pkgs) exif;}; + "exiftool" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, hashable, process + , scientific, string-conversions, temporary, text + , unordered-containers, vector + }: + mkDerivation { + pname = "exiftool"; + version = "0.1.0.0"; + sha256 = "015f0ai0x6iv49k4ljz8058509h8z8kkgnp7p9l4s8z54sgqfw8y"; + revision = "1"; + editedCabalFile = "06w0g76jddjykbvym2zgcwjsa33alm1rwshhzaw0pqm573mqbp26"; + libraryHaskellDepends = [ + aeson base base64 bytestring hashable process scientific + string-conversions temporary text unordered-containers vector + ]; + description = "Haskell bindings to ExifTool"; + license = stdenv.lib.licenses.mit; + }) {}; + "exigo-schema" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, directory , esqueleto, exceptions, hint, hspec, hspec-core, interpolate @@ -85107,6 +85806,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exotic-list-monads" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "exotic-list-monads"; + version = "1.0.0"; + sha256 = "0gi8bkfyw3w53hf6m0g9r0pw68pqh82n8x4zvs8y4wzjiwdipqw3"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Non-standard monads on lists and non-empty lists"; + license = stdenv.lib.licenses.mit; + }) {}; + "exp-cache" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , hashable, HUnit, psqueues, QuickCheck, random, tasty, tasty-hunit @@ -85789,8 +86503,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.7.4"; - sha256 = "0vcn8vid3ps7122zn3h0dzlwkx7kkxzsfhlwymalx6ph1fmxbq9y"; + version = "1.7.8"; + sha256 = "1sgd08h9p7ywmv08yd1h6z1bpf6pqpj1qn4v7vv7w4la86jmh2yg"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -85801,25 +86515,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extra_1_7_5" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, quickcheck-instances, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.7.5"; - sha256 = "1cickrjvg4i25yn3qg4f0id0bmq115siysyqnh0yk9rwjlnrxyn9"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ - base directory filepath QuickCheck quickcheck-instances unix - ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -86336,8 +87031,8 @@ self: { }: mkDerivation { pname = "fakefs"; - version = "0.3.0.1"; - sha256 = "1vilfl6vgxcywg81xfy6w6lir6r5pky7f2p7mf196kjby630av05"; + version = "0.3.0.2"; + sha256 = "16hgahq0j7ry1wdzv9syxk652x3wfhw8svpf1szmql2a32b9928b"; libraryHaskellDepends = [ base containers exceptions mtl ]; testHaskellDepends = [ base containers exceptions hspec QuickCheck @@ -86346,6 +87041,18 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "fakepull" = callPackage + ({ mkDerivation, base, exceptions, hspec, mtl, QuickCheck }: + mkDerivation { + pname = "fakepull"; + version = "0.3.0.2"; + sha256 = "1dmpq3wm3qsq4bg6d3zs79pbcp3v0pk72fizdviw6dl8hqmpgphl"; + libraryHaskellDepends = [ base exceptions mtl ]; + testHaskellDepends = [ base exceptions hspec mtl QuickCheck ]; + description = "Monad to pull from fake stream-like objects"; + license = stdenv.lib.licenses.asl20; + }) {}; + "faker" = callPackage ({ mkDerivation, base, gimlh, random, split }: mkDerivation { @@ -86497,18 +87204,17 @@ self: { "fast-builder" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, process, QuickCheck, scientific, stm - , template-haskell, text, true-name, unordered-containers, vector + , template-haskell, text, unordered-containers, vector }: mkDerivation { pname = "fast-builder"; - version = "0.1.2.0"; - sha256 = "1aa3v14nlcq4ql3f07lan9kg21dqp009yzgb96bxznyigxwf67rp"; + version = "0.1.2.1"; + sha256 = "0j11ahdmbni56car4zblwz9yz1qkrr6qbmpbah4fgpiyq6177cn9"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring process QuickCheck stm ]; benchmarkHaskellDepends = [ aeson base bytestring containers criterion deepseq ghc-prim - scientific template-haskell text true-name unordered-containers - vector + scientific template-haskell text unordered-containers vector ]; description = "Fast ByteString Builder"; license = stdenv.lib.licenses.publicDomain; @@ -86789,8 +87495,8 @@ self: { }: mkDerivation { pname = "fastparser"; - version = "0.4.0"; - sha256 = "1pb97h5hpn3fn4r9qz3rx2kb3xrbvbja9yvakbacd03rn3my1pz3"; + version = "0.5.0"; + sha256 = "0pxd2f6f0a6kckqmkkafh9zx11x75x1zx1z90snzj3j8s4jcfg4y"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers kan-extensions microlens thyme transformers vector-space @@ -88648,6 +89354,8 @@ self: { ]; description = "Reversable and secure encoding of object ids as filepaths"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filepath-io-access" = callPackage @@ -88718,9 +89426,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.4"; - sha256 = "1z967kviqsy3ma8xdfffx864f7ji6nsrbd5riis0nasm1bbwm8rr"; - enableSeparateDataOutput = true; + version = "0.6.5"; + sha256 = "0z29273vdqjsrj4vby0gp7d12wg9nkzq9zgqg18db0p5948jw1dh"; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale parsec process split time utf8-string xml @@ -88859,15 +89566,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filtrable_0_1_5_0" = callPackage - ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck - , transformers + "filtrable_0_1_6_0" = callPackage + ({ mkDerivation, base, containers, smallcheck, tasty + , tasty-smallcheck, transformers }: mkDerivation { pname = "filtrable"; - version = "0.1.5.0"; - sha256 = "0glarxd5yaflyhy8ni6q0kzrhgwi8msr3q4zf6by80g2qd33kvh8"; - libraryHaskellDepends = [ base transformers ]; + version = "0.1.6.0"; + sha256 = "058jl7wjaxzvcayc9qzpikxvi9x42civ4sb02jh66rcvpndbfh5y"; + libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of filtrable containers"; license = stdenv.lib.licenses.bsd3; @@ -90962,8 +91669,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fmlist"; - version = "0.9.3"; - sha256 = "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf"; + version = "0.9.4"; + sha256 = "19h95ph7lh7llw6j1v1rssrdi5k7xw8x0iac9rgzss371s2w3g9d"; libraryHaskellDepends = [ base ]; description = "FoldMap lists"; license = stdenv.lib.licenses.bsd3; @@ -92164,8 +92871,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fpco-api" = callPackage @@ -92533,8 +93238,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.0.8.2"; - sha256 = "0mq9wwsylbmkiwwpvb1frym6nif587920rxkgq1gacwmh6dssymz"; + version = "0.1.0.0"; + sha256 = "0s5gj52b3s1hg92cs12qk7y2zgsl546livdzps2qm4fmjc394qj3"; libraryHaskellDepends = [ base containers data-fix dlist free groups kan-extensions mtl transformers @@ -94236,8 +94941,8 @@ self: { }: mkDerivation { pname = "functor-combinators"; - version = "0.3.3.0"; - sha256 = "1qym0xn4ydj2vx6nhy26k4bwznjjx7spgr0pv33b2i5wpznn972z"; + version = "0.3.6.0"; + sha256 = "0idf896xadp5v5k4m0s087xvvs9008sxw61djqb9v0x08rs5zy8f"; libraryHaskellDepends = [ assoc base bifunctors comonad constraints containers contravariant deriving-compat free invariant kan-extensions mmorph mtl @@ -94510,8 +95215,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "funspection"; - version = "1.0.0.0"; - sha256 = "0jbzvn06d5kfyiav3fjd6k8sk8dy00pwk2g711nrbmlrljbw7f39"; + version = "1.0.0.1"; + sha256 = "0jf8yhk45n06avl9avgmawvazsz585i7jppvcds6pjd8pqdb2qk4"; libraryHaskellDepends = [ base ]; description = "Type-level function utilities"; license = stdenv.lib.licenses.bsd3; @@ -94747,8 +95452,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.16.3"; - sha256 = "0y9g7nldcx2y7h3gb652i5r3lfvbriaqfqs2gnxym1r9w9kki0si"; + version = "0.16.4"; + sha256 = "14k682phqdp2scmv064i6jyymf3j2f3bs25yw1qff76bkymv02vd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96393,6 +97098,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-functor" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-functor"; + version = "0.1.0.0"; + sha256 = "02anlx3l0zn4hx9pckpdpp93yp1xyqcafpy6rk7s1zpv7nqk12z2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Deriving generalized functors with GHC.Generics"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-lens" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text @@ -96462,6 +97179,17 @@ self: { broken = true; }) {}; + "generic-match" = callPackage + ({ mkDerivation, base, generics-sop }: + mkDerivation { + pname = "generic-match"; + version = "0.3.0.0"; + sha256 = "1h27gd7f0px3xgan9liqwav8xhl0smn6nhdmi7ggd18mjafa1ngv"; + libraryHaskellDepends = [ base generics-sop ]; + description = "First class pattern matching"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-maybe" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , directory, doctest, filepath, generic-deriving, ghc-prim, hlint @@ -97972,22 +98700,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-check_0_3_0_1" = callPackage - ({ mkDerivation, base, filepath, ghc, ghc-paths, process - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-check"; - version = "0.3.0.1"; - sha256 = "180xqs4g90v9sdjb0b3baqk62gbnw1xkv76wdq5ap49q0730s3vz"; - libraryHaskellDepends = [ - base filepath ghc ghc-paths process template-haskell transformers - ]; - description = "detect mismatches between compile-time and run-time versions of the ghc api"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-check" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-paths, process, safe-exceptions, template-haskell @@ -98432,8 +99144,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.10.2.20200808"; - sha256 = "0vh941bk7fy44rn5hwqa25xbfyhm28wcy4nwpvm3291lp0cxndgh"; + version = "8.10.2.20200916"; + sha256 = "0yarxqbl7njqhfycrdz4lr6m04wqhrlsgb9vcq6gbmlizswwxr6g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -98451,8 +99163,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.2.20200808"; - sha256 = "0nfxsvpsiyxbjc3hvdax70z07k08bc255lz9jhqgq57lnw46dyfl"; + version = "8.10.2.20200916"; + sha256 = "0azfy14w268by4ydaarjdw7awbd44pgqg03zykzfg7iabyzr2dfk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -98923,8 +99635,8 @@ self: { }: mkDerivation { pname = "ghc-tags-core"; - version = "0.2.3.0"; - sha256 = "0hpk3131dq07m92h6ppacgbj4ar475zrlsj2vhqgpmdh3z9lnd9c"; + version = "0.2.4.0"; + sha256 = "1h2khrvykywdddnhpy6yg2adfjlzdy6i6zib8km5j2zakmhq9s9j"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath-bytestring ghc mtl pipes pipes-attoparsec pipes-bytestring text transformers @@ -98953,8 +99665,8 @@ self: { }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.2.3.0"; - sha256 = "19bkn5lp1n993jxn4mhmnyw36d1vjwbvhlr1r6ywnanis9vgrbzg"; + version = "0.2.4.0"; + sha256 = "1cpfh3cvad2avissri0cs7ghamg2q3nyifyzlj3dndmzbpjrvxy7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99356,47 +100068,55 @@ self: { "ghcide" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, containers, cryptohash-sha1, data-default - , deepseq, directory, extra, filepath, fuzzy, ghc, ghc-boot - , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev + , binary, bytestring, Chart, Chart-diagrams, containers + , cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg + , directory, extra, filepath, fuzzy, ghc, ghc-boot, ghc-boot-th + , ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev , haddock-library, hashable, haskell-lsp, haskell-lsp-types - , hie-bios, hslogger, lens, lsp-test, mtl, network-uri - , optparse-applicative, parser-combinators, prettyprinter - , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances - , regex-tdfa, rope-utf16-splay, safe-exceptions, shake, sorted-list - , stm, syb, tasty, tasty-expected-failure, tasty-hunit + , hie-bios, hslogger, implicit-hie-cradle, lens, lsp-test, mtl + , network-uri, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, record-dot-preprocessor, record-hasfield + , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake + , sorted-list, stm, syb, tasty, tasty-expected-failure, tasty-hunit , tasty-quickcheck, tasty-rerun, text, time, transformers, unix - , unordered-containers, utf8-string + , unordered-containers, utf8-string, yaml }: mkDerivation { pname = "ghcide"; - version = "0.2.0"; - sha256 = "1zadj34583qp8xz0iv2r0anqh96r94jv13iary5bk1m9zbhf4f7v"; + version = "0.4.0"; + sha256 = "0h714pfdjkb4rbq9kz3ilj52nxdvr3c0w5nms5znxjlaysgaqp5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson array async base binary bytestring containers data-default - deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th - haddock-library hashable haskell-lsp haskell-lsp-types hslogger mtl - network-uri prettyprinter prettyprinter-ansi-terminal regex-tdfa - rope-utf16-splay safe-exceptions shake sorted-list stm syb text - time transformers unix unordered-containers utf8-string + aeson array async base base16-bytestring binary bytestring + containers cryptohash-sha1 data-default deepseq directory extra + filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths + haddock-library hashable haskell-lsp haskell-lsp-types hie-bios + hslogger implicit-hie-cradle mtl network-uri prettyprinter + prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay safe + safe-exceptions shake sorted-list stm syb text time transformers + unix unordered-containers utf8-string ]; executableHaskellDepends = [ - aeson async base base16-bytestring binary bytestring containers - cryptohash-sha1 data-default deepseq directory extra filepath ghc - ghc-check ghc-paths gitrev hashable haskell-lsp haskell-lsp-types - hie-bios hslogger optparse-applicative shake text time + aeson base bytestring containers data-default directory extra + filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios + lens lsp-test optparse-applicative process safe-exceptions text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring containers directory extra filepath ghc - ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types - lens lsp-test network-uri parser-combinators QuickCheck - quickcheck-instances rope-utf16-splay shake tasty + aeson base binary bytestring containers directory extra filepath + ghc ghc-typelits-knownnat haddock-library haskell-lsp + haskell-lsp-types lens lsp-test network-uri optparse-applicative + process QuickCheck quickcheck-instances record-dot-preprocessor + record-hasfield rope-utf16-splay safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun text ]; + benchmarkHaskellDepends = [ + aeson base Chart Chart-diagrams diagrams diagrams-svg directory + extra filepath shake text yaml + ]; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ maralorn ]; @@ -99871,6 +100591,25 @@ self: { ]; description = "GI friendly Binding to the Cairo library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "gi-cairo-connector_0_1_0" = callPackage + ({ mkDerivation, base, gi-cairo, gi-cairo-render, haskell-gi-base + , mtl + }: + mkDerivation { + pname = "gi-cairo-connector"; + version = "0.1.0"; + sha256 = "115iy6sd77aabzghdmfpn5w2zqqalrxgbs5i93z49y3vz4wsjiwf"; + libraryHaskellDepends = [ + base gi-cairo gi-cairo-render haskell-gi-base mtl + ]; + description = "GI friendly Binding to the Cairo library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-cairo-render" = callPackage @@ -99890,6 +100629,27 @@ self: { libraryToolDepends = [ c2hs ]; description = "GI friendly Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) cairo;}; + + "gi-cairo-render_0_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, c2hs, cairo + , haskell-gi-base, mtl, text, utf8-string + }: + mkDerivation { + pname = "gi-cairo-render"; + version = "0.1.0"; + sha256 = "1b2qxfahs4w288i6w5m0rs74amnm3zp0mj2vsccf34q437yni2gx"; + libraryHaskellDepends = [ + array base bytestring haskell-gi-base mtl text utf8-string + ]; + libraryPkgconfigDepends = [ cairo ]; + libraryToolDepends = [ c2hs ]; + description = "GI friendly Binding to the Cairo library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) cairo;}; "gi-dbusmenu" = callPackage @@ -99909,6 +100669,8 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenu_0_4_8" = callPackage @@ -99929,6 +100691,7 @@ self: { description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage @@ -99953,6 +100716,8 @@ self: { libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-dbusmenugtk3_0_4_9" = callPackage @@ -99978,6 +100743,7 @@ self: { description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage @@ -100117,6 +100883,8 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; "gi-gdkx11_4_0_2" = callPackage @@ -100140,6 +100908,7 @@ self: { description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk4-x11 = null;}; "gi-ggit" = callPackage @@ -100316,6 +101085,8 @@ self: { libraryPkgconfigDepends = [ graphene-gobject ]; description = "Graphene bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {graphene-gobject = null;}; "gi-graphene_1_0_2" = callPackage @@ -100336,6 +101107,7 @@ self: { description = "Graphene bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {graphene-gobject = null;}; "gi-gsk" = callPackage @@ -100360,6 +101132,8 @@ self: { libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk4 = null;}; "gi-gst" = callPackage @@ -100445,6 +101219,8 @@ self: { libraryPkgconfigDepends = [ gstreamer-pbutils ]; description = "GStreamer Plugins Base Utils bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gstreamer-pbutils = null;}; "gi-gsttag" = callPackage @@ -100466,6 +101242,8 @@ self: { libraryPkgconfigDepends = [ gstreamer-tag ]; description = "GStreamer Tag bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gstreamer-tag = null;}; "gi-gstvideo" = callPackage @@ -100585,6 +101363,8 @@ self: { ]; description = "Declarative GTK+ programming in Haskell"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-declarative-app-simple" = callPackage @@ -100603,6 +101383,8 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-hs" = callPackage @@ -100620,6 +101402,8 @@ 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; + broken = true; }) {}; "gi-gtk-hs_0_3_9" = callPackage @@ -100638,6 +101422,7 @@ 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; + broken = true; }) {}; "gi-gtkosxapplication" = callPackage @@ -100659,6 +101444,8 @@ self: { libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; description = "GtkosxApplication bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk-mac-integration-gtk3 = null;}; "gi-gtksource" = callPackage @@ -100707,6 +101494,8 @@ self: { libraryPkgconfigDepends = [ libhandy ]; description = "libhandy bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libhandy;}; "gi-harfbuzz" = callPackage @@ -100906,6 +101695,8 @@ self: { libraryPkgconfigDepends = [ poppler ]; description = "Poppler bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) poppler;}; "gi-secret" = callPackage @@ -101068,6 +101859,8 @@ self: { libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage @@ -101087,6 +101880,8 @@ self: { libraryPkgconfigDepends = [ xlibsWrapper ]; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) xlibsWrapper;}; "gi-xlib_2_0_9" = callPackage @@ -101107,6 +101902,7 @@ self: { description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -101150,8 +101946,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.10.0.5"; - sha256 = "187118g5fs97msdab4jmhrwy28hhi81ihyc1v6rfb535bsnm70sw"; + version = "0.10.1.0"; + sha256 = "0579ajr1rng0bd0pml69f6yz4aykvk8zcni0p7ck628qx4jzxihx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -101375,8 +102171,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20200810"; - sha256 = "1wy6ckcf5f6m94gakg1504h1zryail3mmj85sglq03s45vawjcg6"; + version = "8.20200908"; + sha256 = "1113inl10f4m0699ba2zglaqlfqvwhqjkqg6r6m1d5rqv5brswb1"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -101432,8 +102228,8 @@ self: { }: mkDerivation { pname = "git-brunch"; - version = "1.4.0.0"; - sha256 = "1dv0hzdfmzm2c3mfmf73lb085279hnfx41ly5393l0vj1v2ln6a4"; + version = "1.4.1.0"; + sha256 = "0jq2i115djl5skkjzxxqdkp2rnw6871xn4aj4ryx9mgfnsd6dfgi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102009,8 +102805,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.3.4"; - sha256 = "04gzafg85fivaslsdi019f4blwrjpda01caly4dd8y7nmmc8xy0y"; + version = "1.3.5"; + sha256 = "0z2sb9avhkq2mgj0pwlji5c2sjxd71628q1i3nhlbajfyms1bsqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102279,15 +103075,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_2_1" = callPackage + "gitlab-haskell_0_2_3" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-conduit , http-types, tasty, tasty-hunit, text, time, transformers , unliftio, unliftio-core }: mkDerivation { pname = "gitlab-haskell"; - version = "0.2.1"; - sha256 = "0s7ar0z2hgkb8qzsyh6j022ks87nxa1fxy99dqrrmcfndcy6by8n"; + version = "0.2.3"; + sha256 = "0nsb7rkqflss6bhdvbjbgg2akwavz777icfkpfy97ix9ahq0i1r8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types text time @@ -103125,14 +103921,16 @@ self: { }) {}; "gloss-accelerate" = callPackage - ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: + ({ mkDerivation, accelerate, base, gloss, gloss-rendering + , linear-accelerate + }: mkDerivation { pname = "gloss-accelerate"; - version = "2.0.0.1"; - sha256 = "106z8kax0m3hzk0381l8m7gxdapl3wf0fdr1ljwb5fgcjc00pac2"; - revision = "1"; - editedCabalFile = "0349yyzxn7r82mz4vr71dibzp0sh45b4a06hm0c0z9d7vlxj0sjj"; - libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; + version = "2.1.0.0"; + sha256 = "1l09li68r04qij11p7rf9dwfv9cdncj7nm6crq6bm834il3zg4zx"; + libraryHaskellDepends = [ + accelerate base gloss gloss-rendering linear-accelerate + ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -103279,10 +104077,8 @@ self: { }: mkDerivation { pname = "gloss-raster-accelerate"; - version = "2.0.0.0"; - sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d"; - revision = "3"; - editedCabalFile = "0nk901zy01x7v7faa20j0yawqfw3nfl27xr19ip7bn3agmq4sqq2"; + version = "2.1.0.0"; + sha256 = "0yxlpz5wqfriijzkhqgjyv3g0wcmdy33ifbziqrdm9phvsjygvza"; libraryHaskellDepends = [ accelerate base colour-accelerate gloss gloss-accelerate ]; @@ -103359,6 +104155,26 @@ self: { broken = true; }) {inherit (pkgs) glpk;}; + "gltf-codec" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , directory, filepath, scientific, shower, text + , unordered-containers, vector + }: + mkDerivation { + pname = "gltf-codec"; + version = "0.1.0.1"; + sha256 = "0qdwk4ygvhdp4x8bkw101b50wc8zfb6bb54zpxaxkmva40hcv2c2"; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring scientific text + unordered-containers vector + ]; + testHaskellDepends = [ base bytestring directory filepath shower ]; + description = "glTF scene loader"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "glue" = callPackage ({ mkDerivation, async, base, ekg-core, hashable, hspec , lifted-base, monad-control, monad-loops, QuickCheck @@ -103874,8 +104690,8 @@ self: { pname = "godot-haskell"; version = "0.1.0.0"; sha256 = "02nvs84bq4nif235iycjwkxmabvs0avwm2xilpwv8kddv95z1f8i"; - revision = "3"; - editedCabalFile = "0dpvraw31gpzzlsy7j7mv99jvmwhldycll1hnbw2iscb5zs2g409"; + revision = "4"; + editedCabalFile = "06mb33ll7m24dr6mvzi2r6v0bl6k0680y751563zhz0ybrjypckk"; libraryHaskellDepends = [ aeson ansi-wl-pprint base bytestring casing colour containers lens linear mtl parsec parsers stm template-haskell text @@ -106315,6 +107131,8 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-oauth2" = callPackage @@ -106447,6 +107265,8 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-translate" = callPackage @@ -107687,9 +108507,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.9.0.0"; - sha256 = "1lyzrnbf1w3j60wwi8cwbh1hxzvsw8vn9aymy1qzxgjgmi2wx94g"; - enableSeparateDataOutput = true; + version = "0.10.0.0"; + sha256 = "0j0l8jmfnn3aw9vmk5z571ly9vk711hsz7cdklc243539vfnsywn"; libraryHaskellDepends = [ aeson base conduit containers exceptions hspec-expectations megaparsec parser-combinators scientific text transformers @@ -107735,14 +108554,61 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "graphql-client" = callPackage + ({ mkDerivation, aeson, aeson-schemas, base, bytestring, file-embed + , http-client, http-client-tls, http-types, mtl + , optparse-applicative, path, path-io, tasty, tasty-hunit + , template-haskell, text, transformers, typed-process + , unliftio-core + }: + mkDerivation { + pname = "graphql-client"; + version = "1.0.0"; + sha256 = "1qzrlk3vkvavi14zz7dkndz8qh449s6rpbrd5phqclgbrah1hj3a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-schemas base http-client http-client-tls http-types mtl + template-haskell text transformers unliftio-core + ]; + executableHaskellDepends = [ + aeson aeson-schemas base bytestring file-embed http-client + http-client-tls http-types mtl optparse-applicative path path-io + template-haskell text transformers typed-process unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-schemas base http-client http-client-tls http-types mtl + tasty tasty-hunit template-haskell text transformers unliftio-core + ]; + description = "A client for Haskell programs to query a GraphQL API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "graphql-utils" = callPackage + ({ mkDerivation, aeson, aeson-helper, base, graphql, text + , unordered-containers, vector + }: + mkDerivation { + pname = "graphql-utils"; + version = "0.1.0.0"; + sha256 = "1m0wan1isb1b574q933mm8xd7gnw2qrf2fd7z0sr7bnqlnl6nkjk"; + libraryHaskellDepends = [ + aeson aeson-helper base graphql text unordered-containers vector + ]; + description = "GraphQL Utils"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "graphql-w-persistent" = callPackage ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.9.0.0"; - sha256 = "1kwrpcrvf6j23lq40j6kyrp6wvya2rb4l6zgn47bwcignac1ag3g"; + version = "0.9.1.0"; + sha256 = "0sm0j1d2h6b2d3ksbbdyvzyvwl306mb64yikwkdwp2izfy387lwg"; libraryHaskellDepends = [ base containers json text ]; - description = "GraphQL interface middleware for (SQL) databases"; + description = "GraphQL interface middleware for SQL databases"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -108599,6 +109465,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groups_0_5" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "groups"; + version = "0.5"; + sha256 = "1ivz03k5bk6d72bibn8jyq4wkivkyakbmvbrp270b33282a4lkpc"; + libraryHaskellDepends = [ base ]; + description = "Groups"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groups-generic" = callPackage ({ mkDerivation, base, generic-data, groups }: mkDerivation { @@ -108925,7 +109803,7 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; + }) {gst-plugins-base = null; gstreamer = null;}; "gt-tools" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, haskeline @@ -110885,8 +111763,8 @@ self: { pname = "hackage-security"; version = "0.6.0.1"; sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "2"; - editedCabalFile = "12m1a5jggzjz3d1q5j41dcs51hi1vwqqxrba0h9jiajv11f3hb39"; + revision = "4"; + editedCabalFile = "06d4xqmpqarisxlm0sp87w2z9rl62p08z5ra5swkvfwn36i9zr15"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -111960,6 +112838,8 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -112073,6 +112953,8 @@ self: { libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ]; description = "automatic hyphenation for Hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-links" = callPackage @@ -112137,6 +113019,8 @@ self: { executableHaskellDepends = [ base dhall hakyll ]; description = "Dhall compiler for Hakyll"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-dir-list" = callPackage @@ -112181,6 +113065,8 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-filestore" = callPackage @@ -112218,6 +113104,8 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -112246,6 +113134,8 @@ self: { ]; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-series" = callPackage @@ -112276,6 +113166,8 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-shortcode" = callPackage @@ -112768,8 +113660,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.9.1.0"; - sha256 = "1gksjmrz1rbkfm2cw1hfz74ws0hyxv3491fw6j2j5f1gjp46fwf7"; + version = "0.10.1.0"; + sha256 = "09kaxb2930synwwcwgk1xhbdmsd3zzr69i0ss4swasw4zlx8n0sh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -113056,38 +113948,6 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, directory - , filepath, formatting, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, process, QuickCheck - , silently, stm, temporary, time, transformers, typed-process, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.4.1.0"; - sha256 = "1fkjg5q70qpp8y9xkzksfrdfn09psz5pydqw5bd8z4nfwhyivql8"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal base filepath formatting gitrev mtl path - process stm time transformers typed-process yaml - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process QuickCheck - silently temporary yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hapistrano_0_4_1_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, directory , filepath, formatting, gitrev, hspec, hspec-discover, mtl , optparse-applicative, path, path-io, process, QuickCheck @@ -113900,6 +114760,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "happy_1_20_0" = callPackage + ({ mkDerivation, array, base, containers, mtl, process }: + mkDerivation { + pname = "happy"; + version = "1.20.0"; + sha256 = "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + description = "Happy is a parser generator for Haskell"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happy-dot" = callPackage ({ mkDerivation, array, base, clock, happy, HUnit, language-dot , pretty, transformers, xml @@ -114392,31 +115268,32 @@ self: { ({ mkDerivation, base, brick, containers, directory, filepath , megaparsec, microlens, microlens-platform, mwc-random , optparse-applicative, ordered-containers, process, random-fu - , strict, text, vector, vty, word-wrap + , split, strict, tasty, tasty-hunit, tasty-quickcheck, text, vector + , vty, word-wrap }: mkDerivation { pname = "hascard"; - version = "0.2.1.0"; - sha256 = "13f7vmdrd3ibr78pjy7144qj0qa8s07k4j341fzw8w8af83m9wvc"; + version = "0.4.0.0"; + sha256 = "1rkcnpv22bfiyzmfdk82531yv6mh6g7imjch9qy8sxda2d73fdm7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers process random-fu strict text vector vty - word-wrap + ordered-containers process random-fu split strict tasty tasty-hunit + tasty-quickcheck text vector vty word-wrap ]; executableHaskellDepends = [ base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers process random-fu strict text vector vty - word-wrap + ordered-containers process random-fu split strict tasty tasty-hunit + tasty-quickcheck text vector vty word-wrap ]; testHaskellDepends = [ base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers process random-fu strict text vector vty - word-wrap + ordered-containers process random-fu split strict tasty tasty-hunit + tasty-quickcheck text vector vty word-wrap ]; description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax"; license = stdenv.lib.licenses.bsd3; @@ -114604,6 +115481,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashable-accelerate" = callPackage + ({ mkDerivation, accelerate, base, template-haskell }: + mkDerivation { + pname = "hashable-accelerate"; + version = "0.1.0.0"; + sha256 = "04cfwd1vyz4xm87ah3x1avs2yzqi6ygcd3sl70v50g492dfl6738"; + libraryHaskellDepends = [ accelerate base template-haskell ]; + description = "A class for types which can be converted into a hash value"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashable-extras" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest , filepath, hashable, transformers, transformers-compat @@ -114774,6 +115663,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashmap-throw" = callPackage + ({ mkDerivation, base, exceptions, hashable, hashmap }: + mkDerivation { + pname = "hashmap-throw"; + version = "0.1.0.0"; + sha256 = "0dibdmpb6nyhn37xfdw8wgam4a2w8b3hl04ivg08d1ybq4a4m1k5"; + libraryHaskellDepends = [ base exceptions hashable hashmap ]; + description = "Throw behaviour for hashmap lookup"; + license = stdenv.lib.licenses.mit; + }) {}; + "hashrename" = callPackage ({ mkDerivation, base, bytestring, cryptohash, directory, filepath }: @@ -114827,14 +115727,22 @@ self: { }) {}; "hashtables" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: + ({ mkDerivation, base, ghc-prim, hashable, HUnit, mwc-random + , primitive, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector + }: mkDerivation { pname = "hashtables"; - version = "1.2.3.4"; - sha256 = "1rjmxnr30g4hygiywkpz5p9sanh0abs7ap4zc1kgd8zv04kycp0j"; + version = "1.2.4.1"; + sha256 = "0vgggm7bqq55zmqj6qji89bfj3k1rdkikkfhyg81vsqf0f3bzhqa"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; + testHaskellDepends = [ + base ghc-prim hashable HUnit mwc-random primitive QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + vector + ]; description = "Mutable hash tables in the ST monad"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -115081,15 +115989,15 @@ self: { broken = true; }) {}; - "haskeline_0_8_0_0" = callPackage + "haskeline_0_8_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, HUnit, process, stm, terminfo, text , transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.8.0.0"; - sha256 = "0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb"; + version = "0.8.1.0"; + sha256 = "0r6skxr45k0qq5vlh9dyl5g5ham994b8z0k3z3v56bi3npvyi6xw"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -115721,12 +116629,12 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "haskell-gi-base_0_24_2" = callPackage + "haskell-gi-base_0_24_3" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.24.2"; - sha256 = "0qjbbfxlx4gqnyfnjpr4ray7fih8alsa2bxb5imkckhrzfx4xmq0"; + version = "0.24.3"; + sha256 = "007qy63s9d6rdhybnd7cfb5jsx0kzg7lbgximxkh5rd66bjbk9pc"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -116417,6 +117325,8 @@ self: { pname = "haskell-src"; version = "1.0.3.1"; sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; + revision = "1"; + editedCabalFile = "1li6czcs54wnij6qnvpx6f66iiw023pggb3zl3jvp74qqflcf5sg"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -116556,6 +117466,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-match" = callPackage + ({ mkDerivation, base, containers, filepath, haskell-src-exts + , hspec, interpolatedstring-perl6, pretty-simple, split + , template-haskell, text, transformers + }: + mkDerivation { + pname = "haskell-src-match"; + version = "0.0.0.1"; + sha256 = "0lhdnmzmwxsiw0if600apdvmkbqz44zwr7sypfclixl9c6h31wg0"; + libraryHaskellDepends = [ + base containers haskell-src-exts interpolatedstring-perl6 + pretty-simple split template-haskell transformers + ]; + testHaskellDepends = [ + base filepath hspec interpolatedstring-perl6 template-haskell text + ]; + description = "Testing code generators piece by piece"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "haskell-src-meta" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty , syb, tasty, tasty-hunit, template-haskell, th-orphans @@ -118436,6 +119368,8 @@ self: { ]; description = "Simple unsupervised segmentation model"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasktags" = callPackage @@ -119271,23 +120205,6 @@ self: { }) {}; "hasql-optparse-applicative" = callPackage - ({ mkDerivation, base-prelude, hasql, hasql-pool - , optparse-applicative - }: - mkDerivation { - pname = "hasql-optparse-applicative"; - version = "0.3.0.5"; - sha256 = "0q5ggbx3xlzq0lv6i6wac9zsf0x4k91cf1n5rg6q96wg90f0dxxq"; - libraryHaskellDepends = [ - base-prelude hasql hasql-pool optparse-applicative - ]; - description = "\"optparse-applicative\" parsers for \"hasql\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hasql-optparse-applicative_0_3_0_6" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative }: @@ -119461,6 +120378,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasqly-mysql" = callPackage + ({ mkDerivation, base, binary, bytestring, dlist, mtl + , mysql-haskell, scientific, text, time + }: + mkDerivation { + pname = "hasqly-mysql"; + version = "0.0.1"; + sha256 = "1la1lnwcv20jig72hgpgzy8a2ils95y0clhkf5ajvj1whh099g7p"; + libraryHaskellDepends = [ + base binary bytestring dlist mtl mysql-haskell scientific text time + ]; + description = "composable SQL generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hastache" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, process, syb, text @@ -120627,8 +121561,6 @@ self: { testHaskellDepends = [ base data-default HUnit ieee754 mtl ]; description = "Easily convert between latitude/longitude, UTM and OSGB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hcron" = callPackage @@ -121179,8 +122111,8 @@ self: { }: mkDerivation { pname = "headed-megaparsec"; - version = "0.1.0.4"; - sha256 = "1nl66j4fqmjcxkrmhm7jnbqqpw48727wfbb9xn0cz4yy1brivjrb"; + version = "0.2"; + sha256 = "1s2alhwmkk5czilm1m2dp72xpbdjhn7yhghrs1aca2js71x5j7qj"; libraryHaskellDepends = [ base case-insensitive megaparsec parser-combinators selective ]; @@ -121233,7 +122165,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "headroom_0_3_0_0" = callPackage + "headroom_0_3_1_0" = callPackage ({ mkDerivation, aeson, base, data-default-class, doctest, either , file-embed, hspec, microlens, microlens-th, mustache , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, rio @@ -121241,8 +122173,8 @@ self: { }: mkDerivation { pname = "headroom"; - version = "0.3.0.0"; - sha256 = "1d4dcb70vzpn6694d4z52aj12vzicmfyyrbhd6x816ic68db08nc"; + version = "0.3.1.0"; + sha256 = "0md8yzjq92xc9pq9h8a78irgyka23ck7nlhdbdyfnm2f490fx2yw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121283,6 +122215,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heapsize" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-heap, hashable + , primitive, unordered-containers + }: + mkDerivation { + pname = "heapsize"; + version = "0.1"; + sha256 = "0cmzmz6f572is70sp79fxriywl5d19rcb8c32x22c2yazyl6c6d9"; + libraryHaskellDepends = [ + base deepseq ghc-heap hashable primitive unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq primitive ]; + description = "Determine the size of runtime data structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "heapsort" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -122522,8 +123470,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.7.3"; - sha256 = "19mz8cqrk7v49h8k2bcpv31qnplx7r10k010gzcwmhhfyrlyrqyg"; + version = "0.7.4"; + sha256 = "0yj9njd168xpj4har99mbb9rr5dqsbnzqs1061s3czrzlp229z3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123014,52 +123962,52 @@ self: { "hevm" = callPackage ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base - , base16-bytestring, base64-bytestring, binary, brick, bytestring - , cereal, containers, cryptonite, data-dword, deepseq, directory - , fgl, filepath, ghci-pretty, haskeline, here, HUnit, lens - , lens-aeson, megaparsec, memory, monad-par, mtl, multiset - , operational, optparse-generic, process, QuickCheck - , quickcheck-text, readline, regex-tdfa, restless-git, rosezipper - , s-cargot, scientific, secp256k1, tasty, tasty-hunit - , tasty-quickcheck, temporary, text, text-format, time - , transformers, tree-view, unordered-containers, vector, vty, wreq + , base16-bytestring, binary, brick, bytestring, cborg, cereal + , containers, cryptonite, data-dword, deepseq, directory, ff, fgl + , filepath, free, haskeline, here, HUnit, lens, lens-aeson + , megaparsec, memory, monad-par, mtl, multiset, operational + , optparse-generic, process, QuickCheck, quickcheck-text + , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific + , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, text-format, time, transformers, tree-view + , unordered-containers, vector, vty, witherable, wreq }: mkDerivation { pname = "hevm"; - version = "0.24"; - sha256 = "0bzhswisrmlw8ajl6mr13vr3a7l0vywl394aihrc0xs6vwgyflh0"; + version = "0.41.0"; + sha256 = "13qf0bh47dppqbxv1g07411c1lfmfxl0pm2s3xkwdf7kr219l0hw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - abstract-par aeson ansi-wl-pprint base base16-bytestring - base64-bytestring binary brick bytestring cereal containers - cryptonite data-dword deepseq directory fgl filepath ghci-pretty - haskeline lens lens-aeson megaparsec memory monad-par mtl multiset - operational optparse-generic process QuickCheck quickcheck-text - readline restless-git rosezipper s-cargot scientific temporary text - text-format time transformers tree-view unordered-containers vector - vty wreq + abstract-par aeson ansi-wl-pprint base base16-bytestring binary + brick bytestring cborg cereal containers cryptonite data-dword + deepseq directory fgl filepath free haskeline lens lens-aeson + megaparsec memory monad-par mtl multiset operational + optparse-generic process QuickCheck quickcheck-text regex-tdfa + restless-git rosezipper s-cargot sbv scientific semver-range + temporary text text-format time transformers tree-view + unordered-containers vector vty witherable wreq ]; - librarySystemDepends = [ secp256k1 ]; + librarySystemDepends = [ ff secp256k1 ]; executableHaskellDepends = [ - aeson ansi-wl-pprint async base base16-bytestring base64-bytestring - binary brick bytestring containers cryptonite data-dword deepseq - directory filepath ghci-pretty lens lens-aeson memory mtl - optparse-generic process QuickCheck quickcheck-text readline - regex-tdfa temporary text text-format unordered-containers vector - vty + aeson ansi-wl-pprint async base base16-bytestring binary brick + bytestring containers cryptonite data-dword deepseq directory + filepath free lens lens-aeson memory mtl operational + optparse-generic process QuickCheck quickcheck-text regex-tdfa sbv + temporary text text-format unordered-containers vector vty ]; testHaskellDepends = [ - base base16-bytestring binary bytestring ghci-pretty here HUnit - lens mtl QuickCheck tasty tasty-hunit tasty-quickcheck text vector + base base16-bytestring binary bytestring containers free here HUnit + lens mtl QuickCheck sbv tasty tasty-hunit tasty-quickcheck text + vector ]; testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) secp256k1;}; + }) {ff = null; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage ({ mkDerivation, base, bytestring, cairo, filepath, haskell98 }: @@ -123103,10 +124051,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "hex"; - version = "0.1.2"; - sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj"; - revision = "1"; - editedCabalFile = "0khmrdni6njr4wxgz15yz77l8ar4qm2jj6v0lvfnwqdms4s6i80y"; + version = "0.2.0"; + sha256 = "1mc66758254d93m7vab7q6lhn7qphzxd6wyc3v6yq1diy0gji4va"; libraryHaskellDepends = [ base bytestring ]; description = "Convert strings into hexadecimal and back"; license = stdenv.lib.licenses.bsd3; @@ -123407,8 +124353,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hextra"; - version = "1.0.0.0"; - sha256 = "17ik20q07if3gvfsifm00k8z6iffcjwmy19n5xyzzc4bd17qffzb"; + version = "1.1.0.1"; + sha256 = "0iq6kj7mijxppjghpqx19s79sj6k1jqf21gfi8jqbj6bq7j2cdvj"; libraryHaskellDepends = [ base ]; description = "Generic and niche utility functions and more for Haskell"; license = stdenv.lib.licenses.mpl20; @@ -124397,7 +125343,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hie-bios_0_6_2" = callPackage + "hie-bios_0_7_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq , directory, extra, file-embed, filepath, ghc, hslogger @@ -124407,8 +125353,10 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.6.2"; - sha256 = "0x0lgrkbp4f9r96cf65d8qg55hp2qb14xd3zzap5yhybhlp54w8m"; + version = "0.7.1"; + sha256 = "00gkr4dbbs70vnd6y90iirss88j8ax714l9jmwdfkmslwd4m2ml8"; + revision = "3"; + editedCabalFile = "104cp386qbk6k72s2ld1cl0fny3f53x98zy3w10mlhqyaipqrf17"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126139,10 +127087,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.18.1"; - sha256 = "1yl6akcbmz5qy559m0k0cndwb6wdzvq2jqn7ahc46v3ai6hwk20c"; - revision = "1"; - editedCabalFile = "1fz1wwpxf6scr8nnrd2n1g92vya9bd0l54fcx3sqhyk5kaf8kp2z"; + version = "1.19.1"; + sha256 = "0wfsyf2q1kf90mj3lxs0m5ghj153axmpkc8xfy12vkz5imnyphfm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126234,23 +127180,23 @@ self: { }) {}; "hledger-flow" = callPackage - ({ mkDerivation, base, containers, foldl, HUnit - , optparse-applicative, stm, text, time, turtle + ({ mkDerivation, base, containers, exceptions, foldl, HUnit + , optparse-applicative, path, path-io, stm, text, time, turtle }: mkDerivation { pname = "hledger-flow"; - version = "0.13.2.0"; - sha256 = "1zajlqbayr6vm45y3901xwgg6acjn8fwx73mm9bnbsbxfzxn4g7d"; + version = "0.14.2.0"; + sha256 = "17a21rf2gj9hp7q0q7gg4znwa2j8xgrlxaq15akjn20sqp8l23ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers foldl stm text time turtle + base containers exceptions foldl path path-io stm text time turtle ]; executableHaskellDepends = [ - base optparse-applicative text turtle + base optparse-applicative path text turtle ]; testHaskellDepends = [ - base containers foldl HUnit stm text turtle + base containers foldl HUnit path path-io stm text turtle ]; description = "An hledger workflow focusing on automated statement import and classification"; license = stdenv.lib.licenses.gpl3; @@ -126265,8 +127211,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.11"; - sha256 = "1pqjyybbnhckz16in6skx3582aykk2yq5bf4ghbhj8iqbm3cczqf"; + version = "1.3.12"; + sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126294,8 +127240,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5.5"; - sha256 = "1rsi0mpdgi0g7m07y8bd3gpw5jc8saxw15ab7yhxif4m7dfwjgmg"; + version = "1.6.0"; + sha256 = "0s0pmdm1vk4ib5ncs9mxyzr3dx5m6ji9778kddzqwxc9y9gvq5sq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126330,35 +127276,33 @@ self: { ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat-batteries, blaze-markup, bytestring, call-stack , cassava, cassava-megaparsec, cmdargs, containers, data-default - , Decimal, deepseq, directory, doctest, extra, fgl, file-embed - , filepath, Glob, hashtables, megaparsec, mtl, old-time, parsec + , Decimal, directory, doctest, extra, fgl, file-embed, filepath + , Glob, hashtables, megaparsec, mtl, old-time, parsec , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular , tasty, tasty-hunit, template-haskell, text, time, timeit - , transformers, uglymemo, utf8-string + , transformers, uglymemo, unordered-containers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.18.1"; - sha256 = "16fd3412n4vdnjacngjx5078yzmypn389m91308kgbd8anv6bhj4"; - revision = "1"; - editedCabalFile = "1icjbfzdq2yd3h6qx245xyb4qahxih97rx63qhxx3vaicvph40pk"; + version = "1.19.1"; + sha256 = "0py11011r358nmnvwwkc8mlx6mpy36jm8sqlr4i8ihx3x0zjdgya"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec - cmdargs containers data-default Decimal deepseq directory extra fgl + cmdargs containers data-default Decimal directory extra fgl file-embed filepath Glob hashtables megaparsec mtl old-time parsec parser-combinators pretty-show regex-tdfa safe split tabular tasty tasty-hunit template-haskell text time timeit transformers uglymemo - utf8-string + unordered-containers utf8-string ]; testHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec - cmdargs containers data-default Decimal deepseq directory doctest - extra fgl file-embed filepath Glob hashtables megaparsec mtl - old-time parsec parser-combinators pretty-show regex-tdfa safe - split tabular tasty tasty-hunit template-haskell text time timeit - transformers uglymemo utf8-string + cmdargs containers data-default Decimal directory doctest extra fgl + file-embed filepath Glob hashtables megaparsec mtl old-time parsec + parser-combinators pretty-show regex-tdfa safe split tabular tasty + tasty-hunit template-haskell text time timeit transformers uglymemo + unordered-containers utf8-string ]; description = "A reusable library providing the core functionality of hledger"; license = stdenv.lib.licenses.gpl3; @@ -126417,8 +127361,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.18.1"; - sha256 = "0ggfz93f14znnjzkznzblsdk6iqbwwj2yxzx5rgsr0xcjzm8gx64"; + version = "1.19.1"; + sha256 = "17iz82jr89qxfd7j6q16w2jjr38mb7d94p3rbp0ks01bf4rlq5fl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126457,7 +127401,7 @@ self: { , case-insensitive, clientsession, cmdargs, conduit, conduit-extra , containers, data-default, Decimal, directory, extra, filepath , hjsmin, hledger, hledger-lib, http-client, http-conduit - , http-types, megaparsec, mtl, network, semigroups, shakespeare + , http-types, megaparsec, mtl, network, shakespeare , template-haskell, text, time, transformers, unix-compat , unordered-containers, utf8-string, wai, wai-cors, wai-extra , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form @@ -126465,10 +127409,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.18.1"; - sha256 = "1s10xyiqs77xl949m7rc71a4511i755yiv88jb0pc32xba7a2b1y"; - revision = "1"; - editedCabalFile = "01amhyjlw6xjh97zhxx8j05jszw0c0wnv7ka835n7rjnnv8199l3"; + version = "1.19.1"; + sha256 = "03wak0dgxhf7y2mc2az4xcypgz1z1lf65vn6kj98z063pmlwp1b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126476,8 +127418,8 @@ self: { clientsession cmdargs conduit conduit-extra containers data-default Decimal directory extra filepath hjsmin hledger hledger-lib http-client http-conduit http-types megaparsec mtl network - semigroups shakespeare template-haskell text time transformers - unix-compat unordered-containers utf8-string wai wai-cors wai-extra + shakespeare template-haskell text time transformers unix-compat + unordered-containers utf8-string wai wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form yesod-static ]; @@ -126584,8 +127526,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.1.6"; - sha256 = "1kbzj3qw3rr4yb2x50q79abckh6fvadbzqidbzkbydqqm0yhqhnx"; + version = "3.2"; + sha256 = "0g3ay30dwr2v22bybapryl0ykjyqs5ym1i1p7jfky7lp20ri9x1z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -126697,6 +127639,8 @@ self: { ]; description = "High-level Redis Database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hlrdb-core" = callPackage @@ -126729,6 +127673,24 @@ self: { broken = true; }) {}; + "hls-plugin-api" = callPackage + ({ mkDerivation, aeson, base, containers, data-default, Diff, ghc + , ghc-boot-th, ghcide, haskell-lsp, hslogger, lens, process + , regex-tdfa, shake, text, unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "0.4.0.0"; + sha256 = "1fr9j1nf0lkff3fb5vslfvkb42836ncfhhkswn8rq6mwlv0mv03k"; + libraryHaskellDepends = [ + aeson base containers data-default Diff ghc ghc-boot-th ghcide + haskell-lsp hslogger lens process regex-tdfa shake text + unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hlwm" = callPackage ({ mkDerivation, base, stm, transformers, unix, X11 }: mkDerivation { @@ -127465,26 +128427,27 @@ self: { ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, comonad, containers, criterion, data-fix, deepseq , deriving-compat, Diff, directory, exceptions, filepath, free - , Glob, hashable, hashing, hedgehog, hnix-store-core, http-client - , http-client-tls, http-types, lens-family, lens-family-core - , lens-family-th, logict, megaparsec, monad-control, monadlist, mtl - , neat-interpolation, optparse-applicative, parser-combinators - , pretty-show, prettyprinter, process, ref-tf, regex-tdfa - , scientific, semialign, semialign-indexed, serialise, some, split - , syb, tasty, tasty-hedgehog, tasty-hunit, tasty-th - , template-haskell, text, these, time, transformers - , transformers-base, unix, unordered-containers, vector, xml + , gitrev, Glob, hashable, hashing, hedgehog, hnix-store-core + , http-client, http-client-tls, http-types, lens-family + , lens-family-core, lens-family-th, logict, megaparsec + , monad-control, monadlist, mtl, neat-interpolation + , optparse-applicative, parser-combinators, pretty-show + , prettyprinter, process, ref-tf, regex-tdfa, scientific, semialign + , semialign-indexed, serialise, some, split, syb, tasty + , tasty-hedgehog, tasty-hunit, tasty-th, template-haskell, text + , these, time, transformers, transformers-base, unix + , unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.9.1"; - sha256 = "1vxb55ih0gpaazb8kvms2sw21l78hb36cbz5217vg94i3yvk8zls"; + version = "0.10.1"; + sha256 = "19a5pa1ji4hjr3vjvbkjmhnysnd8jcpkzlj9f2qw67h5iagysccy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring comonad containers data-fix deepseq deriving-compat directory exceptions - filepath free hashable hashing hnix-store-core http-client + filepath free gitrev hashable hashing hnix-store-core http-client http-client-tls http-types lens-family lens-family-core lens-family-th logict megaparsec monad-control monadlist mtl neat-interpolation optparse-applicative parser-combinators @@ -127754,16 +128717,17 @@ self: { }) {}; "hobbits" = callPackage - ({ mkDerivation, base, deepseq, haskell-src-exts, haskell-src-meta - , mtl, syb, tagged, template-haskell, th-expand-syns, transformers + ({ mkDerivation, base, containers, deepseq, haskell-src-exts + , haskell-src-meta, mtl, syb, tagged, template-haskell + , th-expand-syns, transformers, vector }: mkDerivation { pname = "hobbits"; - version = "1.2.4"; - sha256 = "0hqg29s938hz1hxb7ljv3wnr8iaxwjmi66zjvvy1939g5r6fmdll"; + version = "1.3"; + sha256 = "1w8bz1z747dd7vh110iynmsq5n0a84zw1gk7jcxfwl5lpfrqz97s"; libraryHaskellDepends = [ - base deepseq haskell-src-exts haskell-src-meta mtl syb tagged - template-haskell th-expand-syns transformers + base containers deepseq haskell-src-exts haskell-src-meta mtl syb + tagged template-haskell th-expand-syns transformers vector ]; description = "A library for canonically representing terms with binding"; license = stdenv.lib.licenses.bsd3; @@ -127793,46 +128757,45 @@ self: { }) {ocilib = null;}; "hocker" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, async, base - , bytestring, concurrentoutput, containers, cryptonite, data-fix - , deepseq, directory, exceptions, filepath, foldl, hnix - , http-client, http-types, lens, lens-aeson, lifted-base, memory + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring + , concurrentoutput, containers, cryptonite, data-fix, deepseq + , directory, exceptions, filepath, foldl, hnix, http-client + , http-types, lens, lens-aeson, lifted-base, megaparsec, memory , mtl, neat-interpolation, network, network-uri, nix-paths , optional-args, optparse-applicative, optparse-generic, pooled-io - , pureMD5, scientific, tar, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, temporary, text, time - , transformers, turtle, unordered-containers, uri-bytestring - , vector, wreq, zlib + , prettyprinter, pureMD5, scientific, tar, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text + , time, transformers, turtle, unordered-containers, uri-bytestring + , vector, word8, wreq, zlib }: mkDerivation { pname = "hocker"; - version = "1.0.5"; - sha256 = "0xv22kiw44y72asrnk027h9gxpfhjzgdm8sbcy70s4ipn8n62hha"; + version = "1.0.6"; + sha256 = "1j6gcb33jf3kcskxyl0s264h5b1rvmcgkrmhrgzw7i3314394xdj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty ansi-wl-pprint async base bytestring - concurrentoutput containers cryptonite data-fix deepseq directory - exceptions filepath foldl hnix http-client http-types lens - lens-aeson lifted-base memory mtl neat-interpolation network + aeson aeson-pretty async base bytestring concurrentoutput + containers cryptonite data-fix deepseq directory exceptions + filepath foldl hnix http-client http-types lens lens-aeson + lifted-base megaparsec memory mtl neat-interpolation network network-uri nix-paths optparse-applicative optparse-generic - pooled-io pureMD5 scientific tar temporary text time transformers - turtle unordered-containers uri-bytestring vector wreq zlib + pooled-io prettyprinter pureMD5 scientific tar temporary text time + transformers turtle unordered-containers uri-bytestring vector wreq + zlib ]; executableHaskellDepends = [ base bytestring cryptonite data-fix filepath hnix lens mtl network optional-args optparse-applicative optparse-generic temporary text ]; testHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers cryptonite mtl - network network-uri tasty tasty-golden tasty-hunit tasty-quickcheck - tasty-smallcheck text unordered-containers + aeson base bytestring containers cryptonite mtl network network-uri + prettyprinter tasty tasty-golden tasty-hunit tasty-quickcheck + tasty-smallcheck text unordered-containers word8 ]; description = "Interact with the docker registry and generate nix build instructions"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hodatime" = callPackage @@ -130019,8 +130982,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.9.0.0"; - sha256 = "17w916p4gfzflgvd35d5nxzfch82bwyranvlv28j2qz3dvk15ymn"; + version = "1.9.1.0"; + sha256 = "13q20ak0zakwvlc05y187iq2vpvdjx9dlmvmgvv2gjd263sqcgm2"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -130050,6 +131013,8 @@ self: { pname = "hpqtypes-extras"; version = "1.10.2.1"; sha256 = "06vx7llfyidldp5ar80a3dkw14xv19v1s8kc7kf6vs1gb3vx8r5n"; + revision = "1"; + editedCabalFile = "0vn0396jhxnrnp8724kpl7yjy4aywa2nm1vb7znz0fmzr0vp54yi"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -130982,7 +131947,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; + }) {mesos = null; inherit (pkgs) protobuf;}; "hs-multiaddr" = callPackage ({ mkDerivation, base, bytes, bytestring, cereal, either-unwrap @@ -133157,6 +134122,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lua5_3;}; + "hslua_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 + , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "1.2.0"; + sha256 = "0a295zqpbrv8a2hw7msz5p7brlswag16sg08dyz399ij6b7q5x0h"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers exceptions mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific @@ -133164,10 +134152,8 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "1.0.2"; - sha256 = "1v5saxppbnq62ds00a7diadvqg8dnsx0sjlcanjj15h13j3yw964"; - revision = "1"; - editedCabalFile = "1bikj789x82f4b1pqij1wshkncvlxwjwyxf9z1spfvg8nsb5sd7y"; + version = "1.0.3"; + sha256 = "0qqcf9km39bmw29d2s5zw91rxgmmm8nqfnfs5hkhmsgh5kvaal5h"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -133196,18 +134182,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-doclayout_0_2_0" = callPackage + ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-doclayout"; + version = "0.2.0"; + sha256 = "1ilkyv0wscz2kv0jkn45qc8ng5l1hvvbkwh972zvisys1m3hri4y"; + libraryHaskellDepends = [ base doclayout hslua text ]; + testHaskellDepends = [ + base doclayout hslua tasty tasty-hunit tasty-lua + ]; + description = "Lua module wrapping Text.DocLayout."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslua-module-system" = callPackage ({ mkDerivation, base, containers, directory, exceptions, hslua - , tasty, tasty-hunit, temporary, text + , tasty, tasty-hunit, tasty-lua, temporary, text }: mkDerivation { pname = "hslua-module-system"; - version = "0.2.1"; - sha256 = "1m7wz3g5c34pyizqw5mllzhsy2vziddhlbhjfwdvd7nhd3p4v3hh"; + version = "0.2.2"; + sha256 = "0swl20v40kkh67vn6546a0afjcsq56x3ww854x3pwypxz1p6dyri"; libraryHaskellDepends = [ base containers directory exceptions hslua temporary ]; - testHaskellDepends = [ base hslua tasty tasty-hunit text ]; + testHaskellDepends = [ + base hslua tasty tasty-hunit tasty-lua text + ]; description = "Lua module wrapper around Haskell's System module"; license = stdenv.lib.licenses.mit; }) {}; @@ -133225,6 +134230,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-text_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-text"; + version = "0.3.0"; + sha256 = "1y15b38r0xiwcwpzsdr8x8i4y8all2jd3z0j7fvny6lsbna2hf7r"; + libraryHaskellDepends = [ base bytestring hslua text ]; + testHaskellDepends = [ + base hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsluv-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, containers }: mkDerivation { @@ -133263,10 +134285,9 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; - inherit (pkgs) jasper; inherit (pkgs) lcms; - inherit (pkgs) libjpeg; inherit (pkgs) libpng; - inherit (pkgs) libxml2; tiff = null; wmflite = null; - inherit (pkgs) zlib;}; + jasper = null; inherit (pkgs) lcms; inherit (pkgs) libjpeg; + inherit (pkgs) libpng; inherit (pkgs) libxml2; tiff = null; + wmflite = null; inherit (pkgs) zlib;}; "hsmisc" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec @@ -133585,8 +134606,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.7.1"; - sha256 = "1x8rcr7j1azcaw0fg1xzp8j0gr4ias36z09aj24i4xp8pnyfp341"; + version = "2.7.4"; + sha256 = "0zql8cl025ai3yx2dhp1sgvmw8n4ngqbrlmb42hcgv26q8qnvhmi"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -133594,22 +134615,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec_2_7_2" = callPackage - ({ mkDerivation, base, hspec-core, hspec-discover - , hspec-expectations, QuickCheck - }: - mkDerivation { - pname = "hspec"; - version = "2.7.2"; - sha256 = "0zb9b85vx7wyx8zcrkqwlwp9qmsg3f5qnd43ps6xfrsn1l2vszm9"; - libraryHaskellDepends = [ - base hspec-core hspec-discover hspec-expectations QuickCheck - ]; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -133673,10 +134678,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.7.1"; - sha256 = "08vk8588lap00hsln8zl64dazbb28lzk4b4h5vnm7xvhg7r21k1c"; - revision = "1"; - editedCabalFile = "0aw68sgz2p63y0vg07c1jx2pr8lmhp5c1ck60dlipyxsa00455i6"; + version = "2.7.4"; + sha256 = "1k0rs9399m6bzmndc9ybs26mxrzkl9pifrijvknysbaqfcifmq35"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -133694,34 +134697,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-core_2_7_2" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, stm, temporary, tf-random, transformers - }: - mkDerivation { - pname = "hspec-core"; - version = "2.7.2"; - sha256 = "0vzsxwgg3rfp6mxq85sb1v2wd77f2lwdg9zm5f1mqm02avfglfnk"; - libraryHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm tf-random transformers - ]; - testHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random - transformers - ]; - testToolDepends = [ hspec-meta ]; - 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 ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -133745,8 +134720,8 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.7.1"; - sha256 = "0r47fm94wa6qrhp8cc1zzkjrxc32rnagfn9m9ga4dm6p6ydw4c8b"; + version = "2.7.4"; + sha256 = "02laain23bcnzsl65347qr5knvrmrlhd0kzc0d88kx59lpzm27a0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -133759,26 +134734,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-discover_2_7_2" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck - }: - mkDerivation { - pname = "hspec-discover"; - version = "2.7.2"; - sha256 = "0n3lvdznmrgrhd11969xn4ci31439y6fpr9xkzsabij87rw091l8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck - ]; - testToolDepends = [ hspec-meta ]; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -134026,6 +134981,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-megaparsec_2_2_0" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-expectations + , megaparsec + }: + mkDerivation { + pname = "hspec-megaparsec"; + version = "2.2.0"; + sha256 = "0hyf06gzzqd6sqd76crwxycwgx804sd39z7i0c2vmv1qgsxv82gn"; + libraryHaskellDepends = [ + base containers hspec-expectations megaparsec + ]; + testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; + description = "Utility functions for testing Megaparsec parsers with Hspec"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-meta" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, HUnit @@ -135857,8 +136829,8 @@ self: { pname = "htoml-megaparsec"; version = "2.1.0.3"; sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x"; - revision = "2"; - editedCabalFile = "0vlyr965g1x5hk2mxlp8w4vv9ijq1gbm3i76slkl2aa38bf2i4ki"; + revision = "3"; + editedCabalFile = "074r8wr9xar40ybm6wqg2s0k32kiapbjm8k3djp4lz6gjxyw7nc8"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -136019,6 +136991,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_4_2" = callPackage + ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat + , bytestring, containers, cookie, hashable, hspec, hspec-discover + , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged + , text, time-compat, transformers, unordered-containers, uuid-types + }: + mkDerivation { + pname = "http-api-data"; + version = "0.4.2"; + sha256 = "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl"; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base base-compat bytestring + containers cookie hashable http-types tagged text time-compat + transformers unordered-containers uuid-types + ]; + testHaskellDepends = [ + base base-compat bytestring cookie hspec HUnit nats QuickCheck + quickcheck-instances text time-compat unordered-containers + uuid-types + ]; + 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 ({ mkDerivation, attoparsec, base, bytestring, http-types }: mkDerivation { @@ -136059,7 +137057,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_7_1" = callPackage + "http-client_0_7_2_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -136068,8 +137066,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.1"; - sha256 = "0qjdjpxwqbnxfgqny0iylv11ng2swmdz57bwzy3mif5hfamvr6p0"; + version = "0.7.2.1"; + sha256 = "0b699f07yqa525xqqcs4cn32fryjc2212sv8v83yfqlqwdwzr7jg"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -136652,6 +137650,31 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "http-link-header_1_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, directory + , errors, hspec, hspec-attoparsec, http-api-data, network-uri + , QuickCheck, text, transformers + }: + mkDerivation { + pname = "http-link-header"; + version = "1.2.0"; + sha256 = "1y0vr8fi8pap7ixbafp2lxvdk9hh56h370jw7qd11gm2032nnvg9"; + libraryHaskellDepends = [ + attoparsec base bytestring errors http-api-data network-uri text + ]; + testHaskellDepends = [ + attoparsec base bytestring errors hspec hspec-attoparsec + http-api-data network-uri QuickCheck text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion directory errors http-api-data + network-uri text transformers + ]; + description = "A parser and writer for the HTTP Link header per RFC 5988"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-listen" = callPackage ({ mkDerivation, base, bytestring, exceptions, HTTP, network , transformers @@ -136837,6 +137860,21 @@ self: { broken = true; }) {}; + "http-query" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit, network-uri + , text + }: + mkDerivation { + pname = "http-query"; + version = "0.1.0"; + sha256 = "1j2ad7ym5mkpavlw1fp07n4qlggms04i93l5rv6vg07ljf4imjvs"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit network-uri text + ]; + description = "Simple http queries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-querystring" = callPackage ({ mkDerivation, base, bytestring, containers, doctest, hspec , http-types, QuickCheck @@ -138074,6 +139112,8 @@ self: { pname = "hw-balancedparens"; version = "0.4.1.0"; sha256 = "1ddxg00pwjvlrd4zdx9b9y7hm8rgxsxkvzzvwc34p2y75rivp21l"; + revision = "1"; + editedCabalFile = "0mc9lmjc3xrad4jlc9v66078362a791hnrrg9bclg1nq7jicfxgx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138214,8 +139254,8 @@ self: { pname = "hw-dsv"; version = "0.4.1.0"; sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; - revision = "1"; - editedCabalFile = "1xhdvqmqm44ky8mbwi64fj3bawqswf58ghlbj2bvk136yflvz2c7"; + revision = "2"; + editedCabalFile = "1l7aww6nci05ns7hnk46r20as3xy1j0s5fxsrb5w0x9y2kwvqj61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138255,8 +139295,8 @@ self: { pname = "hw-dump"; version = "0.1.1.0"; sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr"; - revision = "1"; - editedCabalFile = "0v310296cxsv92k2rjrc9zrwh7yb7lkjwivndpbh5hv5p8ll0zm6"; + revision = "2"; + editedCabalFile = "0p6cbijds7vc8bx9rb8s8bwr9dp4qc91idmd64llgz06d9kmvkcs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138290,8 +139330,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.2.0"; sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj"; - revision = "1"; - editedCabalFile = "0qqshcj482x0yfmb76fj6ng57sf3i0r8daz93kzab8lscarh31j9"; + revision = "2"; + editedCabalFile = "0l7h7pr6gpq0xnp4w003q3dxw7pmv2d6kpx2iqfc3nzzpa562ivv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138443,6 +139483,8 @@ self: { pname = "hw-ip"; version = "2.4.2.0"; sha256 = "1bvh4fkg1ffr3y8wink62rgkynlcgjhmra7a4w01h1dmw1vb2vfx"; + revision = "1"; + editedCabalFile = "19jbgqsmc71apmr6z0n0a2hgfhv9r0bsqa2x55r8grpyr91blpmw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138476,6 +139518,8 @@ self: { pname = "hw-json"; version = "1.3.2.1"; sha256 = "11lf4nxnkk8l25a44g1pkr9j1w03l69gqjgli5yfj6k68lzml7bf"; + revision = "1"; + editedCabalFile = "0l42hlc0icik28isjihqsj4cxzgdj1vzyxwazlyyv4f52liyjk61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138547,6 +139591,8 @@ self: { pname = "hw-json-simd"; version = "0.1.1.0"; sha256 = "0bpfyx2bd7pcr8y8bfahcdm30bznqixfawraq3xzy476vy9ppa9n"; + revision = "1"; + editedCabalFile = "047s5clxvi3l9x80lnf7nrv7myxnvqmh8y7syb2ryv3m549lyv2q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -138576,8 +139622,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.1.0"; sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl"; - revision = "2"; - editedCabalFile = "144afi48rm613gcb8gccfyw5ybx9mzsfzsfq1nvsmlyijl8rgc1x"; + revision = "3"; + editedCabalFile = "0zmq1gb9znb84d9igppww6295glnhg5b6xlgadr435cddp5zmhpx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138616,6 +139662,8 @@ self: { pname = "hw-json-standard-cursor"; version = "0.2.3.1"; sha256 = "1mpsspp6ba2zqv38a0rcv93mbwb1rb8snmxklf32g02djj8b4vir"; + revision = "1"; + editedCabalFile = "0gdvwhj2jmd8dm1yi3kzs0lyw5r4bk7c50s21z1600v36bmzpdm1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138752,8 +139800,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.1.0"; sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38"; - revision = "1"; - editedCabalFile = "070ac32s0azzhnqwrvhnfa18sxn60ayhmlikr6zk4vl1v03y0xbc"; + revision = "2"; + editedCabalFile = "0hlmi9w5z7j9ycqjf5avx3b09yglcbx8krypv274j2qrm5fzypr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138856,8 +139904,8 @@ self: { pname = "hw-rankselect"; version = "0.13.4.0"; sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7"; - revision = "1"; - editedCabalFile = "03p711rvs3qn9x5rfc90yxrbyp5fqsi9i2wbiwrs3vq6if66vc5z"; + revision = "2"; + editedCabalFile = "03lc8cgijr4ysz0i9c4pjhas4cd5ifxs400cr0nbasjvmz27hr3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139017,8 +140065,8 @@ self: { pname = "hw-uri"; version = "0.2.1.0"; sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs"; - revision = "1"; - editedCabalFile = "0bbsv8dj0z6wvgn0ldgvbrhji8mw5514pqwrp4ih8i2mjnfcdh2a"; + revision = "2"; + editedCabalFile = "0i6cw8m5g2hasif3q8gk7kpzavpmmk9fgr7vcqvym202ccbyj3dq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139067,8 +140115,8 @@ self: { pname = "hw-xml"; version = "0.5.1.0"; sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4"; - revision = "2"; - editedCabalFile = "1zi0ma6fmzghlc65dxpznsyiyp4ij7cwz1yw35i0jjm314mhi4va"; + revision = "3"; + editedCabalFile = "0b1lkhc6qf5vqafn69bid01k1hi043k7yrpl7pbxfrn154w8afpm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -141345,8 +142393,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.10.1.1"; - sha256 = "10rsdcc2l0gkhapvi5vzjc7m2bwv67k4iy3vjkx8i92jk6023y64"; + version = "0.10.1.2"; + sha256 = "1gs2j0qgxzf346nlnq0zx12yj528ykxia5r3rlldpf6f01zs89v8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -142037,6 +143085,25 @@ self: { broken = true; }) {}; + "immortal_0_2_2_1" = 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "immortal" = callPackage ({ mkDerivation, base, stm, tasty, tasty-hunit, transformers , unliftio-core @@ -142211,8 +143278,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.1.0.0"; - sha256 = "0yyzfpmv5x2ivzjsjwngklxv5nkad987ns8w3g7h92s5j1fb7x82"; + version = "0.2.0.0"; + sha256 = "1rzif3hzayqhm6spmynvw7ynkymsycaiycf6z9h18382vsd53qrk"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -142908,30 +143975,39 @@ self: { }) {}; "indigo" = callPackage - ({ mkDerivation, base, constraints, containers, fmt, hedgehog - , hspec-expectations, HUnit, lorentz, morley, morley-prelude - , reflection, singletons, tasty, tasty-discover, tasty-hedgehog - , tasty-hunit-compat, template-haskell, vinyl + ({ mkDerivation, base, cleveland, constraints, containers + , directory, fmt, hedgehog, hspec-expectations, HUnit, lorentz + , megaparsec, morley, morley-prelude, optparse-applicative, process + , reflection, shelly, singletons, string-interpolate, summoner + , tasty, tasty-discover, tasty-hedgehog, tasty-hunit-compat, text + , vinyl, with-utf8 }: mkDerivation { pname = "indigo"; - version = "0.1.0.0"; - sha256 = "03bspqbw8iz25d58xvy18qzk7wrm5k48k6bvnnslkikqy2bnkcr1"; + version = "0.2.2"; + sha256 = "1ggq5ryq90vmxd4ar93nsfzmmq7b1h3i4piv39220kkpgzz2x291"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base constraints containers lorentz morley morley-prelude - reflection singletons template-haskell vinyl + reflection singletons vinyl with-utf8 + ]; + executableHaskellDepends = [ + base directory megaparsec morley morley-prelude + optparse-applicative process shelly string-interpolate summoner + text with-utf8 ]; testHaskellDepends = [ - base containers fmt hedgehog hspec-expectations HUnit lorentz - morley morley-prelude singletons tasty tasty-hedgehog - tasty-hunit-compat + base cleveland containers fmt hedgehog hspec-expectations HUnit + lorentz morley morley-prelude singletons tasty tasty-hedgehog + tasty-hunit-compat with-utf8 ]; testToolDepends = [ tasty-discover ]; description = "Convenient imperative eDSL over Lorentz"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {cleveland = null;}; "inf-interval" = callPackage ({ mkDerivation, array, base, deepseq, QuickCheck, text, vector }: @@ -143076,8 +144152,8 @@ self: { }: mkDerivation { pname = "inflections"; - version = "0.4.0.5"; - sha256 = "0fdq3iwa2vgb5k19ck6jxzh7f1xsf1kpwx4p3agpdpsrylrcanvb"; + version = "0.4.0.6"; + sha256 = "1054v250p86gb1kvbrp60fzwds8v8nsqap1970j7hgk5hjwq1xj1"; libraryHaskellDepends = [ base exceptions megaparsec text unordered-containers ]; @@ -143491,8 +144567,6 @@ self: { ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -143850,8 +144924,8 @@ self: { pname = "int-cast"; version = "0.2.0.0"; sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; - revision = "2"; - editedCabalFile = "1fhc91170q9q9k628wc3dqzdvxfjs97jzg5x7g0ndaqnh60l8cy5"; + revision = "3"; + editedCabalFile = "1b99lqxwbhg96iykfr2l7qd388cbx9sf8bln728505qgj6kgsvj7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -144542,8 +145616,8 @@ self: { ({ mkDerivation, base, containers, text, vector, word8 }: mkDerivation { pname = "intmap-graph"; - version = "1.1.0.0"; - sha256 = "0yg88vvq53kbzw2r8i1w1g4am4bkp8qzgy9qsc7wknb3zwlzs89w"; + version = "1.3.0.0"; + sha256 = "0g4kf7d4yh29jlb5a2f8awjbmaan2f7m1ybkcihayp83lvjld4v0"; libraryHaskellDepends = [ base containers text vector word8 ]; description = "A graph library that allows to explore edges after their type"; license = stdenv.lib.licenses.bsd3; @@ -144609,15 +145683,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "intro_0_8_0_0" = callPackage + "intro_0_9_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, extra, hashable , lens, mtl, optics, QuickCheck, safe, text, transformers , unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.8.0.0"; - sha256 = "1vmhmpcikxlmad2c55bdlsa7j1x30irjb7dp69qii650qslh2rf3"; + version = "0.9.0.0"; + sha256 = "0x48bj9nri2zhsjpwx08nvjmpsjq6zd61npa02zsf357wylxir0x"; libraryHaskellDepends = [ base bytestring containers extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -144890,8 +145964,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "io-manager"; - version = "0.1.0.2"; - sha256 = "0f21h36z2ls0d6g31pcf4kcyfninaxws8w159zy33bwa19saf2mz"; + version = "0.1.0.3"; + sha256 = "04584flxw3qwzdnas8nbxp6riw6jfvhgy0kkkzjkxg53y1d8ri3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -144959,10 +146033,8 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.5.1.0"; - sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la"; - revision = "1"; - editedCabalFile = "0n0qs5lgryh3zxy73j3qbpnxand43yd2bj6pclvyii8apqqp901a"; + version = "1.5.2.0"; + sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -145267,22 +146339,24 @@ self: { "ipfs" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, directory-tree - , doctest, envy, flow, Glob, ip, lens, lens-aeson, monad-logger - , QuickCheck, regex-compat, rio, servant-client, servant-server - , swagger2, text, vector, yaml + , doctest, envy, flow, Glob, http-media, ip, lens, lens-aeson + , monad-logger, QuickCheck, regex-compat, rio, servant + , servant-client, servant-server, swagger2, text, vector, yaml }: mkDerivation { pname = "ipfs"; - version = "1.1.2"; - sha256 = "13pzj9wx7f0wgzk1hy791a4p2ivfxyb045srfa75l065ca8bjnis"; + version = "1.1.5.0"; + sha256 = "050zj21m4pg8jnpd594p2wc5m3nn4j6cmmv0069mi7kg473dqz2m"; libraryHaskellDepends = [ - aeson base bytestring envy flow Glob ip lens monad-logger - regex-compat rio servant-client servant-server swagger2 text vector + aeson base bytestring envy flow Glob http-media ip lens + monad-logger regex-compat rio servant servant-client servant-server + swagger2 text vector ]; testHaskellDepends = [ aeson base bytestring directory directory-tree doctest envy flow - Glob ip lens lens-aeson monad-logger QuickCheck regex-compat rio - servant-client servant-server swagger2 text vector yaml + Glob http-media ip lens lens-aeson monad-logger QuickCheck + regex-compat rio servant servant-client servant-server swagger2 + text vector yaml ]; description = "Access IPFS locally and remotely"; license = stdenv.lib.licenses.agpl3Plus; @@ -145462,8 +146536,8 @@ self: { }: mkDerivation { pname = "ipython-kernel"; - version = "0.10.2.0"; - sha256 = "0ylqbcs7xdhkm0if18f1cmz4144gx0p4r9wgggbzphfx8v8lhz9a"; + version = "0.10.2.1"; + sha256 = "016w7bmji3k1cnnl3vq35zq6fnqdvc2x762zfzv4ync2jz63rq38"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -146827,23 +147901,23 @@ self: { ({ mkDerivation, base, binary, ixset-typed }: mkDerivation { pname = "ixset-typed-binary-instance"; - version = "0.1.0.0"; - sha256 = "1qa00y5cn3i2b66h87i6sfx6xx4yvgq7gk6maij5b9w4c821h4m4"; + version = "0.1.0.2"; + sha256 = "1jgqc1ys5pvfkha8pyddz5f01qsmv9a83xw0q75njk8zhqajlyvx"; libraryHaskellDepends = [ base binary ixset-typed ]; description = "Binary instance for ixset-typed"; license = stdenv.lib.licenses.mit; }) {}; "ixset-typed-conversions" = callPackage - ({ mkDerivation, base, exceptions, hashable, ixset-typed + ({ mkDerivation, base, exceptions, free, hashable, ixset-typed , unordered-containers, zipper-extra }: mkDerivation { pname = "ixset-typed-conversions"; - version = "0.1.0.1"; - sha256 = "09fl92lkalbzq23742wjiw4568607cdbxy3a8qgkm2hn8r7djhwi"; + version = "0.1.2.0"; + sha256 = "15hxis8m60kfxi65k4sq2wica65whh8l1axw8jkx37yh1fys520x"; libraryHaskellDepends = [ - base exceptions hashable ixset-typed unordered-containers + base exceptions free hashable ixset-typed unordered-containers zipper-extra ]; description = "Conversions from ixset-typed to other containers"; @@ -146854,8 +147928,8 @@ self: { ({ mkDerivation, base, hashable, ixset-typed }: mkDerivation { pname = "ixset-typed-hashable-instance"; - version = "0.1.0.1"; - sha256 = "14cd3kzhqv8w9f756drhjpmrr32i6n9sjmp9fk2gngsigaksnvnk"; + version = "0.1.0.2"; + sha256 = "0bwajqlj1kpis2616lrmcymmag66fkmdrsrj0r3kf8j6090zxmyv"; libraryHaskellDepends = [ base hashable ixset-typed ]; description = "Hashable instance for ixset-typed"; license = stdenv.lib.licenses.mit; @@ -147887,28 +148961,27 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, concise, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, pem, QuickCheck - , quickcheck-instances, safe, semigroups, tasty, tasty-hspec - , tasty-quickcheck, template-haskell, text, time - , unordered-containers, vector, x509 + , quickcheck-instances, safe, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 }: mkDerivation { pname = "jose"; - version = "0.8.3"; - sha256 = "0izrbjcmsiv67d2vmiqgmnzn27pvs0kvka3rw5x33fwjgq0b3jyv"; + version = "0.8.3.1"; + sha256 = "14cbdah9khw8z876c1fn26asp1xa3azn7hh7a04chznmqagnmbmj"; 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 + QuickCheck quickcheck-instances safe template-haskell text time + unordered-containers vector x509 ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring concise containers cryptonite hspec lens memory monad-time mtl network-uri - pem QuickCheck quickcheck-instances safe semigroups tasty - tasty-hspec tasty-quickcheck template-haskell text time - unordered-containers vector x509 + pem QuickCheck quickcheck-instances safe 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; @@ -148273,6 +149346,8 @@ self: { pname = "json-api-lib"; version = "0.3.0.0"; sha256 = "14lycfqjp3v6lnr4vqagps80dpvy8z6gs6sqq3qz184xyw4m2ini"; + revision = "1"; + editedCabalFile = "16k87v87lq2xf3rbig4229a2gc3p6s9a771g48a95xc0rk4k4hkk"; libraryHaskellDepends = [ aeson base containers data-default deepseq lens lens-aeson text unordered-containers uri-encode @@ -148433,15 +149508,13 @@ self: { "json-bytes-builder" = callPackage ({ mkDerivation, aeson, base, base-prelude, bytestring, criterion - , rebase, scientific, semigroups, text + , rebase, scientific, text }: mkDerivation { pname = "json-bytes-builder"; - version = "0.5.2"; - sha256 = "1a7bak30av58739wsxqv8p11nb3ljpj3xfd43yc563z5s3qnchqk"; - libraryHaskellDepends = [ - base base-prelude bytestring scientific semigroups text - ]; + version = "0.5.2.1"; + sha256 = "1h4wnjs1rjl1aq0ldsxmdcxvxgn2c3815640d5dn6ibf2fwlrd3f"; + libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ base-prelude bytestring text ]; benchmarkHaskellDepends = [ aeson criterion rebase ]; description = "Direct-to-bytes JSON Builder"; @@ -149094,8 +150167,8 @@ self: { }: mkDerivation { pname = "json5hs"; - version = "0.1.2.2"; - sha256 = "19r1ripvalrhvlqdk0pvm18b4a8sibdwlc60i2yj7da10rdx5cv1"; + version = "0.1.3.1"; + sha256 = "18i01c0045c26s80g69wdgyk9aa3pj092z0s6hmq9z5xddid2s8h"; libraryHaskellDepends = [ array base bytestring containers mtl pretty syb text ]; @@ -149310,25 +150383,27 @@ self: { "jsop" = callPackage ({ mkDerivation, aeson, base, containers, generics-sop, lens , lens-aeson, monoidal-containers, protolude, string-interpolate - , tasty, tasty-discover, tasty-hspec, text + , tasty, tasty-discover, tasty-hspec, text, unordered-containers }: mkDerivation { pname = "jsop"; - version = "0.1.0.0"; - sha256 = "0yaxcpxgn00jf3igvncg59ca6hz28sf791872n617v3vh7arv8y3"; + version = "0.2.0.1"; + sha256 = "05qacp69pk4fm1b1mrk2ax8f8mbfzsb71bkj2qraa116xym61j38"; libraryHaskellDepends = [ aeson base containers generics-sop lens lens-aeson monoidal-containers protolude string-interpolate tasty - tasty-discover tasty-hspec text + tasty-discover tasty-hspec text unordered-containers ]; testHaskellDepends = [ aeson base containers generics-sop lens lens-aeson monoidal-containers protolude string-interpolate tasty - tasty-discover tasty-hspec text + tasty-discover tasty-hspec text unordered-containers ]; testToolDepends = [ tasty-discover ]; description = "Cherry picking in JSON objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jspath" = callPackage @@ -149436,18 +150511,18 @@ self: { }) {}; "juicy-gcode" = callPackage - ({ mkDerivation, base, configurator, lens, linear, matrix + ({ mkDerivation, base, configurator, gitrev, lens, linear, matrix , optparse-applicative, svg-tree, text }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.9"; - sha256 = "02i1d3jfisxiyq63z9z7jlyscywbskmsxkx2xxv7v742xi4w5wrb"; + version = "0.2.0.1"; + sha256 = "1jpdxxfg3wdj9kz41a1pklyshrxxakf2bahcc7y1l7p7jklb3lbi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base configurator lens linear matrix optparse-applicative svg-tree - text + base configurator gitrev lens linear matrix optparse-applicative + svg-tree text ]; description = "SVG to G-Code converter"; license = stdenv.lib.licenses.bsd3; @@ -150182,8 +151257,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.4.0"; - sha256 = "0hkhvkdyk4m5pdr0yj1lbdwqvrfr7sq49jw683mk0lxjlyc39xm6"; + version = "0.8.5.0"; + sha256 = "1kjzsx4fqbknnv158ypg5jhmw7ww1rk1mf99g3dci09xg97wmgjk"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -151635,6 +152710,25 @@ self: { broken = true; }) {}; + "kmonad" = callPackage + ({ mkDerivation, base, cereal, lens, megaparsec, mtl + , optparse-applicative, resourcet, rio, time, unix, unliftio + }: + mkDerivation { + pname = "kmonad"; + version = "0.4.1"; + sha256 = "1l9980q74q98x9z8xj37bsnc6ywv362cap27n2nwjyc8wsihhc8c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cereal lens megaparsec mtl optparse-applicative resourcet rio + time unix unliftio + ]; + executableHaskellDepends = [ base ]; + description = "Advanced keyboard remapping utility"; + license = stdenv.lib.licenses.mit; + }) {}; + "kmp-dfa" = callPackage ({ mkDerivation, array, base, QuickCheck }: mkDerivation { @@ -152033,6 +153127,27 @@ self: { broken = true; }) {egl = null; inherit (pkgs) glew;}; + "ktx-codec" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, directory + , filepath, shower, text, vector + }: + mkDerivation { + pname = "ktx-codec"; + version = "0.0.1.1"; + sha256 = "1qvkcmxilvlwsbp5pidkh3njwsj6k19ybz8jw5mcm90zdhx3gya0"; + libraryHaskellDepends = [ + base binary bytestring containers text vector + ]; + testHaskellDepends = [ + base binary bytestring containers directory filepath shower text + vector + ]; + description = "Khronos texture format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "kubernetes-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, connection, containers, data-default-class, either @@ -152047,6 +153162,8 @@ self: { pname = "kubernetes-client"; version = "0.2.0.0"; sha256 = "07vvp8yb7jx5cgn3siykkh7jdkkcxapclyp09q4n975fzd01waww"; + revision = "1"; + editedCabalFile = "18gp9q7myy4yvqv5p1ra12d5g69qrc0r0i8ifzwavj4vc92bhmdc"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring connection containers data-default-class either filepath hoauth2 http-client @@ -152100,22 +153217,6 @@ self: { }) {}; "kubernetes-webhook-haskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , text, unordered-containers - }: - mkDerivation { - pname = "kubernetes-webhook-haskell"; - version = "0.2.0.2"; - sha256 = "1zhknc4bpdm3xcynn1jm7yii615sj7xcq3mv31xlx4kc4bh566al"; - libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring text - unordered-containers - ]; - description = "Create Kubernetes Admission Webhooks in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "kubernetes-webhook-haskell_0_2_0_3" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , text, unordered-containers }: @@ -152129,7 +153230,6 @@ self: { ]; description = "Create Kubernetes Admission Webhooks in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kuifje" = callPackage @@ -152562,8 +153662,8 @@ self: { }: mkDerivation { pname = "lambda-options"; - version = "1.1.0.0"; - sha256 = "0ihbwml2l4jyd3h2kj5qz7fxzzkq47xk4fkybhp1rnfzxjlqfib3"; + version = "1.1.0.1"; + sha256 = "1lffzazcv3r14fsymkng6l10g65z1brsg8ghz4w4jplilp2i8ly2"; libraryHaskellDepends = [ base containers funspection mtl read-bounded ]; @@ -153464,6 +154564,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c_0_9" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, mtl, pretty, process, syb + }: + mkDerivation { + pname = "language-c"; + version = "0.9"; + sha256 = "0a2z97ajdbql583jcganadi9frqj09cidqb1hlh0gl6w6aj82kii"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath mtl + pretty process syb + ]; + libraryToolDepends = [ alex happy ]; + 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 ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -153645,8 +154764,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.1.0.3"; - sha256 = "1dfm89zrmq2ibyhjn4hbzq6yfm5acc63s47w7bp1asn6lxnd9dc0"; + version = "1.3.0.3"; + sha256 = "1bgcczk8v3gfrh44hsqmw7an7998yvn0dgla3rc0kr0xs7zsgp62"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -154746,6 +155865,8 @@ self: { pname = "lapack-ffi-tools"; version = "0.1.2.1"; sha256 = "0hk54psm066acgn24mw5dbbhz4a0nqvyks75302cabijbp524gdh"; + revision = "1"; + editedCabalFile = "1h5chlb66ycg96ab56hwqr4qk82l19gq1pg1zfzhfdl5byg24fln"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -154980,6 +156101,8 @@ self: { ]; description = "Use actual LaTeX to render formulae inside Hakyll pages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "latex-svg-image" = callPackage @@ -155016,6 +156139,8 @@ self: { executableHaskellDepends = [ base latex-svg-image pandoc-types ]; description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lattices" = callPackage @@ -155054,8 +156179,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.0.0"; - sha256 = "0dfs9nq3vcf8w2k1x51pixb4wb47rg9nzyjgfpzx6vip296ivyf7"; + version = "2.0.1"; + sha256 = "19jp9809jrh3swvsji5zgbqg4qg5gayv6bj0svq00wyzaisns3dd"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -156202,12 +157327,10 @@ self: { ({ mkDerivation, accelerate, base, lens }: mkDerivation { pname = "lens-accelerate"; - version = "0.2.0.0"; - sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk"; - revision = "1"; - editedCabalFile = "0ggm157i4bmgh7k0dv9zncgn4agwk7zn5wvsknxsnfqzy45qabi9"; + version = "0.3.0.0"; + sha256 = "1sk3iy5qv24mifx0gwd5z714lf3y3s4zpbff09mqk42whk2sdd0y"; libraryHaskellDepends = [ accelerate base lens ]; - description = "Instances to mix lens with accelerate"; + description = "Instances to mix lens with Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -157153,8 +158276,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "2.2.5.2"; - sha256 = "1qydgw1c74c0xp2d5d85qbyyng9rgqgxgvj6fhh94wzgkxj99al6"; + version = "3.0.0.0"; + sha256 = "0qwnp5jzmlvi7bpbh1dhz3lp91qf5phr8hb7m3h5q0a50d72dqpp"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -157275,6 +158398,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {ffi = null;}; + "libfuse3" = callPackage + ({ mkDerivation, base, bytestring, clock, fuse3, resourcet, time + , unix + }: + mkDerivation { + pname = "libfuse3"; + version = "0.1.1.0"; + sha256 = "0jnh6by1k42h8kl78anh8lqwhymdz2xgynm82vidsd7jjzanmf3j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring clock resourcet time unix + ]; + libraryPkgconfigDepends = [ fuse3 ]; + description = "A Haskell binding for libfuse-3.x"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) fuse3;}; + "libgit" = callPackage ({ mkDerivation, base, mtl, process }: mkDerivation { @@ -157378,6 +158521,36 @@ self: { broken = true; }) {}; + "libjwt-typed" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, casing + , containers, criterion, data-default, deepseq, either, exceptions + , extra, hspec, hspec-core, jose, jwt, lens, monad-time, proxied + , QuickCheck, quickcheck-instances, text, time, transformers + , unordered-containers, utf8-string, uuid + }: + mkDerivation { + pname = "libjwt-typed"; + version = "0.1"; + sha256 = "0w0snz2gbdx6csp85bwwga57v1dpz53q2dkhkmmmzrl29jbix9h3"; + libraryHaskellDepends = [ + base bytestring case-insensitive casing data-default either + exceptions extra monad-time proxied text time transformers + unordered-containers utf8-string uuid + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default either exceptions + extra hspec hspec-core jwt monad-time QuickCheck + quickcheck-instances text time transformers uuid + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion data-default deepseq either + exceptions extra jose lens monad-time QuickCheck text time + transformers unordered-containers uuid + ]; + description = "A Haskell implementation of JSON Web Token (JWT)"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "liblastfm" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, hspec, hspec-expectations-lens, http-client @@ -157825,8 +158998,6 @@ self: { testPkgconfigDepends = [ libsodium ]; description = "Low-level bindings to the libsodium C library"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libsodium;}; "libssh2" = callPackage @@ -158726,10 +159897,8 @@ self: { }: mkDerivation { pname = "linear-accelerate"; - version = "0.6.0.0"; - sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s"; - revision = "1"; - editedCabalFile = "1sf1jqpymhkdl5xn1br13qkw3zyg7pqmmwcczcw19zpgwk4ai19v"; + version = "0.7.0.0"; + sha256 = "1rdbmchbvrg5g0ndfppswydn15qbp2k9dvx7wapfpy8971qqf2df"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -159014,19 +160183,22 @@ self: { }) {}; "lingo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, hspec, raw-strings-qq, text, yaml + ({ mkDerivation, base, bytestring, containers, directory, filepath + , hspec, raw-strings-qq, text, yaml }: mkDerivation { pname = "lingo"; - version = "0.3.2.0"; - sha256 = "0qym6svpvxsxbhbppk0lkpp2zbqa13f0njkxnpyz5id581c3v8hx"; - setupHaskellDepends = [ - base bytestring Cabal containers directory filepath text yaml - ]; + version = "0.5.0.1"; + sha256 = "0h57g6r2n9q8asx35prn8p5mn35qnp8cy2pdrrpmrvhq7islwd8s"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers filepath raw-strings-qq text yaml ]; + executableHaskellDepends = [ + base bytestring containers directory filepath raw-strings-qq text + yaml + ]; testHaskellDepends = [ base hspec ]; description = "File extension based programming language detection"; license = stdenv.lib.licenses.bsd3; @@ -159563,23 +160735,19 @@ self: { benchmarkHaskellDepends = [ aeson attoparsec base criterion text ]; description = "Liquid template language library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-base" = callPackage ({ mkDerivation, base, Cabal, liquid-ghc-prim, liquidhaskell }: mkDerivation { pname = "liquid-base"; - version = "4.14.0.0"; - sha256 = "07qy1xc04wbd46cd0zgw3znczang1h1sgllxswjjimaw1wp49xh3"; + version = "4.14.1.0"; + sha256 = "0w5pwksyf8fbr8v8j5mshcysxlbz4lxdvmayc3pj8cm8xcdrvzkm"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ]; description = "Drop-in base replacement for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-bytestring" = callPackage @@ -159595,8 +160763,6 @@ self: { libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ]; description = "LiquidHaskell specs for the bytestring package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-containers" = callPackage @@ -159612,8 +160778,6 @@ self: { libraryHaskellDepends = [ containers liquid-base liquidhaskell ]; description = "LiquidHaskell specs for the containers package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-fixpoint" = callPackage @@ -159626,8 +160790,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.8.10.1"; - sha256 = "0mavpfwsm3a6cnw2p75hvjch1j0nb8qm1rflq304iz6msg9zbhsv"; + version = "0.8.10.2"; + sha256 = "1sdd88p5mz9xfqk9pbn138ixxdrq089iy5imskvhx66dwwrmrr8l"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -159647,8 +160811,6 @@ self: { doCheck = false; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; @@ -159663,8 +160825,6 @@ self: { libraryHaskellDepends = [ ghc-prim liquidhaskell ]; description = "Drop-in ghc-prim replacement for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-parallel" = callPackage @@ -159679,22 +160839,18 @@ self: { libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; description = "LiquidHaskell specs for the parallel package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-platform" = callPackage ({ mkDerivation }: mkDerivation { pname = "liquid-platform"; - version = "0.8.10.1"; - sha256 = "1l1qpg08fhf2xbj7i3hy36idm2z4yggg7mlzyncjkjlqxdnmm44k"; + version = "0.8.10.2"; + sha256 = "1rhpq04nl9gcm9rwjd261ssn8q59pdcpfna0xwkcv3gmkgirwzgf"; isLibrary = false; isExecutable = true; description = "A battery-included platform for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-prelude" = callPackage @@ -159703,16 +160859,14 @@ self: { }: mkDerivation { pname = "liquid-prelude"; - version = "0.8.10.1"; - sha256 = "0pcz59spsg3x4c5553yksfqgdjlh2c33id10b6p8hnm6hyqcbjvn"; + version = "0.8.10.2"; + sha256 = "0s52kd2x4h24j6z7cjkrarnqr7kp198qal55y84740rllskv3ijh"; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ bytestring containers liquid-base liquidhaskell ]; description = "General utility modules for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-vector" = callPackage @@ -159726,8 +160880,6 @@ self: { libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; description = "LiquidHaskell specs for the vector package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquidhaskell" = callPackage @@ -159743,10 +160895,10 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.10.1"; - sha256 = "0xyxb0sifqgp1hl6lcydf7svw6w968hd3dgmnlly8ddpdmhsw9jm"; + version = "0.8.10.2"; + sha256 = "0byh5lia3kb44sgmilya881dp9il3n5qvrn16brnkvl9xhr9rdyi"; revision = "1"; - editedCabalFile = "0bg9660c5454jiimgwciimd114r81gfjdad6nzbgyhkvilfd0wad"; + editedCabalFile = "13xzhr99z459h6kd7h9y3pyyjnvsxwapjiayjr3yq2nyqhpyjygw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -159754,9 +160906,9 @@ self: { aeson base binary bytestring Cabal cereal cmdargs containers data-default deepseq Diff directory extra filepath fingertree ghc ghc-boot ghc-paths ghc-prim githash gitrev hashable hscolour - liquid-fixpoint mtl optics optparse-simple parsec pretty split syb - template-haskell temporary text time transformers - unordered-containers vector + liquid-fixpoint mtl optics optparse-applicative optparse-simple + parsec pretty split syb template-haskell temporary text time + transformers unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -159768,8 +160920,6 @@ self: { testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -159974,8 +161124,6 @@ self: { testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; description = "ListT done right"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "list-t-attoparsec" = callPackage @@ -160340,6 +161488,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "little-rio_0_2_1" = callPackage + ({ mkDerivation, base, exceptions, microlens, microlens-mtl, mtl + , primitive, resourcet, unliftio-core + }: + mkDerivation { + pname = "little-rio"; + version = "0.2.1"; + sha256 = "1fywk5nva88365p9qv866mf1j4jksarv7d9i39m5xxi764wwpzjp"; + libraryHaskellDepends = [ + base exceptions microlens microlens-mtl mtl primitive resourcet + unliftio-core + ]; + description = "When you need just the RIO monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "live-sequencer" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, bytestring, cgi , concurrent-split, containers, data-accessor @@ -160840,12 +162005,17 @@ self: { }) {}; "llvm-pretty" = callPackage - ({ mkDerivation, base, containers, monadLib, parsec, pretty }: + ({ mkDerivation, base, containers, microlens, microlens-th + , monadLib, parsec, pretty, template-haskell, th-abstraction + }: mkDerivation { pname = "llvm-pretty"; - version = "0.7.1.1"; - sha256 = "17lb4jfkaxz2ahjfvq2mxnb82k209qg13rhdg76v3j8yahr5z0a2"; - libraryHaskellDepends = [ base containers monadLib parsec pretty ]; + version = "0.11.0"; + sha256 = "17jw5i68fz2vk40dcqf8k7j6j6h8acg4fhnyygb72jbk17md4q94"; + libraryHaskellDepends = [ + base containers microlens microlens-th monadLib parsec pretty + template-haskell th-abstraction + ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -161373,6 +162543,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-base_0_9_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , exceptions, mmorph, monad-control, monad-time, mtl, semigroups + , stm, text, time, transformers-base, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "log-base"; + version = "0.9.0.0"; + sha256 = "0rlwr80636b4rrjgqg7ri5cfz95v9h47r9k413r9wvldfvz2abyg"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq exceptions mmorph + monad-control monad-time mtl semigroups stm text time + transformers-base unliftio-core unordered-containers + ]; + description = "Structured logging solution (base package)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal , comonad, deepseq, distributive, doctest, generic-deriving @@ -161436,18 +162626,19 @@ self: { "log-elasticsearch" = 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 + , bytestring, deepseq, http-client, http-client-tls, http-types + , log-base, network-uri, semigroups, text, text-show, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.2.0"; - sha256 = "0kcixyklnak34v8vmmpw8vpm1mvf3wll6xpcdvfg1c75wc9n1hqy"; + version = "0.11.0.0"; + sha256 = "1l64mxk3zmlfsqwlhsq62jp8rawj3jbw9izihg7555q51pbqlg5w"; 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 + aeson aeson-pretty base base64-bytestring bytestring deepseq + http-client http-client-tls http-types log-base network-uri + semigroups text text-show time transformers unordered-containers + vector ]; description = "Structured logging solution (Elasticsearch back end)"; license = stdenv.lib.licenses.bsd3; @@ -161463,8 +162654,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.3"; - sha256 = "132q4cx0a2malzncm7bscjikpqaaz6fwzz6n8mhqianbpq02s0v1"; + version = "0.7.1.4"; + sha256 = "1m96d5486xadypm5iby8rkb979k82md394j5iaik6xk5aavcn6xx"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -161677,8 +162868,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.10"; - sha256 = "0d03ma5sq0aqkb42jy0531d4vkn1ci0gcs8vj3xd6ac4hwr0qcwm"; + version = "1.3.11"; + sha256 = "1r5qfip5xl22hq2v27b1lkcknixmc40wm7iya7vs3mrnwyavpmdb"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base @@ -161690,6 +162881,8 @@ self: { ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logging-effect-extra" = callPackage @@ -161862,8 +163055,8 @@ self: { ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { pname = "logict"; - version = "0.7.0.2"; - sha256 = "1xfgdsxg0lp8m0a2cb83rcxrnnc37asfikay2kydi933anh9ihfc"; + version = "0.7.0.3"; + sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "A backtracking logic-programming monad"; @@ -162412,18 +163605,19 @@ self: { ({ mkDerivation, aeson-pretty, base, bimap, bytestring, constraints , containers, data-default, first-class-families, fmt, interpolate , lens, morley, morley-prelude, mtl, named, optparse-applicative - , pretty-terminal, QuickCheck, singletons, text - , unordered-containers, vinyl + , pretty-terminal, QuickCheck, singletons, template-haskell, text + , unordered-containers, vinyl, with-utf8 }: mkDerivation { pname = "lorentz"; - version = "0.5.0"; - sha256 = "0wvvxc49bc8cyfhhwzzhrdf3sia03d8hx2cxpjg3jab8bbxbqza1"; + version = "0.6.1"; + sha256 = "124zqmf200d5gs5bdxbf63z2w0kynxai3hlhf787sdksl3dc4sbl"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley morley-prelude mtl named optparse-applicative pretty-terminal - QuickCheck singletons text unordered-containers vinyl + QuickCheck singletons template-haskell text unordered-containers + vinyl with-utf8 ]; description = "EDSL for the Michelson Language"; license = stdenv.lib.licenses.mit; @@ -162617,6 +163811,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lrucaching-haxl" = callPackage + ({ mkDerivation, base, hashable, haxl, lrucaching, psqueues }: + mkDerivation { + pname = "lrucaching-haxl"; + version = "0.1.0.0"; + sha256 = "0pn2f671ak1grzjigyvan5wagh9vyqhsz86jfy1z281rd2pw4gk2"; + libraryHaskellDepends = [ base hashable haxl lrucaching psqueues ]; + description = "Combine lrucaching and haxl"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ls-usb" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols , cmdtheline, text, usb, usb-id-database, vector @@ -162681,7 +163888,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_4" = callPackage + "lsp-test_0_11_0_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl @@ -162690,8 +163897,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.4"; - sha256 = "0nf0ys44q2n81arg7ll08dkilq8giz0gxarld2lpq5fyhhfvyv7g"; + version = "0.11.0.5"; + sha256 = "0r038x65lc0ij6hs8klgj8v8f0fqqrn12dyxc0k8zf9pan9bwnph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162781,6 +163988,24 @@ self: { broken = true; }) {}; + "lti13" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-client + , http-types, jose-jwt, oidc-client, safe-exceptions, text + }: + mkDerivation { + pname = "lti13"; + version = "0.1.2.1"; + sha256 = "0fs8hj07b9p8m4y8jzmh0ny5x8fnxx75yb8kyk8slc6fjg8ybzlm"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-types jose-jwt + oidc-client safe-exceptions text + ]; + description = "Core functionality for LTI 1.3."; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ltiv1p1" = callPackage ({ mkDerivation, authenticate-oauth, base, blaze-builder , bytestring, containers, data-default, http-client, http-types @@ -162950,8 +164175,8 @@ self: { ({ mkDerivation, base, lucid }: mkDerivation { pname = "lucid-cdn"; - version = "0.1.1.1"; - sha256 = "1dl44rc5b3wrgfcllp6h1sw4w18jgglh1grh5w9g37rcxi2cxwll"; + version = "0.2.0.1"; + sha256 = "1y1rszg00kb1qpwrccpjv6l0qkn8cpxawks7ylcw8sbs0h824l73"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; license = stdenv.lib.licenses.mit; @@ -163410,14 +164635,44 @@ self: { broken = true; }) {}; + "lz4-frame-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , containers, hspec, inline-c, optparse-applicative, QuickCheck + , raw-strings-qq, resourcet, template-haskell, text, unliftio + , unliftio-core + }: + mkDerivation { + pname = "lz4-frame-conduit"; + version = "0.1.0.1"; + sha256 = "0n07cgdwq2miskgqj354hnjghmp555d7n8b39b00sjigdjzkbala"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra containers inline-c + raw-strings-qq resourcet template-haskell unliftio unliftio-core + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra optparse-applicative + resourcet text + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec QuickCheck resourcet + unliftio-core + ]; + description = "Conduit implementing the official LZ4 frame streaming format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "lz4-hs" = callPackage ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty , tasty-hunit, temporary }: mkDerivation { pname = "lz4-hs"; - version = "0.1.4.1"; - sha256 = "15jm8lbwhgp29yvnwsxsmbixvgpxrnw7jc96zwmzbqx365r4dfqr"; + version = "0.1.5.0"; + sha256 = "0qqv6n7hjcjkc1pzhwkdr9l1kfb8rqndx2lfm6j4bhmvrwwrn8lw"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; @@ -164547,8 +165802,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; - version = "1.0.7"; - sha256 = "0wxi6d3kcpc4iyhbrnbapbdgaf46aw0a8d32n2sbs0lbk0pc4c6i"; + version = "1.0.8"; + sha256 = "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38"; libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; @@ -165708,8 +166963,8 @@ self: { }: mkDerivation { pname = "mason"; - version = "0.2.2"; - sha256 = "1wck31lm5ms99r0aji8mkr0ax78i9z0qzz7gy9ihwriwwhyl9yiz"; + version = "0.2.3"; + sha256 = "0iwbdkrlbjn44gj0g43lfajx35jbihw4in5pc8by33ajwix43y5j"; libraryHaskellDepends = [ array base bytestring ghc-prim integer-gmp network text ]; @@ -165725,8 +166980,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.3.2"; - sha256 = "0fprcp231ynl9rax7xniqfr8ryavcbgc0j2h6w3c11n8bnrabrrr"; + version = "0.5.4.0"; + sha256 = "0dmm6x5izmjl1l803fvmxzqrh0jpg56z2aid228a4c44n620dzln"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive scheduler unliftio-core vector @@ -165820,8 +167075,8 @@ self: { }: mkDerivation { pname = "massiv-test"; - version = "0.1.3.1"; - sha256 = "0nwrfxi77w2xmmy7j7fh6kb06hzhmxl8vagdb856xmr9cbq02nj5"; + version = "0.1.4"; + sha256 = "1qhvph2s6bkw3zb43arq1zvrfyr09phqjwxhzsqxi2x2fcrdyvyn"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions hspec massiv primitive QuickCheck scheduler unliftio vector @@ -165955,28 +167210,6 @@ self: { }) {}; "math-functions" = callPackage - ({ mkDerivation, base, data-default-class, deepseq, erf, primitive - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector - , vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.3.4.0"; - sha256 = "1r77ifqjxr8waf9ljgggyhl2a7gpqhhsi7m7cnc9v5kxqzgdbn4a"; - revision = "1"; - editedCabalFile = "1gyrzczs1df98l2d21xrpqqsxs9yw27pfwl27fx8lshd9n25x5h5"; - libraryHaskellDepends = [ - base data-default-class deepseq primitive vector - ]; - testHaskellDepends = [ - base data-default-class deepseq erf primitive QuickCheck tasty - tasty-hunit tasty-quickcheck vector vector-th-unbox - ]; - description = "Collection of tools for numeric computations"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "math-functions_0_3_4_1" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, gauge , primitive, QuickCheck, random, tasty, tasty-hunit , tasty-quickcheck, vector, vector-th-unbox @@ -165997,7 +167230,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "math-grads" = callPackage @@ -166465,8 +167697,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.10.0"; - sha256 = "0wj1bsqmlzb7q92h3hj5gwgwknwqh5p487mgbcd82rgflp4sq5rx"; + version = "50200.10.1"; + sha256 = "0m4vqxxcqvbgm6flfwqy2w47ada3r29r34yw1gyv02na7gx3rqi1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -166860,8 +168092,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.2.1"; - sha256 = "1jh88xqi485ha3bqrp012xsv7cljwsaxxc45l5npcr947g22ln11"; + version = "0.2.3"; + sha256 = "14xf8l3ka7s34sa4rs4xsy7h5jxpl3fhsn959dvf17nsv252s6p8"; libraryHaskellDepends = [ aeson base bytestring containers data-default directory double-conversion log-domain microlens mwc-random statistics time @@ -167458,6 +168690,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec_9_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, mtl, parser-combinators, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "9.0.0"; + sha256 = "1x10f2b14ww306am9w06s23va26ab3vwdh0jk67ql6ybigxh0asi"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq text weigh + ]; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "megaparsec-tests" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , hspec, hspec-discover, hspec-expectations, hspec-megaparsec @@ -167484,6 +168737,31 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec-tests_9_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , hspec, hspec-discover, hspec-expectations, hspec-megaparsec + , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text + , transformers + }: + mkDerivation { + pname = "megaparsec-tests"; + version = "9.0.0"; + sha256 = "0zm246r8k48mj5v2dxjan7dsrcnw54bcm27swi5mh8c0yb3vcvab"; + libraryHaskellDepends = [ + base bytestring containers hspec hspec-expectations + hspec-megaparsec megaparsec mtl QuickCheck text transformers + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hspec + hspec-expectations hspec-megaparsec megaparsec mtl + parser-combinators QuickCheck scientific text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Test utilities and the test suite of Megaparsec"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -167989,8 +169267,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "4"; - editedCabalFile = "1bx3xrafmf82b9wlvhggv87fwqgpgqxjdgkk9r5b323m9ci2gign"; + revision = "5"; + editedCabalFile = "15xgb00cv8srnhfgh7v01b2qijcwapwsbx92jbdss525n3j74d48"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168671,6 +169949,34 @@ self: { broken = true; }) {}; + "micro-gateway" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive + , containers, cookie, data-default-class, hslogger, http-client + , http-types, network-uri, optparse-applicative, scotty, signature + , stm, streaming-commons, text, time, unix-time + , unordered-containers, wai, wai-cors, wai-websockets, warp + , websockets, yaml + }: + mkDerivation { + pname = "micro-gateway"; + version = "1.1.0.0"; + sha256 = "1jb703vcqncxw12cmgmyg63rw6fmfa4mv1685z6vab3xzq7kvxv7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring case-insensitive containers cookie + hslogger http-client http-types scotty signature stm text time + unix-time unordered-containers wai websockets + ]; + executableHaskellDepends = [ + aeson base bytestring data-default-class http-client network-uri + optparse-applicative scotty streaming-commons text wai-cors + wai-websockets warp websockets yaml + ]; + description = "A Micro service gateway"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "micro-recursion-schemes" = callPackage ({ mkDerivation, base, cpphs, HUnit, template-haskell , th-abstraction @@ -169444,19 +170750,29 @@ self: { }) {}; "mime-mail-ses" = callPackage - ({ mkDerivation, base, base64-bytestring, byteable, bytestring - , conduit, cryptohash, http-client, http-client-tls, http-conduit - , http-types, mime-mail, old-locale, text, time, transformers - , xml-conduit, xml-types + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , byteable, bytestring, case-insensitive, conduit, cryptohash + , http-client, http-client-tls, http-conduit, http-types, mime-mail + , optparse-applicative, tasty, tasty-hunit, text, time, xml-conduit + , xml-types }: mkDerivation { pname = "mime-mail-ses"; - version = "0.4.1"; - sha256 = "1w6k4cm5yab9dhg7yn6mp7jzk1zdwpnzc6c1xb3vz3rdwp8jjvx7"; + version = "0.4.3"; + sha256 = "0v4b0y28kf7mx80z16j82wmaccpggkc262f7cn9g9j2nfayy2xhj"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base base64-bytestring byteable bytestring conduit cryptohash - http-client http-client-tls http-conduit http-types mime-mail - old-locale text time transformers xml-conduit xml-types + base base16-bytestring base64-bytestring byteable bytestring + case-insensitive conduit cryptohash http-client http-client-tls + http-conduit http-types mime-mail text time xml-conduit xml-types + ]; + executableHaskellDepends = [ + base http-client http-client-tls mime-mail optparse-applicative + text + ]; + testHaskellDepends = [ + base bytestring case-insensitive tasty tasty-hunit time ]; description = "Send mime-mail messages via Amazon SES"; license = stdenv.lib.licenses.mit; @@ -170579,8 +171895,8 @@ self: { pname = "mmark"; version = "0.0.7.2"; sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm"; - revision = "2"; - editedCabalFile = "1wwcar2a5hdwac8r1c1wlqhk7dnidvq98qsgnxyhfh8iblpn81hb"; + revision = "3"; + editedCabalFile = "1ffa76pz544pa3s764lnc38rdmfccyn8z6zn1w76pqb01p0f9k9p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -170607,8 +171923,8 @@ self: { pname = "mmark-cli"; version = "0.0.5.0"; sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; - revision = "3"; - editedCabalFile = "03n7i551lagr4b6587c34ic6c4d9sn9kmnzkff2x1klqaxgb88ld"; + revision = "5"; + editedCabalFile = "1ncyh564gk6fhirx97jnr6v2nw3k69kngxd3gbn9wbi6hm6zz238"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170629,8 +171945,8 @@ self: { pname = "mmark-ext"; version = "0.2.1.2"; sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c"; - revision = "2"; - editedCabalFile = "0q633c7zv0liaz0a46llgy21x0snbfhl33qx9plh2sxhjvhvhmpj"; + revision = "3"; + editedCabalFile = "02i6577qislr0qvgmfamcixpxgb7bh68lg18n3vkq6xbnjxdpwpx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -170713,8 +172029,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.7.3.0"; - sha256 = "078g7npfal2qry5agqrr13252y7c1n75s0bykdn5s0p5wy5812mj"; + version = "0.8.0.0"; + sha256 = "0cs4mi9ia3l3v19hldbaygsywvjcfx66plbyh6311j2qzbrqaq93"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170734,8 +172050,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.7.7.0"; - sha256 = "0ayx9mv25f8dvp30bbxm6cnbmxwpdhcpqsh0zgh6xp703vlwrfvc"; + version = "0.8.0.0"; + sha256 = "0mj96p3f96brv7cw3mkigngxnmqcn9r1yfghdx1jplrw5wycy80j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170756,8 +172072,8 @@ self: { }: mkDerivation { pname = "mmsyn7l"; - version = "0.7.0.0"; - sha256 = "0mpc782zgv63ax8mfq7ljrdida4vviqhzhiakl42i368f1zavhqm"; + version = "0.8.0.0"; + sha256 = "0w1k89phzxyq2nwzr0vn313rlp0f7d62vhdvq113pqszbdbjh6gd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170774,8 +172090,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }: mkDerivation { pname = "mmsyn7s"; - version = "0.7.0.0"; - sha256 = "14vbqdhk8f6fa319c6yk57y474bivdmyhj9rmy20cqjjh7bsw229"; + version = "0.8.0.0"; + sha256 = "0brcmmlvdd294y35gby1qnb5b5h5mcn6xgwgvffxfmhif7nyxmc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; @@ -170790,8 +172106,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.16.0.0"; - sha256 = "1dmiisbn9v98rf4qa7zw976w3qj6s67j11vvd82f186n9p2id7px"; + version = "0.17.0.0"; + sha256 = "069pyv8g9gdzzvnmdqmcrqnxf5zglrqbmcn2v6frfxj7ibd4awif"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171023,8 +172339,8 @@ self: { pname = "modern-uri"; version = "0.3.2.0"; sha256 = "162s88yayalh4vlngman5gz3k0gnszxrksh1wk5227qihbpsiwhb"; - revision = "1"; - editedCabalFile = "13a9wh31pm151d1xz00wp2nfs73s2ysr1g97vx91rl2caak14ab0"; + revision = "2"; + editedCabalFile = "14qxgpv72ybxrv08591ipsn5x5sdf9iflc94n9liagv5rjriy09x"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -171100,13 +172416,13 @@ self: { }) {}; "modular-arithmetic" = callPackage - ({ mkDerivation, base, doctest }: + ({ mkDerivation, base, doctest, typelits-witnesses }: mkDerivation { pname = "modular-arithmetic"; - version = "1.2.1.5"; - sha256 = "0nrnjyqpyy2c5479wjw5ihkwmiingpw60isdladfgi1cis36pq5f"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; + version = "2.0.0.1"; + sha256 = "132cxgrw6lsdkpqi69v1f9jgl5icslwi5qclv4rc03hn0mcnl2sz"; + libraryHaskellDepends = [ base typelits-witnesses ]; + testHaskellDepends = [ base doctest typelits-witnesses ]; description = "A type for integers modulo some constant"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -171535,6 +172851,8 @@ self: { ]; description = "monad-classes based typeclass for Ollie's logging-effect LoggingT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-codec" = callPackage @@ -171873,27 +173191,6 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , exceptions, fast-logger, lifted-base, monad-control, monad-loops - , mtl, resourcet, stm, stm-chans, template-haskell, text - , transformers, transformers-base, transformers-compat - , unliftio-core - }: - mkDerivation { - pname = "monad-logger"; - version = "0.3.34"; - sha256 = "0sxphrd7g1iwb0nlx0g4y3a661sdsgh098cbyisrm288k9iws91f"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra exceptions fast-logger - lifted-base monad-control monad-loops mtl resourcet stm stm-chans - template-haskell text transformers transformers-base - transformers-compat unliftio-core - ]; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_35" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , exceptions, fast-logger, lifted-base, monad-control, monad-loops , mtl, resourcet, stm, stm-chans, template-haskell, text @@ -171912,7 +173209,6 @@ self: { ]; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -172450,14 +173746,14 @@ self: { }) {}; "monad-supply" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-supply"; - version = "0.7"; - sha256 = "1786rj4n0rrjpp07gn2y8vwpf6ijkjaim1q34rq7lvbjx1fhr2z5"; - libraryHaskellDepends = [ base mtl ]; + version = "0.9"; + sha256 = "1jknppcw8r0fpqnrgw1y8xjyx5xifzl1dkc0s2ffwkgij4x75saa"; + libraryHaskellDepends = [ base mtl transformers ]; description = "Stateful supply monad"; - license = stdenv.lib.licenses.mit; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -173303,6 +174599,8 @@ self: { pname = "monoidal-containers"; version = "0.6.0.1"; sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82"; + revision = "1"; + editedCabalFile = "06agyfnhr4cr42m4zj7xwl5an3skbjvba53a5i6sl9890gx7mml3"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign semigroups these unordered-containers @@ -173615,12 +174913,12 @@ self: { , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances , semigroups, show-type, singletons, syb, template-haskell, text , th-lift, th-lift-instances, time, timerep, transformers-compat - , unordered-containers, vector, vinyl, wl-pprint-text + , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.5.0"; - sha256 = "151idw4dhdlsw9ga8q0mp3vnv520ljmkr0wm2hhhd7k0xliy177a"; + version = "1.7.0"; + sha256 = "18vc9d44hjr8sadh4fhlmzw6668lbzw7a2wbsmyh817blhk9jg6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173632,11 +174930,11 @@ self: { quickcheck-arbitrary-adt quickcheck-instances semigroups show-type singletons syb template-haskell text th-lift th-lift-instances time timerep transformers-compat unordered-containers vector vinyl - wl-pprint-text + with-utf8 wl-pprint-text ]; executableHaskellDepends = [ aeson base bytestring fmt haskeline megaparsec morley-prelude named - optparse-applicative pretty-simple text vinyl + optparse-applicative pretty-simple text vinyl with-utf8 ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.mit; @@ -173699,7 +174997,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql_0_13_0" = callPackage + "morpheus-graphql_0_15_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, megaparsec , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit , template-haskell, text, transformers, unliftio-core @@ -173707,8 +175005,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.13.0"; - sha256 = "0gcrgpdiazridddm9imjhsx05cnqxxb24dhg18d9n6c1qm1d4q30"; + version = "0.15.1"; + sha256 = "1vk1rzrham61pnn5c77rvrn0zb02hc1birxdnyz80sjdap5fk8in"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers megaparsec morpheus-graphql-core @@ -173748,17 +175046,23 @@ self: { }) {}; "morpheus-graphql-client" = callPackage - ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-core - , mtl, template-haskell, text, transformers, unordered-containers + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-core, mtl, tasty, tasty-hunit, template-haskell + , text, transformers, unordered-containers }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.13.0"; - sha256 = "0m1a379csfs3bqysl8ai2k7ybpb2gbm9w1rccgr41p9lk7w2w40k"; + version = "0.15.1"; + sha256 = "1gmyil518qjn5l30kljrm52fznkib1d1qyxnjhyb535jc9f44zhz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-core mtl template-haskell text transformers unordered-containers ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-core mtl tasty + tasty-hunit template-haskell text transformers unordered-containers + ]; description = "Morpheus GraphQL Client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -173789,7 +175093,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql-core_0_13_0" = callPackage + "morpheus-graphql-core_0_15_1" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hashable , megaparsec, mtl, scientific, tasty, tasty-hunit, template-haskell , text, th-lift-instances, transformers, unordered-containers @@ -173797,8 +175101,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.13.0"; - sha256 = "0ix5n3c1db6qa6zdk74r890klc81wa1f4mdlqln6g039dbh423j7"; + version = "0.15.1"; + sha256 = "0nakm33ybrj8y3ci0a4697dvz8q38z17vr2mkcbm7h14h06kg8wr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring hashable megaparsec mtl scientific @@ -174299,17 +175603,17 @@ self: { "mprelude" = callPackage ({ mkDerivation, base, devtools, source-constraints, text - , text-conversions + , unliftio-core }: mkDerivation { pname = "mprelude"; - version = "0.1.0"; - sha256 = "0p7zx0b49dp2vd3mx3knfl9gqbh6sj2znc372bmh6ja57g1kv8ds"; + version = "0.2.0"; + sha256 = "0llkcbilz138zlrqmsny74g9ybjf665h7w84g0q0rli9dvjnc4bl"; libraryHaskellDepends = [ - base source-constraints text text-conversions + base source-constraints text unliftio-core ]; testHaskellDepends = [ - base devtools source-constraints text text-conversions + base devtools source-constraints text unliftio-core ]; description = "A minimalish prelude"; license = stdenv.lib.licenses.bsd3; @@ -176507,8 +177811,8 @@ self: { }: mkDerivation { pname = "musicw"; - version = "0.3.5"; - sha256 = "1fkkx6gsfcb138vr7f685wg0wbqhr2sk9h4vqiv8r254hkwzl91h"; + version = "0.3.5.2"; + sha256 = "0mn5vnjxqkpd2pgjxmchlih74a1m52v06h6f08kyb26l0sjpbfx7"; libraryHaskellDepends = [ array base bytestring containers data-default file-embed ghcjs-base ghcjs-dom ghcjs-prim json monad-loops mtl safe text time @@ -176822,6 +178126,8 @@ self: { ]; description = "A Markov stochastic transition operator with logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mwc-random" = callPackage @@ -176867,10 +178173,8 @@ self: { ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { pname = "mwc-random-accelerate"; - version = "0.1.0.0"; - sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih"; - revision = "3"; - editedCabalFile = "1a7xx3mcli9fx5lqg1zxwqbrgzvgbssn3vprh4wp8zg58pqic6ic"; + version = "0.2.0.0"; + sha256 = "1a8b36l60p29461y0gacgjzarlyrncl54r7x4zh2rgvs2w7mjdc5"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -177384,8 +178688,8 @@ self: { }: mkDerivation { pname = "myxine-client"; - version = "0.0.1.0"; - sha256 = "1vd1dxg39vwz9w58zxpp3mk66gk00534h6c846v2d77nqn0yajf0"; + version = "0.0.1.2"; + sha256 = "0399pig7nw6k1hjw16mjg7lh6z1vd0xhq625wbx76ispwk6gqifb"; libraryHaskellDepends = [ aeson async base blaze-html blaze-markup bytestring constraints containers dependent-map file-embed hashable http-client http-types @@ -178448,15 +179752,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "neat-interpolation_0_5_1_1" = callPackage + "neat-interpolation_0_5_1_2" = callPackage ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell , text }: mkDerivation { pname = "neat-interpolation"; - version = "0.5.1.1"; - sha256 = "1bjl2k3b42kqwq15fsnjxxcadsch5dck9cwf8zvnh4gkyfmkbbx4"; + version = "0.5.1.2"; + sha256 = "18c48r5qwrapkjh35l5dng3ahkkn1ch47vc4nzjwh4a9va94laln"; libraryHaskellDepends = [ base megaparsec template-haskell text ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -179232,8 +180536,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "6"; - editedCabalFile = "0mn0ar2xhjdsm50kmpw5ndvbyfmc30b3x0bx291d2ml7hqspnnsw"; + revision = "7"; + editedCabalFile = "0cmkwkqxzbhrzzwypvmamwcr5ndyk1qc5pjy1rnc50xx7wznw7hf"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -179517,6 +180821,8 @@ self: { pname = "network"; version = "3.1.2.0"; sha256 = "07zbaaa4f0rnc4xqg5kbzqivmr9lqz2g6bw01gmqkmh9k9svsap0"; + revision = "1"; + editedCabalFile = "079svy0nr035xhz4gd6cila0wvsjl23hi3hq5407m3qdmcf4rkis"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -180194,8 +181500,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "network-run"; - version = "0.2.3"; - sha256 = "026l8j1nfgvs3lknn3fvsjj4x4niykhn99h5kywc47347b91xl3n"; + version = "0.2.4"; + sha256 = "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl"; libraryHaskellDepends = [ base bytestring network ]; description = "Simple network runner library"; license = stdenv.lib.licenses.bsd3; @@ -180551,8 +181857,8 @@ self: { }: mkDerivation { pname = "network-uri-json"; - version = "0.3.1.1"; - sha256 = "0akyhgi79pzhvfq47risrqmr6hi409fnz1ivwpwwfc4laimf3mky"; + version = "0.4.0.0"; + sha256 = "1hnsk8xsa89p4ywvyb4xfdk3l16mlhmb73sy1vbgckc7mlv3mmb4"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ aeson base hspec network-arbitrary network-uri test-invariant text @@ -181393,8 +182699,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.16"; - sha256 = "0z2wws28nl7xd5fbc5za287y8ryvfrgha4qh7aahr3x1j9sywpyg"; + version = "0.2.18"; + sha256 = "1jgljmj7msix2vn9nxip9q4754hx4739w4r7sa05l6q4ba5ilwqd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -181621,8 +182927,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.1.0.0"; - sha256 = "0agj882mfnr53jlpn1cnds31b78qw3a13md1ap6jj2rnxs2zjcai"; + version = "0.1.1.0"; + sha256 = "1dciwsw7cv1f73awrqr3gw3zj3mizaw53q3ibkawq9gbfsfg8yiz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -182309,8 +183615,8 @@ self: { }: mkDerivation { pname = "nonempty-containers"; - version = "0.3.4.0"; - sha256 = "1np8gypq49j90clavh17wzxp9y6z23lngal815jsg4p35qc0h01l"; + version = "0.3.4.1"; + sha256 = "0cpn0f0gnir9w366hw2906316qx5yc06rrrlv67xba1p66507m83"; libraryHaskellDepends = [ aeson base comonad containers deepseq nonempty-vector semigroupoids these vector @@ -182459,8 +183765,8 @@ self: { pname = "normalization-insensitive"; version = "2.0.1"; sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v"; - revision = "3"; - editedCabalFile = "1p1pw5llhw0jp1w8yvwd79w06lk7rz74rryppzvw8vpc5axl99bq"; + revision = "4"; + editedCabalFile = "1p0vxvp44nzjn7big9m3wj8gvffaxz05c46jalm73fwm8cj54iqf"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -182571,6 +183877,24 @@ self: { broken = true; }) {}; + "nothunks" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim + , hedgehog, random, tasty, tasty-hedgehog, text, time, vector + }: + mkDerivation { + pname = "nothunks"; + version = "0.1.0.0"; + sha256 = "1ygkkyl90z99xgxzjl122vqnra7jl3v5cxzrb78z4lfx2mm59yla"; + libraryHaskellDepends = [ + base bytestring containers ghc-heap text time vector + ]; + testHaskellDepends = [ + base containers ghc-prim hedgehog random tasty tasty-hedgehog text + ]; + description = "Examine values for unexpected thunks"; + license = stdenv.lib.licenses.mit; + }) {}; + "notifications-tray-icon" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers, dbus , gi-dbusmenu, gi-gio, gi-glib, github, haskeline, hslogger @@ -183564,6 +184888,8 @@ self: { pname = "nvim-hs"; version = "2.1.0.4"; sha256 = "0bg94adja6xvzlv1x849nrfpb0i5mjbp19f9cwhaa4iw1qs532rf"; + revision = "1"; + editedCabalFile = "0yzdq8nxf2n7n4ns6frgl5nhgb3vj3nkh7336mz994iydam17wcl"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -183642,12 +184968,14 @@ self: { }: mkDerivation { pname = "nvvm"; - version = "0.9.0.0"; - sha256 = "00ggaycs5z2b617kgjv851ahrakd4v8w374qbym19r1ccrxkdhhb"; + version = "0.10.0.0"; + sha256 = "188zf4hlqgjj5xgsfvrkynhq8pc29qfkaz6rp61ij3adc30410al"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; - libraryHaskellDepends = [ base bytestring cuda template-haskell ]; + libraryHaskellDepends = [ + base bytestring cuda directory filepath template-haskell + ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to NVVM"; license = stdenv.lib.licenses.bsd3; @@ -184100,6 +185428,18 @@ self: { broken = true; }) {}; + "ocap-io" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ocap-io"; + version = "0.1.1.0"; + sha256 = "07s3nman83mv6g96naz0aax6pn6h6vrw3linv46895rvfz4vak8k"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Object capability based IO"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ochan" = callPackage ({ mkDerivation, async, base, bytestring, mtl, oref, text , transformers @@ -185036,10 +186376,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.6.7005.0"; - sha256 = "0i5lwfvj7382ayxzdbip1nwjiiy7jn58g7qa33s44x3pnjv3wssy"; - revision = "1"; - editedCabalFile = "0bby89fvbx89b882b2qx07lg8npnfa325qg0gyabrd950510vzr2"; + version = "0.6.7006.1"; + sha256 = "0qg42qdk6gcziwfvjsjbwyj629grna2ay4pmh8myy3d1rznp6s93"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -185056,6 +186394,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_7_1_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-locale-compat, transformers, uuid + , void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.1.0"; + sha256 = "0i4ndy9dd6jb4dzx8a5fv8jsmnmp7p1kx2qr012xj1qjq36sqpy6"; + revision = "1"; + editedCabalFile = "1kcgpigl645m1n7ikxx4lnnlqmwh06kndg6mbz69rn5ir7qimv51"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time time-locale-compat + transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -185820,10 +187189,8 @@ self: { }: mkDerivation { pname = "openssl-streams"; - version = "1.2.2.0"; - sha256 = "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr"; - revision = "1"; - editedCabalFile = "125bxb2axgpcq7rrpamfq0yz017i0ks9zsykh6hn0ifw3lxj1k29"; + version = "1.2.3.0"; + sha256 = "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"; libraryHaskellDepends = [ base bytestring HsOpenSSL io-streams network ]; @@ -185845,14 +187212,14 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_6_0" = callPackage + "opentelemetry_0_6_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events , hashable }: mkDerivation { pname = "opentelemetry"; - version = "0.6.0"; - sha256 = "0gl3xax7gz89fc12lyw468qhailgja06skj6siscq9pip03gj6ck"; + version = "0.6.1"; + sha256 = "0i88ciig40gil4gaj95qw28c2racdr2jb6rcpnsf60fzkqc8b3fk"; libraryHaskellDepends = [ base bytestring exceptions ghc-trace-events hashable ]; @@ -185896,7 +187263,7 @@ self: { broken = true; }) {}; - "opentelemetry-extra_0_6_0" = callPackage + "opentelemetry-extra_0_6_1" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, clock , containers, directory, exceptions, filepath, gauge , generic-arbitrary, ghc-events, hashable, hashtables, http-client @@ -185907,8 +187274,8 @@ self: { }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.6.0"; - sha256 = "025fsryqzv0cfny1myrhs4bdrdg8sfp86rvxf671sbl8nli48x1a"; + version = "0.6.1"; + sha256 = "0ggxkhcrjj8sg6zf9jnp1j05wwlsay6k95c79j9j3dvw8qy2yjbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185977,7 +187344,7 @@ self: { broken = true; }) {}; - "opentelemetry-lightstep_0_6_0" = callPackage + "opentelemetry-lightstep_0_6_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, clock, containers , exceptions, filepath, ghc-events, http-client, http-client-tls , http-types, network, opentelemetry, opentelemetry-extra @@ -185986,8 +187353,8 @@ self: { }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.6.0"; - sha256 = "09xqda7hxx4dn85hs2zh7y3jjxvi7xprcpv8mmam38hzyhjw2rv7"; + version = "0.6.1"; + sha256 = "1a7rrm5aahqh63j0rr7nvd4y3q64m8qr7is0r0a17fwkkpppmyln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186021,14 +187388,14 @@ self: { broken = true; }) {}; - "opentelemetry-wai_0_6_0" = callPackage + "opentelemetry-wai_0_6_1" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.6.0"; - sha256 = "1bqq1fs7krckx43w2j4pvfncbyy60rrh6w8n1pcvb629dary5lwn"; + version = "0.6.1"; + sha256 = "0g1a044sphd35z9crc8wbxsk4hfh1gpfi4g8rr1k4f842hznj7nf"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -186588,14 +187955,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optics-th_0_3_0_1" = callPackage + "optics-th_0_3_0_2" = callPackage ({ mkDerivation, base, containers, mtl, optics-core, tagged , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "optics-th"; - version = "0.3.0.1"; - sha256 = "1bn9yhl1v4xkagasgiq4v572v4vvbk40wwlx9wjdw0gqcisy4b3j"; + version = "0.3.0.2"; + sha256 = "1mxi4bwgpl02g7clbs4m5p16i64s5lp13811yhg66i50rnqwpw40"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -186902,14 +188269,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_4_2" = callPackage + "optparse-generic_1_4_3" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.4.2"; - sha256 = "00b46pn3mi0kbx8a2xc92hlrykl9b344sq9ljmydv4zmrrhp5yr6"; + version = "1.4.3"; + sha256 = "18ih1r28hlml9wysqrzljmgi6q90s3k6jaaa7a5i48vr9bl3prs8"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -186940,8 +188307,8 @@ self: { }: mkDerivation { pname = "optparse-simple"; - version = "0.1.1.2"; - sha256 = "1r00hkri42vyx552l8hcd1779fxiyl9w4k0pql915zsprirn8w82"; + version = "0.1.1.3"; + sha256 = "1wymqhac2sngkka8w880gq6y1kk3xs0flbv4mrhfgzrplhax8r9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187248,8 +188615,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.4.0"; - sha256 = "01h8lf3cdkq5s4nx5iy2835sdbly4vrdn2ml34qgaby703drlci4"; + version = "1.5.0"; + sha256 = "1vy8agbcrd81zskfwmrmz63vdif6a2wllr910nmg0jgqxbrd8wn1"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -187460,8 +188827,8 @@ self: { pname = "ormolu"; version = "0.1.2.0"; sha256 = "14ndqfcbx0y71d3q5i7d0scbvg9nd5qr5pdn7qvylxlkgpbc77qp"; - revision = "1"; - editedCabalFile = "0c20myzc42zvfhy8lwqgjrhsna5dg8xfbha5y2v7hsapa0km3ri4"; + revision = "2"; + editedCabalFile = "07p7342972b2ffi46ll8jgbnlx97g7imzpl819hzc0yd2pjn4jn9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -187480,6 +188847,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "orthotope" = callPackage + ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector + }: + mkDerivation { + pname = "orthotope"; + version = "0.1.0.0"; + sha256 = "0nx97r1svhzayf0f4chj8mprqp524hliffnw5y612lwsx41c671k"; + libraryHaskellDepends = [ + base deepseq dlist pretty QuickCheck vector + ]; + testHaskellDepends = [ + base deepseq HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector + ]; + description = "Multidimensional arrays inspired by APL"; + license = stdenv.lib.licenses.asl20; + }) {}; + "os-release" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , hspec-megaparsec, megaparsec, pretty-simple, safe-exceptions @@ -188616,8 +190003,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.7.0"; - sha256 = "1mw5bcl0z1vps4xz72pznr1b9ag1g9sxhm2f51wm3236z9q28za6"; + version = "0.3.8.1"; + sha256 = "15h484xq015jy65mzaqjqyi4ppnqfrdvvj1llmp8k00vb2xcrzrr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -188641,8 +190028,6 @@ self: { ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-csv2table" = callPackage @@ -188658,6 +190043,8 @@ self: { executableHaskellDepends = [ base csv pandoc pandoc-types ]; description = "Convert CSV to Pandoc Table Markdown"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-emphasize-code" = callPackage @@ -188667,8 +190054,8 @@ self: { }: mkDerivation { pname = "pandoc-emphasize-code"; - version = "0.2.4"; - sha256 = "0fz0pkxx64d8bvrsg9s704mhhw9djq74x56dbv5w3y65nch8p3a5"; + version = "0.3.0"; + sha256 = "02bg6aippqbjzx1dqzq63qh4ggm6pyw6p8p5iay9ldxdgx4jicnc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188768,6 +190155,8 @@ self: { ]; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-japanese-filters" = callPackage @@ -188919,7 +190308,7 @@ self: { broken = true; }) {}; - "pandoc-plot_0_9_0_0" = callPackage + "pandoc-plot_0_9_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec , hspec-expectations, lifted-async, mtl, optparse-applicative @@ -188928,8 +190317,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.9.0.0"; - sha256 = "0wamycf3cbblcifs7sppnzg4vbglzgizmjb5idg0dgkhlrk78gcx"; + version = "0.9.2.0"; + sha256 = "0fryriyqlmfc82nqbqw7a8n7325wwag29v3ag61s600jw66i9fsc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189019,6 +190408,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-throw" = callPackage + ({ mkDerivation, base, exceptions, pandoc }: + mkDerivation { + pname = "pandoc-throw"; + version = "0.1.0.0"; + sha256 = "1i737mv2sgm65c53ggrxnscga92fya5khb5nhgbg1nnqgy2sjkm8"; + libraryHaskellDepends = [ base exceptions pandoc ]; + description = "MonadThrow behaviour for Pandoc"; + license = stdenv.lib.licenses.mit; + }) {}; + "pandoc-types" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb @@ -189098,6 +190498,8 @@ self: { ]; description = "Utility functions to work with Pandoc in Haskell applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-vimhl" = callPackage @@ -189122,8 +190524,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.9"; - sha256 = "0gl5h4krn2aigxfqppa4fr8vir2s5xrh8s363frh82fgdxblhjgc"; + version = "0.3.0"; + sha256 = "1k9b714rb9cgapn0vgwymrq7ma1lmq6klmlv37c6gqmb1c5k7ijh"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -189368,7 +190770,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pantry_0_5_1_1" = callPackage + "pantry_0_5_1_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -189382,8 +190784,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.1.1"; - sha256 = "1q1q8jflhd5r70czsclkj27yqk4v8b1njdw8f4qb3xvf9c3gzl70"; + version = "0.5.1.2"; + sha256 = "1ix1y334l4a7zcqm8i849g67mgvkqzikbhcbkqc1d6hg1lhc7xzr"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -190676,8 +192078,8 @@ self: { pname = "parser-combinators-tests"; version = "1.2.1"; sha256 = "0iy4iajpjka1diy660x3mvmh8kldwf3svwdmvlxh26dsqy2s8sx8"; - revision = "1"; - editedCabalFile = "07isz6d136dkbr1aykznfi3dr3dp18x14548af207rd29x51g0di"; + revision = "2"; + editedCabalFile = "07j1y8iqljaqyqhy37db2xvs7y9z91r3sndzmz4gga7w2jpkhq2b"; isLibrary = false; isExecutable = false; testHaskellDepends = [ @@ -191222,28 +192624,28 @@ self: { }) {}; "patat" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base , base64-bytestring, bytestring, colour, containers, directory , filepath, mtl, network, network-uri, optparse-applicative, pandoc - , process, QuickCheck, skylighting, tasty, tasty-hunit - , tasty-quickcheck, terminal-size, text, time, unordered-containers - , yaml + , pandoc-types, process, QuickCheck, skylighting, tasty + , tasty-hunit, tasty-quickcheck, terminal-size, text, time + , unordered-containers, yaml }: mkDerivation { pname = "patat"; - version = "0.8.5.0"; - sha256 = "1b4g5m32dv7905q51p4f23c9d4sfy5jvwbq7wgwsa2mwl8hf5cds"; + version = "0.8.6.1"; + sha256 = "1n9qw4wmh7aqmnkqdc6v12rs80vipnszr4744nlkasq6jlzijw0c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base64-bytestring + aeson ansi-terminal ansi-wl-pprint async base base64-bytestring bytestring colour containers directory filepath mtl network - network-uri optparse-applicative pandoc process skylighting - terminal-size text time unordered-containers yaml + network-uri optparse-applicative pandoc pandoc-types process + skylighting terminal-size text time unordered-containers yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory QuickCheck tasty tasty-hunit tasty-quickcheck + base directory QuickCheck tasty tasty-hunit tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; @@ -191380,8 +192782,8 @@ self: { ({ mkDerivation, base, binary, path }: mkDerivation { pname = "path-binary-instance"; - version = "0.1.0.0"; - sha256 = "1mrmp58s7f88hyq493h39c1f19r92yh2qw1diml61iwhm765j7ir"; + version = "0.1.0.1"; + sha256 = "19ck3ja66vcgl90wyw6r9d2h50kdv9gjs7sxjgciam6v6867vb0y"; libraryHaskellDepends = [ base binary path ]; description = "Binary instance for Path"; license = stdenv.lib.licenses.mit; @@ -191441,8 +192843,8 @@ self: { ({ mkDerivation, base, path }: mkDerivation { pname = "path-like"; - version = "0.2.0.1"; - sha256 = "03d5kqs6xr22dl7gjydi1nlzy13wsc0dkmd93pwf37yp85y4bxrp"; + version = "0.2.0.2"; + sha256 = "1hr58zcgcybd34zzas5kf0jgcm5z2wdlbhskwj9233503nnlwkq9"; libraryHaskellDepends = [ base path ]; description = "PathLike, FileLike and DirLike type classes for the Path library"; license = stdenv.lib.licenses.mit; @@ -191478,6 +192880,17 @@ self: { broken = true; }) {}; + "path-utils" = callPackage + ({ mkDerivation, base, exceptions, path, split, text }: + mkDerivation { + pname = "path-utils"; + version = "0.1.0.0"; + sha256 = "1abva4kfmj00ahd44rgzr6mk41y84gkvc6z7vwqz7m2g3r4zsxm2"; + libraryHaskellDepends = [ base exceptions path split text ]; + description = "Handful of simple utility functions for the path library"; + license = stdenv.lib.licenses.mit; + }) {}; + "pathfinding" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -193530,8 +194943,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.10.0.0"; - sha256 = "1z895y21raak3x9qw05hgif5qyvr6c7pkc59wzg7irk8mxijyf4n"; + version = "2.10.0.1"; + sha256 = "194cxlxyaxwzgm7a7q8530bh842s5s1vmq33pclldp78nfy1dczm"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -193729,6 +195142,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-qq_2_9_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, fast-logger + , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent + , persistent-sqlite, persistent-template, resourcet + , template-haskell, text, unliftio + }: + mkDerivation { + pname = "persistent-qq"; + version = "2.9.2"; + sha256 = "1nks3b420g447i3bvlpf3f41ry8jkfkl60m9yl48vyxgbpcjq523"; + libraryHaskellDepends = [ + base haskell-src-meta mtl persistent template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring fast-logger haskell-src-meta hspec HUnit + monad-logger mtl persistent persistent-sqlite persistent-template + resourcet template-haskell text unliftio + ]; + description = "Provides a quasi-quoter for raw SQL for persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-ratelimit" = callPackage ({ mkDerivation, base, time, yesod }: mkDerivation { @@ -193743,24 +195179,23 @@ self: { }) {}; "persistent-redis" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, hedis - , http-api-data, monad-control, mtl, path-pieces, persistent - , persistent-template, scientific, template-haskell, text, time - , transformers, utf8-string + ({ mkDerivation, aeson, base, binary, bytestring, hedis + , http-api-data, mtl, path-pieces, persistent, persistent-template + , scientific, template-haskell, text, time, transformers + , utf8-string }: mkDerivation { pname = "persistent-redis"; - version = "2.5.2.2"; - sha256 = "1mkdc3s39h0zqzf86zzwyfxfpc4fasrhpfdypkj8mkljbh7v1i1l"; + version = "2.5.2.5"; + sha256 = "0h2bwr5svj36n3axnrgnrzkysg4ywf9d97x4fwwsjgn01gwr262k"; libraryHaskellDepends = [ - aeson attoparsec base binary bytestring hedis http-api-data - monad-control mtl path-pieces persistent scientific text time - transformers utf8-string + aeson base binary bytestring hedis http-api-data mtl path-pieces + persistent scientific text time transformers utf8-string ]; testHaskellDepends = [ - aeson attoparsec base binary bytestring hedis http-api-data - monad-control mtl path-pieces persistent persistent-template - scientific template-haskell text time transformers utf8-string + aeson base binary bytestring hedis http-api-data mtl path-pieces + persistent persistent-template scientific template-haskell text + time transformers utf8-string ]; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; @@ -193900,6 +195335,8 @@ self: { pname = "persistent-template"; version = "2.8.2.3"; sha256 = "1y96aj5i3c1j2ls6980l8lfjj9b3vfmp3766xk5af1870vj1s1lf"; + revision = "1"; + editedCabalFile = "0ilgcn3k72b2zm53yy4na4y0f8xfrlw6s5w3xhhavg6blyw971j7"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -193991,6 +195428,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-test_2_0_3_2" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, hspec-expectations, HUnit + , monad-control, monad-logger, mtl, path-pieces, persistent + , persistent-template, QuickCheck, quickcheck-instances, random + , resourcet, text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers + }: + mkDerivation { + pname = "persistent-test"; + version = "2.0.3.2"; + sha256 = "0d7a6m4qm6xzyv7h2fqn9hgv7r7q6dwh7x04ddsrygjxdgpwgqf3"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring conduit containers exceptions + hspec hspec-expectations HUnit monad-control monad-logger mtl + path-pieces persistent persistent-template QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers + ]; + description = "Tests for Persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-typed-db" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec , http-api-data, monad-logger, path-pieces, persistent @@ -194344,8 +195805,8 @@ self: { ({ mkDerivation, base, containers, gu, pgf, pretty }: mkDerivation { pname = "pgf2"; - version = "1.2.0"; - sha256 = "1lw9wdsvlasd5x323dficcmzqf48yz49wd3v64gsyx60sw93vn0y"; + version = "1.2.1"; + sha256 = "10nbwhdirhlsh68f14z8y75wlbs9f9xcn8cbgkf47m74x71jqqb3"; libraryHaskellDepends = [ base containers pretty ]; librarySystemDepends = [ gu pgf ]; description = "Bindings to the C version of the PGF runtime"; @@ -194614,6 +196075,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "phonetic-languages-ukrainian" = callPackage + ({ mkDerivation, base, mmsyn2, mmsyn5, vector }: + mkDerivation { + pname = "phonetic-languages-ukrainian"; + version = "0.2.0.0"; + sha256 = "0lx1br8az752lnnwqm3qp3z27z78922d5i03bxgzd4v6zx78iksp"; + libraryHaskellDepends = [ base mmsyn2 mmsyn5 vector ]; + description = "Prepares Ukrainian text to be used as a phonetic language text"; + license = stdenv.lib.licenses.mit; + }) {}; + "phooey" = callPackage ({ mkDerivation, array, base, mtl, reactive, TypeCompose, wx , wxcore @@ -194875,10 +196347,8 @@ self: { ({ mkDerivation, base, containers, network, stm, text }: mkDerivation { pname = "pickle"; - version = "1.0.0.0"; - sha256 = "066vla7x4ls59rhx9adr4lqx9yi5d047vcy90wgqh3lmnm7nj77m"; - revision = "1"; - editedCabalFile = "10fbbygp1w79h8spmcdwz56vl0gw761rfvb731fhmsvm35390jd9"; + version = "1.0.1.0"; + sha256 = "13c1n06v6mh9lyplfg0y1gdijk2mhxg4ln59v7i2z4j1y65y8cz9"; libraryHaskellDepends = [ base containers network stm text ]; description = "Instant StatsD in Haskell"; license = stdenv.lib.licenses.mit; @@ -197169,8 +198639,8 @@ self: { }: mkDerivation { pname = "plot"; - version = "0.2.3.10"; - sha256 = "0dva2kvf3193qc7zb9ydmzpffaj9lm6qy79n5zv66jnbccyp36lf"; + version = "0.2.3.11"; + sha256 = "0img30argzgxcgwam3iqc3xasgizbbcrghd2vkmqahmv7g3l36di"; libraryHaskellDepends = [ array base cairo colour hmatrix mtl pango transformers ]; @@ -197386,8 +198856,8 @@ self: { }: mkDerivation { pname = "plugins"; - version = "1.6.0"; - sha256 = "0wbmvcb2j4qi29yrmvjfhdf8251lam5yiqshk9gf6dlprz2kvww1"; + version = "1.6.1"; + sha256 = "004mfq0d10s26sgk12zrhgmxcfxnhvdyajr48scxf5rh1fv9440i"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random split @@ -198226,6 +199696,39 @@ self: { broken = true; }) {}; + "polysemy-http" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring + , case-insensitive, co-log-core, co-log-polysemy, composition + , containers, data-default, either, hedgehog, http-client + , http-client-tls, http-conduit, http-types, lens, network + , polysemy, polysemy-plugin, relude, servant, servant-client + , servant-server, string-interpolate, tasty, tasty-hedgehog + , template-haskell, text, warp + }: + mkDerivation { + pname = "polysemy-http"; + version = "0.2.0.3"; + sha256 = "10a0sihivgxn7w1m9rj6dbs9wiw6gmcf7qg0s2bnd3d4ipxxy89q"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring case-insensitive co-log-core + co-log-polysemy composition containers data-default either + http-client http-client-tls http-conduit http-types lens polysemy + polysemy-plugin relude string-interpolate template-haskell text + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring case-insensitive co-log-core + co-log-polysemy composition containers data-default either hedgehog + http-client http-client-tls http-conduit http-types lens network + polysemy polysemy-plugin relude servant servant-client + servant-server string-interpolate tasty tasty-hedgehog + template-haskell text warp + ]; + description = "Polysemy effect for http-client"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-optics" = callPackage ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: mkDerivation { @@ -198247,8 +199750,8 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.2.5.0"; - sha256 = "1ymry3ppc5cl9agvkbxks155xnxr9cv39p77j05ychnhv9r4vjsh"; + version = "0.2.5.1"; + sha256 = "14iz5p5g57ki9lbjyy8i3lx7xk2qmrc8dqkd94jrbilsvn4m5gf3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -198262,6 +199765,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polysemy-test" = callPackage + ({ mkDerivation, base-noprelude, containers, either, hedgehog, path + , path-io, polysemy, polysemy-plugin, relude, string-interpolate + , tasty, tasty-hedgehog, text + }: + mkDerivation { + pname = "polysemy-test"; + version = "0.2.0.0"; + sha256 = "10kakaipasw1gbipjl4x23cma9f6iv3ma547a26b70ysap6c41ys"; + libraryHaskellDepends = [ + base-noprelude containers either hedgehog path path-io polysemy + polysemy-plugin relude string-interpolate tasty tasty-hedgehog text + ]; + testHaskellDepends = [ + base-noprelude containers either hedgehog path path-io polysemy + polysemy-plugin relude string-interpolate tasty tasty-hedgehog text + ]; + description = "Polysemy effects for testing"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-webserver" = callPackage ({ mkDerivation, base, bytestring, hspec, http-conduit, http-types , polysemy, polysemy-plugin, text, wai, wai-websockets, warp @@ -199314,8 +200840,8 @@ self: { }: mkDerivation { pname = "postgres-websockets"; - version = "0.8.0.1"; - sha256 = "0a56dpj90nmrinjgxaipgbsfl5ligx3iydcnijxpwy6vwbjijnmi"; + version = "0.9.0.0"; + sha256 = "1c7has1vyp8i3my5126m8ciimcyyv4prav94wpl861gz7npdqxym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199366,7 +200892,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "postgresql-binary_0_12_3" = callPackage + "postgresql-binary_0_12_3_1" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, bytestring-strict-builder, containers, conversion , conversion-bytestring, conversion-text, criterion, json-ast @@ -199377,8 +200903,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.12.3"; - sha256 = "0z31d7bw7m43195maqw5pba3l2l98nnkck0gzaghk05id0p7rlmd"; + version = "0.12.3.1"; + sha256 = "0frdyhzdrfnrqmf15all0g817p7i6asj46hzk87rw52qbfiyag2v"; libraryHaskellDepends = [ aeson base base-prelude binary-parser bytestring bytestring-strict-builder containers loch-th network-ip @@ -199938,8 +201464,8 @@ self: { }: mkDerivation { pname = "postgresql-syntax"; - version = "0.3.0.2"; - sha256 = "1gl0k3idcgpnahh8mv01mjzhc4yx6i3f7shfa7mqhcgs6r1ccdhz"; + version = "0.3.0.3"; + sha256 = "0zylrzd8dfks1jdx1yq1i2n2a7sxa8b04h6km9lx3bdpbpv84y7i"; libraryHaskellDepends = [ base bytestring case-insensitive fast-builder hashable headed-megaparsec megaparsec parser-combinators text text-builder @@ -200154,8 +201680,8 @@ self: { pname = "postgrest"; version = "7.0.1"; sha256 = "1cn69dinfv3y8ymsa364b9b0ly3dg80and902gamymb9v89jpsgf"; - revision = "1"; - editedCabalFile = "0s8zzv6vjs4mp6m6l6ahfpfrx551zzp3nh13qk5qxk992x3jxb8b"; + revision = "2"; + editedCabalFile = "061lr5hy3xf1nx7yqjpspxqdccmhvvfkyzd3qxzsg5s041hy4krs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201551,20 +203077,21 @@ self: { maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; }) {}; - "pretty-simple_3_3_0_0" = callPackage - ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest - , containers, criterion, doctest, Glob, mtl, QuickCheck - , template-haskell, text, transformers + "pretty-simple_4_0_0_0" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, criterion + , doctest, Glob, mtl, prettyprinter, prettyprinter-ansi-terminal + , QuickCheck, template-haskell, text, transformers }: mkDerivation { pname = "pretty-simple"; - version = "3.3.0.0"; - sha256 = "0g83958npqscqqz2lh5m0m666qp8ldwps4l5gvfip4b1zgy3f5nh"; + version = "4.0.0.0"; + sha256 = "1srvx854ml2gffnkxr2fm12xk8syjsk078rfzrq0a3idwgv46myw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - ansi-terminal base containers mtl text transformers + base containers mtl prettyprinter prettyprinter-ansi-terminal text + transformers ]; testHaskellDepends = [ base doctest Glob QuickCheck template-haskell @@ -201820,6 +203347,19 @@ self: { broken = true; }) {}; + "prettyprinter-lucid" = callPackage + ({ mkDerivation, base, lucid, prettyprinter, text }: + mkDerivation { + pname = "prettyprinter-lucid"; + version = "0.1.0.1"; + sha256 = "0m8dbxzs22zbahpr6r1frlfqyw581wyg92vswm3gi2qqpj406djh"; + libraryHaskellDepends = [ base lucid prettyprinter text ]; + description = "A prettyprinter backend for lucid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "prettyprinter-vty" = callPackage ({ mkDerivation, base, prettyprinter, vty }: mkDerivation { @@ -201931,6 +203471,40 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "primal" = callPackage + ({ mkDerivation, base, deepseq, doctest, template-haskell + , transformers + }: + mkDerivation { + pname = "primal"; + version = "0.1.0.0"; + sha256 = "0y60m1249n5mzglmbkhv98lzzmmkxs2k0mn882kqs89h04hfx546"; + libraryHaskellDepends = [ base deepseq transformers ]; + testHaskellDepends = [ base doctest template-haskell ]; + description = "Primeval world of Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "primal-memory" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, primal + , primitive, random + }: + mkDerivation { + pname = "primal-memory"; + version = "0.1.0.0"; + sha256 = "0lvz5kj6bvlgz1jykcv8dri77pjmy6fzppvk9vlvh4cx22zh9y5m"; + libraryHaskellDepends = [ base bytestring deepseq primal ]; + benchmarkHaskellDepends = [ + base criterion deepseq primal primitive random + ]; + description = "Unified interface for memory managemenet"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "primes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -202114,8 +203688,6 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "primitive-foreign" = callPackage @@ -202336,6 +203908,17 @@ self: { broken = true; }) {}; + "print-info" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "print-info"; + version = "0.1.3.0"; + sha256 = "02wl9hq7jkz4yzkb744xwgnbss0w2sdpi02d3ms2q5rvc03ixnh6"; + libraryHaskellDepends = [ base ]; + description = "Can be used to coordinate the printing output"; + license = stdenv.lib.licenses.mit; + }) {}; + "printcess" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, lens, mtl , QuickCheck, transformers @@ -202917,14 +204500,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "product-profunctors_0_11_0_0" = callPackage + "product-profunctors_0_11_0_1" = callPackage ({ mkDerivation, base, bifunctors, contravariant, criterion , deepseq, profunctors, tagged, template-haskell }: mkDerivation { pname = "product-profunctors"; - version = "0.11.0.0"; - sha256 = "1jx427xixykq9h353r7izd5nx1hpzc7g0hz4pcx6hnd0ql2d644a"; + version = "0.11.0.1"; + sha256 = "0lwwjnpxgkgk02179j8jj9c1zvaw4f406i9gm7ngqczl8y796q3l"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -203370,8 +204953,8 @@ self: { }: mkDerivation { pname = "prolog"; - version = "0.3"; - sha256 = "02i79irax13rny953k6fvswsgbif9nnvysnnbq3k4w37b3g5maiv"; + version = "0.3.2"; + sha256 = "1clh7gfqh2yf17jc453y8cc8qcga9h0j5a60nfr1sjd5byr8j8ab"; libraryHaskellDepends = [ base containers mtl parsec syb template-haskell th-lift transformers @@ -203671,8 +205254,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.10.2"; - sha256 = "1yagzlpn6myj46ihcy8v43kxjf8kba42q5vahy22aanpwbp9lij8"; + version = "5.12"; + sha256 = "0j2w2j6df965fhh828y6x55p70wi4r7plrlzzgzxxhq0lhjdjyr0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203976,8 +205559,8 @@ self: { }: mkDerivation { pname = "proto-lens-jsonpb"; - version = "0.2.0.0"; - sha256 = "01m88qfi5lak15n14zlxb5yjyi67h5m47czkzirhi0a615v8bwbr"; + version = "0.2.0.2"; + sha256 = "1r98841byxkg5941yjrw15n56i0x68qr3gk29bimwcfifdf0idm2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring proto-lens-runtime text vector @@ -204461,8 +206044,8 @@ self: { }: mkDerivation { pname = "provenience"; - version = "0.1.0.2"; - sha256 = "0wzja3vv21wgwxlmwcfc6vbkdr80jjkhxbxa41zz1i78j8cc3bri"; + version = "0.1.1.0"; + sha256 = "020kfw1laishiqy8npg2f2llq7dv1djii0d0khjfw7f1scy4x10n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204630,6 +206213,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "psql-utils" = callPackage + ({ mkDerivation, aeson, base, hashable, postgresql-simple + , resource-pool, time + }: + mkDerivation { + pname = "psql-utils"; + version = "0.2.0.1"; + sha256 = "0vqi45v5ghv36gqmqc0ddhm4rwc0zg9qckl0bf7klwiiczs52smq"; + libraryHaskellDepends = [ + aeson base hashable postgresql-simple resource-pool time + ]; + description = "PostgreSQL Simple util tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "psqueues" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue @@ -205632,6 +207230,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pusher-http-haskell_2_0_0_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-client-tls + , http-types, memory, QuickCheck, text, time, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "2.0.0.1"; + sha256 = "05f4p4rnx2gy1f17d83sfpnxrfniq710pyai97gwi4ks3f4avk5a"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-client-tls http-types memory text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck text unordered-containers + ]; + description = "Haskell client library for the Pusher Channels HTTP API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -206242,22 +207862,6 @@ self: { }) {}; "qrcode-juicypixels" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels - , qrcode-core, text, vector - }: - mkDerivation { - pname = "qrcode-juicypixels"; - version = "0.8.1"; - sha256 = "0yd22dygh2z8i0yhgdgr1m25ag9bdkpmd1ciq4iq42k0yhk6iqx9"; - libraryHaskellDepends = [ - base base64-bytestring bytestring JuicyPixels qrcode-core text - vector - ]; - description = "Converts a qrcode-core image to JuicyPixels"; - license = stdenv.lib.licenses.mit; - }) {}; - - "qrcode-juicypixels_0_8_2" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels , qrcode-core, text, vector }: @@ -206271,7 +207875,6 @@ self: { ]; description = "Converts a qrcode-core image to JuicyPixels"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qsem" = callPackage @@ -206896,15 +208499,15 @@ self: { "quickcheck-classes-base" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, containers - , contravariant, fail, QuickCheck, semigroups, tagged, transformers + , contravariant, fail, QuickCheck, tagged, transformers }: mkDerivation { pname = "quickcheck-classes-base"; - version = "0.6.0.0"; - sha256 = "193jbr3fy2451gx0hzw82xrzxp6mxz5ics6yaybbz1a3dhlz53yx"; + version = "0.6.1.0"; + sha256 = "0yzljsy74njmbav90hgraxhjx0l86zggakfw0j3k7maz9376jvax"; libraryHaskellDepends = [ base base-orphans bifunctors containers contravariant fail - QuickCheck semigroups tagged transformers + QuickCheck tagged transformers ]; description = "QuickCheck common typeclasses from `base`"; license = stdenv.lib.licenses.bsd3; @@ -207308,6 +208911,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickjs-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , HUnit, inline-c, mtl, QuickCheck, scientific, string-conv, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "quickjs-hs"; + version = "0.1.2.1"; + sha256 = "0dbypa7p3x5j2nmbw2qvs4aik74jfkfa9b0mmv2290p6sj9ag1hd"; + revision = "1"; + editedCabalFile = "0f18980s2sky2fnrdnadyhivjhbzxcq9m3isnji8q2gbzpbywca7"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions inline-c mtl scientific + string-conv text time transformers unliftio-core + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base exceptions HUnit QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers vector + ]; + description = "Wrapper for the QuickJS Javascript Engine"; + license = stdenv.lib.licenses.mit; + }) {}; + "quicklz" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, test-framework , test-framework-quickcheck2 @@ -207387,8 +209015,8 @@ self: { }: mkDerivation { pname = "quickspec"; - version = "2.1.4"; - sha256 = "0h07s2dk4kjqv3hspazjwqbr8p78g2n5ah75h0a6ywdfgdy2z621"; + version = "2.1.5"; + sha256 = "0j8mcn9616r40hdl0jy6mqac7i31mhlsgv421m1hc8pj1kabpc0i"; libraryHaskellDepends = [ base constraints containers data-lens-light dlist QuickCheck quickcheck-instances random spoon template-haskell transformers @@ -208541,6 +210169,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; + revision = "2"; + editedCabalFile = "1pjpv8rzbwhr881ayxbvz4filvx3qkdx13pa21407p5fiyf208a3"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -210096,8 +211726,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.3"; - sha256 = "15jp5rawypxzbbyi9xi6jkds3mns7fpfkvzrzbqd7dvaj4mzzz0g"; + version = "0.5.4"; + sha256 = "1ir2m6d13hg8i4w4vfpnvjv6dvnjmrz2bwl7n6lsac95pm0hbjs3"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -210368,8 +211998,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "read-bounded"; - version = "0.1.1.2"; - sha256 = "1h525al4aavplyimhxsvk96cajl8m7rnlqq3wxh9gqlc1sy4ywcg"; + version = "0.1.1.3"; + sha256 = "0b2syhxan3fpf9h1zq3izpb8bgsl4qrk975afy3r2ji6dhjq81cl"; libraryHaskellDepends = [ base ]; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; @@ -210641,28 +212271,36 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate_0_4_1_0" = callPackage + "reanimate_0_5_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base - , base64-bytestring, bytestring, cassava, cereal, chiphunk, colour - , containers, cubicbezier, directory, earcut, filepath, fsnotify - , geojson, hashable, hmatrix, JuicyPixels, lens, linear, matrix - , mtl, neat-interpolation, open-browser, optparse-applicative - , parallel, process, random, random-shuffle, reanimate-svg, split - , temporary, text, time, vector, vector-space, websockets, xml + , base64-bytestring, bytestring, cassava, cereal, colour + , containers, cubicbezier, directory, filelock, filepath + , fingertree, fsnotify, geojson, ghcid, hashable, hgeometry + , hgeometry-combinatorial, JuicyPixels, lens, linear, matrix, mtl + , neat-interpolation, open-browser, optparse-applicative, parallel + , process, QuickCheck, random, random-shuffle, reanimate-svg, split + , tasty, tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-rerun, temporary, text, time + , unordered-containers, vector, vector-space, websockets, xml }: mkDerivation { pname = "reanimate"; - version = "0.4.1.0"; - sha256 = "12mql2i3433y3cj4x3rcilmvja4cnyk9y5cykw16sg30kbp1riki"; + version = "0.5.0.1"; + sha256 = "1rk28hwz30dq2162fzl98sa0kz1vpy4r3a00npw30vv3ywjm2sgz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring - bytestring cassava cereal chiphunk colour containers cubicbezier - directory earcut filepath fsnotify geojson hashable hmatrix - JuicyPixels lens linear matrix mtl neat-interpolation open-browser - optparse-applicative parallel process random random-shuffle - reanimate-svg split temporary text time vector vector-space - websockets xml + bytestring cassava cereal colour containers cubicbezier directory + filelock filepath fingertree fsnotify geojson ghcid hashable + hgeometry hgeometry-combinatorial JuicyPixels lens linear matrix + mtl neat-interpolation open-browser optparse-applicative parallel + process random random-shuffle reanimate-svg split temporary text + time unordered-containers vector vector-space websockets xml + ]; + testHaskellDepends = [ + base bytestring directory filepath linear process QuickCheck tasty + tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck + tasty-rerun temporary text vector ]; description = "Animation library based on SVGs"; license = stdenv.lib.licenses.publicDomain; @@ -210689,21 +212327,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "reanimate-svg_0_10_2_0" = callPackage + "reanimate-svg_0_11_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , double-conversion, hspec, JuicyPixels, lens, linear, mtl - , scientific, svg-tree, text, transformers, vector, xml + , double-conversion, hashable, JuicyPixels, lens, linear, mtl + , scientific, text, transformers, vector, xml }: mkDerivation { pname = "reanimate-svg"; - version = "0.10.2.0"; - sha256 = "0czj7yii9h24823rl2jlf8pqc670azgbzhrkbizdr2bnrz6g981g"; + version = "0.11.0.0"; + sha256 = "0cgyz2vf6yqkydxbx73blyr0fz0i50i0bdlnzs0r6ypdpsk5hqxy"; libraryHaskellDepends = [ - attoparsec base bytestring containers double-conversion JuicyPixels - lens linear mtl scientific text transformers vector xml - ]; - testHaskellDepends = [ - attoparsec base hspec linear scientific svg-tree + attoparsec base bytestring containers double-conversion hashable + JuicyPixels lens linear mtl scientific text transformers vector xml ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; @@ -210778,22 +212413,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_7" = callPackage + "rebase_1_7_3" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either , hashable, mtl, profunctors, scientific, selective, semigroupoids - , semigroups, stm, text, time, transformers, unordered-containers - , uuid, vector, void + , stm, text, time, transformers, unordered-containers, uuid, vector + , void }: mkDerivation { pname = "rebase"; - version = "1.7"; - sha256 = "1gqdqx2sbm7hn6pyqqi65g8mwz2igsq1lz7y3qdplv2aic6myla7"; + version = "1.7.3"; + sha256 = "0w5ywvwq4m2jw5rrlvxwnczwnxx5gkzdlbji85n0crcsqkhkmn1i"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant contravariant-extras deepseq dlist either hashable mtl profunctors - scientific selective semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void + scientific selective semigroupoids stm text time transformers + unordered-containers uuid vector void ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; @@ -210828,8 +212463,8 @@ self: { }: mkDerivation { pname = "recommender-als"; - version = "0.2.0.0"; - sha256 = "14nw3ns52da4jlbwblbavchxzv1pjhc1zkjzcwfrqznxgsd5525p"; + version = "0.2.1.1"; + sha256 = "0qc91hn42mc2pmljb836chdas1jzsrqbg44cjylx31y0y72dmhdq"; libraryHaskellDepends = [ base containers data-default-class hmatrix parallel random vector ]; @@ -210873,23 +212508,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, record-hasfield - , uniplate - }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.2.5"; - sha256 = "10f054da8iz38mplgbq4j78r4jl4l07iridd89ivk9d366z1c0ly"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base extra ghc uniplate ]; - executableHaskellDepends = [ base extra ]; - testHaskellDepends = [ base extra filepath record-hasfield ]; - description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2_6" = callPackage ({ mkDerivation, base, extra, filepath, ghc, record-hasfield , uniplate }: @@ -210904,7 +212522,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-encode" = callPackage @@ -211075,8 +212692,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.4.1"; - sha256 = "09r4a9h4rd48nqdn08v3mvibqvgb0ym05142jrk0qqq8f4la3dni"; + version = "2.2.4.2"; + sha256 = "15ahlgm0dilapk0y5jhwdvrims7nyzdsbdccq4x9jj0ddsszqr02"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -211360,6 +212977,23 @@ self: { broken = true; }) {}; + "rediscaching-haxl" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, hashable, haxl + , hedis, network, time + }: + mkDerivation { + pname = "rediscaching-haxl"; + version = "0.1.0.0"; + sha256 = "0mgmrcw1p9q4njrmjal9ckxkli8wb2g12njqaj6xlkin2xz5ym8j"; + libraryHaskellDepends = [ + aeson async base bytestring hashable haxl hedis network time + ]; + description = "Combine redis caching and haxl"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "redland" = callPackage ({ mkDerivation, base, deepseq, raptor2, redland }: mkDerivation { @@ -211510,8 +213144,8 @@ self: { }: mkDerivation { pname = "ref-extras"; - version = "0.1.1"; - sha256 = "0cv8h2v7vp6gv2lslzc7rpagaa871bi5drzml3090wna1kqnd0nq"; + version = "0.2.0"; + sha256 = "17f5cjzbhx4ay7qyd5p667hmzg8ps9jnkass5mi423lzly9nyr09"; libraryHaskellDepends = [ base hashable little-rio microlens stm unliftio unliftio-core unordered-containers @@ -213334,8 +214968,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.9.1"; - sha256 = "0vnx2sq3m6mqm1wcicknf7b8pfamx4pbn51hmzs6arwnvsq23vng"; + version = "0.1.9.3"; + sha256 = "1x418lv2nnw5ryrinciq1dg7wgmz0zsvv8v3mfrp38rx5x88hbic"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -214348,8 +215982,8 @@ self: { pname = "repa-io"; version = "3.4.1.1"; sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm"; - revision = "4"; - editedCabalFile = "1lswfxmfn31gm2ayqwns9q9kpbad69scxpq6ybyzxkb9jd0jx4bl"; + revision = "5"; + editedCabalFile = "1v9bza21a3h0pkaxs628jjfli157d44i757da250fxwwamk8sg88"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; @@ -214806,7 +216440,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "req_3_5_0" = callPackage + "req_3_6_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, exceptions, hspec , hspec-core, hspec-discover, http-api-data, http-client @@ -214816,8 +216450,8 @@ self: { }: mkDerivation { pname = "req"; - version = "3.5.0"; - sha256 = "0ydz6m3d87apmkd8i55q4r57cqd65sssxz972p6vv77v3r471n26"; + version = "3.6.0"; + sha256 = "1ks9iqnnsa8m65ndyblyndb95fc4r4xachq1zrik04adxrdj3b50"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -215015,12 +216649,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_7" = callPackage + "rerebase_1_7_3" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.7"; - sha256 = "0primlvckzkz72pdm3c1y32wjbz5wmxkdwfzvxs3yg08v01hrwb7"; + version = "1.7.3"; + sha256 = "0ynvpawhjwbw3231nlwpk5x5wwbzpx1iw66vs97wpk5b8p1bhrld"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -215815,8 +217449,6 @@ self: { ]; description = "A powerful, easy-to-use codemodding tool for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "retry" = callPackage @@ -216748,8 +218380,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.18.0"; - sha256 = "11f1cxa9c90d7hgqn9bl08l499n2dzdj31f9pw9acb1nrlx5hik8"; + version = "0.1.19.0"; + sha256 = "04kvpirwz86pj7izaa0la601xyqnqzsspg43z10vxnc1whjp5rsm"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens microlens-mtl mtl primitive process text time @@ -217224,6 +218856,27 @@ self: { broken = true; }) {}; + "roboservant" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hedgehog, mtl + , servant, servant-client, servant-flatten, servant-server + , string-conversions + }: + mkDerivation { + pname = "roboservant"; + version = "0.1.0.2"; + sha256 = "1dbzwczmjms6phzf3r6igy1q33gkwsdirdabd2rr0i2qp0lynshv"; + libraryHaskellDepends = [ + base bytestring containers hedgehog mtl servant servant-client + servant-flatten servant-server string-conversions + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog mtl servant + servant-client servant-flatten servant-server string-conversions + ]; + description = "Automatic session-aware servant testing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "robot" = callPackage ({ mkDerivation, base, containers, exceptions, transformers, xhb }: mkDerivation { @@ -218162,19 +219815,19 @@ self: { }) {}; "row-types" = callPackage - ({ mkDerivation, base, constraints, criterion, deepseq - , generic-lens, hashable, profunctors, text, unordered-containers + ({ mkDerivation, base, constraints, deepseq, gauge, generic-lens + , hashable, profunctors, text, unordered-containers }: mkDerivation { pname = "row-types"; - version = "0.4.0.0"; - sha256 = "146wcmy65wls6s8z333z9xqdb0m89dwjbfd9vshldkd1g9kgbck7"; + version = "1.0.0.0"; + sha256 = "03qavr0d3ivap1n9nq7ks7yiappmzvirczi796y1krm0kgi25djy"; libraryHaskellDepends = [ base constraints deepseq generic-lens hashable profunctors text unordered-containers ]; testHaskellDepends = [ base generic-lens ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ base deepseq gauge ]; description = "Open Records and Variants"; license = stdenv.lib.licenses.mit; }) {}; @@ -218308,26 +219961,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rpmbuild-order_0_4_2" = callPackage - ({ mkDerivation, base, bytestring, Cabal, case-insensitive - , containers, directory, extra, fgl, filepath, hspec - , optparse-applicative, process, simple-cmd-args, unix + "rpmbuild-order_0_4_3" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , directory, extra, fgl, filepath, hspec, optparse-applicative + , process, simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.2"; - sha256 = "18ay3wga9s3whky49c8v0x7drpv1sf536p4n3h1549zd5w3vjms7"; + version = "0.4.3"; + sha256 = "19aszn4fcsxbzciswrb80qvm6r3x28kyl7g5m3c1569f0ib3rbg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal case-insensitive containers directory extra fgl filepath + base case-insensitive containers directory extra fgl filepath process ]; executableHaskellDepends = [ base bytestring directory extra fgl optparse-applicative simple-cmd-args ]; - testHaskellDepends = [ base extra hspec unix ]; + testHaskellDepends = [ base extra hspec simple-cmd unix ]; description = "Order RPM packages by dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -218839,18 +220492,24 @@ self: { }) {}; "runhs" = callPackage - ({ mkDerivation, base, bytestring, file-embed, process, yaml }: + ({ mkDerivation, base, bytestring, directory, file-embed, hspec + , process, terminal-size, text, word-wrap, yaml + }: mkDerivation { pname = "runhs"; - version = "1.0.0.4"; - sha256 = "01czfphzp252y62vrx1pys74xga3m7b6q9pbd0f20y3m74q337xi"; + version = "1.0.0.8"; + sha256 = "177xak0p91xn827cnpa374l94lmmym2yrrcsxzjd9752hdzyw7k3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring file-embed process yaml + base bytestring file-embed process terminal-size text word-wrap + yaml ]; + testHaskellDepends = [ base directory hspec process ]; description = "Stack wrapper for single-file Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "runmany" = callPackage @@ -219105,10 +220764,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.7.0"; - sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; - revision = "6"; - editedCabalFile = "0x82m44qwf3fls3ypbdca958l9hhfqyfip6rzzxi7648f0sasv21"; + version = "0.1.7.1"; + sha256 = "0gkxacfiqp55xzbmpz5i5c4kqma8jal49q7c8gl9n9qq5c5dvxjb"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; description = "Safe, consistent, and easy exception handling"; @@ -219204,10 +220861,8 @@ self: { }: mkDerivation { pname = "safe-json"; - version = "1.1.0"; - sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; - revision = "3"; - editedCabalFile = "12jjph25vffkj55ds468zv144qxwyrb6qmp2g1pb03732n6z9596"; + version = "1.1.1"; + sha256 = "1307fm7kmls0sd2gb5zcl75rcxxy550ksaf145s54c06qjcihhjg"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -219402,15 +221057,15 @@ self: { }) {}; "safe-tensor" = callPackage - ({ mkDerivation, base, constraints, containers, hmatrix, mtl - , singletons + ({ mkDerivation, base, constraints, containers, deepseq, hmatrix + , mtl, singletons }: mkDerivation { pname = "safe-tensor"; - version = "0.2.0.0"; - sha256 = "04fafmypwcw88qqb9v9lalfyyqna68b3brx2rmry7i4898gwasp8"; + version = "0.2.1.0"; + sha256 = "00s8p7bp72wjpz4mbxn79xg6cllyl2c6fn952w2nykyrapzpxhxm"; libraryHaskellDepends = [ - base constraints containers hmatrix mtl singletons + base constraints containers deepseq hmatrix mtl singletons ]; description = "Dependently typed tensor algebra"; license = stdenv.lib.licenses.mit; @@ -219698,8 +221353,8 @@ self: { pname = "salak"; version = "0.3.6"; sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3"; - revision = "2"; - editedCabalFile = "0azqzfw8ynbj1fzgwksx30m88zsz71vwhdlxw8fkcwbgz49vc7zb"; + revision = "3"; + editedCabalFile = "0cdp6gy3r92vhpmq2i7yg4xxmnj95dyfvaf8gm05v6wl8l6rihfy"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions filepath hashable heaps megaparsec mtl scientific text time @@ -220408,31 +222063,31 @@ self: { }) {}; "sbv" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , crackNum, deepseq, directory, doctest, filepath, gauge - , generic-deriving, Glob, hlint, mtl, pretty, process, QuickCheck - , random, silently, syb, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, time, transformers, z3 + ({ mkDerivation, array, async, base, bench-show, bytestring + , containers, crackNum, deepseq, directory, doctest, filepath + , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random + , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, transformers, z3 }: mkDerivation { pname = "sbv"; - version = "8.7"; - sha256 = "0iipl3ra0ih6fjxfs4p554va5243rg1ddkllfdbs7y2sj697841l"; + version = "8.8"; + sha256 = "0xm05g9kxh38jjbssnhyw6c8q4rsyjndm2b8r36cqwx0n607zvgy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array async base containers crackNum deepseq directory filepath - generic-deriving mtl pretty process QuickCheck random syb - template-haskell time transformers + array async base containers crackNum deepseq directory filepath mtl + pretty process QuickCheck random syb template-haskell time + transformers ]; testHaskellDepends = [ base bytestring containers crackNum directory doctest filepath Glob - hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit - tasty-quickcheck template-haskell + hlint mtl QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck ]; testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ - base containers crackNum deepseq directory filepath gauge mtl - process random silently syb + base bench-show containers crackNum deepseq directory filepath + gauge mtl process random silently syb time ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; @@ -220445,8 +222100,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.11"; - sha256 = "19gji0aqdi232x3y3vkpblwr6y63n7in92dq48ax67h6bqxwg5g2"; + version = "0.12"; + sha256 = "1c413kqbznl1cc3l4lbpk3d8c2jzl62znf7zm89x5dcw7wyfpz0y"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -221631,6 +223286,19 @@ self: { broken = true; }) {}; + "scotty-haxl" = callPackage + ({ mkDerivation, base, haxl, scotty, text }: + mkDerivation { + pname = "scotty-haxl"; + version = "0.1.0.0"; + sha256 = "06wcvjpaar8zd2y6p9j4pxs4l7rkw84s1kmcvacafkw43h1d2bx2"; + libraryHaskellDepends = [ base haxl scotty text ]; + description = "Combine scotty and haxl"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "scotty-params-parser" = callPackage ({ mkDerivation, base-prelude, matcher, scotty, success, text , transformers, unordered-containers @@ -221736,6 +223404,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scotty-utils" = callPackage + ({ mkDerivation, aeson, aeson-result, base, http-types, scotty + , text + }: + mkDerivation { + pname = "scotty-utils"; + version = "0.1.0.0"; + sha256 = "0f77b5xmr5gwswz15i5833karfr1qvyaaiy58khd75n9awfx5jqv"; + libraryHaskellDepends = [ + aeson aeson-result base http-types scotty text + ]; + description = "Scotty utils library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scotty-view" = callPackage ({ mkDerivation, base, scotty, text, transformers }: mkDerivation { @@ -222972,21 +224655,19 @@ self: { "semantic-source" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , doctest, generic-monoid, hashable, hedgehog, lingo, pathtype - , QuickCheck, semilattices, tasty, tasty-hedgehog, tasty-hunit - , text + , hashable, hedgehog, lingo, pathtype, semilattices, tasty + , tasty-hedgehog, tasty-hunit, text }: mkDerivation { pname = "semantic-source"; - version = "0.1.0.0"; - sha256 = "179rxsn1cyh77yn7vzmii38ipgcjpavlyf5xbx4j8zzgh1jklmc5"; + version = "0.1.0.1"; + sha256 = "1v4q9yc91lrx02wdhxp1njzm8g9qlwr40593lwcn6bxlad5sk6yd"; libraryHaskellDepends = [ - aeson base bytestring containers deepseq generic-monoid hashable - lingo pathtype semilattices text + aeson base bytestring containers deepseq hashable lingo pathtype + semilattices text ]; testHaskellDepends = [ - base doctest hedgehog QuickCheck tasty tasty-hedgehog tasty-hunit - text + base hedgehog tasty tasty-hedgehog tasty-hunit text ]; description = "Types and functionality for working with source code"; license = stdenv.lib.licenses.mit; @@ -224769,10 +226450,8 @@ self: { }: mkDerivation { pname = "servant-conduit"; - version = "0.15"; - sha256 = "0mpnkqcls4mrxfd3ksy53k7vvm0hildj21b8mdy53z993wq1blfz"; - revision = "3"; - editedCabalFile = "0adximf4hg3bf7d9mkcjdsp5klg787ryb1hy3j49fg39l1rszac4"; + version = "0.15.1"; + sha256 = "1vy3ihypb0zm2yd16rq120qw3898i3c0mahh2jysssv65g0avdwp"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -224896,7 +226575,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-docs_0_11_5" = callPackage + "servant-docs_0_11_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, hashable, http-media, http-types, lens, servant , string-conversions, tasty, tasty-golden, tasty-hunit, text @@ -224904,8 +226583,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.5"; - sha256 = "0i51f33w5bz8j6jj9j5ivg7kll510nc0hmkhdrh3q0qagbpwryfx"; + version = "0.11.6"; + sha256 = "07qabs5xi6dw8anmrnl2135fps901k4y1s2xywgdxhqyg01rljhq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225134,14 +226813,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-foreign_0_15_1" = callPackage + "servant-foreign_0_15_2" = callPackage ({ mkDerivation, base, base-compat, hspec, hspec-discover , http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.15.1"; - sha256 = "024pd3a5pf4gqx5y2is7n38a7qyfanw13w5jy4j5a81zjmfxnwk7"; + version = "0.15.2"; + sha256 = "0vxm80cnd4w8zpyq7brnnjmcarb0vj7xgikwpc0il1w6hjgis7vl"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -225503,14 +227182,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-lucid_0_9_0_1" = callPackage + "servant-lucid_0_9_0_2" = callPackage ({ mkDerivation, base, http-media, lucid, servant, servant-server , text, wai, warp }: mkDerivation { pname = "servant-lucid"; - version = "0.9.0.1"; - sha256 = "1jhs9qy36vccy90s24cd9bmhqs604xqd9m8a4fbkjxrcpgdzfjgq"; + version = "0.9.0.2"; + sha256 = "0l68dffx746j3p2l5x59cj5cdng2dw6vjq5x5h44m0ccbsmlckpz"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -225525,10 +227204,8 @@ self: { }: mkDerivation { pname = "servant-machines"; - version = "0.15"; - sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i"; - revision = "4"; - editedCabalFile = "1p8ld4cxwsirlwz5ihrz6fyxbary4llxsnby42vjnhl19gylhdmk"; + version = "0.15.1"; + sha256 = "0k8abcc72s5bzcf2vmjkxxjnhk45rww6hr3l93msm2510hi6gda4"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -225779,10 +227456,8 @@ self: { }: mkDerivation { pname = "servant-pipes"; - version = "0.15.1"; - sha256 = "1r2n7f8x7adl117zlswf4ji5yxib2v80wh7wbhwklvd86dbzyrby"; - revision = "1"; - editedCabalFile = "0xm07qxw0szffm8krbvj2kdflwlx2ixlhp5scaj3fhwivycyayvg"; + version = "0.15.2"; + sha256 = "1r5irq09j64iapi5n9mzsph984r5f7cyr6zz4sw3xqh648dmf75h"; libraryHaskellDepends = [ base bytestring monad-control mtl pipes pipes-safe servant ]; @@ -226067,8 +227742,8 @@ self: { }: mkDerivation { pname = "servant-reflex"; - version = "0.3.4"; - sha256 = "1k7dkzs2lsdjj94ai7p225zm09l9sgbxpb4av14xgy9m54rih5kk"; + version = "0.3.5"; + sha256 = "0b4ppjnfas6pwypd16vkq98q1fs0l7cw32hhliv582xfvc0v3k8l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226303,8 +227978,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.8.5"; - sha256 = "12ihxmi6c6zypzx6ijj0yhl0mppk40zkyhkv3g3kx3mgx50qs5yq"; + version = "0.9.0"; + sha256 = "1csfxhdfn4qchxw6n1ysj4mc4ncywdxp326nqjy4b19cxrnkgjsw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226358,8 +228033,8 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.2.3.0"; - sha256 = "0gyfjrrq7anhn4b613gnaa0r2xm8rkminx1nrrbpn6bw47axadj4"; + version = "0.2.4.0"; + sha256 = "1xmikym19kq912apmh6zcdjzbz23mhn580pvsy5ll35ylqziaflk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226522,7 +228197,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-swagger_1_1_8" = callPackage + "servant-swagger_1_1_10" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -226532,8 +228207,8 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.8"; - sha256 = "16zmrakgiwf9rb9bvw3mjbmkqixyms42ymh7g1vyvz399plfn0c7"; + version = "1.1.10"; + sha256 = "0y6zylhs4z0nfz75d4i2azcq0yh2bd4inanwblx4035dgkk1q78a"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -226929,7 +228604,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "serverless-haskell_0_12_1" = callPackage + "serverless-haskell_0_12_2" = callPackage ({ mkDerivation, aeson, aeson-casing, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-client, http-types, iproute, lens @@ -226938,8 +228613,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.12.1"; - sha256 = "0a9df4mxl73wbyf9mvbrczmcn0vvf8yn3p4wb9ggf29x4ls22zg8"; + version = "0.12.2"; + sha256 = "0x61rqv7w0qjnjpkd1hsy1ixdnxv5abicfdglsr62nazhchnh717"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-client http-types iproute lens @@ -228085,16 +229760,21 @@ self: { }) {}; "shake-dhall" = callPackage - ({ mkDerivation, base, containers, dhall, filepath, shake, text }: + ({ mkDerivation, base, containers, dhall, directory, filepath + , shake, tasty, tasty-hunit, text + }: mkDerivation { pname = "shake-dhall"; - version = "0.1.0.0"; - sha256 = "1nhc6sfzsr7adv6xh8r2fyp64gzkiv563xqwmvhmk3pi3zxnlcll"; + version = "0.1.1.3"; + sha256 = "1crakjnib9hvqph8f0wn0ii0y4hp9vix40kd8fpz85mdqfsynf5q"; libraryHaskellDepends = [ - base containers dhall filepath shake text + base containers dhall directory filepath shake text ]; + testHaskellDepends = [ base tasty tasty-hunit ]; description = "Dhall dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-elm" = callPackage @@ -228137,14 +229817,15 @@ self: { }) {}; "shake-futhark" = callPackage - ({ mkDerivation, base, containers, filepath, futhark, shake, text + ({ mkDerivation, base, containers, directory, filepath, futhark + , shake, text }: mkDerivation { pname = "shake-futhark"; - version = "0.1.0.0"; - sha256 = "1wxp025dmlal1nm7f7s16pzgx42sawfcnz3lv6krilhr7ynb92ss"; + version = "0.1.0.2"; + sha256 = "1npkzgixkkkb611hhlrl1xjyp5xl27rlfqyh6q8vz4lg8fmsxsyh"; libraryHaskellDepends = [ - base containers filepath futhark shake text + base containers directory filepath futhark shake text ]; description = "Dependency tracking for Futhark"; license = stdenv.lib.licenses.bsd3; @@ -228278,12 +229959,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "shake-plus_0_3_2_0" = callPackage + "shake-plus_0_3_3_0" = callPackage ({ mkDerivation, base, extra, path, rio, shake }: mkDerivation { pname = "shake-plus"; - version = "0.3.2.0"; - sha256 = "0cgn1hgxp3kly7yp4s8mx714p1gnf30jpp6vjl47l19vc21hfzj5"; + version = "0.3.3.0"; + sha256 = "13a5n6gh1msrygi671lk5y83shcd75yz64x3r2smxif5hsfazwqv"; libraryHaskellDepends = [ base extra path rio shake ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; @@ -228291,18 +229972,19 @@ self: { }) {}; "shake-plus-extended" = callPackage - ({ mkDerivation, base, comonad, extra, ixset-typed - , ixset-typed-binary-instance, ixset-typed-hashable-instance, path - , path-binary-instance, rio, shake, shake-plus, within + ({ mkDerivation, aeson, base, binary-instances, comonad, extra + , http-conduit, ixset-typed, ixset-typed-binary-instance + , ixset-typed-hashable-instance, path, path-binary-instance, rio + , shake, shake-plus, within }: mkDerivation { pname = "shake-plus-extended"; - version = "0.3.0.0"; - sha256 = "040g0h0a03wmwhbqn06jxwf5h0lwsiqfa1x1x9wzyw8m52f5ngn4"; + version = "0.4.0.0"; + sha256 = "1y12hcsyp8slzacjz8dim64m9sr09z7ppv3s4l30wyha9r395x8i"; libraryHaskellDepends = [ - base comonad extra ixset-typed ixset-typed-binary-instance - ixset-typed-hashable-instance path path-binary-instance rio shake - shake-plus within + aeson base binary-instances comonad extra http-conduit ixset-typed + ixset-typed-binary-instance ixset-typed-hashable-instance path + path-binary-instance rio shake shake-plus within ]; description = "Experimental extensions to shake-plus"; license = stdenv.lib.licenses.mit; @@ -228400,8 +230082,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.24.1"; - sha256 = "0r9msld629fh9h98iclhd30h1rbg1xqzjqxj64k0n1p39fkx4ndm"; + version = "2.0.25"; + sha256 = "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -228971,6 +230653,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "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 { + pname = "shelly"; + version = "1.8.1"; + sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y"; + revision = "1"; + editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0"; + 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 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 unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shelly" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib @@ -229042,10 +230756,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.7.0.8"; - sha256 = "1f8r8wymdbv8j2m3apdw75xqq2c1s4wr694qhxljvwa9r0s326wf"; - revision = "1"; - editedCabalFile = "03gvwv2hxrp8ncfmwhp7hn8xah5mx9fgm298s83l78grqjlzdbil"; + version = "0.7.1.0"; + sha256 = "03b8h6sjnrlksvpr9f451469j5xngqpb6g3hyxmxp7h7h4xrsvq2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229716,6 +231428,23 @@ self: { broken = true; }) {}; + "signature" = callPackage + ({ mkDerivation, aeson, base, byteable, bytestring + , case-insensitive, cryptohash, hexstring, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "signature"; + version = "0.1.1.0"; + sha256 = "0ciwxpmcdw5zn6005qpafx2q005bbyalr7zw22kj7grm95ffp5xq"; + libraryHaskellDepends = [ + aeson base byteable bytestring case-insensitive cryptohash + hexstring scientific text unordered-containers vector + ]; + description = "Hmac sha256 signature json and http payload"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "signed-multiset" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -231276,6 +233005,8 @@ self: { ]; description = "A simple to understand static site generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sixel" = callPackage @@ -231687,35 +233418,45 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , skylighting-core + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , directory, filepath, pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; version = "0.8.5"; sha256 = "1b8m0spspp060p5hkl2qxarh3cwji0shq5kdwz2w93kiyl8hk8sv"; + configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers skylighting-core ]; + executableHaskellDepends = [ + base blaze-html bytestring containers directory filepath + pretty-show text + ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_9" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , skylighting-core + "skylighting_0_10_0_2" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , directory, filepath, pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.9"; - sha256 = "1855k1xjh38r389zvlzga7dkc3scj65ip9frvvkagxa2ls1irfp1"; + version = "0.10.0.2"; + sha256 = "0m2z4hmv2m6h6kmvn8n3fskwyhq6pj28bjfvs61qg9pnga3xbf26"; + configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers skylighting-core ]; + executableHaskellDepends = [ + base blaze-html bytestring containers directory filepath + pretty-show text + ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -231753,7 +233494,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "skylighting-core_0_9" = callPackage + "skylighting-core_0_10_0_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -231763,8 +233504,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.9"; - sha256 = "0gljyp007pcym2b0azg0sn654kmss9xwim84xw7hxc1q8rwvdxhr"; + version = "0.10.0.2"; + sha256 = "07gdvmz8lvqkzzgnxakx015g2ijmqd2jmni1phz6x79xf9q7s5vw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232300,19 +234041,19 @@ self: { "slynx" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix - , monad-logger, mwc-random, optparse-applicative, text + , monad-logger, mwc-random, optparse-applicative, statistics, text , transformers, vector }: mkDerivation { pname = "slynx"; - version = "0.3.1"; - sha256 = "0af18y25lix0sy3vyl56d9a8yrvn9riw3vw2azwcq9pzia460qki"; + version = "0.4.0"; + sha256 = "10a6nqpr422c80vmzjx1r2wgbhkc2kjn7kvmavc0cx1752wn79kc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-markov elynx-seq elynx-tools elynx-tree hmatrix monad-logger mwc-random - optparse-applicative text transformers vector + optparse-applicative statistics text transformers vector ]; executableHaskellDepends = [ base ]; description = "Handle molecular sequences"; @@ -232442,18 +234183,19 @@ self: { "smallcheck-series" = callPackage ({ mkDerivation, base, bytestring, containers, doctest, Glob - , logict, smallcheck, text, transformers + , logict, smallcheck, tasty, tasty-hunit, tasty-smallcheck, text + , transformers }: mkDerivation { pname = "smallcheck-series"; - version = "0.6.1"; - sha256 = "07kjbci4wxi6g9m0k0fqpxm8p2kxspyrcmg175vb3bp008vqb931"; - revision = "2"; - editedCabalFile = "1944nax2aq32cd8i335nc511zis3lcwkclkh5caigsfs34kwwglg"; + version = "0.7.0.0"; + sha256 = "11pb4k0y8fqfkq5ajspn5nnliskvk8qp02dzpcjrzqk27da2iwb6"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; - testHaskellDepends = [ base doctest Glob ]; + testHaskellDepends = [ + base doctest Glob smallcheck tasty tasty-hunit tasty-smallcheck + ]; description = "Extra SmallCheck series and utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -232666,8 +234408,8 @@ self: { ({ mkDerivation, base, lens, smash }: mkDerivation { pname = "smash-lens"; - version = "0.1.0.0"; - sha256 = "05f2swr4qv3x12fwpyxa0ph90awgf484gn9y8rlxlvql0h213rnm"; + version = "0.1.0.1"; + sha256 = "1j7v3713aahp3vh7dswrkdfrnksi1zlw9iv9zanhb714s6anyq66"; libraryHaskellDepends = [ base lens smash ]; testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; @@ -232690,12 +234432,10 @@ self: { ({ mkDerivation, base, optics-core, smash }: mkDerivation { pname = "smash-optics"; - version = "0.1.0.0"; - sha256 = "0h8khdm2lgklmf73bshfrjqfmkmhrbr6cq2r11vsm0lqfkzlyndh"; - revision = "1"; - editedCabalFile = "1kzkznb0167krv5pcia2vsj0gy9zgykjhqg5d3pfnwz3152197ql"; + version = "0.1.0.1"; + sha256 = "1jf60vx8hlmyjgap91fvwn0p0hnazpcimshhkz5lsys0ynd4pcwh"; libraryHaskellDepends = [ base optics-core smash ]; - description = "Optics for the `smash` library"; + description = "Optics for the `smash` library using `optics-core`"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -233549,8 +235289,6 @@ self: { ]; description = "Scaffolding CLI for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "snap-testing" = callPackage @@ -234903,10 +236641,10 @@ self: { ({ mkDerivation, base, socket }: mkDerivation { pname = "socket-icmp"; - version = "0.1.0.0"; - sha256 = "14lfvbhcq1ri9bfc0qiymh8qv8b7q78lzfbr5qsarh8rb85ii2vj"; + version = "0.1.0.1"; + sha256 = "1wvrdgz0ybacbzg91vi8jiswr02lj7hz61cksmcfii2qsmzpfgb7"; libraryHaskellDepends = [ base socket ]; - description = "Definitions for ICMP with the `socket` library"; + description = "Definitions for using ICMP with the `socket` library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -235390,18 +237128,18 @@ self: { "souffle-haskell" = callPackage ({ mkDerivation, array, base, containers, deepseq, directory, extra , filepath, hedgehog, hspec, hspec-hedgehog, megaparsec, mtl - , process, template-haskell, temporary, text, type-errors-pretty - , vector + , neat-interpolation, process, template-haskell, temporary, text + , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "1.1.0"; - sha256 = "0s8zl7f6v89m6a3yhlmji1lb8k3rfwzyyg307m3f35a9kms0988p"; + version = "2.0.1"; + sha256 = "1imnmgx2wpxx2g51ajcsvnrpwvw97wmind9wzfirfx4l7zr3cp7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base deepseq directory filepath mtl process template-haskell - temporary text type-errors-pretty vector + array base containers deepseq directory filepath mtl process + template-haskell temporary text type-errors-pretty vector ]; executableHaskellDepends = [ array base containers deepseq directory extra filepath megaparsec @@ -235409,9 +237147,9 @@ self: { vector ]; testHaskellDepends = [ - array base deepseq directory filepath hedgehog hspec hspec-hedgehog - mtl process template-haskell temporary text type-errors-pretty - vector + array base containers deepseq directory filepath hedgehog hspec + hspec-hedgehog mtl neat-interpolation process template-haskell + temporary text type-errors-pretty vector ]; description = "Souffle Datalog bindings for Haskell"; license = stdenv.lib.licenses.mit; @@ -235823,6 +237561,19 @@ self: { broken = true; }) {}; + "spars" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "spars"; + version = "0.1.0.0"; + sha256 = "1q1vpwrr96k41p9zj5x7mjd3817iq9a762q3jfqkwd0cb41iyka6"; + libraryHaskellDepends = [ base containers ]; + description = "A sparse set-based parsing library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sparse" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , criterion, deepseq, directory, doctest, filepath, hlint @@ -236287,8 +238038,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "spherical"; - version = "0.1.2.2"; - sha256 = "014fmxgzymyfa82qabc90avjyv4yp7c0s88kkmp02pvpkmjd6p24"; + version = "0.1.3.0"; + sha256 = "1h014k4yi0aachbbni011a1jkzi31lrxhpi8h5q5f2vkgb18k1g4"; libraryHaskellDepends = [ base composition-prelude ]; description = "Geometry on a sphere"; license = stdenv.lib.licenses.bsd3; @@ -236548,8 +238299,8 @@ self: { ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; - version = "1.0.1.1"; - sha256 = "14rwj7dbzg01lv4abwrgxjianwnshnycsmxcckw1hhqc8wx9jdac"; + version = "1.0.1.2"; + sha256 = "0b7czphkra6q6a5xm30pjh5b4cdvz87fzb2pv17dpxai0mb3c0r6"; libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = stdenv.lib.licenses.isc; @@ -237765,6 +239516,8 @@ self: { pname = "stache"; version = "2.2.0"; sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g"; + revision = "2"; + editedCabalFile = "1p435wl5c50wjz5s07p102dlyg3pby7n918gp4za0crgb8fi99xh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -238933,10 +240686,8 @@ self: { }: mkDerivation { pname = "stateWriter"; - version = "0.2.10"; - sha256 = "0g1r7zn1ahky9wmqbimjryca3hkylx15xpqwhc42gkyf7h7kq2b8"; - revision = "1"; - editedCabalFile = "19zp7wy2k6f5dqw0wfj9wzarjgfr20nvw5rmqiv79h66qssjl9i6"; + version = "0.3.0"; + sha256 = "0l8x758ywgz3c6fhyw1ajaqnq98l2ra39cj4yl2873z89q2cxdlp"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base free hspec mtl QuickCheck ]; benchmarkHaskellDepends = [ @@ -239869,8 +241620,6 @@ self: { ]; description = "Containers for STM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stm-delay" = callPackage @@ -239940,8 +241689,6 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stm-io-hooks" = callPackage @@ -240353,8 +242100,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.6"; - sha256 = "1gzax38chn57ybikvddk6g8msyv52y5s30yndpp64bdh3kqwlchq"; + version = "0.7.7"; + sha256 = "152blmvnp8k0bh9bw6ddzmb2rhs0a36v1k0fza39n88sldx504s3"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -240409,8 +242156,8 @@ self: { }: mkDerivation { pname = "store-streaming"; - version = "0.2.0.2"; - sha256 = "1hnzpyw5l90nrm3vlrwbv8517iaaq0razfjj6m8a41jy2lkgf4gz"; + version = "0.2.0.3"; + sha256 = "0b164ixsqgrar4riqlm3ip5rfbinapk6md7hnz32gzcmrgav283q"; libraryHaskellDepends = [ async base bytestring conduit free resourcet store store-core streaming-commons text transformers @@ -240484,15 +242231,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_57_0" = callPackage + "stratosphere_0_59_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.57.0"; - sha256 = "1ksxy117bizi4bnj7skv5hq7rsw2gz0w5yg5b3xhc6ialkq9in4z"; + version = "0.59.1"; + sha256 = "1gcvz8gpyj495jr5qa2jx2yay7ip3hs1dd4bqckmam8llyz2gvxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -241181,6 +242928,8 @@ self: { pname = "streaming-utils"; version = "0.2.0.0"; sha256 = "05cgcypwxrhhf3xyxggwiz0v3193hf8h7vripqjam38f8ji3lxhk"; + revision = "1"; + editedCabalFile = "0wfk7bq5kpm6cn28z8mjlr1w5y2gp7bkm1xng1myy3jzyjwr68ph"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl network network-simple pipes resourcet streaming @@ -241358,8 +243107,8 @@ self: { }: mkDerivation { pname = "streamly-lmdb"; - version = "0.0.1.1"; - sha256 = "080w7c9dgw4dixnxhvpjnii53c5sk00h18vwps973q51qhl9qa18"; + version = "0.1.0"; + sha256 = "0yccaszb6fbasmlwq3iqci7gin8kf7hgmlcjfsq0pdqw32lnmcbn"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -242186,8 +243935,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.5.0"; - sha256 = "06b5qx20zkvaqvn98jqmq0vqrpkgfvab5wjq7lwlcdm9nn7nrsgi"; + version = "2.6.2"; + sha256 = "00bjr71lawn1ar18vm3p849ffr6r6fmgwn2ksg4vas5rmmy2vwib"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -242202,8 +243951,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-client }: mkDerivation { pname = "stripe-haskell"; - version = "2.5.0"; - sha256 = "0qazqygkg6hlfvz6wg3gk2am7qnxzsfqjqh6mgyandz9l141pyx5"; + version = "2.6.2"; + sha256 = "02ydf9i632r2clhvf1f9v0yx7vmpmh37mch1jshazrw3my6sq1vl"; libraryHaskellDepends = [ base stripe-core stripe-http-client ]; description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; @@ -242217,8 +243966,8 @@ self: { }: mkDerivation { pname = "stripe-http-client"; - version = "2.5.0"; - sha256 = "1386d2bhql56kazxx89icl1j5ikhhza2cv934x19s5lqsl8089yi"; + version = "2.6.2"; + sha256 = "0xz8dc2mh5mscc3mp5n4h2sch1winpaf7sy1w4s87vv68304jfg3"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types stripe-core text @@ -242268,6 +244017,8 @@ self: { ]; description = "Listen for Stripe webhook events with Scotty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-signature" = callPackage @@ -242276,8 +244027,8 @@ self: { }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.4"; - sha256 = "1gsw1a1x4a46fiihwqsh2706nsrjy00mv881fmc1aab7ln2cmzkg"; + version = "1.0.0.6"; + sha256 = "0lp3fli9g5yvlxy8f0md2d3wv6z45mw0929b8c0y2xkcsdjvpp5l"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptonite memory stripe-concepts text @@ -242285,6 +244036,8 @@ self: { testHaskellDepends = [ base bytestring text ]; description = "Verification of Stripe webhook signatures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-tests" = callPackage @@ -242294,8 +244047,8 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.5.0"; - sha256 = "0jqxzdriaysf2lya8p9lc1ind2m4b4nz15dn7vb3sx74vw6lp4s3"; + version = "2.6.2"; + sha256 = "06r1jyf6rjmnd6p2grfs0s0f5x6sswsxw9ip7x81rh9cz5qdshdg"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers @@ -242853,6 +244606,35 @@ self: { broken = true; }) {}; + "subcategories" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, foldl + , hashable, inspection-testing, mono-traversable, pointed + , primitive, QuickCheck, reflection, semialign, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, these + , unordered-containers, vector, vector-algorithms, vector-builder + }: + mkDerivation { + pname = "subcategories"; + version = "0.1.0.0"; + sha256 = "0rrvlwfyjmv4wpvm9dbr4vxbmlr24pzdfwvz3hkshgxnrc58gslw"; + libraryHaskellDepends = [ + base containers data-default foldl hashable mono-traversable + pointed primitive reflection semialign template-haskell text these + unordered-containers vector vector-algorithms vector-builder + ]; + testHaskellDepends = [ + base bytestring containers data-default foldl hashable + inspection-testing mono-traversable pointed primitive QuickCheck + reflection semialign tasty tasty-expected-failure tasty-hunit + tasty-quickcheck template-haskell text these unordered-containers + vector vector-algorithms vector-builder + ]; + testToolDepends = [ tasty-discover ]; + description = "Subcategories induced by class constraints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "subhask" = callPackage ({ mkDerivation, approximate, array, base, bloomfilter, bytes , bytestring, cassava, containers, criterion, deepseq, erf, gamma @@ -243382,8 +245164,6 @@ self: { ]; description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "supercollider-ht" = callPackage @@ -243506,6 +245286,28 @@ self: { broken = true; }) {}; + "supernova" = callPackage + ({ mkDerivation, aeson, async, base, bifunctor, binary, bytestring + , crc32c, exceptions, lens-family-core, lens-family-th, logging + , managed, mtl, network, proto-lens, proto-lens-runtime, streamly + , text + }: + mkDerivation { + pname = "supernova"; + version = "0.0.3"; + sha256 = "1k04k71x42h56n6qzdcviya9alwxgch846l1xcl17zc34rs4p79v"; + libraryHaskellDepends = [ + async base bifunctor binary bytestring crc32c exceptions + lens-family-core lens-family-th logging managed mtl network + proto-lens proto-lens-runtime text + ]; + testHaskellDepends = [ aeson async base bytestring streamly text ]; + description = "Apache Pulsar client for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "supero" = callPackage ({ mkDerivation, base, containers, cpphs, directory, filepath , haskell-src-exts, mtl, process, time, uniplate @@ -243568,8 +245370,8 @@ self: { pname = "supervisors"; version = "0.2.0.0"; sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i"; - revision = "1"; - editedCabalFile = "1p91gji7qgvash13d4c6av573czk70p89g9i4x8gnklzbrpz2qg7"; + revision = "2"; + editedCabalFile = "0pnxmbw3wb0dcbhpl583ffd991iv3zy4xf6xi5z3qhn5qh8nrmz1"; libraryHaskellDepends = [ async base containers safe-exceptions stm ]; @@ -244178,13 +245980,14 @@ self: { }) {}; "swiss-ephemeris" = callPackage - ({ mkDerivation, base, directory, hspec, hspec-discover }: + ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck + }: mkDerivation { pname = "swiss-ephemeris"; - version = "0.1.0.2"; - sha256 = "0kjph3dy7ii767zpjdqi2ya08vgahhwkbf1fp48n26vfilcwppc9"; + version = "1.2.0.0"; + sha256 = "1inzvwm7z562q07r5h8prxpn4g1ywza88a7rv95yx8634fcy1bsl"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base directory hspec ]; + testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; license = stdenv.lib.licenses.gpl2; @@ -244380,6 +246183,40 @@ self: { broken = true; }) {}; + "symantic-atom" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashable + , megaparsec, symantic-xml, tasty, tasty-golden, text, time + , transformers, treeseq + }: + mkDerivation { + pname = "symantic-atom"; + version = "0.0.0.20200523"; + sha256 = "05lw93cx4zpwy7mq4ad6ly2wl51japczxcpss64svklwl78awcz2"; + libraryHaskellDepends = [ + base containers megaparsec symantic-xml text time transformers + treeseq + ]; + testHaskellDepends = [ + base bytestring containers deepseq hashable megaparsec symantic-xml + tasty tasty-golden text time transformers treeseq + ]; + description = "Library for reading and writing Atom"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "symantic-base" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "symantic-base"; + version = "0.0.2.20200708"; + sha256 = "1yvlvsr38b1ydplpz1jldy816sngmic273iajcmhr73rlyzk5y3d"; + libraryHaskellDepends = [ base ]; + description = "Basic symantics for writing Embedded Domain-Specific Languages (EDSL)"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "symantic-cli" = callPackage ({ mkDerivation, base, bytestring, containers, megaparsec , symantic-document, text, transformers @@ -244581,25 +246418,25 @@ self: { }) {}; "symantic-xml" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , deepseq, filepath, hashable, hxt-charproperties, megaparsec, safe - , tasty, tasty-golden, text, transformers, treeseq - , unordered-containers + ({ mkDerivation, base, bytestring, containers, deepseq, hashable + , hxt-charproperties, megaparsec, symantic-base, tasty + , tasty-golden, text, transformers, treeseq, unordered-containers }: mkDerivation { pname = "symantic-xml"; - version = "1.0.0.20190223"; - sha256 = "0mqx0ysp9c4zzljjgl0w68k5r8qgv2h35cfq0mqvijcjq5dgiflp"; + version = "2.0.0.20200523"; + sha256 = "1fz68n63i32rkyvmz99wyg20xhdniqqm1fds0xn320gi2z35092b"; + revision = "1"; + editedCabalFile = "1dvfglys9jza910wr7r7kda1jisbk9gj3d6rfccaip78hyra1z8l"; libraryHaskellDepends = [ - base bytestring containers data-default-class filepath hashable - hxt-charproperties megaparsec safe text transformers treeseq - unordered-containers + base bytestring containers hashable hxt-charproperties megaparsec + symantic-base text transformers treeseq unordered-containers ]; testHaskellDepends = [ - base bytestring containers data-default-class deepseq filepath - hashable megaparsec tasty tasty-golden text transformers treeseq + base bytestring containers deepseq hashable megaparsec + symantic-base tasty tasty-golden text transformers treeseq ]; - description = "Library for reading, validating and writing a subset of the XML format"; + description = "Library for reading, validating and writing XML"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -245957,8 +247794,8 @@ self: { ({ mkDerivation, base, csv, html, mtl }: mkDerivation { pname = "tabular"; - version = "0.2.2.7"; - sha256 = "1ysgq7rrks7f98nnvxil8xz1q27hxdgz4szbjhqwzbwd209dmy0k"; + version = "0.2.2.8"; + sha256 = "0z936gh8n8i8qdkagyxwd9gqq13skd5fv013vdvwsibrxkm0czfb"; libraryHaskellDepends = [ base csv html mtl ]; description = "Two-dimensional data tables with rendering functions"; license = stdenv.lib.licenses.bsd3; @@ -246971,8 +248808,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.10.0"; - sha256 = "14syiis60fds1r295d6nlvw0mn1d1d6ly0j69r9srbcbrbb2j7yw"; + version = "1.10.1"; + sha256 = "1s05jwsfzjvgfcyd4n4ykzxld11mkf5gnyd9crl5ry5pg77iqw72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246989,8 +248826,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "taskpool" = callPackage @@ -247187,14 +249022,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-expected-failure_0_12" = callPackage + "tasty-expected-failure_0_12_1" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden , tasty-hedgehog, tasty-hunit, unbounded-delays }: mkDerivation { pname = "tasty-expected-failure"; - version = "0.12"; - sha256 = "1yhbgrbsghr3cxy4rxb7wfl9xbasm00xky3hrw4zyyl87r7gs6v6"; + version = "0.12.1"; + sha256 = "1r4xljml8w55q6qpjj94ig2yic398624fld3dwjfcbaldgbacpmm"; libraryHaskellDepends = [ base tagged tasty unbounded-delays ]; testHaskellDepends = [ base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit @@ -247538,8 +249373,8 @@ self: { }: mkDerivation { pname = "tasty-lua"; - version = "0.2.2"; - sha256 = "0m75dffrj6ziaalrch91kzj76ki0chbf33pi7mrx0c1gzmpvn8gv"; + version = "0.2.3"; + sha256 = "0kpmp51wyqbjv3nsrnybpms7flsl2bznqp8gf27zv2f5kraa77vk"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; @@ -248540,13 +250375,28 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.2.1"; - sha256 = "1c8m1z46j6azvxd6hrr76rb7gq6bxfwg3j8m25p260hrss595c06"; + version = "0.1.5"; + sha256 = "1s1ynp568i7y5v062kliia46c3cmaijslf2hlmdkkqfdvf8fmzp1"; libraryHaskellDepends = [ base template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = stdenv.lib.licenses.mit; }) {}; + "template-haskell-optics" = callPackage + ({ mkDerivation, base, containers, optics-core, template-haskell }: + mkDerivation { + pname = "template-haskell-optics"; + version = "0.1"; + sha256 = "019njh3w321dsyx892snxl16arypf04mw415s8f1771wcd3l4q8n"; + libraryHaskellDepends = [ + base containers optics-core template-haskell + ]; + description = "Optics for template-haskell types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "template-haskell-util" = callPackage ({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }: mkDerivation { @@ -249366,8 +251216,8 @@ self: { }: mkDerivation { pname = "termonad"; - version = "4.0.0.0"; - sha256 = "1rdr7ha0mmi0xd1dmiyxirmh789v8sbkr1c3gg43a98lh3kqgcq9"; + version = "4.0.0.1"; + sha256 = "0axsmlly8qa5rpakkp1iryypgzswpqjphcl0mgvwa34dsh2hqmyn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -249387,8 +251237,6 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; vte_291 = pkgs.vte;}; @@ -253827,6 +255675,27 @@ self: { broken = true; }) {}; + "timezone-detect" = callPackage + ({ mkDerivation, base, directory, hspec, hspec-discover, time + , timezone-olson, timezone-series + }: + mkDerivation { + pname = "timezone-detect"; + version = "0.3.0.0"; + sha256 = "10pv88wmz8zqr1h3zh66skbkma2zz3gvwjaalnpfz5ii2dgl27yy"; + libraryHaskellDepends = [ + base time timezone-olson timezone-series + ]; + testHaskellDepends = [ + base directory hspec time timezone-olson timezone-series + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell bindings for the zone-detect C library; plus tz-aware utils"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "timezone-olson" = callPackage ({ mkDerivation, base, binary, bytestring, extensible-exceptions , time, timezone-series @@ -254388,8 +256257,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.3.1"; - sha256 = "172mbc79r14sccyghnbvcsa95lypas2gvqn1rf80f9yi2rsz9amy"; + version = "0.4.0"; + sha256 = "1gsyyw8bvlc15z6hy7cd9w6v6wgjg9ra19w9vp6kajlyzyw5j1kw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254695,8 +256564,8 @@ self: { pname = "token-bucket"; version = "0.1.0.1"; sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii"; - revision = "5"; - editedCabalFile = "049d9bk5f8qa6d7gjgg4nqd56xz1mrxr1rxcwxsrk4vkqcpmzs6q"; + revision = "6"; + editedCabalFile = "15p4iycphz4q58kgq00kmz0ik0hzv3vx47k2dkp93xavb0dny46v"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; description = "Rate limiter using lazy bucket algorithm"; @@ -256741,8 +258610,8 @@ self: { pname = "tree-diff"; version = "0.1"; sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3"; - revision = "4"; - editedCabalFile = "0zl94ppd94szvmqa7vnpbcr2zfppbqm4k6isidzks2mz2ji9dc1i"; + revision = "5"; + editedCabalFile = "1b60x9cgp7hn42hc97q866ybhg5hx3sp45j6gngpbwryg29r2p4h"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers hashable parsec parsers pretty @@ -258252,35 +260121,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , containers, criterion, directory, doctest, exceptions, fail - , foldl, hostname, managed, optional-args, optparse-applicative - , process, semigroups, stm, streaming-commons, system-fileio - , system-filepath, temporary, text, time, transformers, unix - , unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.5.19"; - sha256 = "06hxmhz1i6f5r8k3bf5h54g4ahjsvxhv44sa4xiy52rz6qp0211g"; - revision = "1"; - editedCabalFile = "1z0wjrd25k7zc0bvsy1cxicfml0sdchs7sfr6fz5jlnlggpbn0fq"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock containers directory - exceptions foldl hostname managed optional-args - optparse-applicative process semigroups stm streaming-commons - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ - base doctest fail system-filepath temporary - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_5_20" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, foldl , hostname, managed, optional-args, optparse-applicative, process @@ -258301,6 +260141,29 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "turtle_1_5_21" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, foldl + , hostname, managed, optional-args, optparse-applicative, process + , stm, streaming-commons, system-fileio, system-filepath, temporary + , text, time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.21"; + sha256 = "0sb1xnmvqby1lcg3p92v0nkpxnm2qk0gcn41mxxgp3xdm24vkz36"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process stm streaming-commons system-fileio + system-filepath temporary text time transformers unix unix-compat + ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -258742,8 +260605,8 @@ self: { }: mkDerivation { pname = "twirp"; - version = "0.2.0.0"; - sha256 = "00dc6bil998fdvb5p0r2782cy3nknw6s8k5a0cv4yqmha4iyn32m"; + version = "0.2.0.1"; + sha256 = "05np0zvnvy8wrm9lirrkwhd0n8f44j4xwr6lrywxxy9r00mx8bbl"; libraryHaskellDepends = [ aeson base bytestring http-media http-types proto-lens proto-lens-jsonpb proto-lens-runtime servant text wai @@ -260266,8 +262129,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.7.1"; - sha256 = "0yjw4fm7n7qdb9rib7q5nirnw0cdvqy2g05lidxw5pkgdbi9np3m"; + version = "0.7.8.1"; + sha256 = "060fg6s7yjasimhx7nz4cxymlsxdv9pshs4sv83vwj31nw33kr7b"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -261513,22 +263376,22 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath - , gauge, getopt-generics, optparse-applicative, path, path-io - , QuickCheck, split, text + ({ mkDerivation, base, bytestring, deepseq, filepath, gauge + , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck + , split, text }: mkDerivation { pname = "unicode-transforms"; - version = "0.3.6"; - sha256 = "1akscvyssif4hki3g6hy0jmjyr8cqly1whzvzj0km2b3qh0x09l3"; + version = "0.3.7"; + sha256 = "0pgxb4znvr39n0f7y5q0bdajc4l96zsih0a43n90qjlhj9084rp8"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bitarray bytestring text ]; + libraryHaskellDepends = [ base bytestring ghc-prim text ]; testHaskellDepends = [ - base deepseq getopt-generics QuickCheck split text + base deepseq getopt-generics hspec QuickCheck split text ]; benchmarkHaskellDepends = [ - base deepseq filepath gauge optparse-applicative path path-io text + base deepseq filepath gauge path path-io text ]; description = "Unicode normalization"; license = stdenv.lib.licenses.bsd3; @@ -261829,6 +263692,111 @@ self: { broken = true; }) {}; + "uniqueness-periods" = callPackage + ({ mkDerivation, base, mmsyn6ukr, vector }: + mkDerivation { + pname = "uniqueness-periods"; + version = "0.2.0.0"; + sha256 = "1r5wnc9gdinxigqf9sb58k8rvbkbqmn71d2gxpg1xz3fgxs35cqq"; + libraryHaskellDepends = [ base mmsyn6ukr vector ]; + description = "Can be used to produce the 'uniquenessPeriods' function and related functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + + "uniqueness-periods-general" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "uniqueness-periods-general"; + version = "0.2.0.0"; + sha256 = "117svylwp76rgygc1fa871qz0ghv5hsfj7lr63zy1r3zcakak45q"; + libraryHaskellDepends = [ base vector ]; + description = "Can be used to produce the similar to 'String.Ukrainian.UniquenessPeriods' functions."; + license = stdenv.lib.licenses.mit; + }) {}; + + "uniqueness-periods-vector" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "uniqueness-periods-vector"; + version = "0.3.0.0"; + sha256 = "139xs292irnsw7574nsrpw5dqsg0g7j71p2jvq6h2bl9wnndsi8b"; + libraryHaskellDepends = [ base vector ]; + description = "Generalization of the uniqueness-periods and uniqueness-periods-general packages functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + + "uniqueness-periods-vector-common" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "uniqueness-periods-vector-common"; + version = "0.3.0.0"; + sha256 = "1dw1j10ambqcjr42jb5p9kwdzpz943dw6pgiivxs41iq2w6nibp6"; + libraryHaskellDepends = [ base vector ]; + description = "Generalization of the dobutokO-poetry-general package functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + + "uniqueness-periods-vector-examples" = callPackage + ({ mkDerivation, base, mmsyn6ukr, phonetic-languages-ukrainian + , print-info, uniqueness-periods-vector + , uniqueness-periods-vector-common + , uniqueness-periods-vector-filters + , uniqueness-periods-vector-general + , uniqueness-periods-vector-properties, vector + }: + mkDerivation { + pname = "uniqueness-periods-vector-examples"; + version = "0.4.0.0"; + sha256 = "11f7kgsrz0d7hna02qpf519775w4kli7zxg8yp0d0zzi1yp1cgrq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base mmsyn6ukr phonetic-languages-ukrainian print-info + uniqueness-periods-vector uniqueness-periods-vector-common + uniqueness-periods-vector-filters uniqueness-periods-vector-general + uniqueness-periods-vector-properties vector + ]; + description = "Examples of usage for the uniqueness-periods-vector series of packages"; + license = stdenv.lib.licenses.mit; + }) {}; + + "uniqueness-periods-vector-filters" = callPackage + ({ mkDerivation, base, mmsyn2, vector }: + mkDerivation { + pname = "uniqueness-periods-vector-filters"; + version = "0.1.1.0"; + sha256 = "1slwc94m62qp28g3bqbaa4x0zp0zz7x74kv41mcalzd79nlxf7cv"; + libraryHaskellDepends = [ base mmsyn2 vector ]; + description = "A library allows to change the structure of the 'RealFrac' function output"; + license = stdenv.lib.licenses.mit; + }) {}; + + "uniqueness-periods-vector-general" = callPackage + ({ mkDerivation, base, print-info, uniqueness-periods-vector-common + , vector + }: + mkDerivation { + pname = "uniqueness-periods-vector-general"; + version = "0.4.2.0"; + sha256 = "1ixw5lf2p4wnjsm9989nvsp01aznirb2awhasvlbp0bhgqaj0zmq"; + libraryHaskellDepends = [ + base print-info uniqueness-periods-vector-common vector + ]; + description = "Generalization of the functionality of the dobutokO-poetry-general-languages package"; + license = stdenv.lib.licenses.mit; + }) {}; + + "uniqueness-periods-vector-properties" = callPackage + ({ mkDerivation, base, uniqueness-periods-vector, vector }: + mkDerivation { + pname = "uniqueness-periods-vector-properties"; + version = "0.3.1.0"; + sha256 = "0dpbda0p0f6mw5akyfvlj02ih59x0ajmbm3mnykw43xql8jvjarw"; + libraryHaskellDepends = [ base uniqueness-periods-vector vector ]; + description = "Metrices for the maximum element for the uniqueness-periods-vector packages family"; + license = stdenv.lib.licenses.mit; + }) {}; + "unit" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -262198,7 +264166,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_7_0" = callPackage + "universum_1_7_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -262206,8 +264174,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.7.0"; - sha256 = "079sck4cfhvx4zda5qiz7vs3050l87ik9hx8yjc6bihrzlqvmgfb"; + version = "1.7.1"; + sha256 = "0jsdzhy0h5d6znnrdgzr29b6qkriidck5s6yp52pci30rfv1d29z"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -262979,8 +264947,8 @@ self: { }: mkDerivation { pname = "up"; - version = "1.0.0.5"; - sha256 = "1b41pqj2v6j0vgj7j18wlparbbkvf92xcfr59lvgf9k8xvarl43k"; + version = "2.0.0.0"; + sha256 = "1m07w91dq5db5kjv5w4m5hvh6a19rv4m9vz3pq80zng2c1w4qyb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -263381,6 +265349,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "url-bytes" = callPackage + ({ mkDerivation, base, byteslice, bytesmith, bytestring, deepseq + , gauge, HUnit, primitive, tasty, tasty-hunit, template-haskell + , uri-bytestring, weigh + }: + mkDerivation { + pname = "url-bytes"; + version = "0.1.0.0"; + sha256 = "0nbxnmz1m2icg3vvdndr4zydwr8nbgxhb70ak2jzc6d92c3vhvqi"; + libraryHaskellDepends = [ + base byteslice bytesmith primitive template-haskell + ]; + testHaskellDepends = [ + base byteslice HUnit primitive tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + base byteslice bytestring deepseq gauge primitive uri-bytestring + weigh + ]; + description = "Memory efficient url type and parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "url-decoders" = callPackage ({ mkDerivation, base, base-prelude, binary-parser, bytestring , criterion, http-types, QuickCheck, quickcheck-instances, rerebase @@ -264145,15 +266138,16 @@ self: { }) {}; "uuagc" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , ghc-prim, haskell-src-exts, mtl, uuagc-cabal, uulib + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, ghc-prim, haskell-src-exts, mtl, uuagc-cabal, uulib }: mkDerivation { pname = "uuagc"; - version = "0.9.52.2"; - sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y"; + version = "0.9.53"; + sha256 = "0cij4kf8f2151xz2q935bn9bhrqig9alc008vds7cw6pkb32ngz6"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base containers directory filepath ghc-prim haskell-src-exts mtl uuagc-cabal uulib @@ -264195,8 +266189,8 @@ self: { }: mkDerivation { pname = "uuagc-cabal"; - version = "1.1.0.0"; - sha256 = "0bdvrxdbs9672gfmf3r2j2nasc7map2jr191crf1d0jhmg6dmlzj"; + version = "1.2.0.0"; + sha256 = "1hb567h06zdhrrysb99d0c63ih5p1ii2jl0ng2l304w71m35pk2z"; libraryHaskellDepends = [ base Cabal containers directory filepath mtl process uulib ]; @@ -264210,8 +266204,8 @@ self: { ({ mkDerivation, base, diagrams-lib, SVGFonts }: mkDerivation { pname = "uuagc-diagrams"; - version = "0.1.1.0"; - sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz"; + version = "0.1.2.0"; + sha256 = "0x4dhbzl5xvs3mrg7256hg673nbr4k6kjszyavjs61klcq58asm7"; libraryHaskellDepends = [ base diagrams-lib SVGFonts ]; description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = stdenv.lib.licenses.bsd3; @@ -264315,6 +266309,8 @@ self: { ]; description = "Reversable and secure encoding of object ids as uuids"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uuid-le" = callPackage @@ -265730,15 +267726,19 @@ self: { }) {}; "vector-fftw" = callPackage - ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: + ({ mkDerivation, base, fftw, primitive, QuickCheck + , storable-complex, test-framework, test-framework-quickcheck2 + , vector + }: mkDerivation { pname = "vector-fftw"; - version = "0.1.3.8"; - sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6"; - revision = "3"; - editedCabalFile = "0wh7sa71gl1ssqqd4axyvwxlmkfb0n3hm90imjvg0vsp7g2y7zs0"; + version = "0.1.4.0"; + sha256 = "1ns5jhdx585s3jmcslscibf7ryaya3ca1shc4ysrikrp1mzx1jky"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ fftw ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 vector + ]; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -265876,8 +267876,8 @@ self: { }: mkDerivation { pname = "vector-sized"; - version = "1.4.1.0"; - sha256 = "14l6c8l8l29f6kdffknd70kkccfjcf105i1zd0kchgsgjnr9p6l1"; + version = "1.4.2"; + sha256 = "02a7jzik6a6w1xb6bwpvl6hmii6jgi9wr0q7p48bfbq0mlqjv42h"; libraryHaskellDepends = [ adjunctions base binary comonad deepseq distributive finite-typelits hashable indexed-list-literals primitive vector @@ -267380,8 +269380,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.4"; - sha256 = "15zy3q8nk2myp6p6nqpi5sabdi4r0d5jb20g8df1x7r3rqr2lfh2"; + version = "3.6.6"; + sha256 = "09mq11jqrd9sgx4xcy3xxji21yfhzl9a49mh5fp80y2mxsxdl0v9"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -267575,41 +269575,6 @@ self: { }) {}; "wai-app-static" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , containers, cryptonite, directory, file-embed, filepath, hspec - , http-date, http-types, memory, mime-types, mockery, network - , old-locale, optparse-applicative, template-haskell, temporary - , text, time, transformers, unix-compat, unordered-containers, wai - , wai-extra, warp, zlib - }: - mkDerivation { - pname = "wai-app-static"; - version = "3.1.7.1"; - sha256 = "10k6jb450p89r6dgpnwh428gg0wfw2qbx9n126jkvbchcjr1f4v8"; - revision = "1"; - editedCabalFile = "0bkmml30rzifvb7nxddj3pxczk0kniahra19mjn0qrkzy1n5752p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring containers cryptonite - directory file-embed filepath http-date http-types memory - mime-types old-locale optparse-applicative template-haskell text - time transformers unix-compat unordered-containers wai wai-extra - warp zlib - ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; - testHaskellDepends = [ - base bytestring filepath hspec http-date http-types mime-types - mockery network old-locale temporary text time transformers - unix-compat wai wai-extra zlib - ]; - description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-app-static_3_1_7_2" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , containers, cryptonite, directory, file-embed, filepath, hspec , http-date, http-types, memory, mime-types, mockery, network @@ -267640,7 +269605,6 @@ self: { ]; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-cli" = callPackage @@ -267814,7 +269778,7 @@ self: { "wai-extra" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, case-insensitive, containers, cookie + , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec , http-types, http2, HUnit, iproute, network, old-locale, resourcet , streaming-commons, text, time, transformers, unix, unix-compat @@ -267822,12 +269786,12 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.29.2"; - sha256 = "00r65l7xmvhc1jx5fq134q1sysx7ja5dzyhv5x55gmnxmqr0p107"; + version = "3.0.31"; + sha256 = "1kyid5h7pssgqigmggvx6jh9ip848dkyaslnxi58hhddx0m50vs3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring + aeson ansi-terminal base base64-bytestring bytestring call-stack case-insensitive containers cookie data-default-class deepseq directory fast-logger http-types http2 iproute network old-locale resourcet streaming-commons text time transformers unix unix-compat @@ -270691,6 +272655,32 @@ self: { broken = true; }) {}; + "webgear-server" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , bytestring-conversion, case-insensitive, http-api-data + , http-types, mtl, network, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text + , unordered-containers, wai + }: + mkDerivation { + pname = "webgear-server"; + version = "0.2.0"; + sha256 = "0fyyb4f4dab24as2dv5vbvacwcvp9bcrwyr483yiqn3fhm7975nr"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring bytestring-conversion + case-insensitive http-api-data http-types mtl network + template-haskell text unordered-containers wai + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring bytestring-conversion + case-insensitive http-api-data http-types mtl network QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck + template-haskell text unordered-containers wai + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "webidl" = callPackage ({ mkDerivation, base, bytestring, HSFFIG, LEXER, parsec, pretty , utf8-env, utf8-string @@ -271068,8 +273058,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.1.0"; - sha256 = "0pplr61bf9b6s5wgji8s5dwpp69164zhh6skpsminf6fcpvwqwcl"; + version = "2.1.2"; + sha256 = "0jhdpv4032334ag46jm6d6nc3pdkccq74fkfzijslz798zh9sqmj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -271700,8 +273690,8 @@ self: { }: mkDerivation { pname = "winery"; - version = "1.2"; - sha256 = "13ngxcvkixd4dpwkgmiz6w6rczj9jc4hhs39sgmln7y6cb3sfkih"; + version = "1.3"; + sha256 = "0l22647x0j3487kl8f27hn31lprh0cz906h75azvgn9h8s8hpqmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -271884,6 +273874,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "witherable_0_3_2" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , monoidal-containers, transformers, transformers-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.3.2"; + sha256 = "1iqf3kc9h599lbiym8rf9b4fhj31lqwm1cxqz6x02q9dxyrcprmi"; + revision = "1"; + editedCabalFile = "01mprffm41km3pm5nlpsp2ig2izgl6ll9ylrym3dg01f9609aa0z"; + libraryHaskellDepends = [ + base base-orphans containers hashable monoidal-containers + transformers transformers-compat unordered-containers vector + ]; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witherable" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable, lens , monoidal-containers, transformers, transformers-compat @@ -271931,14 +273941,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "within_0_2_0_0" = callPackage + "within_0_2_0_1" = callPackage ({ mkDerivation, base, comonad, exceptions, free, hashable, path , path-like }: mkDerivation { pname = "within"; - version = "0.2.0.0"; - sha256 = "1jvfxcxyavadcbslb50a6ad7bmnwz45d6zaxyc38y61kh0r82242"; + version = "0.2.0.1"; + sha256 = "1yzfzizx45ngvvbshgw9z8hxl8z7vcr1gann6wnxq4b9669h29ic"; libraryHaskellDepends = [ base comonad exceptions free hashable path path-like ]; @@ -272938,6 +274948,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq-helper" = callPackage + ({ mkDerivation, aeson, aeson-result, base, bytestring, http-client + , lens, text, wreq + }: + mkDerivation { + pname = "wreq-helper"; + version = "0.1.0.0"; + sha256 = "18kmh3swa3bbrkfj1dldi7iy6brdvyhfrbdn8gsz2kcarvhnv5f2"; + libraryHaskellDepends = [ + aeson aeson-result base bytestring http-client lens text wreq + ]; + description = "Wreq response process"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wreq-patchable" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -274083,21 +276108,16 @@ self: { }: mkDerivation { pname = "xeno"; - version = "0.4.1"; - sha256 = "0pnmbi6w4l1i8m5vjxgxpcx98b5rphm32ykzcvgdnvahv8mrqycy"; - isLibrary = true; - isExecutable = true; + version = "0.4.2"; + sha256 = "0dvjzh7yyijwy2d6215wlxlln9h0ng6bnqasfh38prp6sllxk25j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring deepseq mtl mutable-containers vector ]; - executableHaskellDepends = [ - base bytestring bytestring-mmap deepseq hexml time weigh - ]; testHaskellDepends = [ base bytestring hexml hspec ]; benchmarkHaskellDepends = [ - base bytestring bzlib criterion deepseq filepath ghc-prim hexml - hexpat weigh xml + base bytestring bytestring-mmap bzlib criterion deepseq filepath + ghc-prim hexml hexpat time weigh xml ]; description = "A fast event-based XML parser in pure Haskell"; license = stdenv.lib.licenses.bsd3; @@ -275380,8 +277400,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.35.1"; - sha256 = "1fizszhij2if9wxwzi728l93j9p5y9kfqnwnxk6nl66g64rsbp5x"; + version = "0.36"; + sha256 = "0kqnadgsqn7m3zw2vk22ssf4aw67rij9l1lpjfsnv2qw0m5apsdl"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -276536,8 +278556,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.4.0"; - sha256 = "0v69d10ni6ydj4g63ajcmnx6a2j3kbl91vpz678l7k5mkd3chkns"; + version = "0.11.5.0"; + sha256 = "1bfdsqckzql50j6ni4fa1470cvkmfiy4skb98cdwnj4rss5p93mj"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -276563,8 +278583,8 @@ self: { }: mkDerivation { pname = "yaml-combinators"; - version = "1.1.1.2"; - sha256 = "13f5z4xq5k8ss3x0afw21cylhpmr1mzsnrj9ck5531p407rj3glw"; + version = "1.1.2"; + sha256 = "0435m79lqah778g95ds628j5bilfggzyn9hzc309xh47h4mxl92m"; libraryHaskellDepends = [ aeson base bytestring generics-sop scientific text transformers unordered-containers vector yaml @@ -277798,6 +279818,30 @@ self: { broken = true; }) {}; + "yesod-auth-lti13" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, containers, cryptonite, http-client, http-conduit + , jose-jwt, load-env, lti13, microlens, oidc-client, random + , safe-exceptions, text, time, warp, yesod, yesod-auth, yesod-core + }: + mkDerivation { + pname = "yesod-auth-lti13"; + version = "0.1.2.1"; + sha256 = "0p4z1vsbf55jc5ljwsdgbvji61554q3ngfn74klr2ddp87dn0fzr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring containers + cryptonite http-client http-conduit jose-jwt load-env lti13 + microlens oidc-client random safe-exceptions text time warp yesod + yesod-auth yesod-core + ]; + description = "A yesod-auth plugin for LTI 1.3"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yesod-auth-nopassword" = callPackage ({ mkDerivation, base, blaze-markup, http-types, pwstore-fast, text , uuid, yesod-auth, yesod-core, yesod-form @@ -277833,20 +279877,21 @@ self: { }) {}; "yesod-auth-oauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec - , http-client, http-conduit, http-types, microlens, random - , safe-exceptions, text, uri-bytestring, yesod-auth, yesod-core + ({ mkDerivation, aeson, base, bytestring, cryptonite, errors + , hoauth2, hspec, http-client, http-conduit, http-types, memory + , microlens, safe-exceptions, text, uri-bytestring, yesod-auth + , yesod-core }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.1.2"; - sha256 = "07jm60q1fbdk53ncirbi8clsimg28k9j12kaq0vx2apn2rlmdy2w"; + version = "0.6.1.5"; + sha256 = "1awd16wli7g746sf5aqkzb0nglcbji3pl5yyximhb2ab2gjl2ank"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring errors hoauth2 http-client http-conduit - http-types microlens random safe-exceptions text uri-bytestring - yesod-auth yesod-core + aeson base bytestring cryptonite errors hoauth2 http-client + http-conduit http-types memory microlens safe-exceptions text + uri-bytestring yesod-auth yesod-core ]; testHaskellDepends = [ base hspec uri-bytestring ]; description = "OAuth 2.0 authentication plugins"; @@ -278703,6 +280748,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-page-cursor" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations-lifted, http-link-header, http-types, lens + , lens-aeson, monad-logger, mtl, network-uri, persistent + , persistent-sqlite, persistent-template, scientific, text, time + , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-page-cursor"; + version = "2.0.0.0"; + sha256 = "0dlr16jkv104siq7r7ff02x60dy6bvhrgq43s5g8iydc9khafai8"; + libraryHaskellDepends = [ + aeson base bytestring containers http-link-header network-uri text + unliftio yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-lifted + http-link-header http-types lens lens-aeson monad-logger mtl + persistent persistent-sqlite persistent-template scientific text + time unliftio unliftio-core wai-extra yesod yesod-core yesod-test + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-paginate" = callPackage ({ mkDerivation, base, template-haskell, yesod }: mkDerivation { @@ -279058,15 +281127,14 @@ self: { "yesod-recaptcha2" = callPackage ({ mkDerivation, aeson, base, classy-prelude, http-conduit - , yesod-auth, yesod-core, yesod-form + , yesod-core, yesod-form }: mkDerivation { pname = "yesod-recaptcha2"; - version = "1.0.0"; - sha256 = "1hg5g90ld4jc1ggi6rg0si35rr8r8dq79a221zjzs37hsla2cr7i"; + version = "1.0.1"; + sha256 = "0mf9n016jxiq6ayq80fv9zldfjh9yskcq8p9grfr0dl8njj88yn5"; libraryHaskellDepends = [ - aeson base classy-prelude http-conduit yesod-auth yesod-core - yesod-form + aeson base classy-prelude http-conduit yesod-core yesod-form ]; description = "yesod recaptcha2"; license = stdenv.lib.licenses.mit; @@ -279627,15 +281695,20 @@ self: { }) {}; "yhseq" = callPackage - ({ mkDerivation, base, hspec, hspec-discover }: + ({ mkDerivation, base, containers, hspec, hspec-discover, vector }: mkDerivation { pname = "yhseq"; - version = "0.2.1.2"; - sha256 = "1mxjfbnic6pn4jnyc83afpmgq4wnb09f72d359pwx693mfi6vbiy"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec hspec-discover ]; + version = "0.3.0.1"; + sha256 = "1daipppqia4ig7xa9wxy2g3gcxrcwhxm1g6j5l81v56vfh0smg9r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers vector ]; + executableHaskellDepends = [ base containers vector ]; + testHaskellDepends = [ + base containers hspec hspec-discover vector + ]; testToolDepends = [ hspec-discover ]; - description = "Calculation of Y-sequence Hexirp edition"; + description = "Calculation of YH sequence system"; license = stdenv.lib.licenses.asl20; }) {}; @@ -280543,8 +282616,8 @@ self: { }: mkDerivation { pname = "z3"; - version = "408.1"; - sha256 = "1r54d289rdfvxqk0774hhh0x2kj8zsh7graahqwwp76r911jb8bp"; + version = "408.2"; + sha256 = "1fjf9pfj3fhhcd0ak8rm6m5im2il8n5d21z8yv5c32xnsgj7z89a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers transformers ]; @@ -280685,8 +282758,8 @@ self: { }: mkDerivation { pname = "zenacy-html"; - version = "2.0.1"; - sha256 = "074iidhiwzajz207q4k7f8sdg6w4421qfwr2s905226jd2xm1680"; + version = "2.0.2"; + sha256 = "12m953skm4ms6y211ahjrr6gkmrh4p3h2snpcpg1fc039nxgkc9p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280710,6 +282783,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "zenacy-unicode" = callPackage + ({ mkDerivation, base, bytestring, HUnit, test-framework + , test-framework-hunit, text, vector, word8 + }: + mkDerivation { + pname = "zenacy-unicode"; + version = "1.0.0"; + sha256 = "03sksmmmn380nvh0f139g63b4yx42ziimv79xjja7yx6mhaa0pqf"; + libraryHaskellDepends = [ base bytestring vector word8 ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + description = "Unicode utilities for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "zenc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -281327,6 +283416,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, conduit-zstd, containers, digest + , directory, dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "1.6.0"; + sha256 = "1k00g2952yf3iyq1p6pjn307zsxsc9j3iq6lih3rr8vysiijivcx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra conduit-zstd containers digest directory dlist + exceptions filepath monad-control mtl resourcet text time + transformers transformers-base + ]; + executableHaskellDepends = [ base filepath ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process @@ -281457,8 +283575,8 @@ self: { }: mkDerivation { pname = "zipper-extra"; - version = "0.1.3.1"; - sha256 = "1n6amxaydfannxhgnbj5g315m96h5wvgrdw89n6761vii76csky4"; + version = "0.1.3.2"; + sha256 = "0cq21hf40qp025ir9kihsp6b09bsrlgiqd5cfq688w57c2vhcmci"; libraryHaskellDepends = [ base comonad comonad-extras exceptions split ]; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix index 8801f1f1dd..7cd4547d90 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -23,4 +23,14 @@ self: super: { # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { }; + hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { }; + + # cabal2nix --revision https://github.com/hasura/ci-info-hs.git + ci-info = self.callPackage ../misc/haskell/hasura/ci-info {}; + # cabal2nix --revision https://github.com/hasura/pg-client-hs.git + pg-client = self.callPackage ../misc/haskell/hasura/pg-client {}; + # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git + graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {}; + # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git + graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {}; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hasura-884-compat.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hasura-884-compat.patch new file mode 100644 index 0000000000..bc000ba9cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hasura-884-compat.patch @@ -0,0 +1,26 @@ +diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs +index 6cb70cf0..0c3789cd 100644 +--- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs ++++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs +@@ -45,7 +45,7 @@ import GHC.AssertNF + import qualified ListT + import qualified Network.WebSockets as WS + import qualified StmContainers.Map as STMMap +-import qualified System.IO.Error as E ++--import qualified System.IO.Error as E + + import qualified Hasura.Logging as L + +@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p + let rcv = forever $ do + -- Process all messages serially (important!), in a separate thread: + msg <- liftIO $ +- -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" : +- -- https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112 +- -- as WS exception signaling cleanup below. It's not clear why exactly this gets +- -- raised occasionally; I suspect an equivalent handler is missing from WS itself. +- -- Regardless this should be safe: +- handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $ + WS.receiveData conn + writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing + _hOnMessage wsHandlers wsConn msg diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix index a34af634e1..32fa46fd04 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -105,17 +105,6 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" fi - # ghcide and haskell-language-server do package discovery without calling our ghc wrapper. - for prg in ghcide haskell-language-server; do - if [[ -x "$out/bin/$prg" ]]; then - wrapProgram $out/bin/$prg \ - --set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \ - --set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \ - --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \ - --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" - fi - done - '' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix index 08db1b077a..7bf4c0fd52 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.9"; + version = "0.9.1"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "1lnap41gl9vg82h557f4rlr69jgmd2gh0iqs6cxm77d39kv1scb8"; + sha256 = "0nd63i924ifh39cba1hd4sbi6vh1cb73v97nrn4bf8rrjh3k8pdi"; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 7d0857f4e7..39db54babe 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }: +{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.590"; + version = "1.10.1.645"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "18x8xkxsqwnv3k1mf42ylfv7zzjllm7yiagq16b2gkq62j5sm1k7"; + sha256 = "1z6a9an8ls992y4japmzdxay7c5d2z9s2q1xl4g615r23jwpcsf9"; }; nativeBuildInputs = [ @@ -16,13 +16,14 @@ stdenv.mkDerivation rec { installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; + binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; in '' mkdir -p $out/libexec cp clojure-tools-${version}.jar $out/libexec cp example-deps.edn $out cp deps.edn $out + cp clj_exec.clj $out substituteInPlace clojure --replace PREFIX $out diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix deleted file mode 100644 index 94dffd1f76..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.6.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "1.6.6"; - sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl"; - minimumOTPVersion = "19"; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix index 54b046beaa..f821baf66c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, +{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, curl, bash, debugInfo ? false }: { baseName ? "elixir" @@ -20,7 +20,7 @@ in inherit src version; - buildInputs = [ erlang rebar makeWrapper ]; + buildInputs = [ erlang makeWrapper ]; LANG = "C.UTF-8"; LC_TYPE = "C.UTF-8"; @@ -32,10 +32,6 @@ in buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info"; preBuild = '' - # The build process uses ./rebar. Link it to the nixpkgs rebar - rm -vf rebar - ln -s ${rebar}/bin/rebar rebar - patchShebangs lib/elixir/generate_app.escript || true substituteInPlace Makefile \ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index af944e6fd1..18b658ae37 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,6 +1,7 @@ { pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoconf -, openjdk ? null # javacSupport +# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 +, openjdk8 ? null # javacSupport , unixODBC ? null # odbcSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , parallelBuild ? false @@ -17,7 +18,7 @@ , enableThreads ? true , enableSmpSupport ? true , enableKernelPoll ? true -, javacSupport ? false, javacPackages ? [ openjdk ] +, javacSupport ? false, javacPackages ? [ openjdk8 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" @@ -36,7 +37,7 @@ assert wxSupport -> (if stdenv.isDarwin else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; +assert javacSupport -> openjdk8 != null; let inherit (stdenv.lib) optional optionals optionalAttrs optionalString; @@ -89,7 +90,8 @@ in stdenv.mkDerivation ({ ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional wxSupport "--enable-wx" ++ optional withSystemd "--enable-systemd" - ++ optional stdenv.isDarwin "--enable-darwin-64bit"; + ++ optional stdenv.isDarwin "--enable-darwin-64bit" + ++ configureFlags; # install-docs will generate and install manpages and html docs # (PDFs are generated only when fop is available). @@ -131,7 +133,6 @@ in stdenv.mkDerivation ({ // optionalAttrs (postUnpack != "") { inherit postUnpack; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (configurePhase != "") { inherit configurePhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix index 1572f5e4be..97e997bdd6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1ddw3fqrmwh4w6z6xgck4jhmq33rwgbmpjw07g12ri1vgw4xks9w"; + sha256 = "0xdm70b61pdj8z3g08az16y9b6cpz5hv7iwvwfyfyxrjdi47h419"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/2.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/guile/2.0.nix index b5b83e1802..5b26b38dbd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/guile/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/2.0.nix @@ -59,7 +59,7 @@ # "libgcc_s.so.1 must be installed for pthread_cancel to work". # don't have "libgcc_s.so.1" on darwin - LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix" ] ++ stdenv.lib.optionals stdenv.isSunOS [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/j/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/j/default.nix index 8e6b434281..b7f8b63d54 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/j/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/j/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, readline, libedit, bc -, avxSupport ? false +, avxSupport ? stdenv.hostPlatform.avxSupport }: stdenv.mkDerivation rec { pname = "j"; version = "901"; - jtype = "release-e"; + jtype = "release-f"; src = fetchFromGitHub { owner = "jsoftware"; repo = "jsource"; rev = "j${version}-${jtype}"; - sha256 = "13ky37rrl6mc66fckrdnrw64gmvq1qlv6skzd513lab4d0wigshw"; + sha256 = "1776021m0j1aanzwg60by83n53pw7i6afd5wplfzczwk8bywax4p"; name = "jsource"; }; @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { doCheck = true; + # Causes build failure due to warning + hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow"; + buildPhase = '' export SOURCE_DIR=$(pwd) export HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix index 52d0b37191..113a582392 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.10.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "18k6dzxzr149p0bby4r0z6kybylig87rwj7gk3z6a98zf6k4xmsw"; + sha256 = "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix index e96a7c604c..afb5dd9c5b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2020-08-05"; - rev = "2211f6f"; + version = "2.0.5-2020-08-09"; + rev = "e296f56"; isStable = true; - sha256 = "01adxmknq2xyb3w9sn8ilnar8181h7ksd9i80yrsbwzix5lwkn6m"; + sha256 = "0g4wvpmmrxj8ir6yi86gg93khy8ri7x4w091jihpxsmn670da21f"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix index f08bbd0e97..cb0320c7c7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2020-08-05"; - rev = "10ddae7"; + version = "2.1.0-2020-08-27"; + rev = "ff1e72a"; isStable = false; - sha256 = "1lmjs0gz9vgbhh5f45jvvibpj7f3sz81r8cz4maln9yhc67f2zmk"; + sha256 = "0rlh5y48jbxnamr3a5i3szzh7y9ycvq052rw6m82gdhrb1jlamdz"; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix index 27ccb6f22c..991c385ced 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -28,7 +28,7 @@ let # TODO: Add a "dev" output containing the header files. outputs = [ "out" "man" "devdoc" ] ++ - optional crossCompiling "dev"; + optional crossCompiling "mini"; setOutputFlags = false; disallowedReferences = [ stdenv.cc ]; @@ -73,7 +73,7 @@ let # Miniperl needs -lm. perl needs -lrt. configureFlags = (if crossCompiling - then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" ] + then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" "-Ddefault_inc_excludes_dot" ] else [ "-de" "-Dcc=cc" ]) ++ [ "-Uinstallusrbinperl" @@ -144,13 +144,13 @@ let --replace "$man" /no-such-path '' + optionalString crossCompiling '' - mkdir -p $dev/lib/perl5/cross_perl/${version} + mkdir -p $mini/lib/perl5/cross_perl/${version} for dir in cnf/{stub,cpan}; do - cp -r $dir/* $dev/lib/perl5/cross_perl/${version} + cp -r $dir/* $mini/lib/perl5/cross_perl/${version} done - mkdir -p $dev/bin - install -m755 miniperl $dev/bin/perl + mkdir -p $mini/bin + install -m755 miniperl $mini/bin/perl export runtimeArch="$(ls $out/lib/perl5/site_perl/${version})" # wrapProgram should use a runtime-native SHELL by default, but @@ -161,9 +161,9 @@ let # miniperl can't load the native modules there. However, it can # (and sometimes needs to) load and run some of the pure perl # code there, so we add it anyway. When needed, stubs can be put - # into $dev/lib/perl5/cross_perl/${version}. - wrapProgram $dev/bin/perl --prefix PERL5LIB : \ - "$dev/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch" + # into $mini/lib/perl5/cross_perl/${version}. + wrapProgram $mini/bin/perl --prefix PERL5LIB : \ + "$mini/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch" ''; # */ meta = { @@ -175,11 +175,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.3.4"; # Jun 2, 2020 + crossVersion = "15ca5359f99698ef0a199bc307b7956c08907abc"; # Aug 27, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "15wvlafhpsh9h66s3vazhx46hf8ik75473acrvf6722ijd1wpz45"; + sha256 = "0pcwv2ac02i2l0fjc8drdw70q6gwbypj2c5a53x2449m919v37h9"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -195,14 +195,6 @@ let setupHook = ./setup-hook-cross.sh; }); in { - # Maint version - perl528 = common { - perl = pkgs.perl528; - buildPerl = buildPackages.perl528; - version = "5.28.3"; - sha256 = "052if351m81yhaab429i1kv77v9b15qm0g48kr6y2yjrc7bc3jdg"; - }; - # Maint version perl530 = common { perl = pkgs.perl530; @@ -211,11 +203,19 @@ in { sha256 = "0vs0wwwlw47sswxaflkk4hw0y45cmc7arxx788kwpbminy5lrq1j"; }; + # Maint version + perl532 = common { + perl = pkgs.perl532; + buildPerl = buildPackages.perl532; + version = "5.32.0"; + sha256 = "1d6001cjnpxfv79000bx00vmv2nvdz7wrnyas451j908y7hirszg"; + }; + # the latest Devel version perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.32.0-RC0"; - sha256 = "02i6n1xa4j0ksp014yy8q0j7scjcy5mr0yd4iash2ryrrfv5yw5k"; + version = "5.33.1"; + sha256 = "1rlnqqqzyhal79ys5dv7fwm3mg81s43dwks28b74x2gcmsngjnw9"; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/setup-hook-cross.sh b/third_party/nixpkgs/pkgs/development/interpreters/perl/setup-hook-cross.sh index 95aae0b267..a7aad6f245 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/setup-hook-cross.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/setup-hook-cross.sh @@ -9,4 +9,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@/@runtimeArch@ } -addEnvHooks "$targetOffset" addPerlLibPath +addEnvHooks "$hostOffset" addPerlLibPath diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix index 53d435ebb8..8921cf78aa 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -8,7 +8,7 @@ let { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 - , systemd, valgrind, xcbuild + , systemd, system-sendmail, valgrind, xcbuild , version , sha256 @@ -195,6 +195,10 @@ let ++ lib.optional systemdSupport "--with-fpm-systemd" ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" ++ lib.optional ztsSupport "--enable-maintainer-zts" + + + # Sendmail + ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] ; hardeningDisable = [ "bindnow" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/CVE-2019-20907.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/CVE-2019-20907.patch new file mode 100644 index 0000000000..cf67ae2b51 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/CVE-2019-20907.patch @@ -0,0 +1,24 @@ +From 5a8d121a1f3ef5ad7c105ee378cc79a3eac0c7d4 Mon Sep 17 00:00:00 2001 +From: Rishi +Date: Wed, 15 Jul 2020 13:51:00 +0200 +Subject: [PATCH] bpo-39017: Avoid infinite loop in the tarfile module + (GH-21454) + +Avoid infinite loop when reading specially crafted TAR files using the tarfile module +(CVE-2019-20907). +--- + Lib/tarfile.py | 2 ++ + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index e2b60532f6..6769066cab 100755 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -1249,6 +1249,8 @@ class TarInfo(object): + + length, keyword = match.groups() + length = int(length) ++ if length == 0: ++ raise InvalidHeaderError("invalid header") + value = buf[match.end(2) + 1:match.start(1) + length - 1] + + # Normally, we could just use "utf-8" as the encoding and "strict" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index 62aae7b221..2cfaa69a4c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -90,6 +90,9 @@ let # Backport from CPython 3.8 of a good list of tests to run for PGO. ./profile-task.patch + + # Patch is likely to go away in the next release (if there is any) + ./CVE-2019-20907.patch ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 4a8d4ab4bf..b25d613eb7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -156,6 +156,8 @@ in with passthru; stdenv.mkDerivation { ]; postPatch = '' + substituteInPlace Lib/subprocess.py \ + --replace "'/bin/sh'" "'${bash}/bin/sh'" '' + optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; @@ -289,6 +291,13 @@ in with passthru; stdenv.mkDerivation { find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - '' + optionalString stripBytecode '' find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}" + '' + '' + # *strip* shebang from libpython gdb script - it should be dual-syntax and + # interpretable by whatever python the gdb in question is using, which may + # not even match the major version of this python. doing this after the + # bytecode compilations for the same reason. + mkdir -p $out/share/gdb + sed '/^#!/d' Tools/gdb/libpython.py > $out/share/gdb/libpython.py ''; preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -306,6 +315,8 @@ in with passthru; stdenv.mkDerivation { pythonForBuild buildPackages.bash ]; + separateDebugInfo = true; + inherit passthru; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 76963587c2..94422518b2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ pkgs }: with pkgs; @@ -68,10 +68,10 @@ in { sourceVersion = { major = "3"; minor = "6"; - patch = "11"; + patch = "12"; suffix = ""; }; - sha256 = "dB69y8Tjk3pf8jUX3UVev31UPqn+9vXPb0blddbE/aQ="; + sha256 = "cJU6m11okdkuZdGEw1EhJqFYFL7hXh7/LdzOBDNOmpk="; inherit (darwin) configd; inherit passthruFun; }; @@ -81,10 +81,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "8"; + patch = "9"; suffix = ""; }; - sha256 = "Q6VDQEs2PwA3+J34R48Z2y28DW8//uMQvCmX+nGFSmM="; + sha256 = "008v6g1jkrjrdmiqlgjlq6msbbj848bvkws6ppwva1ahn03k14li"; inherit (darwin) configd; inherit passthruFun; }; @@ -108,9 +108,9 @@ in { major = "3"; minor = "9"; patch = "0"; - suffix = "b5"; + suffix = "rc1"; }; - sha256 = "0r0m82srq4z44dahczd1cv6wgmxcpqbn5dyd8czcpk2pp9ydgqbc"; + sha256 = "0w6wvyy9fbvfvrmhvmlb5gq18haagywk9hjkp1knjdarfczag9zv"; inherit (darwin) configd; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index a632efa416..c3be76790e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -81,6 +81,8 @@ # "setuptools" : Install a common setuptools/distutils based package. This builds a wheel. # "wheel" : Install from a pre-compiled wheel. # "flit" : Install a flit package. This builds a wheel. +# "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel. +# "egg": Install a package from an egg. # "other" : Provide your own buildPhase and installPhase. , format ? "setuptools" @@ -105,81 +107,81 @@ let "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" ]) // { - name = namePrefix + name; + name = namePrefix + name; - nativeBuildInputs = [ - python - wrapPython - ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? - pythonRecompileBytecodeHook # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441 - pythonRemoveTestsDirHook - ] ++ lib.optionals catchConflicts [ - setuptools pythonCatchConflictsHook - ] ++ lib.optionals removeBinBytecode [ - pythonRemoveBinBytecodeHook - ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ - unzip - ] ++ lib.optionals (format == "setuptools") [ - setuptoolsBuildHook - ] ++ lib.optionals (format == "flit") [ - flitBuildHook - ] ++ lib.optionals (format == "pyproject") [ - pipBuildHook - ] ++ lib.optionals (format == "wheel") [ - wheelUnpackHook - ] ++ lib.optionals (format == "egg") [ - eggUnpackHook eggBuildHook eggInstallHook - ] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [ - pipInstallHook - ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ - # This is a test, however, it should be ran independent of the checkPhase and checkInputs - pythonImportsCheckHook - ] ++ lib.optionals (python.pythonAtLeast "3.3") [ - # Optionally enforce PEP420 for python3 - pythonNamespacesHook - ] ++ nativeBuildInputs; + nativeBuildInputs = [ + python + wrapPython + ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + pythonRecompileBytecodeHook # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441 + pythonRemoveTestsDirHook + ] ++ lib.optionals catchConflicts [ + setuptools pythonCatchConflictsHook + ] ++ lib.optionals removeBinBytecode [ + pythonRemoveBinBytecodeHook + ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ + unzip + ] ++ lib.optionals (format == "setuptools") [ + setuptoolsBuildHook + ] ++ lib.optionals (format == "flit") [ + flitBuildHook + ] ++ lib.optionals (format == "pyproject") [ + pipBuildHook + ] ++ lib.optionals (format == "wheel") [ + wheelUnpackHook + ] ++ lib.optionals (format == "egg") [ + eggUnpackHook eggBuildHook eggInstallHook + ] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [ + pipInstallHook + ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + # This is a test, however, it should be ran independent of the checkPhase and checkInputs + pythonImportsCheckHook + ] ++ lib.optionals (python.pythonAtLeast "3.3") [ + # Optionally enforce PEP420 for python3 + pythonNamespacesHook + ] ++ nativeBuildInputs; - buildInputs = buildInputs ++ pythonPath; + buildInputs = buildInputs ++ pythonPath; - propagatedBuildInputs = propagatedBuildInputs ++ [ python ]; + propagatedBuildInputs = propagatedBuildInputs ++ [ python ]; - inherit strictDeps; + inherit strictDeps; - LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; - # Python packages don't have a checkPhase, only an installCheckPhase - doCheck = false; - doInstallCheck = attrs.doCheck or true; - installCheckInputs = [ - ] ++ lib.optionals (format == "setuptools") [ - # Longer-term we should get rid of this and require - # users of this function to set the `installCheckPhase` or - # pass in a hook that sets it. - setuptoolsCheckHook - ] ++ checkInputs; + # Python packages don't have a checkPhase, only an installCheckPhase + doCheck = false; + doInstallCheck = attrs.doCheck or true; + installCheckInputs = [ + ] ++ lib.optionals (format == "setuptools") [ + # Longer-term we should get rid of this and require + # users of this function to set the `installCheckPhase` or + # pass in a hook that sets it. + setuptoolsCheckHook + ] ++ checkInputs; - postFixup = lib.optionalString (!dontWrapPythonPrograms) '' - wrapPythonPrograms - '' + attrs.postFixup or ''''; + postFixup = lib.optionalString (!dontWrapPythonPrograms) '' + wrapPythonPrograms + '' + attrs.postFixup or ''''; - # Python packages built through cross-compilation are always for the host platform. - disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + # Python packages built through cross-compilation are always for the host platform. + disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; - # For now, revert recompilation of bytecode. - dontUsePythonRecompileBytecode = true; + # For now, revert recompilation of bytecode. + dontUsePythonRecompileBytecode = true; - meta = { - # default to python's platforms - platforms = python.meta.platforms; - isBuildPythonPackage = python.meta.platforms; - } // meta; -} // lib.optionalAttrs (attrs?checkPhase) { - # If given use the specified checkPhase, otherwise use the setup hook. - # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. - installCheckPhase = attrs.checkPhase; -})); + meta = { + # default to python's platforms + platforms = python.meta.platforms; + isBuildPythonPackage = python.meta.platforms; + } // meta; + } // lib.optionalAttrs (attrs?checkPhase) { + # If given use the specified checkPhase, otherwise use the setup hook. + # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. + installCheckPhase = attrs.checkPhase; + })); -passthru.updateScript = let - filename = builtins.head (lib.splitString ":" self.meta.position); - in attrs.passthru.updateScript or [ update-python-libraries filename ]; + passthru.updateScript = let + filename = builtins.head (lib.splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; in lib.extendDerivation true passthru self diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix index 03a3b95370..dcfa41cc30 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -6,67 +6,81 @@ }: let - envs = let - inherit python; - pythonEnv = python.withPackages(ps: with ps; [ ]); - pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); - in { - # Plain Python interpreter - plain = rec { - env = python; - interpreter = env.interpreter; - is_venv = "False"; - is_nixenv = "False"; - is_virtualenv = "False"; - }; - } // lib.optionalAttrs (!python.isPyPy) { - # Use virtualenv from a Nix env. - nixenv-virtualenv = rec { - env = runCommand "${python.name}-virtualenv" {} '' - ${pythonVirtualEnv.interpreter} -m virtualenv $out - ''; - interpreter = "${env}/bin/${python.executable}"; - is_venv = "False"; - is_nixenv = "True"; - is_virtualenv = "True"; - }; - } // lib.optionalAttrs (python.implementation != "graal") { - # Python Nix environment (python.buildEnv) - nixenv = rec { - env = pythonEnv; - interpreter = env.interpreter; - is_venv = "False"; - is_nixenv = "True"; - is_virtualenv = "False"; - }; - } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { - # Venv built using plain Python - # Python 2 does not support venv - # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. - plain-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${python.interpreter} -m venv $out - ''; - interpreter = "${env}/bin/${python.executable}"; - is_venv = "True"; - is_nixenv = "False"; - is_virtualenv = "False"; + environmentTests = let + envs = let + inherit python; + pythonEnv = python.withPackages(ps: with ps; [ ]); + pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); + in { + # Plain Python interpreter + plain = rec { + env = python; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "False"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (!python.isPyPy) { + # Use virtualenv from a Nix env. + nixenv-virtualenv = rec { + env = runCommand "${python.name}-virtualenv" {} '' + ${pythonVirtualEnv.interpreter} -m virtualenv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "True"; + }; + } // lib.optionalAttrs (python.implementation != "graal") { + # Python Nix environment (python.buildEnv) + nixenv = rec { + env = pythonEnv; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + # Venv built using plain Python + # Python 2 does not support venv + # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. + plain-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${python.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "True"; + is_nixenv = "False"; + is_virtualenv = "False"; + }; + + } // lib.optionalAttrs (python.pythonAtLeast "3.8") { + # Venv built using Python Nix environment (python.buildEnv) + # TODO: Cannot create venv from a nix env + # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. + nixenv-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${pythonEnv.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${pythonEnv.executable}"; + is_venv = "True"; + is_nixenv = "True"; + is_virtualenv = "False"; + }; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.8") { - # Venv built using Python Nix environment (python.buildEnv) - # TODO: Cannot create venv from a nix env - # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. - nixenv-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${pythonEnv.interpreter} -m venv $out - ''; - interpreter = "${env}/bin/${pythonEnv.executable}"; - is_venv = "True"; - is_nixenv = "True"; - is_virtualenv = "False"; - }; - }; + testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ + inherit (python) pythonVersion; + } // attrs) '' + cp -r ${./tests/test_environments} tests + chmod -R +w tests + substituteAllInPlace tests/test_python.py + ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py + mkdir $out + touch $out/success + ''; + + in lib.mapAttrs testfun envs; # All PyPy package builds are broken at the moment integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { @@ -76,15 +90,6 @@ let }; }; - testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ - inherit (python) pythonVersion; - } // attrs) '' - cp -r ${./tests} tests - chmod -R +w tests - substituteAllInPlace tests/test_python.py - ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py - mkdir $out - touch $out/success - ''; -in lib.mapAttrs testfun envs // integrationTests + +in environmentTests // integrationTests diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_python.py b/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_environments/test_python.py similarity index 100% rename from third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_python.py rename to third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_environments/test_python.py diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix index a1185fcae3..0c708cd317 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.07"; + version = "2020.08.2"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1f6ay09k4n7dbcvvla45yg1lfb7vk2ssymmll2xiagjb77hlsqir"; + sha256 = "16qsq6alvk2x44x39j2fzxigvm5cvmz85i0nkjcw0wz29yyf8lch"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix index f0a800764b..702fccd7b6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.07"; + version = "2020.08"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "1kzp76vqvny8gpp0b4xg1hg4vih4gmic4w1lddc9gqz03dx8hj6s"; + sha256 = "1gq7z4z5lnkai01721waawkkal82sdmyra05nnbfb1986mq5xpiy"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix index bf6a9ccc61..3f5f7afcfe 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.07"; + version = "2020.08.2"; src = fetchurl { - url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0kian8xsyj51m120nh68c9q359l7iipkddph3r8yzvn41zql3y8v"; + url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; + sha256 = "14zr1swprxl284k0h1w72pcypj24sga15170ylaqjb8wxy8h1mqw"; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/red/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/red/default.nix index e1460ec51a..554dc81bff 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/red/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/red/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "red"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { - rev = "6a43c767fa2e85d668b83f749158a18e62c30f70"; + rev = "755eb943ccea9e78c2cab0f20b313a52404355cb"; owner = "red"; repo = "red"; - sha256 = "1zh6xc728bs7r4v5jz1jjrdk0xd838xsxmvy9gfg75a3zffm0slr"; + sha256 = "sha256:045rrg9666zczgrwyyyglivzdzja103s52b0fzj7hqmr1fz68q37"; }; rebol = fetchurl { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ${r2} -qw red.r tests/hello.red # Compiling the Red console... - ${r2} -qw red.r -r environment/console/console.red + ${r2} -qw red.r -r environment/console/CLI/console.red # Generating docs... cd docs diff --git a/third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix new file mode 100644 index 0000000000..6d10669d20 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, shen-sources +, sbcl +}: + +stdenv.mkDerivation rec { + name = "shen-sbcl-${version}"; + version = "3.0.3"; + src = fetchurl { + url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz"; + sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz"; + }; + buildInputs = [ + sbcl shen-sources + ]; + buildPhase = '' + ln -s ${shen-sources} kernel + make sbcl + ''; + installPhase = '' + mkdir -p $out + install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl + ''; + meta = with stdenv.lib; { + homepage = https://shenlanguage.org; + description = "Port of Shen running on Steel Bank Common Lisp"; + platforms = sbcl.meta.platforms; + maintainers = with maintainers; [ bsima ]; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix new file mode 100644 index 0000000000..f35631daa2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/shen-sources/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + name = "shen-sources-${version}"; + version = "22.3"; + + src = fetchurl { + url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz"; + sha256 = "16jaliga3bia0f8c8ja1y22wanbnbriv31qfqdc87a4p4dx9c77q"; + }; + + buildInputs = []; + buildPhase = ""; + installPhase = '' + mkdir -p $out + cp . $out -R + ''; + + meta = with stdenv.lib; { + homepage = https://shenlanguage.org; + description = "Source code for the Shen Language"; + platforms = platforms.all; + maintainers = with maintainers; [ bsima ]; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/java-modules/jogl/default.nix b/third_party/nixpkgs/pkgs/development/java-modules/jogl/default.nix index 574629d8ef..d4e5f1b62b 100644 --- a/third_party/nixpkgs/pkgs/development/java-modules/jogl/default.nix +++ b/third_party/nixpkgs/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }: +{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }: { jogl_2_3_2 = @@ -28,7 +28,8 @@ -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \; ''; - nativeBuildInputs = [ jdk ant git ]; + # TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731 + nativeBuildInputs = [ jdk8 ant git ]; buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix index 1157142e5b..1bb79a64ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.7.13"; + version = "1.7.14"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "01j4fsq917jckdh16nvmc35xiy11j4g1sc17y6g8qxa00s2sfsa4"; + sha256 = "0yri063v7j5jsvqbmlwr0hf2d1a55dgc1nj85rf10sxqhijwzk55"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/allegro/default.nix b/third_party/nixpkgs/pkgs/development/libraries/allegro/default.nix index 6071f63255..99d7522503 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/allegro/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/allegro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, libXext, xorgproto, libX11 +{ stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL }: @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { patches = [ ./nix-unstable-sandbox-fix.patch + ./encoding.patch ]; buildInputs = [ - texinfo libXext xorgproto libX11 libXpm libXt libXcursor + texinfo6_5 libXext xorgproto libX11 libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/allegro/encoding.patch b/third_party/nixpkgs/pkgs/development/libraries/allegro/encoding.patch new file mode 100644 index 0000000000..1dca947528 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/allegro/encoding.patch @@ -0,0 +1,10 @@ +--- allegro-4.4.3/docs/src/allegro._tx.orig 2019-02-02 20:28:46.000000000 +0100 ++++ allegro-4.4.3/docs/src/allegro._tx 2019-11-04 11:12:39.352699777 +0100 +@@ -23,6 +23,7 @@ + @man_shortdesc_force1=allegro + @man_shortdesc_force2=Allegro game programming library. + @$\input texinfo ++@$@documentencoding ISO-8859-1 + @$@setfilename allegro.inf + @$@settitle Allegro Manual + @$@setchapternewpage odd \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index d4a717e384..1f75892b9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -15,16 +15,19 @@ , xorg , zlib }: +let -stdenv.mkDerivation rec { + suffix = if stdenv.system == "x86_64-linux" then "64" else "32"; + +in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q3.3"; + version = "2020.Q3.5"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "0s5a294gzcz438gmafirk3czrjcahv3imsg41k3vk83x4dbdlhxv"; + sha256 = "08fj3cg3axnwadlpfim23g5nyjl69044fqxdr57af6y79441njay"; }; buildInputs = [ @@ -62,14 +65,24 @@ stdenv.mkDerivation rec { cmakeDir = "../drivers/xgl"; + # LTO is disabled in gcc for i686 as of #66528 + cmakeFlags = stdenv.lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"]; + + postPatch = stdenv.lib.optionalString stdenv.is32bit '' + substituteInPlace drivers/pal/cmake/PalCompilerOptions.cmake \ + --replace "pal_setup_gcc_ipo()" "" + ''; + installPhase = '' - install -Dm755 -t $out/lib icd/amdvlk64.so - install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd64.json + install -Dm755 -t $out/lib icd/amdvlk${suffix}.so + install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd${suffix}.json - substituteInPlace $out/share/vulkan/icd.d/amd_icd64.json --replace \ + substituteInPlace $out/share/vulkan/icd.d/amd_icd${suffix}.json --replace \ "/usr/lib64" "$out/lib" + substituteInPlace $out/share/vulkan/icd.d/amd_icd${suffix}.json --replace \ + "/usr/lib" "$out/lib" - patchelf --set-rpath "$rpath" $out/lib/amdvlk64.so + patchelf --set-rpath "$rpath" $out/lib/amdvlk${suffix}.so ''; # Keep the rpath, otherwise vulkaninfo and vkcube segfault @@ -80,7 +93,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ danieldk Flakebi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/appindicator-sharp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/appindicator-sharp/default.nix new file mode 100644 index 0000000000..9eff4e3895 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/appindicator-sharp/default.nix @@ -0,0 +1,43 @@ +{ + autoreconfHook, + fetchFromGitHub, + lib, + libappindicator, + mono, + gtk-sharp-3_0, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "appindicator-sharp"; + version = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37"; + + src = fetchFromGitHub { + owner = "stsundermann"; + repo = "appindicator-sharp"; + rev = version; + sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l"; + }; + + nativeBuildInputs = [ + autoreconfHook + mono + pkg-config + ]; + + buildInputs = [ + gtk-sharp-3_0 + libappindicator + ]; + + ac_cv_path_MDOC = "no"; + installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"]; + + meta = { + description = "Bindings for appindicator using gobject-introspection"; + homepage = "https://github.com/stsundermann/appindicator-sharp"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix index 21bbf8c1bc..45f27b38a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection -, pcre, itstool, gperf, vala +, pcre, itstool, gperf, vala, lmdb, libsoup }: stdenv.mkDerivation rec { pname = "appstream"; - version = "0.12.6"; + version = "0.12.11"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; - rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0hbl26aw3g2hag7z4di9z59qz057qcywrxpnnmp86z7rngvjbqpx"; + rev = "v${version}"; + sha256 = "sha256-bCDyMwQdn9Csxs2hy4dm+LjtxK4+YBK6yDkAdhu1QVU="; }; nativeBuildInputs = [ @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { gobject-introspection itstool vala ]; - buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ]; + buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ]; prePatch = '' substituteInPlace meson.build \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix index 22f1566ad0..c9fc96b325 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix @@ -1,17 +1,24 @@ -{ stdenv, appstream, qtbase, qttools }: +{ stdenv, mkDerivation, appstream, qtbase, qttools }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here -stdenv.mkDerivation { +mkDerivation { pname = "appstream-qt"; inherit (appstream) version src prePatch; + outputs = [ "out" "dev" ]; + buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; nativeBuildInputs = appstream.nativeBuildInputs ++ [ qttools ]; mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; + postFixup = '' + sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \ + -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@" + ''; + meta = appstream.meta // { description = "Software metadata handling library - Qt"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 90a17b6ad8..a4d359b985 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.900.2"; + version = "9.900.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "01bdw8y2nhj296px6vfh0ibc4gpfa08qh1gb33vzgp9a8k4mi1np"; + sha256 = "02pwhf3y2qq50dswjvfcijaw938d1zi1hxr17msv2x1ahlvff5fn"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index a989833249..2c9bced419 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,9 +1,16 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost -, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl -, python3, rapidjson, snappy, thrift, which, zlib, zstd +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames +, autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4 +, perl, python3, rapidjson, snappy, thrift, utf8proc, which, zlib, zstd , enableShared ? true }: let + arrow-testing = fetchFromGitHub { + owner = "apache"; + repo = "arrow-testing"; + rev = "f552c4dcd2ae3d14048abd20919748cce5276ade"; + sha256 = "1smaidk5k2q6xdav7qp74ak34vvwv5qyfqw0szi573awsrsrahr8"; + }; + parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; @@ -13,14 +20,13 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "0.17.1"; + version = "1.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "18lyvbibfdw3w77cy5whbq7c6mshn5fg2bhvgw7v226a7cs1rifb"; + sha256 = "0hzjrhr4brqpmy9f8fbj9p5a482ya8kjhkycz6maa0w2nkzbkpc6"; }; - sourceRoot = "apache-arrow-${version}/cpp"; ARROW_JEMALLOC_URL = fetchurl { @@ -32,26 +38,31 @@ in stdenv.mkDerivation rec { sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; }; + ARROW_MIMALLOC_URL = fetchurl { + # From + # ./cpp/cmake_modules/ThirdpartyToolchain.cmake + # ./cpp/thirdparty/versions.txt + url = + "https://github.com/microsoft/mimalloc/archive/v1.6.3.tar.gz"; + sha256 = "0pia8b4acv1w8qzcpc9i1a2fasnn3rmp996k0l87p2di0lbls0w5"; + }; + patches = [ # patch to fix python-test ./darwin.patch - - # fix musl build + # Properly exported static targets. Remove at the next version bump. (fetchpatch { - url = "https://github.com/apache/arrow/commit/de4168786dfd8ab932f48801e0a7a6b8a370c19d.diff"; - sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y"; + url = "https://github.com/apache/arrow/commit/b040600b39a4f803b704934252665f9440dd1276.patch"; + sha256 = "1mvw29ybcsz77zprmsk41blxmrj8ywayg7ghf6xkkf98907ws8m8"; + includes = [ "*.cmake" ]; stripLen = 1; }) - - # fix build for "ZSTD_SOURCE=SYSTEM" (fetchpatch { - url = "https://github.com/apache/arrow/commit/13cb3dbded1928d2e96574895bebaf9098a4796d.diff"; - sha256 = "12z3ys47qp2x8f63lggiyj4xs2kmg804ri4xqysw5krbjz2hr6rb"; + url = "https://github.com/apache/arrow/commit/81d3f2657b17436d6d5a6af9aaf6f36c3f5e4ac9.patch"; + sha256 = "18fmzr5f79hvx2qpyfgvvl98p4zgzfxrmrd1d2basp0w0da1ciqs"; + includes = [ "*CMakeLists.txt" "*.cmake" "*.cmake.in" ]; stripLen = 1; }) - ] ++ lib.optionals (!enableShared) [ - # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic. - ./jemalloc-disable-shared.patch ]; nativeBuildInputs = [ @@ -70,6 +81,7 @@ in stdenv.mkDerivation rec { rapidjson snappy thrift + utf8proc zlib zstd ] ++ lib.optionals enableShared [ @@ -78,15 +90,17 @@ in stdenv.mkDerivation rec { ]; preConfigure = '' - substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - patchShebangs build-support/ ''; cmakeFlags = [ "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" + "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" + "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" "-DARROW_BUILD_TESTS=ON" + "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" + "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_PLASMA=ON" # Disable Python for static mode because openblas is currently broken there. "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" @@ -94,25 +108,23 @@ in stdenv.mkDerivation rec { "-DARROW_WITH_BROTLI=ON" "-DARROW_WITH_LZ4=ON" "-DARROW_WITH_SNAPPY=ON" + "-DARROW_WITH_UTF8PROC=ON" "-DARROW_WITH_ZLIB=ON" "-DARROW_WITH_ZSTD=ON" - "-DARROW_ZSTD_USE_SHARED=${if enableShared then "ON" else "OFF"}" + "-DARROW_MIMALLOC=ON" # Parquet options: "-DARROW_PARQUET=ON" "-DPARQUET_BUILD_EXECUTABLES=ON" ] ++ lib.optionals (!enableShared) [ - "-DARROW_BUILD_SHARED=OFF" - "-DARROW_BOOST_USE_SHARED=OFF" - "-DARROW_GFLAGS_USE_SHARED=OFF" - "-DARROW_PROTOBUF_USE_SHARED=OFF" "-DARROW_TEST_LINKAGE=static" - "-DOPENSSL_USE_STATIC_LIBS=ON" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; doInstallCheck = true; + ARROW_TEST_DATA = + if doInstallCheck then "${arrow-testing}/data" else null; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; installCheckInputs = [ perl which ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch deleted file mode 100644 index 564f672738..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -1317,6 +1317,7 @@ if(ARROW_JEMALLOC) - "--with-jemalloc-prefix=je_arrow_" - "--with-private-namespace=je_arrow_private_" - "--without-export" -+ "--disable-shared" - # Don't override operator new() - "--disable-cxx" "--disable-libdl" - # See https://github.com/jemalloc/jemalloc/issues/1237 diff --git a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix index fac55b6065..32405d6a52 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix @@ -694,18 +694,18 @@ in rec { pt_BR = buildOfficialDict { language = "pt_BR"; - version = "20090702-0"; + version = "20131030-12-0"; fullName = "Brazilian Portuguese"; filename = "aspell6"; - sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; + sha256 = "1xqlpk21s93c6blkdnpk7l62q9fxjvzdv2x86chl8p2x1gdrj3gb"; }; pt_PT = buildOfficialDict { language = "pt_PT"; - version = "20070510-0"; + version = "20190329-1-0"; fullName = "Portuguese"; filename = "aspell6"; - sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; + sha256 = "0ld0d0ily4jqifjfsxfv4shbicz6ymm2gk56fq9gbzra1j4qnw75"; }; qu = buildOfficialDict { diff --git a/third_party/nixpkgs/pkgs/development/libraries/assimp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/assimp/default.nix index a6f27f4476..c1972aa1ca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/assimp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/assimp/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "http://assimp.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/audiality2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audiality2/default.nix new file mode 100644 index 0000000000..a311c5f547 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/audiality2/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +# The two audio backends: +, SDL2 +, jack2 +}: + +stdenv.mkDerivation rec { + pname = "audiality2"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "olofson"; + repo = "audiality2"; + rev = "v${version}"; + sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + jack2 + ]; + + meta = with stdenv.lib; { + description = "A realtime scripted modular audio engine for video games and musical applications"; + homepage = "http://audiality.org"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix index 41e4c92e56..66ead87daa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.4.90"; + version = "0.8.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "02vqjryni96zzrpkq5d7kvgw7nf252d2fm2xq8fklvvb2vz3fa0w"; + sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p"; }; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc vala ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix index ec3c04856f..49b2e9be02 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.12.2"; + version = "2.12.3"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="17fr2k0jhdcrmmvvb9d8igmjbyads3hkdrakvmrpgc82srm78jcc"; + sha256="0rp30754frp88wbl17ksr40mmffw5xibq73blgx9jj42d7nl891x"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/check/default.nix b/third_party/nixpkgs/pkgs/development/libraries/check/default.nix index e98fa465e0..be000e457c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/check/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "check"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; - sha256 = "0q5cs6rqbq8a1m9ij3dxnsjcs31mvg0b2i77g0iykqd6iz3f78mf"; + sha256 = "02m25y9m46pb6n46s51av62kpd936lkfv3b13kfpckgvmh5lxpm8"; }; # Test can randomly fail: https://hydra.nixos.org/build/7243912 diff --git a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix index 4702d67a01..12f844aa59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, ffmpeg }: +{ lib, stdenv, fetchurl, cmake, boost, ffmpeg, darwin, zlib }: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg ]; + buildInputs = [ boost ffmpeg ] ++ lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo zlib]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; @@ -20,6 +21,6 @@ stdenv.mkDerivation rec { description = "AcoustID audio fingerprinting library"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix index 312f927767..1963534ae5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "0vl7dscbms4834gm1000sp17pr714pbqwicn40pbl85mxr3pnjp3"; + sha256 = "sha256-7v8651yDkxTdRMoGhEl4d/k7mxYwfIwW/rkuyjqVGwY="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix index 1da2f210c5..b9c12b1889 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, gflags }: +{ stdenv, lib, fetchFromGitHub, cmake, gflags +, staticOnly ? false }: + stdenv.mkDerivation rec { pname = "crc32c"; version = "1.1.0"; @@ -14,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; + cmakeFlags = lib.optionals (!staticOnly) [ "-DBUILD_SHARED_LIBS=1" ]; meta = with stdenv.lib; { homepage = "https://github.com/google/crc32c"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix new file mode 100644 index 0000000000..c26578804b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "crcpp"; + version = "1.0.1.0"; + + src = fetchFromGitHub { + owner = "d-bahr"; + repo = "CRCpp"; + rev = "release-${version}"; + sha256 = "138w97kfxnv8rcnvggba6fcxgbgq8amikkmy3jhqfn6xzy6zaimh"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/include + cp inc/CRC.h $out/include + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/d-bahr/CRCpp"; + description = "Easy to use and fast C++ CRC library"; + platforms = platforms.all; + maintainers = [ maintainers.ivar ]; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix index 94d9776b54..d5e83f0410 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1c4cjzx6jkqlblcfc7pkx66py43576y6rky19j7rjiap724q2yk9"; + sha256 = "1ngacc7ackp08hajby0xvzpvnqahwm2dbxmisw7j7qs1lqrx9k3n"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix index 3f59368c27..43ac2530cc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, libX11 # see http://dlib.net/compile.html -, avxSupport ? true +, avxSupport ? stdenv.hostPlatform.avxSupport , cudaSupport ? true }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { rm -rf dlib/external ''; - cmakeFlags = [ + cmakeFlags = [ "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix new file mode 100644 index 0000000000..f8b806482a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake +}: + +stdenv.mkDerivation rec { + version = "1.3.6"; + pname = "draco"; + + src = fetchFromGitHub { + owner = "google"; + repo = "draco"; + rev = version; + sha256 = "06adhz8gsnns6q98yzjm64xs04qp2fhm9bv0wxny68rkw0bh95a0"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + # Fake these since we are building from a tarball + "-Ddraco_git_hash=${version}" + "-Ddraco_git_desc=${version}" + + "-DBUILD_UNITY_PLUGIN=1" + ]; + + meta = with stdenv.lib; { + description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; + homepage = "https://google.github.io/draco/"; + license = licenses.asl20; + maintainers = with maintainers; [ jansol ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix index e37856abe2..dde0806add 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.1.7"; + version = "0.2.1"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "1pz2q9c3803w8vbqiz9lag4g1kgl4ff9xca0kpcz72ap39pbp5jk"; + sha256 = "18l4qdzfm8k9ggn49r3h99cbcmmq01byzkxps3pvmq8q246hb55x"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dxflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dxflib/default.nix index e1cb8d2d9e..1b63d8805f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dxflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dxflib/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, qt5 +, qmake }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09yjgzh8677pzkkr7a59pql5d11451c22pxksk2my30mapxsri96"; }; nativeBuildInputs = [ - qt5.qmake + qmake ]; preConfigure = '' sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro @@ -42,4 +42,3 @@ stdenv.mkDerivation rec { description = ''DXF file format library''; }; } - diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix new file mode 100644 index 0000000000..2d83b9bbfa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, + openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: + +stdenv.mkDerivation rec { + pname = "embree"; + version = "3.11.0"; + + src = fetchFromGitHub { + owner = "embree"; + repo = "embree"; + rev = "v${version}"; + sha256 = "0v5gqi8jp09xxcbyyknji83412bq4l0w35b6hnrqxycgdrnf7hkr"; + }; + + postPatch = '' + # Fix duplicate /nix/store/.../nix/store/.../ paths + sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \ + common/cmake/embree-config.cmake + sed -i "s|$""{EMBREE_ROOT_DIR}/||" common/cmake/embree-config.cmake + ''; + + cmakeFlags = [ + "-DEMBREE_TUTORIALS=OFF" + "-DEMBREE_RAY_MASK=ON" + ]; + + nativeBuildInputs = [ ispc pkgconfig cmake ]; + buildInputs = [ 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 gebner ]; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 65d85eddbe..b7b86de92c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , aspell -, pkgconfig +, pkg-config , glib , hunspell , hspell @@ -10,17 +10,17 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.8"; + version = "2.2.11"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7"; + sha256 = "opxXd8TkX8rCWVwVxJ1tKqQ0+l58mT3/P582e2X+Ryo="; }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix index 3522ff231a..749005e09a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.4.4"; + version = "0.5.2"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "1gfs8s4nv2ikkn3rhzifr0dx5m0c1kpnhmzf8x6zlwhw3qwlc98w"; + sha256 = "0shr3m33raxy9j2mpm3q9mdbchs3nhgfaywidyxgmwqaiw1xpyif"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 02d3f1da3e..a845e8998e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -15,37 +15,38 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.2"; + version = "0.27.3"; + + outputs = [ "out" "dev" "doc" "man" ]; src = fetchFromGitHub { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf"; + sha256 = "0d294yhcdw8ziybyd4rp5hzwknzik2sm0cz60ff7fljacv75bjpy"; }; patches = [ - # included in next release + # Fix aarch64 build https://github.com/Exiv2/exiv2/pull/1271 (fetchpatch { - name = "cve-2019-20421.patch"; - url = "https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8.patch"; - sha256 = "16r19qb9l5j43ixm5jqid9sdv5brlkk1wq0w79rm5agxq4kblfyc"; - excludes = [ "tests/bugfixes/github/test_issue_1011.py" "test/data/Jp2Image_readMetadata_loop.poc" ]; + name = "cmake-fix-aarch64.patch"; + url = "https://github.com/Exiv2/exiv2/commit/bbe0b70840cf28b7dd8c0b7e9bb1b741aeda2efd.patch"; + sha256 = "13zw1mn0ag0jrz73hqjhdsh1img7jvj5yddip2k2sb5phy04rzfx"; + }) + + # Use correct paths with multiple outputs + # https://github.com/Exiv2/exiv2/pull/1275 + (fetchpatch { + url = "https://github.com/Exiv2/exiv2/commit/48f2c9dbbacc0ef84c8ebf4cb1a603327f0b8750.patch"; + sha256 = "vjB3+Ld4c/2LT7nq6uatYwfHTh+HeU5QFPFXuNLpIPA="; + }) + # https://github.com/Exiv2/exiv2/pull/1294 + (fetchpatch { + url = "https://github.com/Exiv2/exiv2/commit/306c8a6fd4ddd70e76043ab255734720829a57e8.patch"; + sha256 = "0D/omxYxBPGUu3uSErlf48dc6Ukwc2cEN9/J3e7a9eU="; }) ]; - cmakeFlags = [ - "-DEXIV2_BUILD_PO=ON" - "-DEXIV2_BUILD_DOC=ON" - # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly - # (setting it to an absolute path causes include files to go to $out/$out/include, - # because the absolute path is interpreted with root at $out). - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - outputs = [ "out" "dev" "doc" "man" ]; - nativeBuildInputs = [ cmake doxygen @@ -65,7 +66,13 @@ stdenv.mkDerivation rec { which ]; + cmakeFlags = [ + "-DEXIV2_ENABLE_NLS=ON" + "-DEXIV2_BUILD_DOC=ON" + ]; + buildFlags = [ + "all" "doc" ]; @@ -77,7 +84,6 @@ stdenv.mkDerivation rec { preCheck = '' patchShebangs ../test/ mkdir ../test/tmp - export LD_LIBRARY_PATH="$(realpath ../build/lib)" ${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' # Fix tests on arm @@ -86,18 +92,15 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib # Removing tests depending on charset conversion substituteInPlace ../test/Makefile --replace "conversions.sh" "" rm -f ../tests/bugfixes/redmine/test_issue_460.py rm -f ../tests/bugfixes/redmine/test_issue_662.py + rm -f ../tests/bugfixes/github/test_issue_1046.py ''} ''; - postCheck = '' - (cd ../tests/ && python3 runner.py) - ''; - # With CMake we have to enable samples or there won't be # a tests target. This removes them. postInstall = '' @@ -108,20 +111,11 @@ stdenv.mkDerivation rec { ) ''; - # Fix CMake export paths. - postFixup = '' - sed -i "$dev/lib/cmake/exiv2/exiv2Config.cmake" \ - -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${_IMPORT_PREFIX}@$dev@" \ - -e "/Compute the installation prefix/ a set(_IMPORT_PREFIX \"$out\")" \ - -e "/^get_filename_component(_IMPORT_PREFIX/ d" - ''; - - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://www.exiv2.org/"; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; license = licenses.gpl2Plus; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix index 2cb056437c..0c5d2b334a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc -,freetype, fontconfig, pixman, tllist }: +,freetype, fontconfig, pixman, tllist, check }: stdenv.mkDerivation rec { pname = "fcft"; @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig pixman tllist ]; + checkInputs = [ check ]; + + mesonFlags = [ "--buildtype=release" ]; + + doCheck = true; meta = with lib; { homepage = "https://codeberg.org/dnkl/fcft"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index bc84039a9a..23b31fe439 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -31,19 +31,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lcblas" "--with-lapack-libs=-llapacke" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - westmere = [ "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; - + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512f" + "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512dq" + "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512vl" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ]; doCheck = true; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index 1cbcc5471e..c23fb87f2f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -110,6 +110,7 @@ , openjpeg ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null , libpulseaudio ? null # Pulseaudio input support +, rav1e ? null # AV1 encoder (focused on speed and safety) , rtmpdump ? null # RTMP[E] support #, libquvi ? null # Quvi input support , samba ? null # Samba protocol @@ -383,6 +384,7 @@ stdenv.mkDerivation rec { (enableFeature (opensslExtlib && gplLicensing) "openssl") (enableFeature (libpulseaudio != null) "libpulse") #(enableFeature quvi "libquvi") + (enableFeature (rav1e != null) "librav1e") (enableFeature (rtmpdump != null) "librtmp") #(enableFeature (schroedinger != null) "libschroedinger") (enableFeature (SDL2 != null) "sdl2") @@ -419,7 +421,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr + libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 5b98884c1f..d763fb5135 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -126,6 +126,7 @@ stdenv.mkDerivation rec { # Docs (ifMinVer "0.6" "--disable-doc") # External Libraries + "--enable-libass" "--enable-bzlib" "--enable-gnutls" (ifMinVer "1.0" "--enable-fontconfig") diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 40cea4f730..6f8634c01e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -57,14 +57,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.8.1"; + version = "1.8.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "ZpFLZvmmQHk4bMCXpAoZ+oQZVo33+0VvLkB/D3asnq0="; + sha256 = "eSZiXffCKCpe4aizwxevU9QKZjsbxrGKLch0fiZQhbA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/config-compat.patch b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/config-compat.patch deleted file mode 100644 index ddf7bc7818..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/config-compat.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2ff9b53ce755be183ef9274f7dd3f9ac537173f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= -Date: Tue, 4 Nov 2014 12:24:25 +0100 -Subject: [PATCH] add check for /etc/fonts/@configVersion@/fonts.conf - -It's checked between FONTCONFIG_FILE and the in-package etc/fonts/fonts.conf. -The latter is used so that on non-NixOS distributions, fontconfig works at least -with upstream defaults, even when the global config is incompatible. - -Co-Authored-By: Jan Tojnar ---- - src/fccfg.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/fccfg.c b/src/fccfg.c -index 342c996..98a1324 100644 ---- a/src/fccfg.c -+++ b/src/fccfg.c -@@ -2391,8 +2391,13 @@ FcConfigGetFilename (FcConfig *config, - if (!url || !*url) - { - url = (FcChar8 *) getenv ("FONTCONFIG_FILE"); -+ if (!url) { -+ static const FcChar8 *cfPath = "/etc/fonts/@configVersion@/fonts.conf"; -+ if (access (cfPath, R_OK) == 0) -+ url = cfPath; -+ } - if (!url) -- url = (FcChar8 *) FONTCONFIG_FILE; -+ url = (FcChar8 *) FONTCONFIG_PATH "/" FONTCONFIG_FILE; - } - file = 0; - --- -2.26.2 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix index 29d9e3289c..72df121200 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/default.nix @@ -11,21 +11,6 @@ , autoreconfHook }: -/** Font configuration scheme - - ./config-compat.patch makes fontconfig try the following root configs, in order: - $FONTCONFIG_FILE, /etc/fonts/${configVersion}/fonts.conf, ${fontconfig.out}/etc/fonts/fonts.conf - This is done not to override config of pre-2.11 versions (which just blow up) - and still use *global* font configuration at NixOS, - falling back to upstream defaults on non-NixOS. - - NixOS creates /etc/fonts/${configVersion}/fonts.conf link to $out/etc/fonts/fonts.conf, - and other modifications should go to /etc/fonts/${configVersion}/conf.d - - See ./make-fonts-conf.xsl for config details. - -*/ - -let - configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations -in stdenv.mkDerivation rec { pname = "fontconfig"; version = "2.13.92"; @@ -36,11 +21,6 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./config-compat.patch; - inherit configVersion; - }) - # Fix fonts not being loaded when missing included configs that have ignore_missing="yes". # https://bugzilla.redhat.com/show_bug.cgi?id=1744377 (fetchpatch { @@ -73,6 +53,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/37c7c748740bf6f2468d59e67951902710240b34.patch"; sha256 = "1rz5zrfwhpn9g49wrzzrmdglj78pbvpnw8ksgsw6bxq8l5d84jfr"; }) + + # Show warning instead of error when encountering unknown attribute in config. + # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/111 + (fetchpatch { + url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/409b37c62780728755c908991c912a6b16f2389c.patch"; + sha256 = "zJFh37QErSAINPGFkFVJyhYRP27BuIN7PIgoDl/PIwI="; + }) ]; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config @@ -93,6 +80,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ + "--sysconfdir=/etc" "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ "--disable-docs" @@ -106,32 +94,22 @@ stdenv.mkDerivation rec { doCheck = true; - # Don't try to write to /var/cache/fontconfig at install time. - installFlags = [ "fc_cachedir=$(TMPDIR)/dummy" "RUN_FC_CACHE_TEST=false" ]; + installFlags = [ + # Don't try to write to /var/cache/fontconfig at install time. + "fc_cachedir=$(TMPDIR)/dummy" + "RUN_FC_CACHE_TEST=false" + "sysconfdir=${placeholder "out"}/etc" + ]; postInstall = '' cd "$out/etc/fonts" xsltproc --stringparam fontDirectories "${dejavu_fonts.minimal}" \ - --stringparam fontconfig "$out" \ - --stringparam fontconfigConfigVersion "${configVersion}" \ --path $out/share/xml/fontconfig \ ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ > fonts.conf.tmp mv fonts.conf.tmp $out/etc/fonts/fonts.conf - - # Make it easier to remove user config in NixOS module. - mkdir -p $out/etc/fonts/conf.d.bak - mv $out/etc/fonts/conf.d/50-user.conf $out/etc/fonts/conf.d.bak - - # update latest 51-local.conf path to look at the latest local.conf - substituteInPlace $out/etc/fonts/conf.d/51-local.conf \ - --replace local.conf /etc/fonts/${configVersion}/local.conf ''; - passthru = { - inherit configVersion; - }; - meta = with stdenv.lib; { description = "A library for font customization and configuration"; homepage = "http://fontconfig.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index f1a2e865bb..47884b9c3b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -16,7 +16,7 @@ runCommand "fc-cache" cat > fonts.conf << EOF - + ${fontconfig.out}/etc/fonts/fonts.conf $out diff --git a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index b18d72e0a2..493f662d0c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -9,8 +9,6 @@ runCommand "fonts.conf" } '' xsltproc --stringparam fontDirectories "$fontDirectories" \ - --stringparam fontconfig "${fontconfig.out}" \ - --stringparam fontconfigConfigVersion "${fontconfig.configVersion}" \ --path ${fontconfig.out}/share/xml/fontconfig \ ${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \ > $out diff --git a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index 6ec2e7ab51..ed51b62a1d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/third_party/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -12,11 +12,9 @@ extension-element-prefixes="str" > - + - - @@ -28,11 +26,8 @@ /var/cache/fontconfig - - /etc/fonts//conf.d - - - /etc/fonts/conf.d + + /etc/fonts/conf.d fonts diff --git a/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix b/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix index 7167112b6b..675d994cf0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/g2o/default.nix @@ -27,16 +27,13 @@ mkDerivation rec { # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" - ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { - default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; - westmere = [ "-DDISABLE_SSE4_A=ON" ]; - sandybridge = [ "-DDISABLE_SSE4_A=ON" ]; - ivybridge = [ "-DDISABLE_SSE4_A=ON" ]; - haswell = [ "-DDISABLE_SSE4_A=ON" ]; - broadwell = [ "-DDISABLE_SSE4_A=ON" ]; - skylake = [ "-DDISABLE_SSE4_A=ON" ]; - skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); + ] ++ lib.optionals stdenv.isx86_64 [ + "-DDO_SSE_AUTODETECT=OFF" + "-DDISABLE_SSE3=${ if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}" + "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}" + "-DDISABLE_SSE4_2=${if stdenv.hostPlatform.sse4_2Support then "OFF" else "ON"}" + "-DDISABLE_SSE4_A=${if stdenv.hostPlatform.sse4_aSupport then "OFF" else "ON"}" + ]; meta = with lib; { description = "A General Framework for Graph Optimization"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index 7f3e796bbf..72135f1a62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.0.4"; + # broken with poppler 20.08, however, can't fetch patches cleanly + version = "3.1.2.post2020-08-26"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; - rev = "v${version}"; - sha256 = "00a7q9wv8s1bmdhqxvixkq2afr8aibg3pkc76gg50r8lavf6j84c"; + rev = "9a8df672204a8b3b33c36e09a32f747e21166fe9"; + sha256 = "1n25jma4x1l7slwxk702q77r84vxr90fyn4c3zpkr07q1b8wqql9"; }; sourceRoot = "source/gdal"; @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { "--with-proj=${proj.dev}" # optional "--with-geos=${geos}/bin/geos-config" # optional "--with-hdf4=${hdf4.dev}" # optional - "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional + "--with-xml2=yes" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix index 169506e66c..daca5fc0bd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0sdqv4j1jjjc2nxnd9h7r4w66bdjl5ksvfia4i4cjj7jfl0hhynl"; + sha256 = "0c44qhhrknjl7sp94q34z7nv7bvnlqs8wzm385661liy4mnfn4dc"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix b/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix index fdaf518c61..78b6b08827 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -17,17 +17,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ]; # On darwin, tests are linked to dylib in the nix store, so we need to make # sure tests run after installPhase. diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index f7b0667741..88848deec4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -16,9 +16,6 @@ with stdenv.lib; assert stdenv.isLinux -> utillinuxMinimal != null; # TODO: -# * Add gio-module-fam -# Problem: cyclic dependency on gamin -# Possible solution: build as a standalone module, set env. vars # * Make it build without python # Problem: an example (test?) program needs it. # Possible solution: disable compilation of this example somehow @@ -48,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.64.4"; + version = "2.64.5"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0l6fggcgdnjif9kzy4crq7520f43bbrgzxz0c821ya3jn8jv7q7p"; + sha256 = "04fczq693wivkqd2qxvvi3sncqgznsvzfiiwsll1rbayf795pgcw"; }; patches = optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix index dff122d38d..53e924b132 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gnum4 ]; + nativeBuildInputs = [ + pkgconfig + gnum4 + glib # for glib-compile-schemas + ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix index 308a4db280..46b40d00d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.47"; + version = "0.10.48"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215"; + sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix index 09bf922248..4eef2d407d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: +{ mkDerivation, lib, fetchurl, qtbase, qtscript, cmake }: mkDerivation rec { pname = "grantlee"; @@ -14,7 +14,10 @@ mkDerivation rec { buildInputs = [ qtbase qtscript ]; nativeBuildInputs = [ cmake ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./grantlee-nix-profiles.patch + ./grantlee-no-canonicalize-filepath.patch + ]; outputs = [ "out" "dev" ]; postFixup = diff --git a/third_party/nixpkgs/pkgs/development/libraries/grantlee/5/series b/third_party/nixpkgs/pkgs/development/libraries/grantlee/5/series deleted file mode 100644 index 9c4015a1c1..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/grantlee/5/series +++ /dev/null @@ -1,2 +0,0 @@ -grantlee-nix-profiles.patch -grantlee-no-canonicalize-filepath.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index b0fe149b6f..b5d4db8b41 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.31.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.32.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1h7gmhkjijfkpqhz8vswhkz2gkphs638g10dlkayic8xg9xdl4gj"; + sha256 = "0v48h0j0gxcp9s63z1ibwgz4416qd6iq728la80y6gl8rklrqf0c"; fetchSubmodules = true; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index 94d71760a7..e7e11db612 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -23,7 +23,7 @@ rec { inherit gst-plugins-base gstreamer gst-plugins-bad; }; - gst-validate = callPackage ./validate { inherit gst-plugins-base; }; + gst-validate = callPackage ./validate { inherit gstreamer gst-plugins-base; }; # note: gst-python is in ./python/default.nix - called under pythonPackages } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix deleted file mode 100644 index 804d80b8e1..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gst-plugins-base, gstreamer }: - -stdenv.mkDerivation rec { - name = "gnonlin-0.10.17"; - - src = fetchurl { - urls = [ - "https://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gst-plugins-base gstreamer ]; - - meta = { - homepage = "https://gstreamer.freedesktop.org/modules/gnonlin.html"; - description = "Gstreamer Non-Linear Multimedia Editing Plugins"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix deleted file mode 100644 index cd37a51318..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libdvdnav, libdvdread, orc }: - -stdenv.mkDerivation rec { - name = "gst-plugins-bad-0.10.23"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-plugins-bad/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "148lw51dm6pgw8vc6v0fpvm7p233wr11nspdzmvq7bjp2cd7vbhf"; - }; - - postInstall = '' - # Fixes CVE-2016-9447 - # Does not actually impact NSF playback - rm -v $out/lib/gstreamer-0.10/libgstnsf.so - ''; - - buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base libdvdnav libdvdread orc ]; - - enableParallelBuilding = true; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "‘Bad’ (potentially low quality) plug-ins for GStreamer"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - - license = stdenv.lib.licenses.lgpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix deleted file mode 100644 index a19e8ca6a5..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia -, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc -, libintl -, ApplicationServices -, # Whether to build no plugins that have external dependencies - # (except the ALSA plugin). - minimalDeps ? false -}: - -stdenv.mkDerivation rec { - name = "gst-plugins-base-0.10.36"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz" - "mirror://gentoo/distfiles/${name}.tar.xz" - ]; - sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z"; - }; - - patches = [ - ./gcc-4.9.patch - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/f672277509705c4034bc92a141eefee4524d15aa.patch"; - name = "CVE-2019-9928.patch"; - sha256 = "1dlamsmyr7chrb6vqqmwikqvvqcx5l7k72p98448qm6k59ndnimc"; - }) - ]; - - postPatch = '' - sed -i 's@/bin/echo@echo@g' configure - sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in - ''; - - outputs = [ "out" "dev" ]; - - # TODO : v4l, libvisual - buildInputs = - [ pkgconfig glib cairo orc libintl ] - # can't build alsaLib on darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib - ++ stdenv.lib.optionals (!minimalDeps) - [ xorg.xlibsWrapper xorg.libXv libogg libtheora libvorbis freetype pango - liboil ] - # can't build cdparanoia on darwin - ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia - ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; - - propagatedBuildInputs = [ gstreamer ]; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = with stdenv.lib; { - homepage = "https://gstreamer.freedesktop.org"; - description = "Base plug-ins for GStreamer"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - # https://github.com/NixOS/nixpkgs/pull/91090#issuecomment-653753497 - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch deleted file mode 100644 index fd9f6ea240..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=670690 - -From 9bd5a7ae5435469c3557a3d70e762791cb3dc5c7 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Mon, 20 Jan 2014 15:44:09 +0100 -Subject: [PATCH] audioresample: fix build on BSD - -On i386, EMMINTRIN is defined but not usable without sse so check for -__SSE__ and __SSE2__ as well. - -https://bugzilla.gnome.org/show_bug.cgi?id=670690 ---- - gst/audioresample/resample.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c -index 98d006c..481fa01 100644 ---- a/gst/audioresample/resample.c -+++ b/gst/audioresample/resample.c -@@ -77,13 +77,13 @@ - #define EXPORT G_GNUC_INTERNAL - - #ifdef _USE_SSE --#ifndef HAVE_XMMINTRIN_H -+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE - #endif - #endif - - #ifdef _USE_SSE2 --#ifndef HAVE_EMMINTRIN_H -+#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE2 - #endif - #endif --- -1.8.5.3 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix deleted file mode 100644 index 225bcc7e26..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo -, flac, libjpeg, speex, libpng, libdv, libcaca, libvpx -, taglib, libpulseaudio, gdk-pixbuf, orc -, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl -, # Whether to build no plugins that have external dependencies - # (except the PulseAudio plugin). - minimalDeps ? false -}: - -stdenv.mkDerivation rec { - name = "gst-plugins-good-0.10.31"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "1ijswgcrdp243mfsyza31fpzq6plz40p4b83vkr2x4x7807889vy"; - }; - - patches = [ ./v4l.patch ./linux-headers-3.9.patch ]; - - configureFlags = [ "--enable-experimental" "--disable-oss" ]; - - buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base libintl ] - ++ lib.optional stdenv.isLinux libpulseaudio - ++ lib.optionals (!minimalDeps) - [ aalib libcaca cairo libdv flac libjpeg libpng speex - taglib bzip2 libvpx gdk-pixbuf orc libsoup libshout ]; - - enableParallelBuilding = true; - - postInstall = lib.optionalString (!minimalDeps) '' - substituteInPlace $out/lib/gstreamer-0.10/libgstaasink.la \ - --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" - ''; - - # fails 1 out of 65 tests with "Could not read TLS certificate from '../../tests/files/test-cert.pem': TLS support is not available" - doCheck = false; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "`Good' plug-ins for GStreamer"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - - license = stdenv.lib.licenses.lgpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch deleted file mode 100644 index f13d3a1667..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/linux-headers-3.9.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-v4l2/files/gst-plugins-v4l2-0.10.31-linux-headers-3.9.patch - -From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 18 Mar 2013 14:59:35 +0000 -Subject: v4l2: fix compilation against newer kernel headers as on FC19 - ---- -diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c -index 07d390a..4c10f4f 100644 ---- a/sys/v4l2/v4l2_calls.c -+++ b/sys/v4l2/v4l2_calls.c -@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) - break; - case V4L2_CID_HFLIP: - case V4L2_CID_VFLIP: -+#ifndef V4L2_CID_PAN_RESET - case V4L2_CID_HCENTER: -+#endif -+#ifndef V4L2_CID_TILT_RESET - case V4L2_CID_VCENTER: -+#endif - #ifdef V4L2_CID_PAN_RESET - case V4L2_CID_PAN_RESET: - #endif --- -cgit v0.9.0.2-2-gbebe diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch deleted file mode 100644 index 22cff57413..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru -x '*~' gst-plugins-good-0.10.31-orig/sys/v4l2/gstv4l2bufferpool.c gst-plugins-good-0.10.31/sys/v4l2/gstv4l2bufferpool.c ---- gst-plugins-good-0.10.31-orig/sys/v4l2/gstv4l2bufferpool.c 2011-12-30 14:59:13.000000000 +0100 -+++ gst-plugins-good-0.10.31/sys/v4l2/gstv4l2bufferpool.c 2013-01-28 17:41:25.549523708 +0100 -@@ -181,7 +181,6 @@ - GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", - ret->vbuffer.m.offset); - GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); -- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); - - data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, - PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd, diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix deleted file mode 100644 index 5321fc379c..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libmad, libdvdread, a52dec, x264, orc, lame, libintl }: - -stdenv.mkDerivation rec { - name = "gst-plugins-ugly-0.10.19"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "1w4d5iz9ffvh43l261zdp997i6s2iwd61lflf755s3sw4xch1a8w"; - }; - - buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame libintl ]; - - enableParallelBuilding = true; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - - license = stdenv.lib.licenses.lgpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix deleted file mode 100644 index 4c56039bd0..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, python2Packages, gstreamer, gst-plugins-base -}: - -let - inherit (python2Packages) python pygobject2; -in stdenv.mkDerivation rec { - name = "gst-python-0.10.22"; - - src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-python/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "0y1i4n5m1diljqr9dsq12anwazrhbs70jziich47gkdwllcza9lg"; - }; - - hardeningDisable = [ "bindnow" ]; - - # Need to disable the testFake test case due to bug in pygobject. - # See https://bugzilla.gnome.org/show_bug.cgi?id=692479 - patches = [ ./disable-testFake.patch ]; - - buildInputs = - [ pkgconfig gst-plugins-base pygobject2 ] - ; - - propagatedBuildInputs = [ gstreamer python ]; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "Python bindings for GStreamer"; - - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch deleted file mode 100644 index d0c9960e5d..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Nurp gst-python-0.10.22.orig/testsuite/test_bin.py gst-python-0.10.22/testsuite/test_bin.py ---- gst-python-0.10.22.orig/testsuite/test_bin.py 2014-10-29 18:58:00.921827721 +0100 -+++ gst-python-0.10.22/testsuite/test_bin.py 2014-10-29 19:00:32.019353092 +0100 -@@ -131,52 +131,6 @@ class BinAddRemove(TestCase): - self.assertRaises(gst.AddError, self.bin.add, src, sink) - self.bin.remove(src, sink) - self.assertRaises(gst.RemoveError, self.bin.remove, src, sink) -- --class Preroll(TestCase): -- def setUp(self): -- TestCase.setUp(self) -- self.bin = gst.Bin('bin') -- -- def tearDown(self): -- # FIXME: wait for state change thread to settle down -- while self.bin.__gstrefcount__ > 1: -- time.sleep(0.1) -- self.assertEquals(self.bin.__gstrefcount__, 1) -- del self.bin -- TestCase.tearDown(self) -- -- def testFake(self): -- src = gst.element_factory_make('fakesrc') -- sink = gst.element_factory_make('fakesink') -- self.bin.add(src) -- -- # bin will go to paused, src pad task will start and error out -- self.bin.set_state(gst.STATE_PAUSED) -- ret = self.bin.get_state() -- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS) -- self.assertEquals(ret[1], gst.STATE_PAUSED) -- self.assertEquals(ret[2], gst.STATE_VOID_PENDING) -- -- # adding the sink will cause the bin to go in preroll mode -- gst.debug('adding sink and setting to PAUSED, should cause preroll') -- self.bin.add(sink) -- sink.set_state(gst.STATE_PAUSED) -- ret = self.bin.get_state(timeout=0) -- self.assertEquals(ret[0], gst.STATE_CHANGE_ASYNC) -- self.assertEquals(ret[1], gst.STATE_PAUSED) -- self.assertEquals(ret[2], gst.STATE_PAUSED) -- -- # to actually complete preroll, we need to link and re-enable fakesrc -- src.set_state(gst.STATE_READY) -- src.link(sink) -- src.set_state(gst.STATE_PAUSED) -- ret = self.bin.get_state() -- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS) -- self.assertEquals(ret[1], gst.STATE_PAUSED) -- self.assertEquals(ret[2], gst.STATE_VOID_PENDING) -- -- self.bin.set_state(gst.STATE_NULL) -- self.bin.get_state() - - class ConstructorTest(TestCase): - def testGood(self): diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch deleted file mode 100644 index 67dfc34434..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/gst/gstdatetime.c b/gst/gstdatetime.c -index 60f709f..cdc7e75 100644 ---- a/gst/gstdatetime.c -+++ b/gst/gstdatetime.c -@@ -21,8 +21,8 @@ - #include "config.h" - #endif - --#include "glib-compat-private.h" - #include "gst_private.h" -+#include "glib-compat-private.h" - #include "gstdatetime.h" - #include - #include diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix deleted file mode 100644 index b78f6148e4..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ fetchurl, fetchpatch, stdenv, autoreconfHook -, perl, bison, flex, pkgconfig, glib, libxml2, libintl, libunwind -}: - -stdenv.mkDerivation rec { - name = "gstreamer-0.10.36"; - - src = fetchurl { - urls = - [ "${meta.homepage}/src/gstreamer/${name}.tar.xz" - "mirror://gentoo/distfiles/${name}.tar.xz" - ]; - sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison glib ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin libunwind; - propagatedBuildInputs = [ glib libxml2 ]; - - patches = [ - (fetchpatch { - url = "https://github.com/flathub/com.xnview.XnRetro/raw/fec03bbe240f45aa10d7d4eea9d6f066d9b6ac9c/gstreamer-0.10.36-bison3.patch"; - sha256 = "05aarg3yzl5jx3z5838ixv392g0r3kbsi2vfqniaxmidhnfzij2y"; - }) - (fetchpatch { - url = "https://github.com/GStreamer/common/commit/03a0e5736761a72d4ed880e8c485bbf9e4a8ea47.patch"; - sha256 = "0rin3x01yy78ky3smmhbwlph18hhym18q4x9w6ddiqajg5lk4xhm"; - extraPrefix = "common/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://github.com/GStreamer/common/commit/8aadeaaa8a948d7ce62008789ab03e9aa514c2b9.patch"; - sha256 = "0n2mqvq2al7jr2hflhz4l781i3jya5a9i725jvy508ambpgycz3x"; - extraPrefix = "common/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://github.com/GStreamer/common/commit/7bb2bcecda471a0d514a964365a78150f3ee5747.patch"; - sha256 = "0famdj70m7wjvr1dpy7iywhrkqxmrshxz0rizz1bixgp42dvkhbq"; - extraPrefix = "common/"; - stripLen = 1; - }) - ] ++ - # See https://trac.macports.org/ticket/40783 for explanation of patch - stdenv.lib.optional stdenv.isDarwin ./darwin.patch; - - postPatch = '' - sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in - ''; - - configureFlags = [ - "--disable-examples" - "--localstatedir=/var" - "--disable-gtk-doc" - "--disable-docbook" - ]; - - doCheck = false; # fails. 2 tests crash - - postInstall = '' - # Hm, apparently --disable-gtk-doc is ignored... - rm -rf $out/share/gtk-doc - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "https://gstreamer.freedesktop.org"; - - description = "Library for constructing graphs of media-handling components"; - - longDescription = '' - GStreamer is a library for constructing graphs of media-handling - components. The applications it supports range from simple - Ogg/Vorbis playback, audio/video streaming to complex audio - (mixing) and video (non-linear editing) processing. - - Applications can take advantage of advances in codec and filter - technology transparently. Developers can add new codecs and - filters by writing a simple plugin with a clean, generic - interface. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh deleted file mode 100644 index 636e20b732..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addGstreamerLibPath () { - if test -d "$1/lib/gstreamer-0.10" - then - export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH-}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10" - fi -} - -addEnvHooks "$hostOffset" addGstreamerLibPath diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix deleted file mode 100644 index 24197b04b7..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, glibmm, gstreamer, gst-plugins-base, libsigcxx, libxmlxx, pkgconfig }: - -let - ver_maj = "0.10"; - ver_min = "11"; -in -stdenv.mkDerivation { - name = "gstreamermm-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/gstreamermm/${ver_maj}/gstreamermm-${ver_maj}.${ver_min}.tar.xz"; - sha256 = "12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6"; - }; - - doCheck = false; # Tests require pulseaudio in /homeless-shelter - - propagatedBuildInputs = [ - glibmm gstreamer gst-plugins-base libsigcxx libxmlxx - ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = with stdenv.lib; { - description = "C++ bindings for the GStreamer streaming multimedia library"; - homepage = "https://www.gtkmm.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ plcplc ]; - platforms = platforms.unix; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index dfb18754c8..92e8a45a4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + # To use split outputs, we need this so double prefix won't be used in the + # pkg-config files. Hopefully, this won't be needed on the next release, + # _if_ + # https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/merge_requests/1 + # will be merged. For the current release, this merge request won't apply. + ./fix_pkgconfig_includedir.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch new file mode 100644 index 0000000000..d31fe19fb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +diff --git i/pkgconfig/meson.build w/pkgconfig/meson.build +index 8ed8299..594cbfe 100644 +--- i/pkgconfig/meson.build ++++ w/pkgconfig/meson.build +@@ -2,8 +2,8 @@ pkgconf = configuration_data() + + pkgconf.set('prefix', get_option('prefix')) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) ++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) + pkgconf.set('GST_API_VERSION', api_version) + pkgconf.set('VERSION', gst_version) + diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index c00e8035f1..14f822432e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -2,7 +2,10 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 , wayland , gtk3 , gobject-introspection @@ -10,30 +13,39 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.1.0"; + version = "0.2.0"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8"; + sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg"; }; nativeBuildInputs = [ - meson ninja pkgconfig + meson + ninja + pkg-config + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ - wayland gtk3 gobject-introspection + wayland + gtk3 ]; mesonFlags = [ - "-Dout=${placeholder "out"}" + "-Ddocs=true" ]; meta = with stdenv.lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; - license = licenses.mit; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ eonpatapon ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index d27021280a..8110f13d14 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -1,28 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl +{ stdenv, fetchFromGitHub, pkgconfig, glib, freetype, cairo, libintl +, meson, ninja , gobject-introspection , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , ApplicationServices, CoreText , withCoreText ? false , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it -, python +, python3 +, gtk-doc, docbook-xsl-nons, docbook_xml_dtd_43 }: let - version = "2.6.7"; + version = "2.7.1"; inherit (stdenv.lib) optional optionals optionalString; + mesonFeatureFlag = opt: b: + "-D${opt}=${if b then "enabled" else "disabled"}"; in stdenv.mkDerivation { name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; - src = fetchurl { - url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz"; - sha256 = "065jg6s8xix45s4msj0l2r0iycw5yyyjdylripv7pyfzdk883r29"; + src = fetchFromGitHub { + owner = "harfbuzz"; + repo = "harfbuzz"; + rev = version; + sha256 = "172jmwp666xbs6yy1pc2495gnkz8xw11b8zkz3j19jxlvvp4mxcs"; }; postPatch = '' - patchShebangs src/gen-def.py + patchShebangs src/*.py patchShebangs test '' + stdenv.lib.optionalString stdenv.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. @@ -30,22 +36,25 @@ stdenv.mkDerivation { --replace '#pragma GCC diagnostic error "-Wcast-align"' "" ''; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - configureFlags = [ - # not auto-detected by default - "--with-graphite2=${if withGraphite2 then "yes" else "no"}" - "--with-icu=${if withIcu then "yes" else "no"}" - "--with-gobject=yes" - "--enable-introspection=yes" - ] - ++ stdenv.lib.optional withCoreText "--with-coretext=yes"; + mesonFlags = [ + (mesonFeatureFlag "graphite" withGraphite2) + (mesonFeatureFlag "icu" withIcu) + (mesonFeatureFlag "coretext" withCoreText) + ]; nativeBuildInputs = [ + meson + ninja gobject-introspection libintl pkgconfig + python3 + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ glib freetype cairo ] # recommended by upstream @@ -55,11 +64,10 @@ stdenv.mkDerivation { ++ optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ]; - checkInputs = [ python ]; - doInstallCheck = false; # fails, probably a bug + doCheck = true; # Slightly hacky; some pkgs expect them in a single directory. - postInstall = optionalString withIcu '' + postFixup = optionalString withIcu '' rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc" ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.la ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc @@ -71,12 +79,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OpenType text shaping engine"; - homepage = "http://www.freedesktop.org/wiki/Software/HarfBuzz"; - downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/"; + homepage = "https://harfbuzz.github.io/"; maintainers = [ maintainers.eelco ]; license = licenses.mit; platforms = with platforms; linux ++ darwin; - inherit version; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix index d3433246b7..8dc0df3a9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix @@ -1,11 +1,11 @@ -{ stdenv, qt5, unzip, fetchFromGitHub, qtmultimedia }: +{ stdenv, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: stdenv.mkDerivation rec { version = "2.1.0"; pname = "herqq"; - nativeBuildInputs = [ qt5.qmake ]; - buildInputs = [ qt5.qtbase unzip qtmultimedia ]; + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase unzip qtmultimedia ]; preConfigure = "cd herqq"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/libraries/hiredis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hiredis/default.nix index 4055cb8eb7..2f7fe18484 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hiredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "0.14.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "1r93ssniiv610pj6d78i1cngism0cdv2k8cmzy7jf9klf76jiwfq"; + sha256 = "01xnynm9d56a0alb5wxbfayakybm5pnr12icj9mqkn4xxihbnbgr"; }; PREFIX = "\${out}"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix index 3ced1c121c..b6d6b68875 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "0yjsrb11hlfwbiw0xi71ami9nrvz6jwj160h9qgl50icd79ngn46"; + sha256 = "10hgjavhvn33y3k5j3l1326x13bxffghg2arxjrh7i7zd3qprfv5"; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/cross.patch b/third_party/nixpkgs/pkgs/development/libraries/ilmbase/cross.patch deleted file mode 100644 index 207a440a0d..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/cross.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Helmut Grohne <> -Subject: compile build tools with the build architecture compiler - -Patch-Source: https://github.com/openexr/openexr/issues/221 - -Index: ilmbase-2.2.0/configure.ac -=================================================================== ---- ilmbase-2.2.0.orig/configure.ac -+++ ilmbase-2.2.0/configure.ac -@@ -28,6 +28,7 @@ - AC_PROG_LN_S - AC_PROG_LIBTOOL - AC_PROG_MAKE_SET -+AX_PROG_CXX_FOR_BUILD - - dnl - dnl PKGCONFIG preparations -Index: ilmbase-2.2.0/Half/Makefile.am -=================================================================== ---- ilmbase-2.2.0.orig/Half/Makefile.am -+++ ilmbase-2.2.0/Half/Makefile.am -@@ -17,9 +17,11 @@ - - CLEANFILES = eLut eLut.h toFloat toFloat.h - --eLut_SOURCES = eLut.cpp -+eLut$(EXEEXT): eLut.cpp -+ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ - --toFloat_SOURCES = toFloat.cpp -+toFloat$(EXEEXT): toFloat.cpp -+ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ - - eLut.h: eLut - ./eLut > eLut.h diff --git a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix index ac78257b74..68bd677cf7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ilmbase/default.nix @@ -2,7 +2,6 @@ , lib , buildPackages , cmake -, libtool , openexr }: @@ -12,26 +11,23 @@ stdenv.mkDerivation rec { # the project no longer provides separate tarballs. We may even want to merge # the ilmbase package into openexr in the future. - src = openexr.src; - - sourceRoot = "source/IlmBase"; + inherit (openexr) src patches; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake libtool ]; + nativeBuildInputs = [ cmake ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - patches = [ - ./cross.patch - ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "glibc") [ - openexr.non_glibc_fpstate_patch # see description of this patch in `openexr` - ]; - # fails 1 out of 1 tests with # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" # at least on i686. spooky! doCheck = stdenv.isx86_64; + preConfigure = '' + # Need to cd after patches for openexr patches to apply. + cd IlmBase + ''; + meta = with stdenv.lib; { description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; homepage = "https://www.openexr.com/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix index 36b1063531..458b3d29d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "0v8n3dswx7rxqfd0q03xwc7j2w1mv8lv18rdxv487a1xw5vklfad"; + sha256 = "0zdk4afdrrr1539f2q15zja19j4wwfmpswzws2ffgflcnhywlxhr"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index c1e2fa5a6f..89305baaee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.2.3"; + version = "20.2.5"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "1gsjcsad70pxafhw0jhxdrnfqwv8ffp5sawbgylvc009jlzxh5l8"; + sha256 = "0jg3kc74iqmbclx77a6dp4h85va8wi210x4zf5jypiq35c57r8hh"; }; nativeBuildInputs = [ cmake ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { license = licenses.mit; description = "Intel Graphics Memory Management Library"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ danieldk ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix index 84dedfa0b3..1288242faf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/itk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "itk"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl"; + sha256 = "1z7rmqrhgl7hfb3d0077kvp8vpi05r2zk3qyqzmv7bzbal5sqqhv"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix deleted file mode 100644 index cd7b1cf4fd..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }: - -stdenv.mkDerivation rec { - pname = "jasper"; - version = "2.0.16"; - - src = fetchFromGitHub { - repo = "jasper"; - owner = "mdadams"; - rev = "version-${version}"; - sha256 = "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2018-9055.patch"; - url = "http://paste.opensuse.org/view/raw/330751ce"; - sha256 = "0m798m6c4v9yyhql7x684j5kppcm6884n1rrb9ljz8p9aqq2jqnm"; - }) - ]; - - - # newer reconf to recognize a multiout flag - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ libjpeg ]; - - configureFlags = [ "--enable-shared" ]; - - outputs = [ "bin" "dev" "out" "man" ]; - - enableParallelBuilding = true; - - doCheck = false; # fails - - postInstall = '' - moveToOutput bin "$bin" - ''; - - meta = with stdenv.lib; { - homepage = "https://www.ece.uvic.ca/~frodo/jasper/"; - description = "JPEG2000 Library"; - platforms = platforms.unix; - license = licenses.jasper; - maintainers = with maintainers; [ pSub ]; - knownVulnerabilities = [ - "Numerous CVE unsolved upstream" - "See: https://github.com/NixOS/nixpkgs/pull/57681#issuecomment-475857499" - "See: https://github.com/mdadams/jasper/issues/208" - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix index 5e57415165..0133138b47 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, gettext, jdk, libmatthew_java}: +{stdenv, fetchurl, gettext, jdk8, libmatthew_java}: +let jdk = jdk8; in stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix index d9139ec1d8..88f32866b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.5.0"; + version = "2.5.1"; underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "0s64w7qq5vayrzcmdhrdfmd6iqqv6x6fpiq9lpy2gva3dckv3q6j"; + sha256 = "0yd9px85y036bp3q1assj3fgaykxrwnhnc7cbjgic39cykfy5hrg"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index f48c4821d9..5928d99b6c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.18.10"; + name = "lombok-1.18.12"; src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "1ymjwxg01dq8qq89hx23yvk5h46hwfb8ihbqbvabmz1vh9afjdi8"; + sha256 = "01jl6i5wzjxyk36fcq6ji90x9h143gvnwhv86cbkqaxhxh41af29"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix index 22d38a080c..a6eb564239 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patchShebangs test_jbig2dec.py ''; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; checkInputs = [ python3 ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix index e119c75ff8..f0f5b9d779 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w"; }; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace '-shared' '-dynamiclib -undefined dynamic_lookup' \ + --replace '.so' '.dylib' + ''; + nativeBuildInputs = [ python ]; makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ]; @@ -21,7 +27,7 @@ stdenv.mkDerivation rec { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix index 9ac3ed11b4..02e25692ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix @@ -112,6 +112,7 @@ let kitemmodels = callPackage ./kitemmodels.nix {}; kitemviews = callPackage ./kitemviews.nix {}; kplotting = callPackage ./kplotting.nix {}; + kquickcharts = callPackage ./kquickcharts.nix {}; kwayland = callPackage ./kwayland.nix {}; kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; kwindowsystem = callPackage ./kwindowsystem {}; @@ -146,10 +147,11 @@ let kbookmarks = callPackage ./kbookmarks.nix {}; kcmutils = callPackage ./kcmutils {}; kconfigwidgets = callPackage ./kconfigwidgets {}; + kdav = callPackage ./kdav.nix {}; kdeclarative = callPackage ./kdeclarative.nix {}; kded = callPackage ./kded.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdesu = callPackage ./kdesu.nix {}; + kdesu = callPackage ./kdesu {}; kdewebkit = callPackage ./kdewebkit.nix {}; kemoticons = callPackage ./kemoticons.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 3a3f066ad3..645d05afc2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,9 +1,11 @@ -{ mkDerivation, lib, copyPathsToStore, cmake, pkgconfig }: +{ mkDerivation, lib, cmake, pkgconfig }: mkDerivation { name = "extra-cmake-modules"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./nix-lib-path.patch + ]; outputs = [ "out" ]; # this package has no runtime components diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series deleted file mode 100644 index b4569e50a5..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series +++ /dev/null @@ -1 +0,0 @@ -nix-lib-path.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index 81a755bd3b..839b2eb466 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(https://download.kde.org/stable/frameworks/5.71/) +WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/) diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix index c94c8b91ec..0a513d6eed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, propagate, + mkDerivation, lib, propagate, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }: @@ -9,7 +9,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ polkit-qt qttools ]; propagatedBuildInputs = [ kcoreaddons ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./cmake-install-paths.patch + ]; # library stores reference to plugin path, # separating $out from $bin would create a reference cycle outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/series deleted file mode 100644 index d2689425c3..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/series +++ /dev/null @@ -1 +0,0 @@ -cmake-install-paths.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index 29689c789d..ab14529be0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews, kpackage, kservice, kxmlgui, qtdeclarative, diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdav.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdav.nix similarity index 83% rename from third_party/nixpkgs/pkgs/applications/kde/kdav.nix rename to third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdav.nix index 800c92511d..a03cca3fdf 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdav.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdav.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcoreaddons, kio, qtxmlpatterns, }: @@ -8,7 +8,6 @@ mkDerivation { name = "kdav"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons kio qtxmlpatterns ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 7e3de9d4d1..5eced88328 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, docbook_xml_dtd_45, extra-cmake-modules, kdoctools, kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons, @@ -11,7 +11,9 @@ mkDerivation { name = "kdelibs4support"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./nix-kde-include-dir.patch + ]; setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedNativeBuildInputs = [ kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/series deleted file mode 100644 index 9b08ab2087..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdelibs4support/series +++ /dev/null @@ -1 +0,0 @@ -nix-kde-include-dir.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu.nix rename to third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix index df60511b51..cd7055c4ea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/default.nix @@ -11,4 +11,5 @@ mkDerivation { buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ]; propagatedBuildInputs = [ kpty ]; outputs = [ "out" "dev" ]; + patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch new file mode 100644 index 0000000000..f82bf828e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -0,0 +1,38 @@ +From 01af4d2a098e5819c09bca37568941dcd4b89d0b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= +Date: Thu, 16 Jul 2020 13:21:42 -0300 +Subject: [PATCH] Search for the daemon first in /run/wrappers/bin + +If looking first in libexec, the eventually wrapped one in +/run/wrappers/bin can not be found. +--- + src/client.cpp | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/src/client.cpp b/src/client.cpp +index 44fbacd..6b5abf5 100644 +--- a/src/client.cpp ++++ b/src/client.cpp +@@ -378,11 +378,14 @@ int KDEsuClient::stopServer() + + static QString findDaemon() + { +- QString daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); +- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH +- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); +- if (daemon.isEmpty()) { +- qCWarning(KSU_LOG) << "kdesud daemon not found."; ++ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); ++ if (!QFile::exists(daemon)) { // if not in wrappers ++ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); ++ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH ++ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); ++ if (daemon.isEmpty()) { ++ qCWarning(KSU_LOG) << "kdesud daemon not found."; ++ } + } + } + return daemon; +-- +2.27.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 90a7116f42..47831f0f5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib }: @@ -12,5 +12,7 @@ mkDerivation { attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia taglib ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./cmake-install-paths.patch + ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/series deleted file mode 100644 index d2689425c3..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/series +++ /dev/null @@ -1 +0,0 @@ -cmake-install-paths.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 8faac005f2..76bf0fd053 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, qtbase, qtsvg, qttools, @@ -8,7 +8,9 @@ mkDerivation { name = "kiconthemes"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./default-theme-breeze.patch + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/series deleted file mode 100644 index ab5cc8a3ed..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kiconthemes/series +++ /dev/null @@ -1 +0,0 @@ -default-theme-breeze.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 116f475e2f..654f6e2060 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, writeScript, + mkDerivation, lib, writeScript, extra-cmake-modules, kdoctools, kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/series deleted file mode 100644 index 9195a4e8e6..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/series +++ /dev/null @@ -1,3 +0,0 @@ -kinit-libpath.patch -start_kdeinit-path.patch -kdeinit-extra_libs.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix index fee21a6a92..434496c7b9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, qttools, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, @@ -21,5 +21,8 @@ mkDerivation { kxmlgui qtbase qttools solid ]; outputs = [ "out" "dev" ]; - patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)); + patches = [ + ./samba-search-path.patch + ./kio-debug-module-loader.patch + ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/series deleted file mode 100644 index 5330c40a33..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/series +++ /dev/null @@ -1,2 +0,0 @@ -samba-search-path.patch -kio-debug-module-loader.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 6779faa50c..6bd42420b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, kdoctools, karchive, kconfig, kcoreaddons, ki18n, qtbase, }: @@ -9,5 +9,8 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./allow-external-paths.patch + ./qdiriterator-follow-symlinks.patch + ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/series deleted file mode 100644 index 9b7f076efc..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kpackage/series +++ /dev/null @@ -1,2 +0,0 @@ -allow-external-paths.patch -qdiriterator-follow-symlinks.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kquickcharts.nix new file mode 100644 index 0000000000..5a06d4c1ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + qtquickcontrols2, +}: + +mkDerivation { + name = "kquickcharts"; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ qtquickcontrols2 ]; + outputs = [ "out" "dev" ]; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix index 7dd91ffb24..990c3c4fdf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -9,13 +9,6 @@ let self = mkDerivation { name = "krunner"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - # Un-deprecate virtual method to restore binary compatibility. - (assert !(lib.versionOlder "5.72" self.version); fetchpatch { - url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff"; - sha256 = "124xqxpgmc5fdn1mcf8x1564pqc5y81j7lhzcirql2xcs0sbcyby"; - }) - ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons ki18n kio kservice qtdeclarative solid diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 356e6537a4..630582ecf7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, qtbase, shared-mime-info, @@ -15,5 +15,8 @@ mkDerivation { ]; propagatedBuildInputs = [ kconfig kcoreaddons ]; propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./qdiriterator-follow-symlinks.patch + ./no-canonicalize-path.patch + ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/series deleted file mode 100644 index 3ce22dbd35..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/series +++ /dev/null @@ -1,2 +0,0 @@ -qdiriterator-follow-symlinks.patch -no-canonicalize-path.patch \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix index c19836ed7a..36e0ddc3f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, propagateBin, extra-cmake-modules, - qtbase, wayland, wayland-protocols + plasma-wayland-protocols, qtbase, wayland, wayland-protocols }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ wayland wayland-protocols ]; + buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; setupHook = propagateBin; # XDG_CONFIG_DIRS } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index c075adf029..1e77b63f7c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, extra-cmake-modules, libpthreadstubs, libXdmcp, qtbase, qttools, qtx11extras @@ -14,7 +14,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ + ./platform-plugins-path.patch + ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/series b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/series deleted file mode 100644 index 2cd02056ff..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/series +++ /dev/null @@ -1 +0,0 @@ -platform-plugins-path.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index 8ac9d33c8d..070b11f6bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,659 +4,667 @@ { attica = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/attica-5.71.0.tar.xz"; - sha256 = "9e24fd7f58c66879a05e056b781637196eea69d3276ed470643c505f9fd46d3d"; - name = "attica-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/attica-5.73.0.tar.xz"; + sha256 = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a"; + name = "attica-5.73.0.tar.xz"; }; }; baloo = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/baloo-5.71.0.tar.xz"; - sha256 = "23378213d00ecf1f26eeb417987984f5a63bbd643359403dfd20638cbc1ec84b"; - name = "baloo-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/baloo-5.73.0.tar.xz"; + sha256 = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe"; + name = "baloo-5.73.0.tar.xz"; }; }; bluez-qt = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/bluez-qt-5.71.0.tar.xz"; - sha256 = "7014e946f16db62218fe8e9af808999922d447034355f17b9e09b31321e53bad"; - name = "bluez-qt-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/bluez-qt-5.73.0.tar.xz"; + sha256 = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4"; + name = "bluez-qt-5.73.0.tar.xz"; }; }; breeze-icons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/breeze-icons-5.71.0.tar.xz"; - sha256 = "72217c46e071b204a80ff8064b1b7319c7a7f9f0b08e69d8add2065e5d301155"; - name = "breeze-icons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/breeze-icons-5.73.0.tar.xz"; + sha256 = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b"; + name = "breeze-icons-5.73.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/extra-cmake-modules-5.71.0.tar.xz"; - sha256 = "64f41c0b4b3164c7be8fcab5c0181253d97d1e9d62455fd540cb463afd051878"; - name = "extra-cmake-modules-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/extra-cmake-modules-5.73.0.tar.xz"; + sha256 = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4"; + name = "extra-cmake-modules-5.73.0.tar.xz"; }; }; frameworkintegration = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/frameworkintegration-5.71.0.tar.xz"; - sha256 = "f5ba2d5c363dcb09177424b82d9a59ce0f0a6b2dea372799dcba000452764961"; - name = "frameworkintegration-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/frameworkintegration-5.73.0.tar.xz"; + sha256 = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3"; + name = "frameworkintegration-5.73.0.tar.xz"; }; }; kactivities = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kactivities-5.71.0.tar.xz"; - sha256 = "b4e63fec6532e4bdc41470985cea46b0a88c1b2298b80286cbf0ed2d2139b66f"; - name = "kactivities-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kactivities-5.73.0.tar.xz"; + sha256 = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a"; + name = "kactivities-5.73.0.tar.xz"; }; }; kactivities-stats = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kactivities-stats-5.71.0.tar.xz"; - sha256 = "79fe4f674d7bae457ce6af0357104a8691f5822963b0ef1f99cd5a43e3666978"; - name = "kactivities-stats-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kactivities-stats-5.73.0.tar.xz"; + sha256 = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a"; + name = "kactivities-stats-5.73.0.tar.xz"; }; }; kapidox = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kapidox-5.71.0.tar.xz"; - sha256 = "da75660fc2808f38441ec0f59d3c58ce29fcfdcea29e251308a11a92546f1ed5"; - name = "kapidox-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kapidox-5.73.0.tar.xz"; + sha256 = "b49ff6673906817ed95a3de56535594de02a9f95bcb2726abe52d0c0e0161be5"; + name = "kapidox-5.73.0.tar.xz"; }; }; karchive = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/karchive-5.71.0.tar.xz"; - sha256 = "cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624"; - name = "karchive-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/karchive-5.73.0.tar.xz"; + sha256 = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f"; + name = "karchive-5.73.0.tar.xz"; }; }; kauth = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kauth-5.71.0.tar.xz"; - sha256 = "a0de83bd662e20253011216ab8cba597f8db7429f8706237e7307580125025b5"; - name = "kauth-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kauth-5.73.0.tar.xz"; + sha256 = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9"; + name = "kauth-5.73.0.tar.xz"; }; }; kbookmarks = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kbookmarks-5.71.0.tar.xz"; - sha256 = "e00db1e62a769863a1bf90bb508f108f2740298aa40173cad34ef34a1c23a01a"; - name = "kbookmarks-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kbookmarks-5.73.0.tar.xz"; + sha256 = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51"; + name = "kbookmarks-5.73.0.tar.xz"; }; }; kcalendarcore = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcalendarcore-5.71.0.tar.xz"; - sha256 = "d5138db971f6be606be8ae7d761bad778af3cacada8e85fb2f469190c347cd94"; - name = "kcalendarcore-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcalendarcore-5.73.0.tar.xz"; + sha256 = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713"; + name = "kcalendarcore-5.73.0.tar.xz"; }; }; kcmutils = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcmutils-5.71.0.tar.xz"; - sha256 = "27743a81e9aa48baac12bb844e48d3098250699122ed6040b1e3c50a5e8f276d"; - name = "kcmutils-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcmutils-5.73.0.tar.xz"; + sha256 = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9"; + name = "kcmutils-5.73.0.tar.xz"; }; }; kcodecs = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcodecs-5.71.0.tar.xz"; - sha256 = "3392c4df652e3a44a2b941ccb419dee9521642e503104de403ec1c6be9f43a28"; - name = "kcodecs-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcodecs-5.73.0.tar.xz"; + sha256 = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67"; + name = "kcodecs-5.73.0.tar.xz"; }; }; kcompletion = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcompletion-5.71.0.tar.xz"; - sha256 = "bf0b6ce1ee133900f169662dbd35da6f766d3e4e02c0c102a9402e20450a22a4"; - name = "kcompletion-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcompletion-5.73.0.tar.xz"; + sha256 = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a"; + name = "kcompletion-5.73.0.tar.xz"; }; }; kconfig = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kconfig-5.71.0.tar.xz"; - sha256 = "618ff0d168abf8fb73dc83431b9a76f7859d522bea100ff07c7e1632e129e3f4"; - name = "kconfig-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kconfig-5.73.0.tar.xz"; + sha256 = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e"; + name = "kconfig-5.73.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kconfigwidgets-5.71.0.tar.xz"; - sha256 = "5778523c49a5294e9376ce8ee6db1a51ffaa506418a19e8632f73287a596276f"; - name = "kconfigwidgets-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kconfigwidgets-5.73.0.tar.xz"; + sha256 = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e"; + name = "kconfigwidgets-5.73.0.tar.xz"; }; }; kcontacts = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcontacts-5.71.0.tar.xz"; - sha256 = "57f511a624406b27a7de25c83deb4104c95e851f9fda4f6d94450155ab08f4bd"; - name = "kcontacts-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcontacts-5.73.0.tar.xz"; + sha256 = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb"; + name = "kcontacts-5.73.0.tar.xz"; }; }; kcoreaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcoreaddons-5.71.0.tar.xz"; - sha256 = "e95008b032e299cf47f596739d9236701e2f55e507734f33b8ea497882fd130b"; - name = "kcoreaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcoreaddons-5.73.0.tar.xz"; + sha256 = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51"; + name = "kcoreaddons-5.73.0.tar.xz"; }; }; kcrash = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcrash-5.71.0.tar.xz"; - sha256 = "526242aa9fde7cff11ecaa88bf75d6fbbfc412f46bf19a7a9e185f2adb616005"; - name = "kcrash-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcrash-5.73.0.tar.xz"; + sha256 = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583"; + name = "kcrash-5.73.0.tar.xz"; + }; + }; + kdav = { + version = "5.73.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.73/kdav-5.73.0.tar.xz"; + sha256 = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31"; + name = "kdav-5.73.0.tar.xz"; }; }; kdbusaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdbusaddons-5.71.0.tar.xz"; - sha256 = "b441f525248d9d675333cebedf97ee0232a3a9b7aa9aff84d825dfcdb3bcd23c"; - name = "kdbusaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdbusaddons-5.73.0.tar.xz"; + sha256 = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba"; + name = "kdbusaddons-5.73.0.tar.xz"; }; }; kdeclarative = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdeclarative-5.71.0.tar.xz"; - sha256 = "ace0e52f561a9cfba1de4b77144a0a68037a1229530fb39070dc837da80ac8f8"; - name = "kdeclarative-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdeclarative-5.73.0.tar.xz"; + sha256 = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598"; + name = "kdeclarative-5.73.0.tar.xz"; }; }; kded = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kded-5.71.0.tar.xz"; - sha256 = "404c8caae0f4abe2ef85c2e82b5db2b14ae4b607fa30e4f16d15dad53c269fcc"; - name = "kded-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kded-5.73.0.tar.xz"; + sha256 = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895"; + name = "kded-5.73.0.tar.xz"; }; }; kdelibs4support = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kdelibs4support-5.71.0.tar.xz"; - sha256 = "1110ed68a29e38059d195817735d58df45e59b57fa9ac48ef2036c1037a23fb7"; - name = "kdelibs4support-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kdelibs4support-5.73.0.tar.xz"; + sha256 = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b"; + name = "kdelibs4support-5.73.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kdesignerplugin-5.71.0.tar.xz"; - sha256 = "e77a96c2a6cd518f3040e9366f013f0128200791b6c93c3c5b2310af16fb040b"; - name = "kdesignerplugin-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kdesignerplugin-5.73.0.tar.xz"; + sha256 = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2"; + name = "kdesignerplugin-5.73.0.tar.xz"; }; }; kdesu = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdesu-5.71.0.tar.xz"; - sha256 = "b183e67c089b02f984284b5eb3c05f7216d289bef7ae08a9e6c6f991b2a1a23a"; - name = "kdesu-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdesu-5.73.0.tar.xz"; + sha256 = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d"; + name = "kdesu-5.73.0.tar.xz"; }; }; kdewebkit = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kdewebkit-5.71.0.tar.xz"; - sha256 = "04b8b90734ddf6d5e72ffa69707d473e1d1f8605ba06d4ceca83f4a1d195c65d"; - name = "kdewebkit-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kdewebkit-5.73.0.tar.xz"; + sha256 = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b"; + name = "kdewebkit-5.73.0.tar.xz"; }; }; kdnssd = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdnssd-5.71.0.tar.xz"; - sha256 = "bc269f0a74eee99d6c49550fc608450ced753a599cd03f77ea577af4c2e87958"; - name = "kdnssd-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdnssd-5.73.0.tar.xz"; + sha256 = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d"; + name = "kdnssd-5.73.0.tar.xz"; }; }; kdoctools = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdoctools-5.71.0.tar.xz"; - sha256 = "1e2fcaa97a014e82f68c0c36591ce84568ead7abd59b66e534789103e162cd09"; - name = "kdoctools-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdoctools-5.73.0.tar.xz"; + sha256 = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d"; + name = "kdoctools-5.73.0.tar.xz"; }; }; kemoticons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kemoticons-5.71.0.tar.xz"; - sha256 = "20bcb111971cc2e8c17b38a0c20aff7cf453174f885c4b4bcc5899141113e2fc"; - name = "kemoticons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kemoticons-5.73.0.tar.xz"; + sha256 = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778"; + name = "kemoticons-5.73.0.tar.xz"; }; }; kfilemetadata = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kfilemetadata-5.71.0.tar.xz"; - sha256 = "2e302958065157c1f9ea4a189bbca40b7dbed019767a3380e34e0b6a633c75fe"; - name = "kfilemetadata-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kfilemetadata-5.73.0.tar.xz"; + sha256 = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894"; + name = "kfilemetadata-5.73.0.tar.xz"; }; }; kglobalaccel = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kglobalaccel-5.71.0.tar.xz"; - sha256 = "218d77aa4f6089d57932d627c4a46a8a4a5e964c2bfcee0d1c54338c25c7a06c"; - name = "kglobalaccel-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kglobalaccel-5.73.0.tar.xz"; + sha256 = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f"; + name = "kglobalaccel-5.73.0.tar.xz"; }; }; kguiaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kguiaddons-5.71.0.tar.xz"; - sha256 = "c1f7bf540a689319962275916c0434f47ba5ed8f7d46a78704393163e32eccd2"; - name = "kguiaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kguiaddons-5.73.0.tar.xz"; + sha256 = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350"; + name = "kguiaddons-5.73.0.tar.xz"; }; }; kholidays = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kholidays-5.71.0.tar.xz"; - sha256 = "5469718d6ede7edb2ab06bbaff8af01567ba77ffe2160c2c2d47c666cfebf417"; - name = "kholidays-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kholidays-5.73.0.tar.xz"; + sha256 = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab"; + name = "kholidays-5.73.0.tar.xz"; }; }; khtml = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/khtml-5.71.0.tar.xz"; - sha256 = "df8d2a4776f98e1490a21e71e31a2ea7694bc7452da35f88623b19214b6e1c10"; - name = "khtml-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/khtml-5.73.0.tar.xz"; + sha256 = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262"; + name = "khtml-5.73.0.tar.xz"; }; }; ki18n = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/ki18n-5.71.0.tar.xz"; - sha256 = "f2fc8c40c10576da8b74070b7dc8e752fdd04204cb2bfe522f37a0458fbaf881"; - name = "ki18n-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/ki18n-5.73.0.tar.xz"; + sha256 = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689"; + name = "ki18n-5.73.0.tar.xz"; }; }; kiconthemes = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kiconthemes-5.71.0.tar.xz"; - sha256 = "3fa986207e9d967840bd7a3f1af1e4d0105905012a0e4cf56f7ef1b3740b3496"; - name = "kiconthemes-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kiconthemes-5.73.0.tar.xz"; + sha256 = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356"; + name = "kiconthemes-5.73.0.tar.xz"; }; }; kidletime = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kidletime-5.71.0.tar.xz"; - sha256 = "1bcacd6c9ec8d65f93434f51d865723a50609ec074f88da2890a8f37ea8d207d"; - name = "kidletime-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kidletime-5.73.0.tar.xz"; + sha256 = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2"; + name = "kidletime-5.73.0.tar.xz"; }; }; kimageformats = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kimageformats-5.71.0.tar.xz"; - sha256 = "0d6d6a8664e4a01df27e9970ec9ec10a92c1d43a00a3e9ef0471d740b4c93d94"; - name = "kimageformats-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kimageformats-5.73.0.tar.xz"; + sha256 = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b"; + name = "kimageformats-5.73.0.tar.xz"; }; }; kinit = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kinit-5.71.0.tar.xz"; - sha256 = "6ea625bced2c19b0f3e5bb504775dd6764358f02412364a16cbad731c5c299b6"; - name = "kinit-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kinit-5.73.0.tar.xz"; + sha256 = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770"; + name = "kinit-5.73.0.tar.xz"; }; }; kio = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kio-5.71.0.tar.xz"; - sha256 = "b972c8dede50be3e89babb5a536054759db2a87003e6df770c598c7c1c94b8d6"; - name = "kio-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kio-5.73.0.tar.xz"; + sha256 = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66"; + name = "kio-5.73.0.tar.xz"; }; }; kirigami2 = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kirigami2-5.71.0.tar.xz"; - sha256 = "f323efb96a809dc9e572a0e68e04c4f485fc27f9ae65ffa3988830e348151356"; - name = "kirigami2-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kirigami2-5.73.0.tar.xz"; + sha256 = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb"; + name = "kirigami2-5.73.0.tar.xz"; }; }; kitemmodels = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kitemmodels-5.71.0.tar.xz"; - sha256 = "68205f09d63a916f236e2b3b729c0055377d852de48f7cf29fa7174ca97b84e7"; - name = "kitemmodels-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kitemmodels-5.73.0.tar.xz"; + sha256 = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371"; + name = "kitemmodels-5.73.0.tar.xz"; }; }; kitemviews = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kitemviews-5.71.0.tar.xz"; - sha256 = "2843ef166ff5bf69c1132bbc09545b59ad208313c0acad71d0cd951fde1d33de"; - name = "kitemviews-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kitemviews-5.73.0.tar.xz"; + sha256 = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727"; + name = "kitemviews-5.73.0.tar.xz"; }; }; kjobwidgets = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kjobwidgets-5.71.0.tar.xz"; - sha256 = "63f3b2fc1c062b1a485ff543e2d5afa68a9f9a918676bf3a6a5dc8f56f5f30e3"; - name = "kjobwidgets-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kjobwidgets-5.73.0.tar.xz"; + sha256 = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf"; + name = "kjobwidgets-5.73.0.tar.xz"; }; }; kjs = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kjs-5.71.0.tar.xz"; - sha256 = "702224482139e500da1ea4e0d2b5132bf762f87f426f294587a0f2f47b9a9734"; - name = "kjs-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kjs-5.73.0.tar.xz"; + sha256 = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5"; + name = "kjs-5.73.0.tar.xz"; }; }; kjsembed = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kjsembed-5.71.0.tar.xz"; - sha256 = "9352a31b5f735d71d6db4b09825ca01adb337e37f2b0cfce48c679e932238486"; - name = "kjsembed-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kjsembed-5.73.0.tar.xz"; + sha256 = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3"; + name = "kjsembed-5.73.0.tar.xz"; }; }; kmediaplayer = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kmediaplayer-5.71.0.tar.xz"; - sha256 = "72492a6c877dded4f2333f140c025fdc4a271a68695c635c0dbc09b08d832eca"; - name = "kmediaplayer-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kmediaplayer-5.73.0.tar.xz"; + sha256 = "69aa3bbedfc8b9a0dd9f4ac260cded9d7b5894477bf4b5b09065d0aae8e44ab2"; + name = "kmediaplayer-5.73.0.tar.xz"; }; }; knewstuff = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/knewstuff-5.71.0.tar.xz"; - sha256 = "aba867855d69641f73db30405e787fc9ea22e3386a45be9626ba84cbe208f855"; - name = "knewstuff-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/knewstuff-5.73.0.tar.xz"; + sha256 = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e"; + name = "knewstuff-5.73.0.tar.xz"; }; }; knotifications = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/knotifications-5.71.0.tar.xz"; - sha256 = "b900146340621d54f6113600e85d287b28225d82515affb8690704433e5d0440"; - name = "knotifications-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/knotifications-5.73.0.tar.xz"; + sha256 = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c"; + name = "knotifications-5.73.0.tar.xz"; }; }; knotifyconfig = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/knotifyconfig-5.71.0.tar.xz"; - sha256 = "226b7f956f7013027621c4018b4376b76129ea4195df67fc7df4435c54baf50e"; - name = "knotifyconfig-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/knotifyconfig-5.73.0.tar.xz"; + sha256 = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4"; + name = "knotifyconfig-5.73.0.tar.xz"; }; }; kpackage = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kpackage-5.71.0.tar.xz"; - sha256 = "c4b924e7c506cb75bdaaf68bd881e79a73999bd6436f29157f56c76f32b48cba"; - name = "kpackage-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kpackage-5.73.0.tar.xz"; + sha256 = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f"; + name = "kpackage-5.73.0.tar.xz"; }; }; kparts = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kparts-5.71.0.tar.xz"; - sha256 = "d038f97dfdccdd85dbac09c0f64cf852191ec2e535fd7928740e03d4ffe63b90"; - name = "kparts-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kparts-5.73.0.tar.xz"; + sha256 = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2"; + name = "kparts-5.73.0.tar.xz"; }; }; kpeople = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kpeople-5.71.0.tar.xz"; - sha256 = "d63d5f5cbbedc2e4ef85fa8c2ff4adcd5cb9e05d1d1ee0e7b2c2d151193f5403"; - name = "kpeople-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kpeople-5.73.0.tar.xz"; + sha256 = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4"; + name = "kpeople-5.73.0.tar.xz"; }; }; kplotting = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kplotting-5.71.0.tar.xz"; - sha256 = "84bacfbd86105e454f3d97f4ac4062e2f992556fca66d2c73806d1d12095bec1"; - name = "kplotting-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kplotting-5.73.0.tar.xz"; + sha256 = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14"; + name = "kplotting-5.73.0.tar.xz"; }; }; kpty = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kpty-5.71.0.tar.xz"; - sha256 = "7629d35ff783aff8fe801db30eb146efe50620f7500c4f7f1bf7d2619568c6b9"; - name = "kpty-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kpty-5.73.0.tar.xz"; + sha256 = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c"; + name = "kpty-5.73.0.tar.xz"; }; }; kquickcharts = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kquickcharts-5.71.0.tar.xz"; - sha256 = "a1befe13903676a9779030b02b91da9889540e689e1f6a0afd54ff484109642a"; - name = "kquickcharts-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kquickcharts-5.73.0.tar.xz"; + sha256 = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe"; + name = "kquickcharts-5.73.0.tar.xz"; }; }; kross = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kross-5.71.0.tar.xz"; - sha256 = "ac42ed4ec39ddaea0a4668803271f6f5de513fcdd1243d02b296544ab601bb1c"; - name = "kross-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kross-5.73.0.tar.xz"; + sha256 = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e"; + name = "kross-5.73.0.tar.xz"; }; }; krunner = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/krunner-5.71.0.tar.xz"; - sha256 = "fb3ce4c587a1b114550487b5716f0aba53b775018b6eef2ae48b8d6fdda40952"; - name = "krunner-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/krunner-5.73.0.tar.xz"; + sha256 = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09"; + name = "krunner-5.73.0.tar.xz"; }; }; kservice = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kservice-5.71.0.tar.xz"; - sha256 = "6b7f4784cb514ec966f3cb01d26aa2dbdfd2425919efa57a4efa6117fcafc9ce"; - name = "kservice-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kservice-5.73.0.tar.xz"; + sha256 = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b"; + name = "kservice-5.73.0.tar.xz"; }; }; ktexteditor = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/ktexteditor-5.71.0.tar.xz"; - sha256 = "6e50b6669b288f8e624cba11bca53b78748faf6cb978628f02664038cfa294da"; - name = "ktexteditor-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/ktexteditor-5.73.0.tar.xz"; + sha256 = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18"; + name = "ktexteditor-5.73.0.tar.xz"; }; }; ktextwidgets = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/ktextwidgets-5.71.0.tar.xz"; - sha256 = "0a7fae03d8b59ec8a4f7c49a228536ea4121bd3d8f19fb1ff9831ada428509f4"; - name = "ktextwidgets-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/ktextwidgets-5.73.0.tar.xz"; + sha256 = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5"; + name = "ktextwidgets-5.73.0.tar.xz"; }; }; kunitconversion = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kunitconversion-5.71.0.tar.xz"; - sha256 = "65bfba8e88e2cf6de40e06ce24fe5f48948cc92f16ce78eb8538de532dcf36cb"; - name = "kunitconversion-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kunitconversion-5.73.0.tar.xz"; + sha256 = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935"; + name = "kunitconversion-5.73.0.tar.xz"; }; }; kwallet = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwallet-5.71.0.tar.xz"; - sha256 = "d53b5bc4bbe054101b012d63672efc30af6a5aea58f467037cab4735b6ace9b5"; - name = "kwallet-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwallet-5.73.0.tar.xz"; + sha256 = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1"; + name = "kwallet-5.73.0.tar.xz"; }; }; kwayland = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwayland-5.71.0.tar.xz"; - sha256 = "369ba54b485214687e719bc9216e3bb50849df3af9a3ec0e95cf5d5687c847c2"; - name = "kwayland-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwayland-5.73.0.tar.xz"; + sha256 = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe"; + name = "kwayland-5.73.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwidgetsaddons-5.71.0.tar.xz"; - sha256 = "897077995bcf4125d0f90d2964500e718d2a3fd5f117e1b7906177ad13a5082e"; - name = "kwidgetsaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwidgetsaddons-5.73.0.tar.xz"; + sha256 = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6"; + name = "kwidgetsaddons-5.73.0.tar.xz"; }; }; kwindowsystem = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwindowsystem-5.71.0.tar.xz"; - sha256 = "a3613aea6fa73ebc53f28c011a6bca31ed157e29f85df767e617c44399360cda"; - name = "kwindowsystem-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwindowsystem-5.73.0.tar.xz"; + sha256 = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8"; + name = "kwindowsystem-5.73.0.tar.xz"; }; }; kxmlgui = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kxmlgui-5.71.0.tar.xz"; - sha256 = "2e4b2563daeedf35a54d38002c05d7c39017a36c0b8a19c236ea87324eebf7cc"; - name = "kxmlgui-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kxmlgui-5.73.0.tar.xz"; + sha256 = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb"; + name = "kxmlgui-5.73.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kxmlrpcclient-5.71.0.tar.xz"; - sha256 = "5947de8ec9cd57d8ccf6ea8a764066733d2633d93e11f94ecfb47a75e1e7a91f"; - name = "kxmlrpcclient-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kxmlrpcclient-5.73.0.tar.xz"; + sha256 = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047"; + name = "kxmlrpcclient-5.73.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/modemmanager-qt-5.71.0.tar.xz"; - sha256 = "b2e5e2a8b8fe2e9fb22bb7dc77177a975727991c6c0ee19d5a9b0a2ab513531d"; - name = "modemmanager-qt-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/modemmanager-qt-5.73.0.tar.xz"; + sha256 = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd"; + name = "modemmanager-qt-5.73.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/networkmanager-qt-5.71.0.tar.xz"; - sha256 = "7fe6a0c9d9b25c434c6a200de19f722d942165252cc9161f1d8fcddf64147034"; - name = "networkmanager-qt-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/networkmanager-qt-5.73.0.tar.xz"; + sha256 = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f"; + name = "networkmanager-qt-5.73.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/oxygen-icons5-5.71.0.tar.xz"; - sha256 = "a75a82164e2af5b6f269a386762ff2abba052dbfca18c9aed8d738c9cd958b04"; - name = "oxygen-icons5-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/oxygen-icons5-5.73.0.tar.xz"; + sha256 = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc"; + name = "oxygen-icons5-5.73.0.tar.xz"; }; }; plasma-framework = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz"; - sha256 = "a54c8603ca261c89609a3009536a9217ce3415a7fd63527ed36f266399613067"; - name = "plasma-framework-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/plasma-framework-5.73.0.tar.xz"; + sha256 = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93"; + name = "plasma-framework-5.73.0.tar.xz"; }; }; prison = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/prison-5.71.0.tar.xz"; - sha256 = "44762ee7a3993bd7527f0b33ee09bacc1d5a518641b79932e5490a511ac7e87f"; - name = "prison-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/prison-5.73.0.tar.xz"; + sha256 = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87"; + name = "prison-5.73.0.tar.xz"; }; }; purpose = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/purpose-5.71.0.tar.xz"; - sha256 = "de0531a84f671a15fe4a6348220e922a3230178554e26baf392a1f295044e4be"; - name = "purpose-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/purpose-5.73.0.tar.xz"; + sha256 = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32"; + name = "purpose-5.73.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/qqc2-desktop-style-5.71.0.tar.xz"; - sha256 = "b968ce6fc7c1d111aa2c63584dddc0f74e9066a0b4ea26d1194e46e2f7b38700"; - name = "qqc2-desktop-style-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/qqc2-desktop-style-5.73.0.tar.xz"; + sha256 = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd"; + name = "qqc2-desktop-style-5.73.0.tar.xz"; }; }; solid = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/solid-5.71.0.tar.xz"; - sha256 = "72a7bdd8306ec4cda5f504819e0ff3f8baca6530fa04e33f10b6b89dc010505b"; - name = "solid-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/solid-5.73.0.tar.xz"; + sha256 = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933"; + name = "solid-5.73.0.tar.xz"; }; }; sonnet = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/sonnet-5.71.0.tar.xz"; - sha256 = "cd663b3e1b23aef58d85f72dfdc92aaae33f358b22ad1fc36fde6c66eb7f0e72"; - name = "sonnet-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/sonnet-5.73.0.tar.xz"; + sha256 = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c"; + name = "sonnet-5.73.0.tar.xz"; }; }; syndication = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/syndication-5.71.0.tar.xz"; - sha256 = "c515fd48d3736b55c8e7990c72471bfddd55363c4bcb049713be741eaa7b07e0"; - name = "syndication-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/syndication-5.73.0.tar.xz"; + sha256 = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954"; + name = "syndication-5.73.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/syntax-highlighting-5.71.0.tar.xz"; - sha256 = "845ae0c7b8523c23c3ad704a6c551260a358d96b0094a5c2b062879e58173f84"; - name = "syntax-highlighting-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/syntax-highlighting-5.73.0.tar.xz"; + sha256 = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b"; + name = "syntax-highlighting-5.73.0.tar.xz"; }; }; threadweaver = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/threadweaver-5.71.0.tar.xz"; - sha256 = "039e73d70f38af38a63235cfb554111ee0d58a6ac168bff0745f0d029c5c528d"; - name = "threadweaver-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/threadweaver-5.73.0.tar.xz"; + sha256 = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38"; + name = "threadweaver-5.73.0.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix index 52e6264843..7903fc7463 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix @@ -3,15 +3,12 @@ , libatasmart, parted , utillinux }: -let +stdenv.mkDerivation rec { pname = "kpmcore"; - -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "3.3.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq"; }; @@ -24,12 +21,14 @@ in stdenv.mkDerivation rec { utillinux # needs blkid (note that this is not provided by utillinux-compat) ]; + nativeBuildInputs = [ extra-cmake-modules ]; + enableParallelBuilding = true; meta = with stdenv.lib; { maintainers = with lib.maintainers; [ peterhoeg ]; - # The build requires at least Qt 5.12: - broken = lib.versionOlder qtbase.version "5.12.0"; + # The build requires at least Qt 5.14: + broken = lib.versionOlder qtbase.version "5.14"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix index 2b3ef8c99c..d6c90ee172 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1zhjdcph8sqx7ak35s22kc736icwq135jlypggkp6vqyyygb3xlk"; + sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"; }; buildInputs = [ libgcrypt libgpgerror ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix index dc0542c212..7a7ad22756 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libappindicator/default.nix @@ -1,11 +1,11 @@ # TODO: Resolve the issues with the Mono bindings. -{ stdenv, fetchurl, fetchpatch, lib +{ stdenv, fetchgit, lib , pkgconfig, autoreconfHook , glib, dbus-glib, gtkVersion ? "3" , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, vala, gobject-introspection +, gtk-doc, vala, gobject-introspection , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -15,18 +15,17 @@ with lib; stdenv.mkDerivation rec { name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "12.10"; - versionMinor = "0"; + version = "12.10.1+20.10.20200706.1"; outputs = [ "out" "dev" ]; - src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/libappindicator-${version}.tar.gz"; - sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"; + src = fetchgit { + url = "https://git.launchpad.net/ubuntu/+source/libappindicator"; + rev = "fe25e53bc7e39cd59ad6b3270cd7a6a9c78c4f44"; + sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection ]; + nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection gtk-doc ]; propagatedBuildInputs = if gtkVersion == "2" @@ -39,14 +38,9 @@ stdenv.mkDerivation rec { then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ libindicator-gtk3 ]); - patches = [ - # Remove python2 from libappindicator. - (fetchpatch { - name = "no-python.patch"; - url = "https://src.fedoraproject.org/rpms/libappindicator/raw/8508f7a52437679fd95a79b4630373f08315f189/f/nopython.patch"; - sha256 = "18b1xzvwsbhhfpbzf5zragij4g79pa04y1dk6v5ci1wsjvii725s"; - }) - ]; + preAutoreconf = '' + gtkdocize + ''; configureFlags = [ "CFLAGS=-Wno-error" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix new file mode 100644 index 0000000000..0032941f87 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix @@ -0,0 +1,23 @@ +{ stdenv, callPackage, fetchFromGitHub, enableStatic ? false, enableShared ? true }: +let + yesno = b: if b then "yes" else "no"; +in stdenv.mkDerivation rec { + pname = "libbacktrace"; + version = "2020-05-13"; + src = fetchFromGitHub { + owner = "ianlancetaylor"; + repo = pname; + rev = "9b7f216e867916594d81e8b6118f092ac3fcf704"; + sha256 = "0qr624v954gnfkmpdlfk66sxz3acyfmv805rybsaggw5gz5sd1nh"; + }; + configureFlags = [ + "--enable-static=${yesno enableStatic}" + "--enable-shared=${yesno enableShared}" + ]; + meta = with stdenv.lib; { + description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces"; + homepage = https://github.com/ianlancetaylor/libbacktrace; + maintainers = with maintainers; [ twey ]; + license = with licenses; [ bsd3 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix index ec14b2a609..c93a59d462 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.3"; + version = "2.4"; in stdenv.mkDerivation rec { pname = "libbytesize"; inherit version; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "1nrlmn63k0ix1yzn8v4lni5n5b4c0b6w9f33p1ig113ymmdvcc0h"; + sha256 = "1kq0hnw2yxjdmcrwvgp0x4j1arkka23k8vp2l6nqcw9lc15x18fp"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix index 4a83175f66..55ba8d7b30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "3.0.20"; + version = "3.1.1"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "0iqqq568q9sxppr08rvmpyjq0n82pm04x9rxhh3mf20x1ds7ngj5"; + sha256 = "0z1gavi7aacx68fmyzy90vzv5kff844lnxc6habs6y377dr3rwwy"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix index c9f45280bd..7c136dd780 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.0.6"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "v${version}"; - sha256 = "1qisj8ryzbknam3hk81rq70fsd9mcpxm898bqygvbsmbwyvmz3pg"; + sha256 = "0ipccyavlgf7hfzx1g8bvzg62xq10vcxvwgq70r3z3j6mdvmrzjp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix index c769006e0b..fdd5e20640 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "17pb5375njb1r05xmk0r57a2j986ihglh2n5nqcylbag4rj8mqg7"; + sha256 = "1jvsphdrs1i54ccjcn6ll26jy42am7h28lbsvwa6pmxgqm43qq7m"; }; - patches = [ - # Fix libevdev-python tests on aarch64 - # https://gitlab.freedesktop.org/libevdev/libevdev/merge_requests/63 - (fetchpatch { - url = "https://gitlab.freedesktop.org/libevdev/libevdev/commit/66113fe84f62bab3a672a336eb10b255d2aa5ce7.patch"; - sha256 = "gZKr/P+/OqU69IGslP8CQlcGuyzA/ulcm+nGwHdis58="; - }) - ]; - nativeBuildInputs = [ python3 ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index ed9de3aaa4..455d42e305 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl - +, autoreconfHook , gettext , gnutls , nettle @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.23.0"; + version = "0.24.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0lk84aw5ylrhpy26djdw3byhjbn9qrzx5k98r0i4nwfizckw3smd"; + sha256 = "sha256-/dW07hkWr3sdQC591GfwXfdiS7ZfuVoIdaA3EuzC1v0="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ gettext gnutls nettle ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix index 1ff02a8709..70043d1132 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; + enableParallelBuilding = true; + buildInputs = [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix index 6d77a28d55..68078bbc9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "14iv8iwyvfznyifhkqz1bjh24dvb03gmpjn8v3fs6h734l93vvw5"; + sha256 = "1bknh7kn5gxc8xwf913lsdm9zgn1bwj42nsnp6kbkyn6ip7s6c4r"; }; buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix index 411ae0a331..234e116489 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 -, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex +, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, xen, libapparmor, jansson , getopt, perlPackages, ocamlPackages , appliance ? null @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses cpio gperf jansson cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex + systemd fuse yajl libvirt gmp readline file hivex db numactl xen libapparmor getopt perlPackages.ModuleBuild ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgumath/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgumath/default.nix index 27a10507a5..55e89d8766 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgumath/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgumath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libgumath"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "gumath"; - rev = "5a9d27883b40432246d6a93cd6133157267fd166"; - sha256 = "0w2qzp7anxd1wzkvv5r2pdkkpgrnqzgrq47lrvpqc1i1wqzcwf0w"; + rev = "360ed454105ac5615a7cb7d216ad25bc4181b876"; + sha256 = "1wprkxpmjrk369fpw8rbq51r7jvqkcndqs209y7p560cnagmsxc6"; }; buildInputs = [ libndtypes libxnd ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix index d147820cff..fd527eb415 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.7.0"; + version = "1.8.0"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0alri5h486ck9b5z6wwrmlpzydhz58l223z3zxkizqrzxlllhr6p"; + sha256 = "15az44qdqp2vncdfv1bzdl30977kvqxcb2bhx4x3q6vcxnm1xfgg"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix index c413642803..3c3ccf2788 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix @@ -7,6 +7,7 @@ , python , libusb1 , runtimeShell +, lib }: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { python libxml2 libusb1 - ]; + ] ++ lib.optional python.isPy3k python.pkgs.setuptools; cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix index cb8009011b..576a2fec92 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.6"; + version = "1.16.1"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "073z61dw46cyq0635a5n1mw7hw4qdgr58gbwwb3ds5v3d8hymvdf"; + sha256 = "e6fRru3RUWi7IdF+nmKKocJ5V5Y6Qjo/6jk4pQF1hTk="; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix index cb4db488dc..79ae927fc2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libipt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "19y1lk5z1rf8xmr08m8zrpjkgr5as83b96xyaxwn67m2wz58mpmh"; + sha256 = "095agnk7r2sq5yas6c1ri8fmsl55n4l5hkl6j5l397p9nxvxvrkc"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix index 5d0459b4f3..c394e3dc4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "0v6w8b9r994mkkbm2gqgd7k5yfmdhgbabh0j1gmn375nyvhy4qqh"; + sha256 = "1ljy5xsy7vf2r0ix0d7bqcr6qvr6897f8madsx9zlm1mrj31n5px"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix index 16cdf416b2..5d065636a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libmatroska"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; rev = "release-${version}"; - sha256 = "1ws07ldcm5gy8z8p627vknqcb8iw1hxdby24g0xi6hbfy66p6qxs"; + sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 0cc911fbd0..0e9a3784f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.24.0"; + version = "1.24.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "15hi1vq327drgi6h4dsi74lb7wg0sxd7mipa3irh5zgc7gn5qj9x"; + sha256 = "1r41d4yddp8rgccxrkz9vg5lbrj3dr5vy71d8igrr147k44qq69j"; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix index c0459e393f..79fa174378 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix @@ -8,7 +8,7 @@ # files. let - version = "1.1.0"; + version = "1.2.0"; in stdenv.mkDerivation { pname = "libmpc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; - sha256 = "0biwnhjm3rx3hc0rfpvyniky4lpzsvdcwhmcn7f0h4iw2hwcb1b9"; + sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9"; }; buildInputs = [ gmp mpfr ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libndtypes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libndtypes/default.nix index ffb2f56d67..d27c1ba376 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libndtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libndtypes/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "libndtypes"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "ndtypes"; - rev = "4d810d0c4d54c81a7136f313f0ae6623853d574a"; - sha256 = "1kk1sa7f17ffh49jc1qlizlsj536fr3s4flb6x4rjyi81rp7psb9"; + rev = "3ce6607c96d8fe67b72cc0c97bf595620cdd274e"; + sha256 = "18303q0jfar1lmi4krp94plczb455zcgw772f9lb8xa5p0bkhx01"; }; # Override linker with cc (symlink to either gcc or clang) diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboping/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liboping/default.nix index 1b2d83b84d..956538b762 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liboping/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liboping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses ? null, perl ? null }: +{ stdenv, fetchurl, ncurses ? null, perl ? null, lib }: stdenv.mkDerivation rec { name = "liboping-1.10.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = lib.optionalString + stdenv.cc.isGNU "-Wno-error=format-truncation"; buildInputs = [ ncurses perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix index 3398d3feb9..b29aeb2930 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, enableShared ? true }: stdenv.mkDerivation (rec { - version = "4.10.1"; + version = "4.11.0"; pname = "libpfm"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; - sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766"; + sha256 = "1k7yp6xfsglp2b6271r622sjinlbys0dk24n9iiv656y5f3zi9ax"; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix index bf80562a0b..be3ab953c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpipeline/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libpipeline-1.5.1"; + name = "libpipeline-1.5.3"; src = fetchurl { url = "mirror://savannah/libpipeline/${name}.tar.gz"; - sha256 = "0bwh5xz5f2czwb7f564jz1mp4znm8pldnvf65fs0hpw4gmmp0cyn"; + sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix index a710e09a45..feb9c7e651 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A C++ library to access PostgreSQL databases"; homepage = "http://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix index bd45cb529f..5d83b137b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3 }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "libpwquality"; @@ -11,8 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h"; }; - nativeBuildInputs = [ autoreconfHook perl ]; - buildInputs = [ cracklib python3 ]; + nativeBuildInputs = [ autoreconfHook perl python3 ]; + buildInputs = [ cracklib ]; + + patches = lib.optional stdenv.hostPlatform.isStatic [ + (fetchpatch { + name = "static-build.patch"; + url = "https://github.com/libpwquality/libpwquality/pull/40.patch"; + sha256 = "1ypccq437wxwgddd98cvd330jfm7jscdlzlyxgy05g6yzrr68xyk"; + }) + ]; + + configureFlags = lib.optional stdenv.hostPlatform.isStatic [ + # Python binding generates a shared library which are unavailable with musl build + "--disable-python-bindings" + ]; meta = with lib; { description = "Password quality checking and random password generation library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 8acfcb4b75..5c520e1c9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.8.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df"; + sha256 = "0g3ipl6ynhclmwny54zgdh721v0fs9dzj6j7r8dz91s86jva3chb"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix index e577b40382..e8db750153 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.0"; + version = "1.26.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "0h3fzmjlla7ib9wn4rv98bm40y2k28jcl29da4hjwyaqmvh2j13z"; + sha256 = "00vvvfq74awg6mk0si1cdv79f6z6wqx11h47nl78a1h7zsr6fd0k"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix index 69169c7e9a..b190d36acb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix @@ -1,21 +1,16 @@ -{ stdenv, fetchurl, lcms2, pkgconfig -, jasper ? null, withJpeg2k ? false -# disable JPEG2000 support by default as jasper has many CVE -}: +{ stdenv, fetchurl, lcms2, pkgconfig }: stdenv.mkDerivation rec { pname = "libraw"; - version = "0.19.5"; + version = "0.20.0"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "1x827sh6vl8j3ll2ihkcr234y07f31hi1v7sl08jfw3irkbn58j0"; + sha256 = "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz"; }; outputs = [ "out" "lib" "dev" "doc" ]; - buildInputs = stdenv.lib.optionals withJpeg2k [ jasper ]; - propagatedBuildInputs = [ lcms2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librseq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librseq/default.nix index d4619ba432..4fd8bb7e33 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librseq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librseq/default.nix @@ -4,22 +4,29 @@ stdenv.mkDerivation rec { pname = "librseq"; - version = "0.1.0pre54_${builtins.substring 0 7 src.rev}"; + version = "0.1.0pre70_${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "compudj"; repo = "librseq"; - rev = "152600188dd214a0b2c6a8c66380e50c6ad27154"; - sha256 = "0mivjmgdkgrr6z2gz3k6q6wgnvyvw9xzy65f6ipvqva68sxhk0mx"; + rev = "d1cdec98d476b16ca5e2d9d7eabcf9f1c97e6111"; + sha256 = "0vgillrxc1knq591gjj99x2ws6q1xpm5dmfrhsxisngfpcnjr10v"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ linuxHeaders ]; + installTargets = [ "install" "install-man" ]; + + doCheck = true; separateDebugInfo = true; enableParallelBuilding = true; + patchPhase = '' + patchShebangs tests + ''; + # The share/ subdir only contains a doc/ with a README.md that just describes # how to compile the library, which clearly isn't very useful! So just get # rid of it anyway. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix index f3816c2ef0..6ea0e6be46 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, getopt, makeWrapper, utillinux }: +{ stdenv, fetchurl, getopt, utillinux, gperf }: stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg"; + sha256 = "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz"; }; outputs = [ "out" "lib" "dev" "man" ]; - buildInputs = [ getopt makeWrapper ]; + nativeBuildInputs = [ gperf ]; + buildInputs = [ getopt ]; patchPhase = '' patchShebangs . @@ -25,13 +26,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High level library for the Linux Kernel seccomp filter"; - homepage = "https://github.com/seccomp/libseccomp"; - license = licenses.lgpl21; - platforms = platforms.linux; + homepage = "https://github.com/seccomp/libseccomp"; + license = licenses.lgpl21; + platforms = platforms.linux; badPlatforms = [ "alpha-linux" - "riscv64-linux" "riscv32-linux" - "sparc-linux" "sparc64-linux" + "riscv32-linux" + "sparc-linux" + "sparc64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix new file mode 100644 index 0000000000..ed19fab6d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "1.3.0"; + pname = "libthreadar"; + + src = fetchurl { + url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; + sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z"; + }; + + outputs = [ "out" "dev" ]; + + configureFlags = [ + "--disable-build-html" + ]; + + postInstall = '' + # Disable html help + rm -r "$out"/share + ''; + + meta = { + homepage = "http://libthreadar.sourceforge.net/"; + description = '' + Libthreadar is a C++ library providing a small set of C++ classes to manipulate + threads in a very simple and efficient way from your C++ code. + ''; + maintainers = with maintainers; [ izorkin ]; + license = licenses.lgpl3; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix index 5b54917688..d30c84b52a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libunibreak"; - version = "1.1"; + version = "4.3"; - src = fetchurl { - url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${pname}-${version}.tar.gz"; - sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn"; + src = let + rev_version = stdenv.lib.replaceStrings ["."] ["_"] version; + in fetchFromGitHub { + owner = "adah1972"; + repo = pname; + rev = "libunibreak_${rev_version}"; + sha256 = "19g3ixs1ycisfdnzd8v7j5r49h0x0hshchk9qwlz4i0mjv825plx"; }; + nativeBuildInputs = [ autoreconfHook ]; + meta = with stdenv.lib; { - homepage = "http://vimgadgets.sourceforge.net/libunibreak/"; - description = "A library implementing a line breaking algorithm as described in Unicode 6.0.0 Standard"; + homepage = "https://github.com/adah1972/libunibreak"; + description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard"; license = licenses.zlib; platforms = platforms.unix; maintainers = [ maintainers.coroa ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusb/fix-headers.patch b/third_party/nixpkgs/pkgs/development/libraries/libusb-compat/fix-headers.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/libusb/fix-headers.patch rename to third_party/nixpkgs/pkgs/development/libraries/libusb-compat/fix-headers.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix index 5d6a20b13a..a3323c8e02 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0mxbpg01kgbk5nh6524b0m4xk7ywkyzmc3yhi5asqcsd3rbhjj98"; }; - outputs = [ "out" "dev" ]; # get rid of propagating systemd closure + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; propagatedBuildInputs = @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { dontDisableStatic = withStatic; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - configureFlags = stdenv.lib.optional (!enableSystemd) "--disable-udev"; preFixup = stdenv.lib.optionalString enableSystemd '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix index aca345e6bb..cf73a64f67 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes - "tcp_writealot" # times out sometimes + "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes ] ++ stdenv.lib.optionals stdenv.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should diff --git a/third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix index cee04fa79e..a26aa9b569 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, lib }: stdenv.mkDerivation rec { pname = "libversion"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = lib.optional stdenv.isDarwin [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests + ]; + preCheck = '' export LD_LIBRARY_PATH=/build/source/build/libversion/''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index 6c2b61cf11..9f7e84558f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ stdenv, fetchFromGitHub, meson, ninja, nasm }: stdenv.mkDerivation rec { pname = "libvmaf"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "18w0z3w90fdbzsqaa4diwvq0xmvg0aiw4hi3aaa4pq0zgnb8g3mk"; + sha256 = "0x3l3g0hgrrjh3ygmxr1pd3rd5589s07c7id35nvj76ch5b7gy63"; }; sourceRoot = "source/libvmaf"; - nativeBuildInputs = [ meson ninja ]; + nativeBuildInputs = [ meson ninja nasm ]; outputs = [ "out" "dev" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix index e762ead192..7c71dc4388 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.4.1"; + version = "1.5"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "0m96zjj832l18rzg9l31ambm6rv9vnh2a1sfk8531da8m347z287"; + sha256 = "1a3qkzpkag1vqd2xl7b7f2b8kbg1y1g6gg5ydzb1ppyqw3zdjf9x"; }; nativeBuildInputs = [ pkgconfig meson ninja doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index 0b0524e163..97e8d23c07 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.2.0"; + version = "0.2.1"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "VBIQo+6WqJUbkBZnG6eihx3eJFFWF68A7RpZ7gPVbEI="; + sha256 = "XD66YfD8fjaqp5pkcR8qNh7Srjh+atAIC2qkDTF7KdM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxnd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxnd/default.nix index 7313b2582b..1fac0d86d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxnd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxnd/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libxnd"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "xnd"; - rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3"; - sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44"; + rev = "6f305cd40d90b4f3fc2fe51ae144b433d186a6cc"; + sha256 = "1n31d64qwlc7m3qkzbafhp0dgrvgvkdx89ykj63kll7r1n3yk59y"; }; buildInputs = [ libndtypes ]; @@ -28,6 +28,14 @@ stdenv.mkDerivation { "--with-libs=${libndtypes}/lib" ]; + # other packages which depend on libxnd seem to expect overflow.h, but + # it doesn't seem to be included in the installed headers. for now this + # works, but the generic name of the header could produce problems + # with collisions down the line. + postInstall = '' + cp libxnd/overflow.h $out/include/overflow.h + ''; + doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix index 25c8594860..394347277f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchFromGitHub, coreutils, gfortran7, gnused -, python27, utillinux, which, bash +{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused +, python3, utillinux, which + +, enableStatic ? false }: let - version = "1.15"; + version = "1.16.1"; in stdenv.mkDerivation { pname = "libxsmm"; inherit version; @@ -11,31 +13,40 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "hfp"; repo = "libxsmm"; - rev = "refs/tags/${version}"; - sha256 = "1406qk7k2k4qfqy4psqk55iihsrx91w8kjgsa82jxj50nl9nw5nj"; + rev = version; + sha256 = "1c1qj6hcdfx11bvilnly92vgk1niisd2bjw1s8vfyi2f7ws1wnp0"; }; - buildInputs = [ + nativeBuildInputs = [ coreutils - gfortran7 + gfortran gnused - python27 + python3 utillinux which ]; + enableParallelBuilding = true; + + dontConfigure = true; + + makeFlags = let + static = if enableStatic then "1" else "0"; + in [ + "OMP=1" + "PREFIX=$(out)" + "STATIC=${static}" + ]; + prePatch = '' patchShebangs . ''; - makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; license = licenses.bsd3; homepage = "https://github.com/hfp/libxsmm"; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ chessai ]; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix index 2217996acd..09bd7e1209 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -39,18 +39,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} - ++ stdenv.lib.optionals withSage [ + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ] ++ stdenv.lib.optionals withSage [ "--enable-sage" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix index c0220e6e21..8d5d083d82 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.4"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "08g6kqaj079aq7i6c1pwj778lrr3yk188wn1byxdd6zqpwrsv71q"; + sha256 = "0xil6b055csnrvxxmby5x9njf166bri472jxwzshc49cz7svhhpk"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix b/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix index 3371bd45e7..97cc4f7ff2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.8.0"; + version = "0.9.0"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "Y9HzysChzzmKW5PuCLm9AZ4oaBLMpB0I5NyZUOYFzm4="; + sha256 = "DEtibrGgHSgRjaarAzizzLN1xsJKXl+LCQ29FmpPoJo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/malcontent/ui.nix b/third_party/nixpkgs/pkgs/development/libraries/malcontent/ui.nix index c69f987c70..54382cfc0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/malcontent/ui.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/malcontent/ui.nix @@ -11,6 +11,7 @@ , flatpak , malcontent , gtk3 +, appstream-glib , desktop-file-utils , polkit , glib-testing @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream-glib dbus polkit glib-testing diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index ee0094b263..cf452fded1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -4,7 +4,6 @@ , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, python3Packages , libglvnd -, patchelf, autoreconfHook, fetchFromGitHub , enableRadv ? true , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] @@ -32,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.1.4"; + version = "20.1.7"; branch = versions.major version; in @@ -47,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1zlrczmmkcy42w332rfmlicihlnrxmkrnkpb21sl98725cf2f038"; + sha256 = "1252mgwiy05nz8mm4gjkzmnjfvdz5yv1shnsr837cdnan86dvsad"; }; prePatch = "patchShebangs ."; @@ -97,6 +96,12 @@ stdenv.mkDerivation { substituteInPlace meson.build --replace \ "find_program('pkg-config')" \ "find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')" + + # The drirc.d directory cannot be installed to $drivers as that would cause a cyclic dependency: + substituteInPlace src/util/xmlconfig.c --replace \ + 'DATADIR "/drirc.d"' '"${placeholder "out"}/drirc.d"' + substituteInPlace src/util/meson.build --replace \ + "get_option('datadir')" "'${placeholder "out"}'" ''; outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa"; @@ -104,6 +109,7 @@ stdenv.mkDerivation { # TODO: Figure out how to enable opencl without having a runtime dependency on clang mesonFlags = [ "--sysconfdir=/etc" + "--datadir=${placeholder "drivers"}/share" # Vendor files # Don't build in debug mode # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327 @@ -141,16 +147,6 @@ stdenv.mkDerivation { depsBuildBuild = [ pkgconfig ]; nativeBuildInputs = [ - (patchelf.overrideAttrs (pa: { - src = fetchFromGitHub { - owner = "NixOS"; - repo = "patchelf"; - rev = "61bc10176"; # current master; what matters is merge of #225 - sha256 = "0cy77mn77w3mn64ggp20f4ygnbxfjmddhjjhfwkva53lsirg6w93"; - }; - nativeBuildInputs = pa.nativeBuildInputs or [] ++ [ autoreconfHook ]; - })) - ] ++ [ pkgconfig meson ninja intltool bison flex file python3Packages.python python3Packages.Mako @@ -184,9 +180,6 @@ stdenv.mkDerivation { mv $out/lib/lib*_mesa* $drivers/lib fi - # move vendor files - mv $out/share/ $drivers/ - # Update search path used by glvnd for js in $drivers/share/glvnd/egl_vendor.d/*.json; do substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch b/third_party/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch index e6182009ba..0a66033239 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch @@ -1,4 +1,4 @@ -From 00f3c6d1b771c11ecc08c3d8bd793a51d6e64166 Mon Sep 17 00:00:00 2001 +From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 26 Jul 2020 17:29:49 -0300 Subject: [PATCH] link radv with ld_args_build_id @@ -9,18 +9,17 @@ This is needed for radv_device_get_cache_uuid to work correctly. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build -index efcf2dd6c89..590f286b8cb 100644 +index eec026e8f60..a07a0821938 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build -@@ -173,7 +173,7 @@ libvulkan_radeon = shared_library( +@@ -183,7 +183,7 @@ libvulkan_radeon = shared_library( ], c_args : [c_vis_args, no_override_init_args, radv_flags], cpp_args : [cpp_vis_args, radv_flags], -- link_args : [ld_args_bsymbolic, ld_args_gc_sections], -+ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections], +- link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], ++ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], + link_depends : [libvulkan_radeon_link_depends,], install : true, ) - --- -2.27.0 - +-- +2.28.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index bf6c5b1baf..997fd2ab63 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "0hk30adrm0s1g5flfaqfr3lc72y3hlmhqnyrqd7p0y91rsaw86b9"; + sha256 = "0b6ymi2a9is2q6n49dvlnjxknikj0rfff5ygbc4n7894h5mllvvr"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index f0b45753df..6b41affb12 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + broken = versionAtLeast qtbase.version "5.15"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix new file mode 100644 index 0000000000..2c5bde316b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "muparserx"; + version = "4.0.8"; + + src = fetchFromGitHub { + owner = "beltoforion"; + repo = "muparserx"; + rev = "v${version}"; + sha256 = "097pkdffv0phr0345hy06mjm5pfy259z13plsvbxvcmds80wl48v"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + ]; + + doCheck = true; + checkPhase = '' + echo "***Muparserx self-test***" + echo "quit" | ./example > test_result.log + cat test_result.log + if grep -Fqi "failed" test_result.log; then + echo ">=1 muparserx tests failed" + exit 1 + else + echo -e "\nmuparserx tests succeeded" + fi + ''; + + meta = with stdenv.lib; { + description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more."; + homepage = "https://beltoforion.de/en/muparserx/"; + license = licenses.bsd2; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix index 2c4357e1e9..2eba3ca8bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix @@ -4,15 +4,20 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "036kzhbabbwc3gvsw8kqf6rs0gh8kgn6i0by9pxski38mi0qs1qs"; + sha256 = "0zx9f9h1hqcyh3sf6k0scny2039p1lwdqbwqi8ppwwhjl2fzniv8"; }; + postPatch = '' + substituteInPlace meson.build --replace \ + "version: '0.2.0'" "version: '${version}'" + ''; + nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index 3294674e17..c9ccf63f88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -27,11 +27,11 @@ let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.40.0"; + version = "1.41.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "0kyrgd4s2pq51ps5z385kw1hn62m8qp7c4h6im0g4ibrf89qwxc2"; + sha256 = "0h12wz72paxnj8l9vv2qfgfbmj20c6pz6xbilb7ns9zcwxwa0p34"; }; outputs = [ "bin" "out" "dev" "lib" ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix index 403b0326bb..58d35767d1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/notify-sharp/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitLab, pkgconfig, autoreconfHook , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { pname = "notify-sharp"; version = "3.0.3"; - src = fetchFromGitHub { - owner = "GNOME"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "Archive"; repo = "notify-sharp"; rev = version; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix index 8a16803fd8..d9b7ff13d1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix @@ -2,7 +2,7 @@ , CoreServices ? null , buildPackages }: -let version = "4.27"; in +let version = "4.28"; in stdenv.mkDerivation { pname = "nspr"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "16z82qc1l4cqn66p59ai0dy9ycllywn4jlxhip1a605bns952jbd"; + sha256 = "0miv8ggil1xdywxw2sxaa05kqw7ahjgaimf7zjc6y2x8367grpk3"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix index a504aae6a9..e378cd5554 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.55"; + version = "3.56"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0100hm7n1xrp144xy665z46s0wf1jpkqkncc6bk2w22snhyjwsgw"; + sha256 = "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index b2beaee0bc..1fb0f03d30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "0w2rgr3zgk7a3cql12dpddyhz2isyqqaks4vm8p45y426pd5m64b"; + sha256 = "1rdq2rb4f9xbk2a07fpqgvd9mx1r5gwpm0jr8rra815bzddam8zh"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencascade/default.nix index 8334bf195f..c0b2366ab7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencascade/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencascade/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkgconfig, fontconfig, freetype, expat, freeimage, vtk }: + pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, + OpenCL, Cocoa +}: +with stdenv.lib; stdenv.mkDerivation rec { pname = "opencascade-oce"; version = "0.18.3"; @@ -13,13 +16,21 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk ]; + buildInputs = [ + libGL libGLU libXmu freetype fontconfig expat freeimage vtk + gl2ps tbb + ] + ++ optionals stdenv.isDarwin [OpenCL Cocoa] + ; cmakeFlags = [ "-DOCE_INSTALL_PREFIX=${placeholder "out"}" "-DOCE_WITH_FREEIMAGE=ON" "-DOCE_WITH_VTK=ON" - ]; + "-DOCE_WITH_GL2PS=ON" + "-DOCE_MULTITHREAD_LIBRARY=TBB" + ] + ++ optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; patches = [ # Use fontconfig instead of hardcoded directory list @@ -33,6 +44,10 @@ stdenv.mkDerivation rec { url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch"; sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k"; }) + (fetchpatch { + url = "https://github.com/tpaviot/oce/commit/cf50d078cd5fac03a48fd204938bd240930a08dc.patch"; + sha256 = "1xv94hcvggmb1c8vqwic1aiw9jw1sxk8mqbaak9xs9ycfqdvgdyc"; + }) ]; postPatch = '' @@ -41,11 +56,11 @@ stdenv.mkDerivation rec { --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES ''; - meta = with stdenv.lib; { + meta = { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = "https://github.com/tpaviot/oce"; maintainers = [ maintainers.viric ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix index bf45bc90f1..1486ea9317 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencl-clhpp"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-CLHPP"; rev = "v${version}"; - sha256 = "0a0n0f1lb86cwfm0ndzykcn965vz1v0n9n3rfmkiwrzkdhc9iy2y"; + sha256 = "04g3mg2cpbi048fxxkghra81bpxzqr4r3gspx5mvqipx1lzypsci"; }; nativeBuildInputs = [ cmake python ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index 1597eb7913..2ad2d016c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -9,7 +9,6 @@ , enableTIFF ? true, libtiff , enableWebP ? true, libwebp , enableEXR ? !stdenv.isDarwin, openexr, ilmbase -, enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true @@ -187,7 +186,6 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] @@ -225,7 +223,6 @@ stdenv.mkDerivation { "-DBUILD_DOCS=${printEnabled enableDocs}" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) - (opencvFlag "JASPER" enableJPEG2K) (opencvFlag "WEBP" enableWebP) (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index dd71b10728..adeab6b449 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -9,7 +9,6 @@ , enableTIFF ? true, libtiff , enableWebP ? true, libwebp , enableEXR ? !stdenv.isDarwin, openexr, ilmbase -, enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true @@ -32,7 +31,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 +, AVFoundation, Cocoa, VideoDecodeAcceleration, CoreMedia, MediaToolbox, bzip2 }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; @@ -203,7 +202,6 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] @@ -219,7 +217,7 @@ stdenv.mkDerivation { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ] - ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] + ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -242,7 +240,6 @@ stdenv.mkDerivation { "-DBUILD_DOCS=${printEnabled enableDocs}" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) - (opencvFlag "JASPER" enableJPEG2K) (opencvFlag "WEBP" enableWebP) (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) @@ -258,7 +255,6 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" - "-DBUILD_opencv_videoio=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix index 06a3d5f194..d71c210fb6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix @@ -6,7 +6,6 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase -, enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableFfmpeg ? false, ffmpeg_3 , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen @@ -65,7 +63,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ (opencvFlag "TIFF" enableTIFF) - (opencvFlag "JASPER" enableJPEG2K) (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix index a1f5183da9..b33b284f45 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix @@ -6,52 +6,32 @@ , ilmbase , fetchpatch , cmake -, libtool }: -let - non_glibc_fpstate_patch = - # Fix ilmbase/openexr using glibc-only fpstate. - # Found via https://git.alpinelinux.org/aports/tree/community/openexr/10-musl-_fpstate.patch?id=80d9611b7b8e406a554c6f511137e03ff26acbae, - # TODO Remove when https://github.com/AcademySoftwareFoundation/openexr/pull/798 is merged and available. - # Remove it from `ilmbase` as well then. - (fetchpatch { - name = "ilmbase-musl-_fpstate.patch.patch"; - url = "https://raw.githubusercontent.com/void-linux/void-packages/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch"; - sha256 = "0appzbs9pd6dia5pzxmrs9ww35shlxi329ks6lchwzw4f2a81arz"; - }); -in - stdenv.mkDerivation rec { pname = "openexr"; - version = "2.4.1"; + version = "2.5.3"; + + outputs = [ "bin" "dev" "out" "doc" ]; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01"; + sha256 = "xyYdRrwAYdnRZmErIK0tZspguqtrXvixO5+6nMDoOh8="; }; - outputs = [ "bin" "dev" "out" "doc" ]; - nativeBuildInputs = [ cmake libtool ]; + patches = [ + # Fix pkg-config paths + (fetchpatch { + url = "https://github.com/AcademySoftwareFoundation/openexr/commit/6442fb71a86c09fb0a8118b6dbd93bcec4883a3c.patch"; + sha256 = "bwD5WTKPT4DjOJDnPXIvT5hJJkH0b71Vo7qupWO9nPA="; + }) + ]; + + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ ilmbase zlib ]; - postPatch = - if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "glibc") - then - '' - patch -p0 < ${non_glibc_fpstate_patch} - '' - else null; # `null` avoids rebuild on glibc - - enableParallelBuilding = true; - - passthru = { - # So that ilmbase (sharing the same source code) can re-use this patch. - inherit non_glibc_fpstate_patch; - }; - meta = with stdenv.lib; { description = "A high dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index b60eb4fbaa..7f9c2dbf3e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { - name = "openldap-2.4.50"; + name = "openldap-2.4.51"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw"; + sha256 = "0qmy2jkk6v9iqwrsdsn8s7lwzaplr01a2mgf21r6nl66lig7g47l"; }; # TODO: separate "out" and "bin" diff --git a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix index d6f23a9060..95c2a9c3fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -18,7 +18,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.4"; + version = "4.0.5"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = with stdenv.lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1i0slg2dxjdgw513aml1n9dsbdxn2fimi2b5712d5r9z4ar4xqj7"; + sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix index a861718521..4ded4770fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix @@ -2,7 +2,6 @@ libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, jpegSupport ? true, libjpeg, - jasperSupport ? false, jasper, # disable jasper by default (many CVE) exrSupport ? false, openexr, gifSupport ? true, giflib, pngSupport ? true, libpng, @@ -42,7 +41,6 @@ stdenv.mkDerivation rec { libX11 libXinerama libXrandr libGLU libGL glib ilmbase libxml2 pcre zlib ] ++ lib.optional jpegSupport libjpeg - ++ lib.optional jasperSupport jasper ++ lib.optional exrSupport openexr ++ lib.optional gifSupport giflib ++ lib.optional pngSupport libpng diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 6c5f2af3a5..e03752872f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.10"; + version = "1.0.11"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "1igxyji2ab3gki1hlndvws1b2868mk1n3c4c3y5z0h3g713zw9ap"; + sha256 = "0f3x5h0hdjiqgjf5mzzlprbhrbyabxllrjmlzgc9fv5rgqyyphj5"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix new file mode 100644 index 0000000000..094ee54464 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, eigen }: + +stdenv.mkDerivation rec { + pname = "orocos-kdl"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "orocos"; + repo = "orocos_kinematics_dynamics"; + rev = "v${version}"; + sha256 = "0qj56j231h0rnjbglakammxn2lwmhy5f2qa37v1f6pcn81dn13vv"; + }; + + sourceRoot = "source/orocos_kdl"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen ]; + + meta = with lib; { + description = "Kinematics and Dynamics Library"; + homepage = "https://www.orocos.org/kdl.html"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index 204de957f3..46f520e41e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -4,19 +4,24 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.23.20"; + version = "0.23.21"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "00xxhzgd7cpin9nzwrrzykvhjwqg5l45p0cq2gv68y3sxq2p9q6y"; + sha256 = "1w24brn8j3vwfp07p2hldw2ci06pk1cx1dvjk8jjxkccp20fk958"; }; outputs = [ "out" "dev"]; outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook pkgconfig which ]; + # for cross platform builds of p11-kit, libtasn1 in nativeBuildInputs + # provides the asn1Parser binary on the hostPlatform needed for building. + # at the same time, libtasn1 in buildInputs provides the libasn1 library + # to link against for the target platform. + # hence, libtasn1 is required in both native and build inputs. + nativeBuildInputs = [ autoreconfHook pkgconfig which libtasn1 ]; buildInputs = [ gettext libffi libiconv libtasn1 ]; autoreconfPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix index 506c78aca8..cb1bcdd1bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.11.0"; + name = "pcl-1.11.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "0nr3j71gh1v8x6wjr7a7xyr0438sw7vf621a5kbw4lmsxbj55k8g"; + sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; enableParallelBuilding = true; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pointclouds.org/"; + broken = stdenv.lib.versionAtLeast qtbase.version "5.15"; description = "Open project for 2D/3D image and point cloud processing"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix index d39b91355b..b127eb0a31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-pcre2-16" "--enable-pcre2-32" - "--enable-jit" - ]; + ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit"; outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix new file mode 100644 index 0000000000..2d3a5239d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -0,0 +1,25 @@ +{ mkDerivation, fetchurl, lib +, extra-cmake-modules +, qtbase +}: + +mkDerivation rec { + pname = "plasma-wayland-protocols"; + version = "1.1.1"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-xUkzg9EVFxw0NeqaIbOWaGBjKoRFRP+sj1SJBDalHTg="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ qtbase ]; + + meta = { + description = "Plasma Wayland Protocols"; + license = lib.licenses.lgpl21Plus; + platforms = qtbase.meta.platforms; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix index cd39e61a0c..074868251d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.90.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "20.08.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "mE2C5y6RQY0oCIUpjIvchVov2SZl/VKhNFsnI14MccQ="; + sha256 = "19gchq6fpa00ic5rn1zmjzxx85cif4hbdrsjcfd2aqxz9gqgwrdf"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix new file mode 100644 index 0000000000..3e3740a7c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.13.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.13.0"; + sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd"; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix index 77f4e1b905..06de3f7c56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; + sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks="; }; buildInputs = [ openssl qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qoauth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qoauth/default.nix index 85682e2c2a..41e4b80d9c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qoauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, qca2-qt5 }: +{ stdenv, fetchurl, qtbase, qmake, qca-qt5 }: stdenv.mkDerivation { name = "qoauth-2.0.0"; @@ -15,15 +15,15 @@ stdenv.mkDerivation { -e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|' ''; - buildInputs = [ qt5.qtbase qca2-qt5 ]; - nativeBuildInputs = [ qt5.qmake ]; + buildInputs = [ qtbase qca-qt5 ]; + nativeBuildInputs = [ qmake ]; - NIX_CFLAGS_COMPILE = "-I${qca2-qt5}/include/Qca-qt5/QtCrypto"; + NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; - inherit (qt5.qtbase.meta) platforms; + inherit (qtbase.meta) platforms; license = licenses.lgpl21; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix index b324bfed5a..9405e18eda 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, libjpeg, zlib, perl }: +{ stdenv, fetchFromGitHub, libjpeg, zlib, perl }: -let version = "9.1.1"; -in stdenv.mkDerivation rec { pname = "qpdf"; - inherit version; + version = "10.0.1"; - src = fetchurl { - url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz"; - sha256 = "0dj27wb9xg6pg95phbflfvy9rwxn1gh3kc4n175g0pf41r0zrim2"; + src = fetchFromGitHub { + owner = "qpdf"; + repo = "qpdf"; + rev = "release-qpdf-${version}"; + sha256 = "0g3rqf4wd1n9cms7ra1jnszsgw5bygv37jq2l20d8z5fajckhyyi"; }; nativeBuildInputs = [ perl ]; buildInputs = [ zlib libjpeg ]; - postPatch = '' - patchShebangs qpdf/fix-qdf - ''; - preCheck = '' patchShebangs qtest/bin/qtest-driver ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index 8512806e45..3deea882bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -3,9 +3,7 @@ , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng , libmng, which, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi -, buildMultimedia ? false # ancient gstreamer is broken -, alsaLib, gstreamer, gst-plugins-base -, buildWebkit ? false +, alsaLib , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , flashplayerFix ? false, gdk-pixbuf , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 @@ -178,7 +176,7 @@ stdenv.mkDerivation rec { "-exceptions" "-xmlpatterns" "-make" "libs" "-make" "tools" "-make" "translations" - "-no-phonon" (mk buildWebkit "webkit") (mk buildMultimedia "multimedia") "-audio-backend" + "-no-phonon" "-no-webkit" "-no-multimedia" "-audio-backend" ]) ++ [ "-${if demos then "" else "no"}make" "demos" "-${if examples then "" else "no"}make" "examples" @@ -191,9 +189,7 @@ stdenv.mkDerivation rec { [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM zlib libpng openssl dbus freetype fontconfig glib ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used - ++ lib.optional libGLSupported libGLU - ++ lib.optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib - ++ lib.optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ]; + ++ lib.optional libGLSupported libGLU; # The following libraries are only used in plugins buildInputs = diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index e8d052d3cd..fcceb6d6cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -97,13 +97,21 @@ let url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) - ] - ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; - qtwebkit = [ ./qtwebkit.patch ] - ++ optionals stdenv.isDarwin [ - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; + ] ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch + ./qtwebengine-darwin-fix-failed-static-assertion.patch + ]; + qtwebkit = [ + (fetchpatch { + name = "qtwebkit-bison-3.7-build.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; + sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; + }) + ./qtwebkit.patch + ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; qttools = [ ./qttools.patch ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch new file mode 100644 index 0000000000..510e25f56a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch @@ -0,0 +1,31 @@ +Fix a following build error: + +In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: +../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|." + static_assert( + ^ +../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here + : AssertConstructible, Unwrapped, Params>... { + ^ +../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity, base::internal::TypeList, long>, base::internal::TypeList, base::internal::TypeList >' requested here + static_assert(internal::AssertBindArgsValidity< + ^ +../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating, long>' requested here + return base::BindRepeating(std::forward(functor), + ^ +../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind, long>' requested here + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, + ^ + +Resurrected from https://github.com/NixOS/nixpkgs/blob/ddcf01bca6c7a7a7f096bec836a1e6a707ad473d/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch because the same problem is present in 5.12 when compiling on macOS. + +--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm ++++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm +@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, +- weak_ptr_factory_.GetWeakPtr(), nil)); ++ weak_ptr_factory_.GetWeakPtr(), nullptr)); + } + } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch index 546e753144..8ed3fe59a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch @@ -1,4 +1,18 @@ +diff --git a/configure.pri b/configure.pri +index 897bea54..6f834c20 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) { + } + + defineReplace(webEngineGetMacOSSDKVersion) { +- value = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") ++ value = $$system("xcrun --show-sdk-version") + return($$value) + } + diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +index 35eb6b89..7eed640a 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { @@ -19,15 +33,39 @@ diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf } } else { skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +@@ -111,7 +107,7 @@ defineTest(isMinOSXSDKVersion) { + requested_minor = $$2 + requested_patch = $$3 + isEmpty(requested_patch): requested_patch = 0 +- WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") ++ WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("xcrun --show-sdk-version") + export(WEBENGINE_OSX_SDK_PRODUCT_VERSION) + isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) { + skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.") diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +index 4426901c..3aa6057e 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri -@@ -5,8 +5,6 @@ load(functions) +@@ -5,16 +5,16 @@ load(functions) # otherwise query for it. QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) isEmpty(QMAKE_MAC_SDK_VERSION) { - QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") -- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") ++ QMAKE_MAC_SDK_VERSION = $$system("xcrun --show-sdk-version") + isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") } - + QMAKE_CLANG_DIR = "/usr" +-QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) +-!isEmpty(QMAKE_CLANG_PATH) { +- clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../") +- exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir +-} ++# QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) ++# !isEmpty(QMAKE_CLANG_PATH) { ++# clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../") ++# exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir ++# } + + QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++" + message("Using clang++ from $${QMAKE_CLANG_PATH}") diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index 1a90c610a5..469157a5f7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix @@ -72,11 +72,17 @@ let qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; - qtwebkit = [ ./qtwebkit.patch ] - ++ optionals stdenv.isDarwin [ - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; + qtwebkit = [ + (fetchpatch { + name = "qtwebkit-bison-3.7-build.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; + sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; + }) + ./qtwebkit.patch + ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; qttools = [ ./qttools.patch ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix new file mode 100644 index 0000000000..1a90c610a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -0,0 +1,176 @@ +/* + +# Updates + +Before a major version update, make a copy of this directory. (We like to +keep the old version around for a short time after major updates.) Add a +top-level attribute to `top-level/all-packages.nix`. + +1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. +2. From the top of the Nixpkgs tree, run + `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. + +*/ + +{ + newScope, + stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, + bison, cups ? null, harfbuzz, libGL, perl, + gstreamer, gst-plugins-base, gtk3, dconf, + llvmPackages_5, + + # options + developerBuild ? false, + decryptSslTraffic ? false, + debug ? false, +}: + +with stdenv.lib; + +let + + qtCompatVersion = srcs.qtbase.version; + + stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + + mirror = "https://download.qt.io"; + srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { + # qtwebkit does not have an official release tarball on the qt mirror and is + # mostly maintained by the community. + qtwebkit = rec { + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebkit"; + rev = "v${version}"; + sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg"; + }; + version = "5.212.0-alpha4"; + }; + }; + + patches = { + qtbase = + optionals stdenv.isDarwin [ + ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch + ./qtbase.patch.d/0002-qtbase-mac.patch + ] + ++ [ + ./qtbase.patch.d/0003-qtbase-mkspecs.patch + ./qtbase.patch.d/0004-qtbase-replace-libdir.patch + ./qtbase.patch.d/0005-qtbase-cmake.patch + ./qtbase.patch.d/0006-qtbase-gtk3.patch + ./qtbase.patch.d/0007-qtbase-xcursor.patch + ./qtbase.patch.d/0008-qtbase-tzdir.patch + ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch + ./qtbase.patch.d/0010-qtbase-assert.patch + ./qtbase.patch.d/0011-fix-header_module.patch + ]; + qtdeclarative = [ ./qtdeclarative.patch ]; + qtscript = [ ./qtscript.patch ]; + qtserialport = [ ./qtserialport.patch ]; + qtwebengine = [ ] + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; + qtwebkit = [ ./qtwebkit.patch ] + ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; + qttools = [ ./qttools.patch ]; + }; + + qtModule = + import ../qtModule.nix + { + inherit perl; + inherit (stdenv) lib; + # Use a variant of mkDerivation that does not include wrapQtApplications + # to avoid cyclic dependencies between Qt modules. + mkDerivation = + import ../mkDerivation.nix + { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + stdenvActual.mkDerivation; + } + { inherit self srcs patches; }; + + addPackages = self: with self; + let + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + in { + + mkDerivationWith = + import ../mkDerivation.nix + { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + + mkDerivation = mkDerivationWith stdenvActual.mkDerivation; + + qtbase = callPackage ../modules/qtbase.nix { + inherit (srcs.qtbase) src version; + patches = patches.qtbase; + inherit bison cups harfbuzz libGL; + withGtk3 = true; inherit dconf gtk3; + inherit developerBuild decryptSslTraffic; + }; + + qtcharts = callPackage ../modules/qtcharts.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; + qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; + qtimageformats = callPackage ../modules/qtimageformats.nix {}; + qtlocation = callPackage ../modules/qtlocation.nix {}; + qtmacextras = callPackage ../modules/qtmacextras.nix {}; + qtmultimedia = callPackage ../modules/qtmultimedia.nix { + inherit gstreamer gst-plugins-base; + }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; + qtquick1 = null; + qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; + qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; + qtscript = callPackage ../modules/qtscript.nix {}; + qtsensors = callPackage ../modules/qtsensors.nix {}; + qtserialport = callPackage ../modules/qtserialport.nix {}; + qtspeech = callPackage ../modules/qtspeech.nix {}; + qtsvg = callPackage ../modules/qtsvg.nix {}; + qtscxml = callPackage ../modules/qtscxml.nix {}; + qttools = callPackage ../modules/qttools.nix {}; + qttranslations = callPackage ../modules/qttranslations.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; + qtwayland = callPackage ../modules/qtwayland.nix {}; + qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; + qtwebengine = callPackage ../modules/qtwebengine.nix {}; + qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; + qtwebkit = callPackage ../modules/qtwebkit.nix {}; + qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; + qtwebview = callPackage ../modules/qtwebview.nix {}; + qtx11extras = callPackage ../modules/qtx11extras.nix {}; + qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; + + env = callPackage ../qt-env.nix {}; + full = env "qt-full-${qtbase.version}" ([ + qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 + qtscript qtsensors qtserialport qtsvg qttools qttranslations + qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets + qtwebview qtx11extras qtxmlpatterns + ] ++ optional (!stdenv.isDarwin) qtwayland + ++ optional (stdenv.isDarwin) qtmacextras); + + qmake = makeSetupHook { + deps = [ self.qtbase.dev ]; + substitutions = { + fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; + }; + } ../hooks/qmake-hook.sh; + + wrapQtAppsHook = makeSetupHook { + deps = + [ self.qtbase.dev makeWrapper ] + ++ optional stdenv.isLinux self.qtwayland.dev; + } ../hooks/wrap-qt-apps-hook.sh; + }; + + self = makeScope newScope addPackages; + +in self diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh new file mode 100644 index 0000000000..97829a133c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/ ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch new file mode 100644 index 0000000000..ba4c54b228 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -0,0 +1,411 @@ +From 5ec1d1009d9943f20e82ffc087deabb31d447e75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:07:58 +0200 +Subject: [PATCH 01/11] qtbase-mkspecs-mac + +--- + mkspecs/common/mac.conf | 2 +- + mkspecs/features/mac/default_post.prf | 206 -------------------------- + mkspecs/features/mac/default_pre.prf | 58 -------- + mkspecs/features/mac/sdk.mk | 25 ---- + mkspecs/features/mac/sdk.prf | 61 -------- + 5 files changed, 1 insertion(+), 351 deletions(-) + delete mode 100644 mkspecs/features/mac/sdk.mk + delete mode 100644 mkspecs/features/mac/sdk.prf + +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf +index 61bea952b2..9909dae726 100644 +--- a/mkspecs/common/mac.conf ++++ b/mkspecs/common/mac.conf +@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = +diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf +index 92a9112bca..b80ec1e801 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -68,212 +68,6 @@ 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 { +- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks +- else: QMAKE_RPATHDIR += @executable_path/../Frameworks +- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks +-} +- +-# Don't pass -headerpad_max_install_names when using Bitcode. +-# In that case the linker emits a warning stating that the flag is ignored when +-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). +-# Using this flag is also unnecessary in practice on UIKit platforms since they +-# are sandboxed, and only UIKit platforms support bitcode to begin with. +-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD +- +-app_extension_api_only { +- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +-} +- +-macx-xcode { +- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO +- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ +- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO +- else: \ +- qmake_pkginfo_typeinfo.value = "????" +- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo +- +- bundle_version = $$VERSION +- isEmpty(bundle_version): bundle_version = 1.0.0 +- +- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three +- VER_MAJ = $$member(l, 0, 0) +- VER_MIN = $$member(l, 1, 1) +- VER_PAT = $$member(l, 2, 2) +- unset(l) +- +- qmake_full_version.name = QMAKE_FULL_VERSION +- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} +- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version +- +- qmake_short_version.name = QMAKE_SHORT_VERSION +- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} +- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version +- +- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { +- debug_information_format.name = DEBUG_INFORMATION_FORMAT +- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT +- debug_information_format.build = debug +- QMAKE_MAC_XCODE_SETTINGS += debug_information_format +- } +- +- QMAKE_XCODE_ARCHS = +- +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- +- simulator { +- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" +- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_simulator +- } +- +- only_active_arch.name = ONLY_ACTIVE_ARCH +- only_active_arch.value = YES +- only_active_arch.build = debug +- QMAKE_MAC_XCODE_SETTINGS += only_active_arch +-} else { +- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS +- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS +- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS +- +- isEmpty(VALID_ARCHS): \ +- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") +- +- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) +- +- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- +- arch_flags = $(EXPORT_ARCH_ARGS) +- +- QMAKE_CFLAGS += $$arch_flags +- QMAKE_CXXFLAGS += $$arch_flags +- QMAKE_LFLAGS += $$arch_flags +- +- QMAKE_PCH_ARCHS = $$VALID_ARCHS +- +- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET +- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET +- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET +- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET +- +- # If we're doing a simulator and device build, device and simulator +- # architectures use different paths and flags for the sysroot and +- # deployment target switch, so we must multiplex them across multiple +- # architectures using -Xarch. Otherwise we fall back to the simple path. +- # This is not strictly necessary, but results in cleaner command lines +- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit +- # individual rules to a different set of architecture(s) from the overall +- # build (such as machtest in QtCore). +- simulator:device { +- QMAKE_XARCH_CFLAGS = +- QMAKE_XARCH_LFLAGS = +- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS +- +- for (arch, VALID_ARCHS) { +- contains(VALID_SIMULATOR_ARCHS, $$arch) { +- sdk = $$simulator.sdk +- version_identifier = $$simulator.deployment_identifier +- } else { +- sdk = $$device.sdk +- version_identifier = $$device.deployment_identifier +- } +- +- version_min_flags = \ +- -Xarch_$${arch} \ +- -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- +- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) +- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) +- +- QMAKE_EXTRA_VARIABLES += \ +- QMAKE_XARCH_CFLAGS_$${arch} \ +- QMAKE_XARCH_LFLAGS_$${arch} +- } +- +- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) +- } else { +- simulator { +- version_identifier = $$simulator.deployment_identifier +- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) +- } else { +- version_identifier = $$device.deployment_identifier +- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) +- } +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag +- } +- +- # Enable precompiled headers for multiple architectures +- QMAKE_CFLAGS_USE_PRECOMPILE = +- for (arch, VALID_ARCHS) { +- icc_pch_style: \ +- use_flag = "-pch-use " +- else: \ +- use_flag = -include +- +- # Only use Xarch with multi-arch, as the option confuses ccache +- count(VALID_ARCHS, 1, greaterThan): \ +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- -Xarch_$${arch} +- +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} +- } +- icc_pch_style { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} +- QMAKE_CFLAGS_USE_PRECOMPILE = +- } else { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- } +- +- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} +-} +- +-!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { +- # Explicit SDK version has been set, respect that +- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version +-} +- +-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- 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_target = $$QMAKE_BUNDLE +-isEmpty(xcode_product_bundle_target): \ +- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" +-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting +- + !macx-xcode { + generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS + generate_xcode_project.target = xcodeproj +diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf +index e3534561a5..3b01424e67 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf +@@ -1,60 +1,2 @@ + CONFIG = asset_catalogs rez $$CONFIG + load(default_pre) +- +-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { +- # Get path of Xcode's Developer directory +- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") +- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode path is valid +- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +-} +- +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") +- +-!isEmpty(QMAKE_XCODEBUILD_PATH) { +- # Make sure Xcode is set up properly +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") +- +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } +-} +- +-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { +- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist +- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ +- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") +- +- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ +- cache(QMAKE_TARGET_BUNDLE_PREFIX) +-} +- +-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon +- +-# Make the default debug info format for static debug builds +-# DWARF instead of DWARF with dSYM. This cuts down build times +-# for application debug builds significantly, as Xcode doesn't +-# have to pull out all the DWARF info from the Qt static libs +-# and put it into a dSYM file. We don't need that dSYM file in +-# the first place, since the information is available in the +-# object files inside the archives (static libraries). +-macx-xcode:qtConfig(static): \ +- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf +- +-# This variable is used by the xcode_dynamic_library_suffix +-# feature, which allows Xcode to choose the Qt libraries to link to +-# at build time, depending on the current Xcode SDK and configuration. +-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +- +-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 +diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk +deleted file mode 100644 +index c40f58c987..0000000000 +--- a/mkspecs/features/mac/sdk.mk ++++ /dev/null +@@ -1,25 +0,0 @@ +- +-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) +- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 +- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) +- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) +- # We don't want to complain about out of date SDK unless the target needs to be remade. +- # This covers use-cases such as running 'make check' after moving the build to a +- # computer without Xcode or with a different Xcode version. +- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) +- ifeq ($(TARGET_UP_TO_DATE),0) +- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) +- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) +- else ifneq ($(CURRENT_MAC_SDK_VERSION),) +- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) +- else +- $(info Unknown error resolving current platform SDK version.) +- endif +- $(info This requires a fresh build. Please wipe the build directory completely,) +- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) +- $(error ^) +- endif +- endif +-endif +diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf +deleted file mode 100644 +index 3a9c2778bb..0000000000 +--- a/mkspecs/features/mac/sdk.prf ++++ /dev/null +@@ -1,61 +0,0 @@ +- +-isEmpty(QMAKE_MAC_SDK): \ +- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") +- +-contains(QMAKE_MAC_SDK, .*/.*): \ +- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") +- +-defineReplace(xcodeSDKInfo) { +- info = $$1 +- equals(info, "Path"): \ +- infoarg = --show-sdk-path +- equals(info, "PlatformPath"): \ +- infoarg = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- 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 $$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(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}) +- } +- +- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) +-} +- +-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) +-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- +-isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { +- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL +- sysrootified = +- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val +- QMAKE_INCDIR_OPENGL = $$sysrootified +-} +- +-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 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) +- next() +- } +- +- value = $$eval($$tool) +- isEmpty(value): next() +- +- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") +- isEmpty(sysrooted): next() +- +- $$tool = $$sysrooted $$member(value, 1, -1) +- cache($$tool_variable, set stash, $$tool) +-} +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch new file mode 100644 index 0000000000..4271b64679 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch @@ -0,0 +1,118 @@ +From a9ba67d3db7390d9ddc46751346e70b0a522711a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:15:27 +0200 +Subject: [PATCH 02/11] qtbase-mac + +--- + src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- + src/testlib/qappletestlogger.cpp | 2 +- + src/testlib/qappletestlogger_p.h | 2 +- + src/testlib/qtestcase.cpp | 2 +- + src/testlib/qtestlog.cpp | 2 +- + src/testlib/qtestlog_p.h | 4 ++-- + 6 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h +index 535d3579b2..3d70bf39c1 100644 +--- a/src/corelib/kernel/qcore_mac_p.h ++++ b/src/corelib/kernel/qcore_mac_p.h +@@ -225,7 +225,7 @@ private: + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include +@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp +index dfeadebdef..2a74330c1d 100644 +--- a/src/testlib/qappletestlogger.cpp ++++ b/src/testlib/qappletestlogger.cpp +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h +index 62c6d95c5a..f8e0a3b767 100644 +--- a/src/testlib/qappletestlogger_p.h ++++ b/src/testlib/qappletestlogger_p.h +@@ -57,7 +57,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + class QAppleTestLogger : public QAbstractTestLogger + { + public: +diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp +index f45999c7fa..d5b525dc12 100644 +--- a/src/testlib/qtestcase.cpp ++++ b/src/testlib/qtestcase.cpp +@@ -849,7 +849,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool + + bool addFallbackLogger = !explicitLoggerRequested; + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + // Any explicitly requested loggers will be added by now, so we can check if they use stdout + const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); + if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { +diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp +index a388780532..63ab965101 100644 +--- a/src/testlib/qtestlog.cpp ++++ b/src/testlib/qtestlog.cpp +@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) + case QTestLog::TAP: + logger = new QTapTestLogger(filename); + break; +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + case QTestLog::Apple: + logger = new QAppleTestLogger; + break; +diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h +index ddaf14ed9b..0c49c93a88 100644 +--- a/src/testlib/qtestlog_p.h ++++ b/src/testlib/qtestlog_p.h +@@ -74,8 +74,8 @@ public: + Q_DISABLE_COPY_MOVE(QTestLog) + + enum LogMode { +- Plain = 0, XML, LightXML, JUnitXML, CSV, TeamCity, TAP +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++ Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + , Apple + #endif + #if defined(HAVE_XCTEST) +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch new file mode 100644 index 0000000000..9f8ef67ab5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch @@ -0,0 +1,464 @@ +From 82771c437957b3684ce296997d795432756aa8b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:25:52 +0200 +Subject: [PATCH 03/11] qtbase-mkspecs + +--- + mkspecs/features/create_cmake.prf | 51 +++--------- + .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ + mkspecs/features/qml_module.prf | 2 +- + mkspecs/features/qml_plugin.prf | 2 +- + mkspecs/features/qt_app.prf | 2 +- + mkspecs/features/qt_build_paths.prf | 4 +- + mkspecs/features/qt_docs.prf | 10 +-- + mkspecs/features/qt_example_installs.prf | 2 +- + mkspecs/features/qt_functions.prf | 2 +- + mkspecs/features/qt_installs.prf | 22 ++--- + mkspecs/features/qt_plugin.prf | 2 +- + 11 files changed, 38 insertions(+), 141 deletions(-) + +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 24ed125f12..f0666a1986 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -21,7 +21,7 @@ load(cmake_functions) + # at cmake time whether package has been found via a symlink, and correct + # that to an absolute path. This is only done for installations to + # the /usr or / prefix. +-CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) ++CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) + contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR + + CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake +@@ -77,45 +77,20 @@ split_incpath { + $$cmake_extra_source_includes.output + } + +-CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { +- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ +- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True +-} ++CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ ++CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + +-CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_LIB_DIR,"^\\.\\./.*") { +- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ +- CMAKE_LIB_DIR_IS_ABSOLUTE = True +-} else { +- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) +- # We need to go up another two levels because the CMake files are +- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} +- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" +-} ++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_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, "^\\.\\./.*") { +- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ +- CMAKE_DLL_DIR_IS_ABSOLUTE = True +- } +-} else { +- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR +- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE +-} ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_DLL_DIR_IS_ABSOLUTE = True + + static|staticlib:CMAKE_STATIC_TYPE = true + +@@ -258,7 +233,7 @@ contains(CONFIG, plugin) { + + cmake_qt5_plugin_file.files = $$cmake_target_file.output + static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output +- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + INSTALLS += cmake_qt5_plugin_file + + return() +@@ -400,7 +375,7 @@ exists($$cmake_macros_file.input) { + cmake_qt5_module_files.files += $$cmake_macros_file.output + } + +-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + + # 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 309798a767..b6c3ab8609 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -2,30 +2,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() + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!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)") +@@ -145,11 +121,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + IsDebugAndRelease) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set(_deps + ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} +@@ -209,11 +181,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + !!ENDIF + + !!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) + if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +@@ -229,24 +197,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 +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" + ) + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE +-!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -262,7 +219,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -499,25 +455,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) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -536,25 +480,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) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -581,11 +513,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf +index c0b50416c9..cabe39b22e 100644 +--- a/mkspecs/features/qml_module.prf ++++ b/mkspecs/features/qml_module.prf +@@ -51,7 +51,7 @@ builtin_resources { + # Install rules + qmldir.base = $$qmldir_path + qmldir.files = $$qmldir_file +-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH + + qmlfiles.base = $$_PRO_FILE_PWD_ + qmlfiles.files = $$fq_aux_qml_files +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index 1b67435787..24a1f78c17 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -50,7 +50,7 @@ load(qt_build_paths) + + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH + +-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++target.path = $$NIX_OUTPUT_QML/$$TARGETPATH + INSTALLS += target + + # Some final setup +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 8354f30eea..62028fef8e 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -30,7 +30,7 @@ host_build:force_bootstrap { + target.path = $$[QT_HOST_BINS] + } else { + !build_pass:qtConfig(debug_and_release): CONFIG += release +- target.path = $$[QT_INSTALL_BINS] ++ target.path = $$NIX_OUTPUT_BIN/bin + CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable + } + INSTALLS += target +diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf +index 3bb3823a8e..655b7b7db8 100644 +--- a/mkspecs/features/qt_build_paths.prf ++++ b/mkspecs/features/qt_build_paths.prf +@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ + !force_independent { + # If the module is not built independently, everything ends up in qtbase. + # This is the case in non-prefix builds, except for selected modules. +- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] +- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] ++ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT ++ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT + } +diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf +index 095bf15dac..4cc977bea5 100644 +--- a/mkspecs/features/qt_docs.prf ++++ b/mkspecs/features/qt_docs.prf +@@ -65,7 +65,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR + + QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) + !build_online_docs: \ +- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) ++ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) + PREP_DOC_INDEXES = + DOC_INDEXES = + !isEmpty(QTREPOS) { +@@ -84,8 +84,8 @@ DOC_INDEXES = + DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) + } else { + prepare_docs: \ +- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) +- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) ++ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) ++ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) + } + + qtattributionsscanner.target = qtattributionsscanner +@@ -108,12 +108,12 @@ prepare_docs { + qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) + + inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR +- inst_html_docs.path = $$[QT_INSTALL_DOCS] ++ inst_html_docs.path = $$NIX_OUTPUT_DOC + inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build + INSTALLS += inst_html_docs + + inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch +- inst_qch_docs.path = $$[QT_INSTALL_DOCS] ++ inst_qch_docs.path = $$NIX_OUTPUT_DOC + inst_qch_docs.CONFIG += no_check_exist no_default_install no_build + INSTALLS += inst_qch_docs + +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index 15b373ba40..5c373fe1d5 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -91,7 +91,7 @@ sourcefiles += \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) +-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase ++sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase + INSTALLS += sources + + check_examples { +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 7777e615bd..abeb03a663 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -87,7 +87,7 @@ defineTest(qtHaveModule) { + defineTest(qtPrepareTool) { + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ cmd = $$system("command -v $$2") + exists($${cmd}.pl) { + $${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 1ebca17366..a8f958eae8 100644 +--- a/mkspecs/features/qt_installs.prf ++++ b/mkspecs/features/qt_installs.prf +@@ -12,16 +12,10 @@ + #library + !qt_no_install_library { + win32 { +- host_build: \ +- dlltarget.path = $$[QT_HOST_BINS] +- else: \ +- dlltarget.path = $$[QT_INSTALL_BINS] ++ dlltarget.path = $$NIX_OUTPUT_BIN/bin + INSTALLS += dlltarget + } +- host_build: \ +- target.path = $$[QT_HOST_LIBS] +- else: \ +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + !static: target.CONFIG = no_dll + INSTALLS += target + } +@@ -29,35 +23,35 @@ + #headers + qt_install_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 ++ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += targ_headers + + private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES +- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private ++ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + generated_privates: \ + private_headers.CONFIG += no_check_exist + INSTALLS += private_headers + + qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES +- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa ++ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa + INSTALLS += qpa_headers + } + + #module + qt_install_module { + !isEmpty(MODULE_PRI) { +- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + pritarget.files = $$MODULE_PRI + INSTALLS += pritarget + } else: isEmpty(MODULE_PRIVATE_PRI) { + warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") + } + !isEmpty(MODULE_PRIVATE_PRI) { +- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + privpritarget.files = $$MODULE_PRIVATE_PRI + INSTALLS += privpritarget + } +diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf +index 573d717eea..024c624cb6 100644 +--- a/mkspecs/features/qt_plugin.prf ++++ b/mkspecs/features/qt_plugin.prf +@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { + } + } + +-target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE ++target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE + INSTALLS += target + + qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch new file mode 100644 index 0000000000..bbfc938978 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch @@ -0,0 +1,68 @@ +From 30d3906ff5e8671e9c97c5336c6c549656c0e293 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:27:41 +0200 +Subject: [PATCH 04/11] qtbase-replace-libdir + +--- + mkspecs/features/qt_common.prf | 20 ++------------------ + mkspecs/features/qt_module.prf | 5 +---- + 2 files changed, 3 insertions(+), 22 deletions(-) + +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index 8df94aa4ee..414029f31c 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib)|contains(TEMPLATE, aux) { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR +- host_build { +- qqt_libdir = \$\$\$\$[QT_HOST_LIBS] +- qt_libdir = $$[QT_HOST_LIBS] +- } else { +- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] +- qt_libdir = $$[QT_INSTALL_LIBS] +- } ++ qt_libdir = $$NIX_OUTPUT_OUT/lib + contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { +- lib_replace0.match = $$rplbase/lib/ +- lib_replace0.replace = $$qqt_libdir/ +- lib_replace0.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += lib_replace0 + lib_replace.match = "[^ ']*$$rplbase/lib" + lib_replace.replace = + } else { + lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$qqt_libdir ++ lib_replace.replace = $$qt_libdir + } + lib_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += lib_replace +- !equals(qt_libdir, $$rplbase/lib) { +- qtlibdir_replace.match = $$qt_libdir +- qtlibdir_replace.replace = $$qqt_libdir +- qtlibdir_replace.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace +- } + } + contains(TEMPLATE, .*lib)|darwin { + if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 828a9621b9..b9e5d35026 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -305,10 +305,7 @@ load(qt_targets) + } + !lib_bundle:unix { + CONFIG += create_libtool +- host_build: \ +- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] +- else: \ +- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" ++ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib + !isEmpty(lib_replace0.match) { + ltlib_replace0.match = $$lib_replace0.match + ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch new file mode 100644 index 0000000000..19646df166 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch @@ -0,0 +1,194 @@ +From 7871fbcefc7596a458cec005edafd9d4962baea3 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:34:28 -0500 +Subject: [PATCH 05/11] qtbase-cmake + +--- + mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- + mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- + src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- + src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- + .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- + src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- + src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 8 files changed, 16 insertions(+), 24 deletions(-) + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index b6c3ab8609..edb6a89316 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -513,7 +513,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") ++ set(imported_location \"${PLUGIN_LOCATION}\") + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +index b550a52c60..dbd3243885 100644 +--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -53,10 +53,10 @@ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES + !!ENDIF + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 4c1c3a612b..bb8ab08143 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -21,7 +21,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -38,7 +38,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -121,7 +121,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) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -135,7 +135,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +index c357237d0e..6f0c75de3c 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +index 706304cf34..546420f6ad 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index a814678f7b..b13b964ec8 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -2,11 +2,7 @@ + if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbuscpp2xml PROPERTIES +@@ -17,11 +13,7 @@ endif() + if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbusxml2cpp PROPERTIES +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 84dbbfebd4..8ad0720c5c 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 83d8004a08..ca0b8e4bfb 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch new file mode 100644 index 0000000000..48f4c9b3f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch @@ -0,0 +1,48 @@ +From 7a9f4f875053aed8ab387161eea623bf8325cfa8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:33 -0500 +Subject: [PATCH 06/11] qtbase-gtk3 + +--- + src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp +index 860fc3a26e..8cd4663d49 100644 +--- a/src/plugins/platformthemes/gtk3/main.cpp ++++ b/src/plugins/platformthemes/gtk3/main.cpp +@@ -39,6 +39,7 @@ + + #include + #include "qgtk3theme.h" ++#include + + QT_BEGIN_NAMESPACE + +@@ -54,8 +55,22 @@ public: + QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) + { + Q_UNUSED(params); +- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) ++ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { ++ ++#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS ++ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); ++ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); ++ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); ++#endif ++ ++#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES ++ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); ++ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); ++ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); ++#endif ++ + return new QGtk3Theme; ++ } + + return nullptr; + } +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch new file mode 100644 index 0000000000..617b0684df --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch @@ -0,0 +1,29 @@ +From 707098eada20ba074e642a73248de74407bc261c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:58 -0500 +Subject: [PATCH 07/11] qtbase-xcursor + +--- + src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index 42c7a52bd4..ba670ddb44 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -317,10 +317,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) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch new file mode 100644 index 0000000000..319de315bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch @@ -0,0 +1,64 @@ +From da003b582ee8823b29b1ff5c0aca8e06e7741b94 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:36:25 -0500 +Subject: [PATCH 08/11] qtbase-tzdir + +--- + src/corelib/time/qtimezoneprivate_tz.cpp | 31 +++++++++++++++--------- + 1 file changed, 19 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp +index 01f9a6cce0..910338205a 100644 +--- a/src/corelib/time/qtimezoneprivate_tz.cpp ++++ b/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -77,7 +77,11 @@ typedef QHash QTzTimeZoneHash; + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ // Try TZDIR first, in case we're running on NixOS. ++ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); ++ // Fallback to traditional paths in case we are not on NixOS. ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -672,20 +676,23 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return ret; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first, in case we're running on NixOS ++ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ +- const QByteArray zoneInfo = ianaId.split(',').at(0); +- const char *begin = zoneInfo.constBegin(); +- if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() +- && (begin == zoneInfo.constEnd() +- || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { +- ret.m_posixRule = ianaId; ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ ++ const QByteArray zoneInfo = ianaId.split(',').at(0); ++ const char *begin = zoneInfo.constBegin(); ++ if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() ++ && (begin == zoneInfo.constEnd() ++ || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { ++ ret.m_posixRule = ianaId; ++ } ++ return ret; + } +- return ret; + } + } + } +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch new file mode 100644 index 0000000000..28013ec104 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch @@ -0,0 +1,33 @@ +From 9fc6efaf774a8716932c98c0b0ea6408ed2614c2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sun, 10 May 2020 12:47:28 +0200 +Subject: [PATCH 09/11] qtbase-qtpluginpath + +--- + src/corelib/kernel/qcoreapplication.cpp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp +index 5fdcc9b914..1a126ef359 100644 +--- a/src/corelib/kernel/qcoreapplication.cpp ++++ b/src/corelib/kernel/qcoreapplication.cpp +@@ -2691,6 +2691,16 @@ QStringList QCoreApplication::libraryPathsLocked() + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ ++ + auto setPathsFromEnv = [&](QString libPathEnv) { + if (!libPathEnv.isEmpty()) { + QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts); +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch new file mode 100644 index 0000000000..c5b099c4ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch @@ -0,0 +1,32 @@ +From 015845b3c320d02691f28373097d1e6dbbac79f7 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:37:04 -0500 +Subject: [PATCH 10/11] qtbase-assert + +--- + src/testlib/qtestassert.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index 6498ea84ef..d821ced7fc 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -44,10 +44,13 @@ + + QT_BEGIN_NAMESPACE + +- ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else + #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) +- + #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch new file mode 100644 index 0000000000..9873865611 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch @@ -0,0 +1,25 @@ +From 2bce8511877db1db532e1437e7140b1d55633f86 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Mon, 30 Sep 2019 20:15:40 -0500 +Subject: [PATCH 11/11] fix header_module + +--- + mkspecs/features/qt_module.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index b9e5d35026..9924271042 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -84,7 +84,7 @@ header_module { + CONFIG += qt_no_install_library + + # Allow creation of .prl, .la and .pc files. +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + target.CONFIG += dummy_install + INSTALLS += target + } else { +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch new file mode 100644 index 0000000000..d9c721e694 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch @@ -0,0 +1,114 @@ +diff --git a/src/particles/particles.pro b/src/particles/particles.pro +index aaaa83419a..58aee00036 100644 +--- a/src/particles/particles.pro ++++ b/src/particles/particles.pro +@@ -20,6 +20,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Particles.2 + QML_IMPORT_NAME = QtQuick.Particles + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/qml/qml.pro b/src/qml/qml.pro +index e39a8319b6..90c0331278 100644 +--- a/src/qml/qml.pro ++++ b/src/qml/qml.pro +@@ -72,6 +72,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml + QML_IMPORT_NAME = QtQml + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/qmlmodels/qmlmodels.pro b/src/qmlmodels/qmlmodels.pro +index 4ac093556d..112e2c2be0 100644 +--- a/src/qmlmodels/qmlmodels.pro ++++ b/src/qmlmodels/qmlmodels.pro +@@ -68,6 +68,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/Models.2 + QML_IMPORT_NAME = QtQml.Models + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro +index c2e8068fc6..79dba368f7 100644 +--- a/src/qmltest/qmltest.pro ++++ b/src/qmltest/qmltest.pro +@@ -34,7 +34,7 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/Qt/test/qtestroot + QML_IMPORT_NAME = Qt.test.qtestroot + QML_IMPORT_VERSION = 1.0 +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + # Install qmldir + qmldir.files = $$PWD/qmldir +diff --git a/src/qmlworkerscript/qmlworkerscript.pro b/src/qmlworkerscript/qmlworkerscript.pro +index 84466062e1..79885455cc 100644 +--- a/src/qmlworkerscript/qmlworkerscript.pro ++++ b/src/qmlworkerscript/qmlworkerscript.pro +@@ -23,6 +23,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/WorkerScript.2 + QML_IMPORT_NAME = QtQml.WorkerScript + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/quick/quick.pro b/src/quick/quick.pro +index f2d49cf939..c401b04c4e 100644 +--- a/src/quick/quick.pro ++++ b/src/quick/quick.pro +@@ -52,4 +52,4 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick.2 + QML_IMPORT_NAME = QtQuick + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes +diff --git a/src/quickshapes/quickshapes.pro b/src/quickshapes/quickshapes.pro +index 4dbd3e5e46..0c6b186fc8 100644 +--- a/src/quickshapes/quickshapes.pro ++++ b/src/quickshapes/quickshapes.pro +@@ -36,4 +36,4 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Shapes + QML_IMPORT_NAME = QtQuick.Shapes + IMPORT_VERSION = 1.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index 005db4248..685c5b1b2 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); ++ } ++ } ++ + // env import paths + 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 537eaf62ea..e21de58f64 100644 +--- a/tools/qmlcachegen/qmlcache.prf ++++ b/tools/qmlcachegen/qmlcache.prf +@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) { + } + + qmlcacheinst.base = $$QMLCACHE_DESTDIR +-qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH + qmlcacheinst.CONFIG = no_check_exist + + qmlcachegen.input = CACHEGEN_FILES diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtscript.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtscript.patch new file mode 100644 index 0000000000..5508dec128 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtscript.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +index 1f6d25e..087c3fb 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +@@ -81,7 +81,7 @@ + #include + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtserialport.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtserialport.patch new file mode 100644 index 0000000000..f25524e80b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtserialport.patch @@ -0,0 +1,22 @@ +diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h +index af2dab2..8e17f64 100644 +--- a/src/serialport/qtudev_p.h ++++ b/src/serialport/qtudev_p.h +@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN + inline bool resolveSymbols(QLibrary *udevLibrary) + { + if (!udevLibrary->isLoaded()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); ++#endif + if (!udevLibrary->load()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); ++#endif + if (!udevLibrary->load()) { + qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); + return false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qttools.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qttools.patch new file mode 100644 index 0000000000..8ae12198ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qttools.patch @@ -0,0 +1,15 @@ +--- a/src/macdeployqt/shared/shared.cpp ++++ b/src/macdeployqt/shared/shared.cpp +@@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + if (!QFile(qmlImportScannerPath).exists()) + qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; + ++#ifdef NIXPKGS_QMLIMPORTSCANNER ++ // Fallback: Nixpkgs hardcoded path ++ if (!QFile(qmlImportScannerPath).exists()) ++ qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER; ++#endif ++ + // Verify that we found a qmlimportscanner binary + if (!QFile(qmlImportScannerPath).exists()) { + LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 0000000000..546e753144 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,33 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { + } else:osx { + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + !isMinXcodeVersion(8, 3, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") +- return(false) + } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") +@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { + return(false) + } + !isMinOSXSDKVersion(10, 12): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) + } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch new file mode 100644 index 0000000000..a7087f5176 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch @@ -0,0 +1,11 @@ +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) + endif () + + if (APPLE) +- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) + endif () + + if (ENABLE_MATHML) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch new file mode 100644 index 0000000000..26d189d860 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch @@ -0,0 +1,45 @@ +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -9,7 +9,6 @@ set(JSC_LIBRARIES + ) + + if (WTF_OS_MAC_OS_X) +- list(APPEND JSC_LIBRARIES edit) + endif () + + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -563,7 +563,6 @@ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 +-#define HAVE_READLINE 1 + #if USE(APPLE_INTERNAL_SDK) + #define USE_CFNETWORK 1 + #endif +@@ -650,7 +649,6 @@ + #define HAVE_MADV_DONTNEED 1 + #define HAVE_MERGESORT 1 + #define HAVE_PTHREAD_SETNAME_NP 1 +-#define HAVE_READLINE 1 + #define HAVE_SYS_TIMEB_H 1 + + #if !PLATFORM(GTK) && !PLATFORM(QT) +diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake +--- a/Source/WTF/wtf/PlatformMac.cmake ++++ b/Source/WTF/wtf/PlatformMac.cmake +@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) + + find_library(COCOA_LIBRARY Cocoa) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +-find_library(READLINE_LIBRARY Readline) + list(APPEND WTF_LIBRARIES + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} +- ${READLINE_LIBRARY} + libicucore.dylib + ) + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch new file mode 100644 index 0000000000..b94a4b76cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/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/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix new file mode 100644 index 0000000000..c88e896286 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -0,0 +1,342 @@ +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.15 +{ fetchurl, mirror }: + +{ + qt3d = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qt3d-everywhere-src-5.15.0.tar.xz"; + sha256 = "61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd"; + name = "qt3d-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtactiveqt-everywhere-src-5.15.0.tar.xz"; + sha256 = "1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51"; + name = "qtactiveqt-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtandroidextras-everywhere-src-5.15.0.tar.xz"; + sha256 = "c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671"; + name = "qtandroidextras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtbase = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz"; + sha256 = "9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5"; + name = "qtbase-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtcharts = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtcharts-everywhere-src-5.15.0.tar.xz"; + sha256 = "44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7"; + name = "qtcharts-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtconnectivity-everywhere-src-5.15.0.tar.xz"; + sha256 = "f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd"; + name = "qtconnectivity-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdatavis3d-everywhere-src-5.15.0.tar.xz"; + sha256 = "8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3"; + name = "qtdatavis3d-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz"; + sha256 = "9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699"; + name = "qtdeclarative-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtdoc = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdoc-everywhere-src-5.15.0.tar.xz"; + sha256 = "07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f"; + name = "qtdoc-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtgamepad = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgamepad-everywhere-src-5.15.0.tar.xz"; + sha256 = "dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a"; + name = "qtgamepad-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz"; + sha256 = "0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda"; + name = "qtgraphicaleffects-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtimageformats = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtimageformats-everywhere-src-5.15.0.tar.xz"; + sha256 = "83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8"; + name = "qtimageformats-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtlocation = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz"; + sha256 = "c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f"; + name = "qtlocation-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtlottie = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlottie-everywhere-src-5.15.0.tar.xz"; + sha256 = "2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833"; + name = "qtlottie-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtmacextras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmacextras-everywhere-src-5.15.0.tar.xz"; + sha256 = "95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439"; + name = "qtmacextras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz"; + sha256 = "0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7"; + name = "qtmultimedia-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtnetworkauth = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtnetworkauth-everywhere-src-5.15.0.tar.xz"; + sha256 = "96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85"; + name = "qtnetworkauth-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtpurchasing-everywhere-src-5.15.0.tar.xz"; + sha256 = "2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16"; + name = "qtpurchasing-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquick3d = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquick3d-everywhere-src-5.15.0.tar.xz"; + sha256 = "6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb"; + name = "qtquick3d-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz"; + sha256 = "7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee"; + name = "qtquickcontrols-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz"; + sha256 = "839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f"; + name = "qtquickcontrols2-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquicktimeline = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz"; + sha256 = "16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00"; + name = "qtquicktimeline-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtremoteobjects = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtremoteobjects-everywhere-src-5.15.0.tar.xz"; + sha256 = "86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf"; + name = "qtremoteobjects-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtscript = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscript-everywhere-src-5.15.0.tar.xz"; + sha256 = "02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373"; + name = "qtscript-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtscxml = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscxml-everywhere-src-5.15.0.tar.xz"; + sha256 = "9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72"; + name = "qtscxml-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtsensors = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsensors-everywhere-src-5.15.0.tar.xz"; + sha256 = "12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da"; + name = "qtsensors-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtserialbus = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialbus-everywhere-src-5.15.0.tar.xz"; + sha256 = "cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379"; + name = "qtserialbus-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtserialport = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialport-everywhere-src-5.15.0.tar.xz"; + sha256 = "ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67"; + name = "qtserialport-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtspeech = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtspeech-everywhere-src-5.15.0.tar.xz"; + sha256 = "7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61"; + name = "qtspeech-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtsvg = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz"; + sha256 = "ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d"; + name = "qtsvg-everywhere-src-5.15.0.tar.xz"; + }; + }; + qttools = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz"; + sha256 = "ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437"; + name = "qttools-everywhere-src-5.15.0.tar.xz"; + }; + }; + qttranslations = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz"; + sha256 = "45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe"; + name = "qttranslations-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz"; + sha256 = "f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be"; + name = "qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwayland = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz"; + sha256 = "084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb"; + name = "qtwayland-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebchannel-everywhere-src-5.15.0.tar.xz"; + sha256 = "ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f"; + name = "qtwebchannel-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebengine = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebengine-everywhere-src-5.15.0.tar.xz"; + sha256 = "c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df"; + name = "qtwebengine-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebglplugin = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebglplugin-everywhere-src-5.15.0.tar.xz"; + sha256 = "f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15"; + name = "qtwebglplugin-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebsockets-everywhere-src-5.15.0.tar.xz"; + sha256 = "87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092"; + name = "qtwebsockets-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebview = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebview-everywhere-src-5.15.0.tar.xz"; + sha256 = "b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660"; + name = "qtwebview-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwinextras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwinextras-everywhere-src-5.15.0.tar.xz"; + sha256 = "d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0"; + name = "qtwinextras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtx11extras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz"; + sha256 = "c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1"; + name = "qtx11extras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtxmlpatterns-everywhere-src-5.15.0.tar.xz"; + sha256 = "2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507"; + name = "qtxmlpatterns-everywhere-src-5.15.0.tar.xz"; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index a4c12793ab..cc6e45e3eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -8,7 +8,7 @@ darwin, libiconv, dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite, - libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, + libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, zlib, @@ -48,7 +48,7 @@ stdenv.mkDerivation { harfbuzz icu # Image formats - libjpeg libpng libtiff + libjpeg libpng (if compareVersion "5.9.0" < 0 then pcre16 else pcre2) ] ++ ( @@ -255,18 +255,18 @@ stdenv.mkDerivation { "-no-warnings-are-errors" ] ++ ( - if (!stdenv.hostPlatform.isx86_64) - then [ "-no-sse2" ] - else lib.optionals (compareVersion "5.9.0" >= 0) { - default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; - westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; - sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} + if (!stdenv.hostPlatform.isx86_64) then [ + "-no-sse2" + ] else if (compareVersion "5.9.0" >= 0) then [ + "-sse2" + "${if stdenv.hostPlatform.sse3Support then "" else "-no"}-sse3" + "${if stdenv.hostPlatform.ssse3Support then "" else "-no"}-ssse3" + "${if stdenv.hostPlatform.sse4_1Support then "" else "-no"}-sse4.1" + "${if stdenv.hostPlatform.sse4_2Support then "" else "-no"}-sse4.2" + "${if stdenv.hostPlatform.avxSupport then "" else "-no"}-avx" + "${if stdenv.hostPlatform.avx2Support then "" else "-no"}-avx2" + ] else [ + ] ) ++ [ "-no-mips_dsp" @@ -295,8 +295,8 @@ stdenv.mkDerivation { "-make tools" ''-${lib.optionalString (!buildExamples) "no"}make examples'' ''-${lib.optionalString (!buildTests) "no"}make tests'' - "-v" ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-v" ++ ( if stdenv.isDarwin @@ -311,8 +311,9 @@ stdenv.mkDerivation { else [ "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" - - "-system-xcb" + ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb" + ++ [ "-xcb" "-qpa xcb" "-L" "${libX11.out}/lib" @@ -327,7 +328,9 @@ stdenv.mkDerivation { ''-${lib.optionalString (cups == null) "no-"}cups'' "-dbus-linked" "-glib" - "-system-libjpeg" + ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg" + ++ [ "-system-libpng" ] ++ lib.optional withGtk3 "-gtk" diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix index 1a7726070b..9c80507b7c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix @@ -1,6 +1,7 @@ -{ qtModule, qtbase }: +{ qtModule, qtbase, libtiff }: qtModule { name = "qtimageformats"; qtInputs = [ qtbase ]; + propagatedBuildInputs = [ libtiff ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 512060701e..049b0349a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -13,9 +13,9 @@ , systemd , enableProprietaryCodecs ? true , gn -, cups, darwin, openbsm, runCommand, xcbuild +, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_3 ? null -, lib, stdenv +, lib, stdenv, fetchpatch }: with stdenv.lib; @@ -38,6 +38,17 @@ qtModule { # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; + patches = [ + # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 + (fetchpatch { + name = "qtwebengine-bison-3.7-build.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; + sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + ]; + postPatch = # Patch Chromium build tools '' @@ -51,6 +62,13 @@ qtModule { substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ --replace /bin/echo ${coreutils}/bin/echo '' + # Prevent Chromium build script from making the path to `clang` relative to + # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` + # from `src/core/config/mac_osx.pri`. + + optionalString stdenv.isDarwin '' + substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \ + --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"' + '' # Patch library paths in Qt sources + '' sed -i \ @@ -61,7 +79,7 @@ qtModule { '' # Patch library paths in Chromium sources + optionalString (!stdenv.isDarwin) '' - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ @@ -69,32 +87,15 @@ qtModule { '' + optionalString stdenv.isDarwin ('' substituteInPlace src/core/config/mac_osx.pri \ - --replace /usr ${stdenv.cc} + --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' '' + # Following is required to prevent a build error: + # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") '' substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ --replace '$sysroot/usr' "${darwin.xnu}" '') + '' - - cat < src/3rdparty/chromium/build/mac/find_sdk.py -#!/usr/bin/env python -print("${darwin.apple_sdk.sdk}") -print("10.12.0") -EOF - - cat < src/3rdparty/chromium/build/config/mac/sdk_info.py -#!/usr/bin/env python -print('xcode_version="0910"') -print('xcode_version_int=910') -print('xcode_build="9B55"') -print('machine_os_build="17E199"') -print('sdk_path=""') -print('sdk_version="10.10"') -print('sdk_platform_path=""') -print('sdk_build="17B41"') -EOF - # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" @@ -111,8 +112,8 @@ EOF # TODO: investigate and fix properly "-march=westmere" ] ++ lib.optionals stdenv.isDarwin [ - "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" - "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10" + "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12" + "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12" # # Prevent errors like @@ -189,6 +190,7 @@ EOF CoreWLAN Quartz Cocoa + LocalAuthentication openbsm libunwind @@ -197,6 +199,21 @@ EOF buildInputs = optionals stdenv.isDarwin (with darwin; [ cups + # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` + # to get some information about the host platform. + (writeScriptBin "sw_vers" '' + #!${stdenv.shell} + + while [ $# -gt 0 ]; do + case "$1" in + -buildVersion) echo "17E199";; + *) break ;; + + esac + shift + done + '') + # For sandbox.h include (runCommand "MacOS_SDK_sandbox.h" {} '' install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 1133623483..b31e57f380 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -71,5 +71,8 @@ qtModule { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; - meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; + meta = { + broken = lib.versionAtLeast qtbase.version "5.15"; + maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix index ac5755f7c3..1970dd183c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix @@ -10,6 +10,8 @@ mkDerivation { sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy"; }; + patches = [ ./fix-build-against-Qt-5.15.patch ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ gtk2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch new file mode 100644 index 0000000000..7eb7441582 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch @@ -0,0 +1,44 @@ +From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Thu, 28 May 2020 12:35:42 +0200 +Subject: [PATCH] fix build against Qt 5.15 + +With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application +palette handling between QGuiApplication and QApplication") +QApplicationPrivate::setSystemPalette is no longer used and necessary. +--- + src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++ + src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp +index 36169c9..2544593 100644 +--- a/src/plugins/styles/gtk2/qgtkstyle.cpp ++++ b/src/plugins/styles/gtk2/qgtkstyle.cpp +@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app) + // not supported as these should be entirely determined by + // current Gtk settings + if (app->desktopSettingsAware() && d->isThemeAvailable()) { ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + QApplicationPrivate::setSystemPalette(standardPalette()); ++#endif + QApplicationPrivate::setSystemFont(d->getThemeFont()); + d->applyCustomPaletteHash(); + if (!d->isKDE4Session()) +diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp +index e57b3d8..e71beb0 100644 +--- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp ++++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp +@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme() + if (oldTheme != QGtkStylePrivate::getThemeName()) { + oldTheme = QGtkStylePrivate::getThemeName(); + QPalette newPalette = qApp->style()->standardPalette(); ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + QApplicationPrivate::setSystemPalette(newPalette); ++#endif + QApplication::setPalette(newPalette); + if (!QGtkStylePrivate::instances.isEmpty()) { + QGtkStylePrivate::instances.last()->initGtkWidgets(); +-- +2.26.2 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix b/third_party/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix index 04bc0d7ed2..4b7aa9cf7f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { - name = "qwt-6.1.4"; + name = "qwt-6.1.5"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "1navkcnmn0qz8kzsyqmk32d929zl72l0b580w1ica7z5559j2a8m"; + sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index 7539d45627..308fadbdfd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "05mgrdzacn9kdpr68r5j0cvsvl54s52glnsc1ww9rcxx6p7hq1ly"; + sha256 = "0y4m29wyvhhxb7fap9z07zwgcqlr4ifwynf8a7yp5ldjpzfzxpix"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/readosm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/readosm/default.nix index 8bf3200e29..6aed49d65e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/readosm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/readosm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { - name = "readosm-1.1.0"; + name = "readosm-1.1.0a"; src = fetchurl { url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; - sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; + sha256 = "0igif2bxf4dr82glxz9gyx5mmni0r2dsnx9p9k6pxv3c4lfhaz6v"; }; buildInputs = [ expat zlib geos libspatialite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix index 63e5eea25a..be6bf0d7fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "redkite"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "1qd4r7ps0fg2m1vx3j48chfdh2c5909j4f9wip4af59inrid4w6a"; + sha256 = "1m2db7c791fi33snkjwnvlxapmf879g5r8azlkx7sr6vp2s0jq2k"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix index a1787ce24b..43e02fc875 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix @@ -1,27 +1,72 @@ -{ stdenvNoCC, buildPackages, fetchurl }: +{ stdenvNoCC, buildPackages, makeRustPlatform }: -stdenvNoCC.mkDerivation { - name = "binary-relibc-latest"; +let + rpath = stdenvNoCC.lib.makeLibraryPath [ + buildPackages.stdenv.cc.libc + "$out" + ]; + bootstrapCrossRust = stdenvNoCC.mkDerivation { + name = "binary-redox-rust"; + + src = fetchTarball { + name = "redox-rust-toolchain-bin.tar.gz"; + url = "https://www.dropbox.com/s/33r92en0t47l1ei/redox-rust-toolchain-bin.tar.gz?dl=1"; + sha256 = "1g17qp2q6b88p04yclkw6amm374pqlakrmw9kd86vw8z4g70jkxm"; + }; - # snapshot of https://static.redox-os.org/toolchain/x86_64-unknown-redox/relibc-install.tar.gz - src = fetchurl { - name = "relibc-install.tar.gz"; - url = "https://gateway.pinata.cloud/ipfs/QmNp6fPTjPA6LnCYvW1UmbAHcPpU7tqZhstfSpSXMJCRwp"; - sha256 = "1hjdzrj67jdag3pm8h2dqh6xipbfxr6f4navdra6q1h83gl7jkd9"; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + installPhase = '' + mkdir $out/ + cp -r * $out/ + + find $out/ -executable -type f -exec patchelf \ + --set-interpreter "${buildPackages.stdenv.cc.libc}/lib/ld-linux-x86-64.so.2" \ + --set-rpath "${rpath}" \ + "{}" \; + find $out/ -name "*.so" -type f -exec patchelf \ + --set-rpath "${rpath}" \ + "{}" \; + ''; + + meta.platforms = with stdenvNoCC.lib; platforms.redox ++ platforms.linux; }; - # to avoid "unpacker produced multiple directories" - unpackPhase = "unpackFile $src"; + redoxRustPlatform = buildPackages.makeRustPlatform { + rustc = bootstrapCrossRust; + cargo = bootstrapCrossRust; + }; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - installPhase = '' - mkdir $out/ - cp -r x86_64-unknown-redox/* $out/ - rm -rf $out/bin +in +redoxRustPlatform.buildRustPackage rec { + pname = "relibc"; + version = "latest"; + + LD_LIBRARY_PATH = "${buildPackages.zlib}/lib"; + + src = buildPackages.fetchgit { + url = "https://gitlab.redox-os.org/redox-os/relibc/"; + rev = "5af8e3ca35ad401014a867ac1a0cc3b08dee682b"; + sha256 = "1j4wsga9psl453031izkl3clkvm31d1wg4y8f3yqqvhml2aliws5"; + fetchSubmodules = true; + }; + + RUSTC_BOOTSTRAP = 1; + + dontInstall = true; + dontFixup = true; + doCheck = false; + + postBuild = '' + mkdir -p $out + DESTDIR=$out make install ''; + TARGET = buildPackages.rust.toRustTarget stdenvNoCC.targetPlatform; + + cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; + meta = with stdenvNoCC.lib; { homepage = "https://gitlab.redox-os.org/redox-os/relibc"; description = "C Library in Rust for Redox and Linux"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix index 6b561b3c9d..2034b658dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix @@ -10,24 +10,25 @@ , libelf , libglvnd , libX11 +, numactl }: stdenv.mkDerivation rec { pname = "rocclr"; - version = "3.5.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; - rev = "roc-${version}"; - sha256 = "0j70lxpwrdrb1v4lbcyzk7kilw62ip4py9fj149d8k3x5x6wkji1"; + rev = "rocm-${version}"; + sha256 = "05vh70qh6jb7038b1rcmz24bg4an0nw98bv2vn3jcyygj4dr3fmf"; }; nativeBuildInputs = [ cmake rocm-cmake ]; buildInputs = [ clang rocm-comgr rocm-runtime rocm-thunk ]; - propagatedBuildInputs = [ libelf libglvnd libX11 ]; + propagatedBuildInputs = [ libelf libglvnd libX11 numactl ]; prePatch = '' substituteInPlace CMakeLists.txt \ @@ -45,10 +46,9 @@ stdenv.mkDerivation rec { ]; preFixup = '' - mv $out/include/include/* $out/include - ln -s $out/include/compiler/lib/include/* $out/include/include ln -s $out/include/compiler/lib/include/* $out/include - sed "s|^\([[:space:]]*IMPORTED_LOCATION_RELEASE \).*|\1 \"$out/lib/libamdrocclr_static.a\"|" -i $out/lib/cmake/amdrocclr_staticTargets.cmake + substituteInPlace $out/lib/cmake/rocclr/ROCclrConfig.cmake \ + --replace "/build/source/build" "$out" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix index c86b081a14..916af54349 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "3.5.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - sha256 = "0h9bxz98sskgzc3xpnp469iq1wi59nbijbqprlylha91y10hqb88"; + sha256 = "05gs282kqnz7lf3b8r1908zk05dbzdx02ar2ns2900fas1l27qc1"; }; sourceRoot = "source/lib/comgr"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix index dcdbb1cb6d..bf302ff227 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix @@ -5,23 +5,22 @@ , clang-unwrapped , lld , llvm -, rocm-runtime }: stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "3.5.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - sha256 = "180bx05l293hrhzk2ymx41j5lhskysywvx33igbbsngzailwsc22"; + sha256 = "0kgsp22rbg09q09n36j1vfs9v8x0liap3ycnqyn1g7dxy38kqmi4"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ clang lld llvm rocm-runtime ]; + buildInputs = [ clang lld llvm ]; cmakeBuildType = "Release"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix index 6830d95619..5f2188f6e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-icd"; - version = "3.5.0"; + version = rocm-opencl-runtime.version; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 0c7ce26021..6504ae1004 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -5,7 +5,8 @@ , rocm-cmake , clang , clang-unwrapped -, libGLU +, glew +, libglvnd , libX11 , lld , llvm @@ -18,20 +19,15 @@ , rocm-thunk }: -let - version = "3.5.0"; - tag = "roc-${version}"; -in stdenv.mkDerivation rec { - inherit version; - +stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; - rev = tag; - sha256 = "1wrr6mmn4gf6i0vxp4yqk0ny2wglvj1jfj50il8czjwy0cwmhykk"; - name = "ROCm-OpenCL-Runtime-${tag}-src"; + rev = "rocm-${version}"; + sha256 = "07zc6ww92nsq1z0gcp1sfhqsk0jkrjnv9cnw5akh471f7n7jiznm"; }; nativeBuildInputs = [ cmake rocm-cmake ]; @@ -39,7 +35,8 @@ in stdenv.mkDerivation rec { buildInputs = [ clang clang-unwrapped - libGLU + glew + libglvnd libX11 lld llvm @@ -63,6 +60,12 @@ in stdenv.mkDerivation rec { dontStrip = true; + # Remove clinfo, which is already provided through the + # `clinfo` package. + postInstall = '' + rm -rf $out/bin + ''; + # Fix the ICD installation path for NixOS postPatch = '' substituteInPlace khronos/icd/loader/linux/icd_linux.c \ @@ -70,10 +73,6 @@ in stdenv.mkDerivation rec { echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt ''; - preFixup = '' - patchelf --set-rpath "$out/lib" $out/bin/clinfo - ''; - meta = with stdenv.lib; { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/default.nix deleted file mode 100644 index 3962804306..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, autoPatchelfHook, rpmextract, rocm-runtime }: - -stdenv.mkDerivation rec { - pname = "rocm-runtime-ext"; - version = "3.5.1"; - - src = fetchurl { - url = "https://repo.radeon.com/rocm/yum/3.5.1/hsa-ext-rocr-dev-1.1.30501.0-rocm-rel-3.5-34-def83d8a-Linux.rpm"; - sha256 = "0r7lrmnplr10hs6wrji55i3dnczfzlmp8jahm1g3mhq2x12zmly0"; - }; - - nativeBuildInputs = [ autoPatchelfHook rpmextract ]; - - buildInputs = [ rocm-runtime stdenv.cc.cc ]; - - unpackPhase = "rpmextract ${src}"; - - installPhase = '' - mkdir -p $out/lib - cp -R opt/rocm-${version}/hsa/lib $out/lib/rocm-runtime-ext - ''; - - setupHook = ./setup-hook.sh; - - meta = with stdenv.lib; { - description = "Platform runtime for ROCm (closed-source extensions)"; - longDescription = '' - This package provides closed-source extensions to the ROCm - runtime. Currently this adds support for OpenCL image - processing. - - In order for the ROCm runtime to pick up the extension, you - should either set the ROCR_EXT_DIR environment variable should - be set to ''${rocm-runtime-ext}/lib/rocm-runtime-ext or this - package should be added to the hardware.opengl.extraPackages - NixOS configuration option. - ''; - homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; - license = with licenses; [ unfreeRedistributable ]; - maintainers = with maintainers; [ danieldk ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh deleted file mode 100644 index 150d65570e..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -addRocmRuntimeExtDir () { - if [[ -z "${ROCR_EXT_DIR-}" ]]; then - export ROCR_EXT_DIR="@out@/lib/rocm-runtime-ext" - fi -} - -addEnvHooks "$hostOffset" addRocmRuntimeExtDir diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix index 7470784d48..57635a3470 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix @@ -1,41 +1,42 @@ { stdenv , fetchFromGitHub , addOpenGLRunpath +, clang-unwrapped , cmake +, xxd , elfutils +, llvm +, rocm-device-libs , rocm-thunk }: stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "3.5.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - sha256 = "028x1f0if6lw41cpfpysp82ikp6c3fdxxd2a6ixs0vpm4424svb1"; + sha256 = "1lm4cbx1d727zll85vjc1kykc72mk82nfhyyhjljv82gd4mnz00c"; }; sourceRoot = "source/src"; - buildInputs = [ cmake elfutils ]; + nativeBuildInputs = [ cmake xxd ]; - cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ]; + buildInputs = [ clang-unwrapped elfutils llvm ]; - # Use the ROCR_EXT_DIR environment variable and/or OpenGL driver - # link path to try to find binary-only ROCm runtime extension - # libraries. Without this change, we would have to rely on - # LD_LIBRARY_PATH to let the HSA runtime discover the shared - # libraries. - patchPhase = '' - substitute '${./rocr-ext-dir.diff}' ./rocr-ext-dir.diff \ - --subst-var-by rocrExtDir "${addOpenGLRunpath.driverLink}/lib/rocm-runtime-ext" - patch -p2 < ./rocr-ext-dir.diff + cmakeFlags = [ + "-DBITCODE_DIR=${rocm-device-libs}/lib" + "-DCMAKE_PREFIX_PATH=${rocm-thunk}" + ]; + + postPatch = '' + patchShebangs image/blit_src/create_hsaco_ascii_file.sh ''; fixupPhase = '' - rm -r $out/lib $out/include - mv $out/hsa/lib $out/hsa/include $out + rm -rf $out/hsa ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff deleted file mode 100644 index 21ffe7d8c3..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/core/runtime/runtime.cpp b/src/core/runtime/runtime.cpp -index dd6a15c..fb6de49 100644 ---- a/src/core/runtime/runtime.cpp -+++ b/src/core/runtime/runtime.cpp -@@ -1358,7 +1358,17 @@ void Runtime::LoadExtensions() { - core::HsaApiTable::HSA_EXT_FINALIZER_API_TABLE_ID); - - // Update Hsa Api Table with handle of Image extension Apis -- extensions_.LoadImage(kImageLib[os_index(os::current_os)]); -+ // -+ // Use ROCR_EXT_DIR when it is non-empty. Otherwise, try to load the -+ // library from the OpenGL driver path. -+ std::string extDirVar = os::GetEnvVar("ROCR_EXT_DIR"); -+ if (!extDirVar.empty()) { -+ extensions_.LoadImage(extDirVar + "/" + kImageLib[os_index(os::current_os)]); -+ } else { -+ std::string globalDriverDir("@rocrExtDir@"); -+ extensions_.LoadImage(globalDriverDir + "/" + kImageLib[os_index(os::current_os)]); -+ } -+ - hsa_api_table_.LinkExts(&extensions_.image_api, - core::HsaApiTable::HSA_EXT_IMAGE_API_TABLE_ID); - } diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix index 42b632d293..ba780ae4bd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "3.5.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - sha256 = "0xn1z0xc3phjc9vabwxgph5any4ffhc8wgs5yb15m5wpg87l8x1z"; + sha256 = "00xrwxndah2frdggqniz1j4s46ha3dav8qlnxm3gk9m4b80m774k"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix index 37055259e7..572c31dd1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/nifticlib/default.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchurl, cmake, zlib }: +{ stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { - pname = "nifticlib"; - pversion = "2.0.0"; - name = "${pname}-${pversion}"; + pname = "nifticlib"; + version = "3.0.1"; - src = fetchurl { - url = "mirror://sourceforge/project/niftilib/${pname}/${pname}_2_0_0/${name}.tar.gz"; - sha256 = "123z9bwzgin5y8gi5ni8j217k7n683whjsvg0lrpii9flgk8isd3"; + src = fetchFromGitHub { + owner = "NIFTI-Imaging"; + repo = "nifti_clib"; + rev = "v${version}"; + sha256 = "0hamm6nvbjdjjd5md4jahzvn5559frigxaiybnjkh59ckxwb1hy4"; }; + cmakeFlags = [ "-DDOWNLOAD_TEST_DATA=OFF" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - doCheck = false; # fails 7 out of 293 tests + checkPhase = '' + runHook preCheck + ctest -LE 'NEEDS_DATA' + runHook postCheck + ''; + doCheck = true; meta = with stdenv.lib; { - homepage = "https://sourceforge.net/projects/niftilib"; + homepage = "https://nifti-imaging.github.io"; description = "Medical imaging format C API"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index 0829557d0f..02d51f0c41 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ]; preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib:${blas}/lib:${lapack}/lib '' else '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib '' + '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix new file mode 100644 index 0000000000..42ba4f2520 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, fetchFromGitHub +, perl +, python3 + +# Enable BLAS interface with 64-bit integer width. +, blas64 ? false + +# Target architecture. x86_64 builds Intel and AMD kernels. +, withArchitecture ? "x86_64" + +# Enable OpenMP-based threading. +, withOpenMP ? true +}: + +let + blasIntSize = if blas64 then "64" else "32"; +in stdenv.mkDerivation rec { + pname = "blis"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "flame"; + repo = "blis"; + rev = version; + sha256 = "13g9kg7x8j9icg4frdq3wpl2cmp0jnh93mw48daa7ym399w17423"; + }; + + inherit blas64; + + nativeBuildInputs = [ + perl + python3 + ]; + + doCheck = true; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-cblas" + "--blas-int-size=${blasIntSize}" + ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ] + ++ [ withArchitecture ]; + + postPatch = '' + patchShebangs configure build/flatten-headers.py + ''; + + postInstall = '' + ln -s $out/lib/libblis.so.3 $out/lib/libblas.so.3 + ln -s $out/lib/libblis.so.3 $out/lib/libcblas.so.3 + ln -s $out/lib/libblas.so.3 $out/lib/libblas.so + ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so + ''; + + meta = with stdenv.lib; { + description = "BLAS-compatible linear algebra library"; + homepage = "https://github.com/flame/blis"; + license = licenses.bsd3; + maintainers = [ maintainers.danieldk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix index 765d634a91..9495366eaa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 }: +{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -80,4 +80,13 @@ in rec { }; cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1; + + cudnn_cudatoolkit_11_0 = generic rec { + version = "8.0.2"; + cudatoolkit = cudatoolkit_11_0; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v8.0.2.39.tgz"; + sha256 = "0ib3v3bgcdxarqapkxngw1nwl0c2a7zz392ns7w9ipcficl4cbv7"; + }; + + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index 5a17e807bd..e727218c05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -37,7 +37,15 @@ stdenv.mkDerivation { # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. postFixup = '' - addOpenGLRunpath $out/lib/lib*.so + for lib in $out/lib/lib*.so; do + # patchelf fails on libcudnn_cnn_infer due to it being too big. + # Most programs will still get the RPATH since they link to + # other things. + # (https://github.com/NixOS/patchelf/issues/222) + if [ "$(basename $lib)" != libcudnn_cnn_infer.so ]; then + addOpenGLRunpath $lib + fi + done ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix new file mode 100644 index 0000000000..3ae4627058 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -0,0 +1,111 @@ +{ callPackage +, stdenv +, fetchzip +, lib + +, addOpenGLRunpath +, patchelf +, fixDarwinDylibNames + +, cudaSupport +, nvidia_x11 +}: + +let + version = "1.6.0"; + device = if cudaSupport then "cuda" else "cpu"; + srcs = import ./binary-hashes.nix; + unavailable = throw "libtorch is not available for this platform"; +in stdenv.mkDerivation { + inherit version; + pname = "libtorch"; + + src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable; + + nativeBuildInputs = + if stdenv.isDarwin then [ fixDarwinDylibNames ] + else [ addOpenGLRunpath patchelf ] + ++ stdenv.lib.optionals cudaSupport [ addOpenGLRunpath ]; + + buildInputs = [ + stdenv.cc.cc + ] ++ lib.optionals cudaSupport [ nvidia_x11 ]; + + dontBuild = true; + dontConfigure = true; + dontStrip = true; + + installPhase = '' + # Copy headers and CMake files. + install -Dm755 -t $dev/lib lib/*.a + cp -r include $dev + cp -r share $dev + + install -Dm755 -t $out/lib lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* + + # We do not care about Java support... + rm -f $out/lib/lib*jni* 2> /dev/null || true + ''; + + postFixup = let + libPaths = [ stdenv.cc.cc.lib ] + ++ stdenv.lib.optionals cudaSupport [ nvidia_x11 ]; + rpath = stdenv.lib.makeLibraryPath libPaths; + in stdenv.lib.optionalString stdenv.isLinux '' + find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + echo "setting rpath for $lib..." + patchelf --set-rpath "${rpath}:$out/lib" "$lib" + ${lib.optionalString cudaSupport '' + addOpenGLRunpath "$lib" + ''} + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_python.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_cpu.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_cpu.dylib + install_name_tool -change @rpath/libtensorpipe.dylib $out/lib/libtensorpipe.dylib $out/lib/libtorch_cpu.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_observers.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_detectron_ops.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libshm.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libshm.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libshm.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libshm.dylib + + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_global_deps.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_global_deps.dylib + ''; + + outputs = [ "out" "dev" ]; + + passthru.tests = callPackage ./test { }; + + meta = with stdenv.lib; { + description = "C++ API of the PyTorch machine learning framework"; + homepage = "https://pytorch.org/"; + license = licenses.unfree; # Includes CUDA and Intel MKL. + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix new file mode 100644 index 0000000000..92a2e05e0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -0,0 +1,14 @@ +{ + x86_64-darwin-cpu = { + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.6.0.zip"; + sha256 = "0d4n7la31qzl4s9pwvm07la7q6lhcwiww0yjpfz3kw6nvx84p22r"; + }; + x86_64-linux-cpu = { + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.6.0%2Bcpu.zip"; + sha256 = "1975b4zvyihzh89vnwspw0vf9qr05sxj8939vcrlmv3gzvdspcxz"; + }; + x86_64-linux-cuda = { + url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip"; + sha256 = "127qnfyi1faqbm40sbnsyqxjhrqj82bzwqyz7c1hs2bm0zgrrpya"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt new file mode 100644 index 0000000000..b302449ef7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt @@ -0,0 +1,4 @@ +find_package(Torch REQUIRED) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}") +add_executable(test test.cpp) +target_link_libraries(test "${TORCH_LIBRARIES}") diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix new file mode 100644 index 0000000000..d661ec28db --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, libtorch-bin, symlinkJoin }: + +stdenv.mkDerivation { + pname = "libtorch-test"; + version = libtorch-bin.version; + + src = ./.; + + postPatch = '' + cat CMakeLists.txt + ''; + + makeFlags = [ "VERBOSE=1" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtorch-bin ]; + + installPhase = '' + touch $out + ''; + + checkPhase = '' + ./test + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp new file mode 100644 index 0000000000..5537724ce5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/test.cpp @@ -0,0 +1,7 @@ +#include +#include + +int main() { + torch::Tensor tensor = torch::eye(3); + std::cout << tensor << std::endl; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix index dbe162c60b..2079ace021 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas }: +{ stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }: with stdenv.lib; -let version = "2.5.0"; +let version = "2.5.3"; in stdenv.mkDerivation { pname = "magma"; inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; - sha256 = "0czspk93cv1fy37zyrrc9k306q4yzfxkhy1y4lj937dx8rz5rm2g"; + sha256 = "1xjy3irdx0w1zyhvn4x47zni5fwsh6z97xd4yqldz8zrm5lx40n6"; name = "magma-${version}.tar.gz"; }; - buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake lapack blas ]; + nativeBuildInputs = [ gfortran cmake ninja ]; + + buildInputs = [ cudatoolkit libpthreadstubs lapack blas ]; doCheck = false; @@ -32,7 +34,7 @@ in stdenv.mkDerivation { mkdir -p $out/lib/pkgconfig cp -a ../include/*.h $out/include #cp -a sparse-iter/include/*.h $out/include - cp -a lib/*.a $out/lib + cp -a lib/*.so $out/lib cat ../lib/pkgconfig/magma.pc.in | \ sed -e s:@INSTALL_PREFIX@:"$out": | \ sed -e s:@CFLAGS@:"-I$out/include": | \ @@ -48,4 +50,6 @@ in stdenv.mkDerivation { platforms = platforms.unix; maintainers = with maintainers; [ tbenst ]; }; + + passthru.cudatoolkit = cudatoolkit; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 11c5e42335..2be3baed44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -19,14 +19,18 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 year = if stdenvNoCC.isDarwin then "2019" else "2020"; - spot = if stdenvNoCC.isDarwin then "3" else "2"; - rel = if stdenvNoCC.isDarwin then "199" else "254"; + spot = if stdenvNoCC.isDarwin then "3" else "3"; + rel = if stdenvNoCC.isDarwin then "199" else "279"; + + # Replace `openmpSpot` by `spot` after 2020.3. Release 2020.03 + # adresses performance regressions and does not update OpenMP. + openmpSpot = if stdenvNoCC.isDarwin then spot else "2"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; # Intel openmp uses its own versioning, but shares the spot release patch. openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; - openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}"; + openmp-ver = "${openmp}.${openmpSpot}-${rel}-${openmp}.${openmpSpot}-${rel}"; shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; @@ -42,8 +46,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16849/l_mkl_${version}.tgz"; - sha256 = "08q2q5rary7fxlrk09kpw0vl7mkk2smmklib44a6qainmxks407d"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_${version}.tgz"; + sha256 = "013shn3c823bjfssq4jyl3na5lbzj99s09ds608ljqllri7473ib"; }); nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index 5f38d45fc4..eb194c0e9e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; - version = "2.4.8-1"; + version = "2.7.8-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl"; rev = "v${version}"; - sha256 = "05m66y64rgsdyybvjybhy6clikwv438b1m484ikai78fb2b7mvyq"; + sha256 = "0xxiwaw239dc9g015fka3k1nvm5zyl00dzgxnwzkang61dys9wln"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 7517ca9c6c..560f39e4e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "18q6mrq4agvlpvhix2k13qcyvqqzh30vj7b329dva64035rzg68n"; + sha256 = "0yg8sfibr38hpb4s5ri7i0ivp96c7khdwhlxngjiymvl3jvm5cnl"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index e3594d72ed..82a0d06357 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.13.3"; + version = "3.13.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "0fhydhws57hvxv7mkldlicm2xmmnb9f4nhd8n16idxg4snck38vz"; + sha256 = "1n2paqw5c0ja392s1qhp7q2ypwav8s5drxxz2w5m2cn31vbspy1c"; }; nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 5244ccdb28..1c910a4f75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.3.0"; + version = "3.3.3"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "1fin9741ild3dv7c9gk07kpizsnnx17ar9cv9lny8vl47pms940h"; + sha256 = "1nmygb2yny0mdqp0mc6760gbxklq1jjm0c6s39qkdwzf3n9f8j7p"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index f0480e1e23..d50e065efc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -57,29 +57,6 @@ stdenv.mkDerivation rec { "library" ]; - # Likely fixed after 5.7.2 - # https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/f6daae26ee391e475e2295e77c839aa7c1a8b784 - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - # The fixDarwinDylibNames in nixpkgs can't seem to fix all the libraries. - # We manually fix them up here. - fixDarwinDylibNames() { - local flags=() - local old_id - - for fn in "$@"; do - flags+=(-change "$PWD/lib/$(basename "$fn")" "$fn") - done - - for fn in "$@"; do - if [ -L "$fn" ]; then continue; fi - echo "$fn: fixing dylib" - install_name_tool -id "$fn" "''${flags[@]}" "$fn" - done - } - - fixDarwinDylibNames $(find "$out" -name "*.dylib") - ''; - meta = with stdenv.lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix index 9d0b3bf76b..2c73ff24df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -1,13 +1,13 @@ { gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1 , openldap, mysql, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "4.3.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "0ny1ihx38gd25w8f3dfybyswvyjfljvb2fhfmkajgg6hhjrkfar2"; + sha256 = "sha256-7NM9wcyHDSVmjjqu489Ff3iJgl9VM+UBF3XYWoiHHTg="; }; nativeBuildInputs = [ gnustep.make ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix index ff7c670ca0..7a4e6c45cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix @@ -1,4 +1,4 @@ -{ fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }: +{ fetchhg, stdenv, coin3d, qtbase, cmake, pkgconfig }: stdenv.mkDerivation { pname = "soqt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { fetchSubrepos = true; }; - buildInputs = [ coin3d qt5.qtbase ]; + buildInputs = [ coin3d qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sparsehash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sparsehash/default.nix index 6845c616e9..6007560a11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sparsehash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sparsehash/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "sparsehash-2.0.3"; + name = "sparsehash-2.0.4"; src = fetchFromGitHub { owner = "sparsehash"; repo = "sparsehash"; rev = name; - sha256 = "0m3f0cnpnpf6aak52wn8xbrrdw8p0yhq8csgc8nlvf9zp8c402na"; + sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix index add1dcf10c..22266bfd4b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -35,8 +35,8 @@ let in { spdlog_1 = generic { - version = "1.6.0"; - sha256 = "15fn8nd9xj7wrxcg9n4fjffid790qg2m366rx2lq2fc9v9walrxs"; + version = "1.7.0"; + sha256 = "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j"; }; spdlog_0 = generic { diff --git a/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix index eab6c1d446..fbf399cb24 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix @@ -39,11 +39,11 @@ let throw "You need to enable at least one output module."; in stdenv.mkDerivation rec { pname = "speech-dispatcher"; - version = "0.9.1"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p"; + sha256 = "0j2lfzkmbsxrrgjw6arzvnfd4jn5pxab28xsk2djssr2ydb9x309"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix index 5c65c84e54..d0100edd34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "sqlite-analyzer"; - version = "3.32.3"; + version = "3.33.0"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1fgmslzf013ry3a7g2vms7zyg24gs53gfj308r6ki4inbn3g04lk"; + sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh"; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index cd0042e722..4393b63146 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.32.3"; + version = "3.33.0"; - # NB! Make sure to update analyzer.nix src (in the same directory). + # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3"; + sha256 = "05dvdfaxd552gj5p7k0i72sfam7lykaw1g2pfn52jnppqx42qshh"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix new file mode 100644 index 0000000000..3ac1f61786 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }: + +let + archiveVersion = import ./archive-version.nix stdenv.lib; + mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { + inherit pname; + version = "3.33.0"; + + src = assert version == sqlite.version; fetchurl { + url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; + sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation; + + makeFlags = [ makeTarget ]; + + installPhase = "install -Dt $out/bin ${makeTarget}"; + + meta = with stdenv.lib; { + inherit description homepage; + downloadPage = http://sqlite.org/download.html; + license = licenses.publicDomain; + maintainers = with maintainers; [ pesterhazy johnazoidberg ]; + platforms = platforms.unix; + }; + }; +in +{ + sqldiff = mkTool { + pname = "sqldiff"; + makeTarget = "sqldiff"; + description = "A tool that displays the differences between SQLite databases"; + homepage = "https://www.sqlite.org/sqldiff.html"; + }; + sqlite-analyzer = mkTool { + pname = "sqlite-analyzer"; + makeTarget = "sqlite3_analyzer"; + description = "A tool that shows statistics about SQLite databases"; + homepage = "https://www.sqlite.org/sqlanalyze.html"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/strigi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/strigi/default.nix deleted file mode 100644 index 33a2ae25b1..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/strigi/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus, pkgconfig -}: - -stdenv.mkDerivation rec { - pname = "strigi"; - version = "0.7.8"; - - src = fetchurl { - url = "https://www.vandenoever.info/software/strigi/${pname}-${version}.tar.bz2"; - sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; - }; - - includeAllQtDirs = true; - - CLUCENE_HOME = clucene_core; - - buildInputs = - [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ]; - - nativeBuildInputs = [ cmake pkgconfig perl ]; - - patches = [ ./export_bufferedstream.patch ./gcc6.patch ]; - - enableParallelBuilding = true; - - # Strigi installs some libraries in an incorrect place - # ($out/$out/lib instead of $out/lib), so move them to the right - # place. - postInstall = - '' - mv $out/$out/lib/* $out/lib - rm -rf $out/nix - ''; - - meta = { - homepage = "http://strigi.sourceforge.net"; - description = "A very fast and efficient crawler to index data on your harddrive"; - license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/strigi/export_bufferedstream.patch b/third_party/nixpkgs/pkgs/development/libraries/strigi/export_bufferedstream.patch deleted file mode 100644 index 4c6b34fe1b..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/strigi/export_bufferedstream.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r strigi-0.7.8/libstreams/include/strigi/bufferedstream.h strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h ---- strigi-0.7.8/libstreams/include/strigi/bufferedstream.h 2013-02-05 13:34:57.000000000 -0800 -+++ strigi-0.7.8_new/libstreams/include/strigi/bufferedstream.h 2013-07-14 17:01:54.000000000 -0700 -@@ -34,7 +34,7 @@ - * BufferedStream will do the rest. - */ - template --class BufferedStream : public StreamBase { -+class STRIGI_EXPORT BufferedStream : public StreamBase { - private: - StreamBuffer buffer; - bool finishedWritingToBuffer; diff --git a/third_party/nixpkgs/pkgs/development/libraries/strigi/gcc6.patch b/third_party/nixpkgs/pkgs/development/libraries/strigi/gcc6.patch deleted file mode 100644 index b46f6c52b8..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/strigi/gcc6.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://sourceforge.net/p/strigi/patches/4/ - -and a fix for - -/tmp/nix-build-strigi-0.7.8.drv-0/strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp:325:37: error: no matching function for call to 'make_pair(std::__cxx11::string, std::__cxx11::string&)' - wchartoutf8(name), value)); - -diff -Naur strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake ---- strigi-0.7.8.old/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:52.000000000 -0500 -+++ strigi-0.7.8/libstreamanalyzer/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:39:54.586260564 -0400 -@@ -15,7 +15,7 @@ - # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) - -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: - if (NOT _gcc_version) - string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") -diff -Naur strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake ---- strigi-0.7.8.old/libstreams/cmake/MacroCheckGccVisibility.cmake 2013-02-05 16:34:57.000000000 -0500 -+++ strigi-0.7.8/libstreams/cmake/MacroCheckGccVisibility.cmake 2016-05-14 11:40:11.340134414 -0400 -@@ -15,7 +15,7 @@ - # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) - -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string (REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: - if (NOT _gcc_version) - string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") - -diff -ru strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp ---- strigi-0.7.8-orig/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2013-02-05 22:34:52.000000000 +0100 -+++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexreader.cpp 2017-07-31 10:56:27.067902643 +0200 -@@ -321,8 +321,7 @@ - string size = value; - doc.size = atoi(size.c_str()); - } else { -- doc.properties.insert(make_pair( -- wchartoutf8(name), value)); -+ doc.properties.emplace(wchartoutf8(name), value); - } - } - Variant diff --git a/third_party/nixpkgs/pkgs/development/libraries/sundials/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/sundials/2.x.nix index b54e537fb8..ae22f0be17 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sundials/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sundials/2.x.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "Suite of nonlinear differential/algebraic equation solvers"; homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; + maintainers = with maintainers; [ idontgetoutmuch ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix index 24980e9b70..e1b4d37528 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -5,7 +5,9 @@ , blas , lapack , gfortran -, lapackSupport ? true }: +, suitesparse +, lapackSupport ? true +, kluSupport ? true }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -13,7 +15,20 @@ stdenv.mkDerivation rec { pname = "sundials"; version = "5.3.0"; - buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ]; + buildInputs = [ + python + ] ++ stdenv.lib.optionals (lapackSupport) [ + gfortran + blas + lapack + ] + # KLU support is based on Suitesparse. + # It is tested upstream according to the section 1.1.4 of + # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) + ++ stdenv.lib.optionals (kluSupport) [ + suitesparse + ]; + nativeBuildInputs = [ cmake ]; src = fetchurl { @@ -35,6 +50,10 @@ stdenv.mkDerivation rec { "-DSUNDIALS_INDEX_TYPE=int32_t" "-DLAPACK_ENABLE=ON" "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" + ] ++ stdenv.lib.optionals (kluSupport) [ + "-DKLU_ENABLE=ON" + "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include" + "-DKLU_LIBRARY_DIR=${suitesparse}/lib" ]; doCheck = true; @@ -44,7 +63,7 @@ stdenv.mkDerivation rec { description = "Suite of nonlinear differential/algebraic equation solvers"; homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; + maintainers = with maintainers; [ idontgetoutmuch ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix index 18f9e541ac..8f045802d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: +{ stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: with stdenv.lib; stdenv.mkDerivation rec { pname = "tbb"; @@ -11,6 +11,8 @@ with stdenv.lib; stdenv.mkDerivation rec { sha256 = "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj"; }; + nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames; + makeFlags = optional (compiler != null) "compiler=${compiler}" ++ optional (stdver != null) "stdver=${stdver}"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 3ebfd4ea91..2726ed7f23 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -16,19 +16,26 @@ , python , gtest , doxygen +, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "tiledb"; - version = "1.7.7"; + version = "2.0.7"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "0vpbyxi8k29c7sjpk86y5w3yyp5fn62q5xvbw061wgp7vrprf8bm"; + sha256 = "00g8ibsbnl4wjfx3qg4qy6s7z6dsj898j0yqfhw1gjr1pb5dsapb"; }; + # (bundled) blosc headers have a warning on some archs that it will be using + # unaccelerated routines. + cmakeFlags = [ + "-DTILEDB_WERROR=0" + ]; + nativeBuildInputs = [ clang-tools cmake @@ -53,7 +60,7 @@ stdenv.mkDerivation rec { openssl boost libpqxx - ]; + ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; # emulate the process of pulling catch down postPatch = '' @@ -65,11 +72,15 @@ stdenv.mkDerivation rec { installTargets = [ "install-tiledb" "doc" ]; + postInstall = lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib + ''; + meta = with lib; { description = "TileDB allows you to manage the massive dense and sparse multi-dimensional array data"; homepage = "https://github.com/TileDB-Inc/TileDB"; license = licenses.mit; - platforms = [ "x86_64-linux"]; + platforms = platforms.unix; maintainers = with maintainers; [ rakesh4g ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix index 745be0be92..1cbf4026cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postInstall = '' ln -s $out/bin/wish* $out/bin/wish cp ../{unix,generic}/*.h $out/include - ln -s $out/lib/libtk${tcl.release}.so $out/lib/libtk.so + ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary} '' + stdenv.lib.optionalString (stdenv.isDarwin) '' cp ../macosx/*.h $out/include diff --git a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix index 13a9855b62..e08aea2e1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "utf8proc"; @@ -11,7 +11,17 @@ stdenv.mkDerivation rec { sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq"; }; - makeFlags = [ "prefix=$(out)" ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + + # the pkg-config file is not created in the cmake installation + # process, so we use the Makefile and install it manually + # see https://github.com/JuliaStrings/utf8proc/issues/198 + preConfigure = "make libutf8proc.pc prefix=$out"; + postInstall = "install -Dm644 ../libutf8proc.pc -t $out/lib/pkgconfig/"; meta = with stdenv.lib; { description = "A clean C library for processing UTF-8 Unicode data"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vid-stab/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vid-stab/default.nix index e22396f8aa..2921719e75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vid-stab/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vid-stab/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake, openmp }: stdenv.mkDerivation rec { - pname = "vid-stab"; - version = "0.98b"; - - src = fetchurl { - url = "https://github.com/georgmartius/vid.stab/archive/release-${version}.tar.gz"; - sha256 = "09fh6xbd1f5xp3il3dpvr87skmnp2mm2hfmg4s9rvj4y8zvhn3sk"; + pname = "vid.stab"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "georgmartius"; + repo = pname; + rev = "v${version}"; + sha256 = "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38"; }; nativeBuildInputs = [ cmake ]; - + + buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ openmp ]; + meta = with stdenv.lib; { description = "Video stabilization library"; - homepage = "http://public.hronopik.de/vid.stab/"; - license = licenses.gpl2; + homepage = "http://public.hronopik.de/vid.stab/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; + platforms = platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix index 21c186a673..f191a97643 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, lapack , Accelerate, CoreGraphics, CoreVideo }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ boost blas ] + buildInputs = [ boost lapack ] ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; enableParallelBuilding = true; @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vector and matrix math library implemented using C++ templates"; - longDescription = ''vmmlib is a vector and matrix math library implemented - using C++ templates. Its basic functionality includes a vector - and a matrix class, with additional functionality for the + longDescription = ''vmmlib is a vector and matrix math library implemented + using C++ templates. Its basic functionality includes a vector + and a matrix class, with additional functionality for the often-used 3d and 4d vectors and 3x3 and 4x4 matrices. - More advanced functionality include solvers, frustum + More advanced functionality include solvers, frustum computations and frustum culling classes, and spatial data structures''; license = licenses.bsd2; @@ -43,4 +43,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index e650a28c61..8b5aa74286 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' - substituteInPlace loader/vulkan.pc.in --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' + substituteInPlace loader/vulkan.pc.in \ + --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' \ + --replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@' ''; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix index d13cdaff8c..2b3414df1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "7.3"; + version = "7.3.1"; pname = "wcslib"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 ="0q99k61l2zh6irzkd5195aama37mlm0nivamz6j6r8l2ad1cy0ab"; + sha256 ="0p0bp3jll9v2094a8908vk82m7j7qkjqzkngm1r9qj1v6l6j5z6c"; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkit2-sharp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkit2-sharp/default.nix new file mode 100644 index 0000000000..b8a476b3b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/webkit2-sharp/default.nix @@ -0,0 +1,49 @@ +{ + stdenv, + autoreconfHook, + fetchFromGitHub, + gtk-sharp-3_0, + lib, + libxslt, + mono, + pkg-config, + webkitgtk, +}: + +stdenv.mkDerivation rec { + pname = "webkit2-sharp"; + version = "a59fd76dd730432c76b12ee6347ea66567107ab9"; + + src = fetchFromGitHub { + owner = "hbons"; + repo = "webkit2-sharp"; + rev = version; + sha256 = "sha256:0a7vx81zvzn2wq4q2mqrxvlps1mqk28lm1gpfndqryxm4iiw28vc"; + }; + + nativeBuildInputs = [ + autoreconfHook + libxslt + mono + pkg-config + ]; + + buildInputs = [ + gtk-sharp-3_0 + webkitgtk + ]; + + ac_cv_path_MONODOCER = "no"; + installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"]; + + passthru = { + inherit webkitgtk; + }; + + meta = { + description = "C# bindings for WebKit 2 with GTK+ 3"; + homepage = "https://github.com/hbons/webkit2-sharp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 72e78be977..d60e56763a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -43,6 +43,7 @@ , sqlite , enableGtk2Plugins ? false , gtk2 ? null +, enableGLES ? true , gst-plugins-base , gst-plugins-bad , woff2 @@ -167,7 +168,7 @@ stdenv.mkDerivation rec { "-DUSE_ACCELERATE=0" "-DUSE_SYSTEM_MALLOC=ON" ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"; + ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; postPatch = '' patchShebangs . diff --git a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 2815520f51..30fc90ec8c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1bgkxqgxwa5dvi7fkna64wpcs552f3yxvs6fh6d32v7vg88vpfx9"; + sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v"; }; configureFlags = [ "--enable-all" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix index 9bea7f5e84..9d80e5de44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha256 = "0090f7r3blks18vifkna4l890fwaya58ajh9qblbw9065zj5hrm3"; + sha256 = "0snsysfrr5h66mybls8r8k781v732dlfn4jdnmk348jgvny275fj"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix index 98cf0d5847..deb7d19c0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, gstreamer, gst-plugins-base, GConf, libX11, cairo +, libX11, cairo , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ] + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] ++ optional withMesa libGLU; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix index 3812c81a51..5db7cfc26b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, gstreamer, gst-plugins-base, GConf, setfile +, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null @@ -32,8 +32,7 @@ stdenv.mkDerivation { ]; buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer - gst-plugins-base GConf ] + [ gtk2 libXinerama libSM libXxf86vm xorgproto ] ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" + [ "--enable-gtk2" "--disable-precomp-headers" (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") ] ++ optional unicode "--enable-unicode" diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index f125ac9dca..df90342a97 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm -, gtk2, GConf ? null, gtk3 +, gtk2, gtk3 , xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 GConf ] + ] ++ optionals withGtk2 [ gtk2 ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix index 0f30deb6c5..44e6fe49b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm -, gtk2, GConf ? null, gtk3 +, gtk2, gtk3 , xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 GConf ] + ] ++ optionals withGtk2 [ gtk2 ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk diff --git a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix index cfa19e5419..48ed6cf468 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, fetchpatch, cmake, nasm, numactl , numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms , debugSupport ? false # Run-time sanity checks (debugging) -, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel , werrorSupport ? false # Warnings as errors , ppaSupport ? false # PPA profiling instrumentation , vtuneSupport ? false # Vtune profiling instrumentation @@ -13,10 +12,17 @@ let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; inherit (stdenv) is64bit; -in -stdenv.mkDerivation rec { - pname = "x265"; + cmakeFlagsAll = [ + "-DSTATIC_LINK_CRT=OFF" + (mkFlag debugSupport "CHECKED_BUILD") + (mkFlag ppaSupport "ENABLE_PPA") + (mkFlag vtuneSupport "ENABLE_VTUNE") + (mkFlag custatsSupport "DETAILED_CU_STATS") + (mkFlag unittestsSupport "ENABLE_TESTS") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ]; + version = "3.2"; src = fetchurl { @@ -27,8 +33,6 @@ stdenv.mkDerivation rec { sha256 = "0fqkhfhr22gzavxn60cpnj3agwdf5afivszxf3haj5k1sny7jk9n"; }; - enableParallelBuilding = true; - patches = [ # Fix build on ARM (#406) (fetchpatch { @@ -37,22 +41,56 @@ stdenv.mkDerivation rec { }) ]; + buildLib = has12Bit: stdenv.mkDerivation rec { + name = "libx265-${if has12Bit then "12" else "10"}-${version}"; + inherit src patches; + enableParallelBuilding = true; + + postPatch = '' + sed -i 's/unknown/${version}/g' source/cmake/version.cmake + ''; + + cmakeLibFlags = [ + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DENABLE_HDR10_PLUS=ON" + "-DEXPORT_C_API=OFF" + "-DHIGH_BIT_DEPTH=ON" + ]; + cmakeFlags = [(mkFlag has12Bit "MAIN12")] ++ cmakeLibFlags ++ cmakeFlagsAll; + + preConfigure = '' + cd source + ''; + + nativeBuildInputs = [cmake nasm] ++ stdenv.lib.optional numaSupport numactl; + }; + + libx265-10 = buildLib false; + libx265-12 = buildLib true; +in + +stdenv.mkDerivation rec { + pname = "x265"; + inherit version src patches; + + enableParallelBuilding = true; + postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake ''; cmakeFlags = [ - (mkFlag debugSupport "CHECKED_BUILD") - "-DSTATIC_LINK_CRT=OFF" - (mkFlag (highbitdepthSupport && is64bit) "HIGH_BIT_DEPTH") - (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - (mkFlag ppaSupport "ENABLE_PPA") - (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag custatsSupport "DETAILED_CU_STATS") "-DENABLE_SHARED=ON" + "-DHIGH_BIT_DEPTH=OFF" + "-DENABLE_HDR10_PLUS=OFF" + ] ++ stdenv.lib.optionals is64bit [ + "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" + "-DLINKED_10BIT=ON" + "-DLINKED_12BIT=ON" + ] ++ [ (mkFlag cliSupport "ENABLE_CLI") - (mkFlag unittestsSupport "ENABLE_TESTS") - ]; + ] ++ cmakeFlagsAll; preConfigure = '' cd source diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix index 33a4fb93cb..195aea5c2f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.16" "4937f2f49ff27e39a42150e928c8b45877b0bf456510f0785f50159a5cb6bf70"; + xapian_1_4 = generic "1.4.17" "0bjpaavdckl4viznr8gbq476fvg648sj4rks2vacmc51vrb8bsxm"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix index 11eda01a76..df36f48648 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix @@ -4,13 +4,13 @@ assert withSystemd -> systemd != null; stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.10"; + version = "1.4.12"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "1m1aw4im1vvddkl7mknq0h0nj0x2zpql3r17lxhw4mmib05zbdgj"; + sha256 = "1cmla7rpwvsj1b3jhp9q8y3ni5n8rsqxib87yhh07b7xnlhy0gcj"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/zimg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zimg/default.nix index f5913137e1..afb13a03cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zimg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "2.9.3"; + version = "3.0.1"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1dqyrq3p8bkgvj4ci50ac342hjnhyz6xxvhiwp7wpi3v3nbj7s02"; + sha256 = "1mpns443ifbkbaxsw6yy8z01l7815259pxzd7s006npr0dxnc8ng"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index bb14f562d7..f9c91c3a8a 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -691,6 +691,74 @@ lua-messagepack = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; +lua-resty-http = buildLuarocksPackage { + pname = "lua-resty-http"; + version = "0.15-0"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-http-0.15-0.src.rock; + sha256 = "1121abcz9y8kis2wdg7i1m75y8lplk3k49v02y804bywbl2km4fz"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ledgetech/lua-resty-http"; + description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua."; + license.fullName = "2-clause BSD"; + }; +}; +lua-resty-jwt = buildLuarocksPackage { + pname = "lua-resty-jwt"; + version = "0.2.2-0"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-jwt-0.2.2-0.src.rock; + sha256 = "1a4wwiwcjwgr59g2940a2h0i6n1c7xjy2px5bls3x5br4shwhswa"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/cdbattags/lua-resty-jwt"; + description = "JWT for ngx_lua and LuaJIT."; + license.fullName = "Apache License Version 2"; + }; +}; +lua-resty-openidc = buildLuarocksPackage { + pname = "lua-resty-openidc"; + version = "1.7.2-1"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-openidc-1.7.2-1.src.rock; + sha256 = "01mya69r4fncfrpqh5pn2acg18q3slds8zm976qgkjby0pzwzzw7"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/zmartzone/lua-resty-openidc"; + description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality"; + license.fullName = "Apache 2.0"; + }; +}; +lua-resty-session = buildLuarocksPackage { + pname = "lua-resty-session"; + version = "3.6-1"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-session-3.6-1.src.rock; + sha256 = "1r5626x247d1vi5bzqfk11bl4d5c39h1iqj6mgndnwpnz43cag5i"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/bungle/lua-resty-session"; + description = "Session Library for OpenResty – Flexible and Secure"; + license.fullName = "BSD"; + }; +}; lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; diff --git a/third_party/nixpkgs/pkgs/servers/hasura/ci-info.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/hasura/ci-info.nix rename to third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix diff --git a/third_party/nixpkgs/pkgs/servers/hasura/graphql-engine.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix similarity index 91% rename from third_party/nixpkgs/pkgs/servers/hasura/graphql-engine.nix rename to third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix index 05ba895be0..0bd68afae4 100644 --- a/third_party/nixpkgs/pkgs/servers/hasura/graphql-engine.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix @@ -17,18 +17,18 @@ , text-builder, text-conversions, th-lift-instances, these, time , transformers, transformers-base, unix, unordered-containers , uri-encode, uuid, vector, wai, wai-websockets, warp, websockets -, wreq, x509, yaml, zlib +, wreq, x509, yaml, zlib, witherable, semialign, validation, cron }: mkDerivation { pname = "graphql-engine"; version = "1.0.0"; src = fetchgit { url = "https://github.com/hasura/graphql-engine.git"; - sha256 = "0hg44zl3gqa8lq7kggwgmgbsgdc7zrv5cxs507vilg11xklsbz4l"; - rev = "27b0b59361cebecd074bd59123f602e7b013bac1"; + sha256 = "sha256-tNKoi3dtoXj0nn4qBgLBroo7SgX7SdVaHtBqjs1S3hQ="; + rev = "1e3eb035d3c915032ba23e502bcb0132b4d54202"; fetchSubmodules = true; }; - postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; + postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48,6 +48,8 @@ mkDerivation { th-lift-instances these time transformers transformers-base unix unordered-containers uri-encode uuid vector wai wai-websockets warp websockets wreq x509 yaml zlib + witherable semialign validation + cron ]; executableHaskellDepends = [ base bytestring pg-client text text-conversions diff --git a/third_party/nixpkgs/pkgs/servers/hasura/graphql-parser.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/servers/hasura/graphql-parser.nix rename to third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix index 8066bb83dd..991b5384d5 100644 --- a/third_party/nixpkgs/pkgs/servers/hasura/graphql-parser.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix @@ -5,11 +5,11 @@ }: mkDerivation { pname = "graphql-parser"; - version = "0.1.0.0"; + version = "0.1.0.1"; src = fetchgit { url = "https://github.com/hasura/graphql-parser-hs.git"; - sha256 = "0vz0sqqmr1l02d3f1pc5k7rm7vpxmg5d5ijvdcwdm34yw6x5lz1v"; - rev = "623ad78aa46e7ba2ef1aa58134ad6136b0a85071"; + sha256 = "sha256-oem/h0AQPk7eSM/P6wMoWV9KirxutE4hnQWwrpQ6TGk="; + rev = "ba8e26fef1488cf3c8c08e86f02730f56ec84e1f"; fetchSubmodules = true; }; libraryHaskellDepends = [ @@ -29,6 +29,7 @@ mkDerivation { template-haskell text text-builder th-lift-instances unordered-containers vector ]; + doCheck = false; prePatch = "hpack"; homepage = "https://github.com/hasura/graphql-parser-hs#readme"; license = stdenv.lib.licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/servers/hasura/pg-client.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/hasura/pg-client.nix rename to third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index f98547011b..794de22766 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,4 +1,4 @@ -{requireFile, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: +{requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686, licenseAccepted ? false}: { toolsVersion ? "25.2.5" , platformToolsVersion ? "29.0.6" @@ -14,7 +14,7 @@ , lldbVersions ? [ ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "18.1.5063045" +, ndkVersion ? "21.0.6113669" , useGoogleAPIs ? false , useGoogleTVAddOns ? false , includeExtras ? [] @@ -144,7 +144,7 @@ rec { ) cmakeVersions; ndk-bundle = import ./ndk-bundle { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs lib platform-tools; + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools; package = packages.ndk-bundle.${ndkVersion}; }; diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix index 0228cd8392..a13b98cf94 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs ? import {} +{ config, pkgs ? import {}, pkgsHostHost ? pkgs.pkgsHostHost , pkgs_i686 ? import { system = "i686-linux"; } , licenseAccepted ? config.android_sdk.accept_license or false }: @@ -6,7 +6,7 @@ rec { composeAndroidPackages = import ./compose-android-packages.nix { inherit (pkgs) requireFile autoPatchelfHook; - inherit pkgs pkgs_i686 licenseAccepted; + inherit pkgs pkgsHostHost pkgs_i686 licenseAccepted; }; buildApp = import ./build-app.nix { diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix index 839a14f703..4f9db98c00 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix @@ -5,7 +5,8 @@ let extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ]; in stdenv.mkDerivation ({ - name = package.name + "-" + package.revision; + pname = package.name; + version = package.revision; src = if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all; buildInputs = [ unzip ] ++ buildInputs; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix index 23a55595cc..231e5b8ea2 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix @@ -672,70 +672,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"; - sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; @@ -896,70 +832,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"; - sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index b81fab1ed7..ca305e0398 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -1,18 +1,24 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, platform-tools}: +{ lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook +, deployAndroidPackage, package, os, platform-tools +}: let - runtime_paths = lib.makeBinPath [ pkgs.coreutils pkgs.file pkgs.findutils pkgs.gawk pkgs.gnugrep pkgs.gnused pkgs.jdk pkgs.python3 pkgs.which ] + ":${platform-tools}/platform-tools"; + runtime_paths = lib.makeBinPath (with pkgsHostHost; [ + coreutils file findutils gawk gnugrep gnused jdk python3 which + ]) + ":${platform-tools}/platform-tools"; in deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ] ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ]; - patchInstructions = lib.optionalString (os == "linux") '' + patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . + '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' patch -p1 \ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + '' + '' # TODO: allow this stuff rm -rf docs tests @@ -46,6 +52,6 @@ deployAndroidPackage { do ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i done - ''; + ''); noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script } diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index 5c8fca096b..be1b58acd7 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -39,6 +39,14 @@ let meta.broken = since "12"; }; + # NOTE: this is a stub package to fetch npm dependencies for + # ../../applications/video/epgstation + epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { + meta = drv.meta // { + broken = true; # not really broken, see the comment above + }; + }); + bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: { name = "bitwarden-cli-${drv.version}"; }); @@ -103,7 +111,7 @@ let }; node-red = super.node-red.override { - meta.broken = since "10"; + buildInputs = [ self.node-pre-gyp ]; }; pnpm = super.pnpm.override { @@ -150,10 +158,44 @@ let ''; }; + tsun = super.tsun.overrideAttrs (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/tsun" \ + --prefix NODE_PATH : ${self.typescript}/lib/node_modules + ''; + }); + stf = super.stf.override { meta.broken = since "10"; }; + vega-cli = super.vega-cli.override { + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ + super.node-pre-gyp + pixman + cairo + pango + libjpeg + ]; + }; + + vega-lite = super.vega-lite.override { + # npx tries to install vega from scratch at vegalite runtime if it + # can't find it. We thus replace it with a direct call to the nix + # derivation. This might not be necessary anymore in future vl + # versions: https://github.com/vega/vega-lite/issues/6863. + postInstall = '' + substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2pdf \ + --replace "npx -p vega vg2pdf" "${self.vega-cli}/bin/vg2pdf" + substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2svg \ + --replace "npx -p vega vg2svg" "${self.vega-cli}/bin/vg2svg" + substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2png \ + --replace "npx -p vega vg2png" "${self.vega-cli}/bin/vg2png" + ''; + }; + webtorrent-cli = super.webtorrent-cli.override { buildInputs = [ self.node-gyp-build ]; }; @@ -165,6 +207,8 @@ let # https://sharp.pixelplumbing.com/install vips + libsecret + self.node-gyp-build self.node-pre-gyp ]; }; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 8b6a53ebe2..ba8488bda2 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -61,11 +61,13 @@ , "csslint" , "dat" , "dhcp" +, "diagnostic-languageserver" , "dockerfile-language-server-nodejs" , "elasticdump" , "elm-oracle" , "emoj" , "emojione" +, {"epgstation": "../../applications/video/epgstation"} , "escape-string-regexp" , "eslint" , "eslint_d" @@ -118,11 +120,11 @@ , "mastodon-bot" , "mathjax" , "meat" -, "meguca" , "mirakurun" , "mocha" , "multi-file-swagger" , "neovim" +, "netlify-cli" , "nijs" , "node-gyp" , "node-gyp-build" @@ -137,6 +139,7 @@ , "ocaml-language-server" , "parcel-bundler" , "parsoid" +, "patch-package" , "peerflix" , "peerflix-server" , "pnpm" @@ -196,9 +199,13 @@ , "typescript-language-server" , "uglify-js" , "ungit" +, "vega-cli" +, "vega-lite" , "vim-language-server" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" +, "vscode-json-languageserver-bin" +, { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" } , "vue-cli" , "vue-language-server" , "web-ext" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index bd4c3cdb5c..8d56372af2 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -22,112 +22,139 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1000.5" = { + "@analytics/cookie-utils-0.2.3" = { + name = "_at_analytics_slash_cookie-utils"; + packageName = "@analytics/cookie-utils"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@analytics/cookie-utils/-/cookie-utils-0.2.3.tgz"; + sha512 = "RiMAVpSluRbWb2hlT9wMJ0r2l+MUZzScYjY+w2iWRzjOr9Zzzs4tYzJT6Sd94PDz3LzCuf4aGOwS6pkKXTEBLw=="; + }; + }; + "@analytics/core-0.6.2" = { + name = "_at_analytics_slash_core"; + packageName = "@analytics/core"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@analytics/core/-/core-0.6.2.tgz"; + sha512 = "qXBfef5/HK5RZkGlkVqRKnjFQuPZejU6NLqnzx/DH3EU28w7a7IgUN+qZ2VSWFr3aMtNJ0qVybfHDxcJBtrLtQ=="; + }; + }; + "@analytics/storage-utils-0.2.4" = { + name = "_at_analytics_slash_storage-utils"; + packageName = "@analytics/storage-utils"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@analytics/storage-utils/-/storage-utils-0.2.4.tgz"; + sha512 = "VHRggJbRY8vHIADWVwbq9cZux0L9LdmlN31XA3daVAI4gMkKdQEocxB7KqGDt6SfIJ3NYi/qh1nRJGooYmTBiA=="; + }; + }; + "@angular-devkit/architect-0.1001.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1000.5"; + version = "0.1001.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.5.tgz"; - sha512 = "BhNqB7fmmrDQwxoJ3zdw5FslFD+nYGgMTiC48ERVYJVuN3BK6xtt2OGA7vho3eJ13OE5cPGUi8crQDRROgxxQg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.2.tgz"; + sha512 = "05o12amjZ8NNIFehKm/lFYf12xvCclC7V5tGl/9+V7g/3pQqakwAjCysgb9T+ETffhmKhMnE8XdAJZqF7YrDcw=="; }; }; - "@angular-devkit/core-10.0.5" = { + "@angular-devkit/core-10.0.7" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.0.5"; + version = "10.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.5.tgz"; - sha512 = "ZaF1EYniIo+yRLvvaKnLrjYCdKeg2U3YtbA932M2AIfjgfFv/9mnAbH4jmZsBZhCstxZPz+ItwJesdR20h4Z1Q=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.7.tgz"; + sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-9.1.7" = { + "@angular-devkit/core-10.1.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.7"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz"; - sha512 = "guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.2.tgz"; + sha512 = "LMxesiCuXRe3UzPdRouXsC1W73/q6rVtACVoD5GdzmmnZ7cRh7oiwonqT0lEXIKQikMsZUasUOXHD2HoKV6BoA=="; }; }; - "@angular-devkit/core-9.1.9" = { + "@angular-devkit/core-9.1.12" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.9"; + version = "9.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz"; - sha512 = "SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz"; + sha512 = "D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA=="; }; }; - "@angular-devkit/schematics-10.0.5" = { + "@angular-devkit/schematics-10.0.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.0.5"; + version = "10.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.5.tgz"; - sha512 = "UeeV8O0IydxCKj2oejygs80oIAQXPYrJHo0PQ/fa0RH6rtV3wZwirdy+yqq/BDGhtV/5VQSVCvu6uyAtGGMgNg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.7.tgz"; + sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-9.1.7" = { + "@angular-devkit/schematics-10.1.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.7"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.7.tgz"; - sha512 = "oeHPJePBcPp/bd94jHQeFUnft93PGF5iJiKV9szxqS8WWC5OMZ5eK7icRY0PwvLyfenspAZxdZcNaqJqPMul5A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.2.tgz"; + sha512 = "gS5yP8ntw3/v9zBK9kBsp5r4gYlp8cLvJ3oWLZmSvdzzbm/QznPnRKqNm72AptKrlxRFX0xyrJ7vjtLWcssqxA=="; }; }; - "@angular-devkit/schematics-9.1.9" = { + "@angular-devkit/schematics-9.1.12" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.9"; + version = "9.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.9.tgz"; - sha512 = "aKuMmS3wshOTl9+01jiB50ml09fRN1WfOOtoNqwvKTEi87DrT6Mn3l0eVQo8PJK/bIq/FBmPgsIl2nsETiBSxg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.12.tgz"; + sha512 = "+GYnUzmIy1/QpYitCC8mI7jcrViGHTtOKvvDPEFjU2nggjNEQaMmsHcdIsjrqggEc23ZZyebNAIewT8CMkJyrQ=="; }; }; - "@angular-devkit/schematics-cli-0.901.9" = { + "@angular-devkit/schematics-cli-0.1000.7" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "0.901.9"; + version = "0.1000.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.901.9.tgz"; - sha512 = "mkbN30u7/GvFOIOjj20w5OWi+vEOc/mdnpSrm3AxXvmha4AG56VL6uzF/kKHw9vyhfv8wLMt11OK/iSms9hSWw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1000.7.tgz"; + sha512 = "5zXO0WfyRySZudv2/EEC/UVfG75y7TGrdMfVZNc1WP0SB54psA0U3Z3jT+6Y9VjdjmXdxjVfybhuOzZ4I1fs0Q=="; }; }; - "@antora/asciidoc-loader-2.3.3" = { + "@antora/asciidoc-loader-2.3.4" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.3.tgz"; - sha512 = "4dPwCnpKUrME8PZLImOD3BBcyxpaA9tAtySPKACDJPkXc24GcfjI59QbSc+shG1fKptOGaDk68O2ZMu/Gpmlhw=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.4.tgz"; + sha512 = "IQ0d/hnOCGZXzTYUwKAw2BlyRMI4Kg/zu7XejQ6ERIncjuUUv/+PhlzVxoJNT0r9uasJFHDlZ7l3X53Hn+MUuQ=="; }; }; - "@antora/content-aggregator-2.3.3" = { + "@antora/content-aggregator-2.3.4" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.3.tgz"; - sha512 = "ehr0VmPltRCmKuSIT5idSnI7S2sn/q9UHBdB85GsvxOqgfM08lnkZrxbdiVqmg+06rLi8qUUCLB3dI4RZ8+xvw=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.4.tgz"; + sha512 = "ZwlGm/t90PUnGVo+pir71O+wC+gyXnVuhoAed+9bBLjsiGI7EGUzwUEXSZqHRSihPx5XLFj6pZinoCGX+uabcw=="; }; }; - "@antora/content-classifier-2.3.3" = { + "@antora/content-classifier-2.3.4" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.3.tgz"; - sha512 = "VLnOIuL0uRasQsXJ8m2vjpAFdEkpWfs1L32OuVupQ1SwjpUAvJz46W3pVg9qxxEWRRjtidCvcc3KY0LI6X0Jvw=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.4.tgz"; + sha512 = "DR4I6dLSZEFOS3T0F/hYwLf3AGY2Rb3e9j8V8ygEFzdP8OySAAZWyTjjJPF4pJZqjWtqD7s7S1f5/cCI83977Q=="; }; }; - "@antora/document-converter-2.3.3" = { + "@antora/document-converter-2.3.4" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.3.tgz"; - sha512 = "mGdDHRxYPts3QiT/thYVoQz1QgFXN6ZFU2jgjX0VmCzcIwKGK0TOgzbp+1A3V0o92VAISEmrjC812orbtHeKqA=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.4.tgz"; + sha512 = "Fo2SKdX3BlNrvfQEBOi2II+YmYzdEqKQ5+lO2pzxJuNBfqN0kJJYYk30jFPR27h6QuU43U/XZgufyDt+FjfdZg=="; }; }; "@antora/expand-path-helper-1.0.0" = { @@ -139,85 +166,85 @@ let sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; }; }; - "@antora/navigation-builder-2.3.3" = { + "@antora/navigation-builder-2.3.4" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.3.tgz"; - sha512 = "dx8PPFPvRBF+KInDXZU8k5dJ3sIVh1VvfsZhPUI27d5HMi+FRa0le8PK0OK5Hms4ixY/c1lXGcCAPFt0aH4Lxw=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.4.tgz"; + sha512 = "55I7p9tNTernQ/YR1+mp6RRXMV5EcU8q20Tdodt3mazdm3ObTe9E9XVAvUDFmDzRA27D0eb06jVRwLoth1gHYA=="; }; }; - "@antora/page-composer-2.3.3" = { + "@antora/page-composer-2.3.4" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.3.tgz"; - sha512 = "yp1bHj5twD8TbBn8MHwe7488EB+xVmbyFJBvV2GLMyiWN7DnlCaW/AaCiw05vsU4mDAd+MQ8P+KeNhDRZnlU2w=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.4.tgz"; + sha512 = "xY0O9X87DzcoP6k/5Jx55ysy0iQIhgav3q1JbOQK/FoYQYHbiQgmVWOjJdqh5nZw57ih3yE20JROPuYqOYuUZA=="; }; }; - "@antora/playbook-builder-2.3.3" = { + "@antora/playbook-builder-2.3.4" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.3.tgz"; - sha512 = "X9S38WgX2diZISNF4QKdF4ZfdND4ySsMlI26Iz4iybxf7xNlUJE1lAk9RM57Ooq543lEUNSnYHpECb1tog2BNw=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.4.tgz"; + sha512 = "iPjBndcoZhWqpN608WOkXKUUD94b3JX38igebshiT5/NRINJbeEclpdEX/gPv8D1Z1JcrSVGURZQO1uML76dkg=="; }; }; - "@antora/redirect-producer-2.3.3" = { + "@antora/redirect-producer-2.3.4" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.3.tgz"; - sha512 = "69QtpB9wPVsg7/ykJq8zYUrHywSOtfgJEizxK+GmWharjZyrMReNB7IX1pg7Dk8qI6CGB0OOkhIYC41nGmuhmg=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.4.tgz"; + sha512 = "148amiLc+1Pod6kluAOBke8OATFWFUW3LZdTPFVfqX1lJolCp5ciOnGciy52sIIysSyVkQUjotEUhqGO9Af1EQ=="; }; }; - "@antora/site-mapper-2.3.3" = { + "@antora/site-mapper-2.3.4" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.3.tgz"; - sha512 = "ERMGWl6s9B42crML7Tt4alPdJ/diSE6zQUSIMbbK7biI1EzjwxUCgKQ5lRJllUuGAdcXuYWQLGrpj/CWJzUXXA=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.4.tgz"; + sha512 = "GVghn6ausIWZlUfbEEdDD4YB7M1mWJAUMokyha9sE5w0gyYoWwukKWQiwCwk/JhvnwXunMLhEUm6y2nrHEmlLw=="; }; }; - "@antora/site-publisher-2.3.3" = { + "@antora/site-publisher-2.3.4" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.3.tgz"; - sha512 = "LAavxXd3wmH0hWqNkKMgQuj/fjE08BTO6zYR51KLBO798h0f7H0OgyBI+p8c7l/QANpAfjaWyBpbR1zOxnLCMQ=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.4.tgz"; + sha512 = "7xI/5OdjKq5tkdGzE0ABkl/QpIcgtnof+rnIWZweQKeQtA3LWutvEHtdIeXLQt0oNZmE/kf45FwC2XCg9/ptDg=="; }; }; - "@antora/ui-loader-2.3.3" = { + "@antora/ui-loader-2.3.4" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.3.tgz"; - sha512 = "bQVb6PE34iDmZj6wZZzYm3rLjguxoSqHZj4QReVQsOle/LdIwl48hV9Iz/Pivy9NtVCui9LL/lmSQzMt0G0jkw=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.4.tgz"; + sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; - "@apollo/federation-0.19.0" = { + "@apollo/federation-0.20.0" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.19.0"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.19.0.tgz"; - sha512 = "8cd8ftHgqaseDTN7RJrROT6FT1xy8RV2Qb9BGhhqPVMHqf08GtidBqQTk6hv1UDR0qu/TRZA6J4Kh7oXeMrPQg=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.0.tgz"; + sha512 = "Q2eGSjrArtY04FSVIxUK3/JaVDDw4aJZBRl0+UZ1dwrpk6YtBpydW2u4X6dPTnBqRDpKVGVmc9gkQr8d3LpcKA=="; }; }; - "@apollo/protobufjs-1.0.4" = { + "@apollo/protobufjs-1.0.5" = { name = "_at_apollo_slash_protobufjs"; packageName = "@apollo/protobufjs"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.0.4.tgz"; - sha512 = "EE3zx+/D/wur/JiLp6VCiw1iYdyy1lCJMf8CGPkLeDt5QJrN4N8tKFx33Ah4V30AUQzMk7Uz4IXKZ1LOj124gA=="; + url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.0.5.tgz"; + sha512 = "ZtyaBH1icCgqwIGb3zrtopV2D5Q8yxibkJzlaViM08eOhTQc7rACdYu0pfORFfhllvdMZ3aq69vifYHszY4gNA=="; }; }; "@apollographql/apollo-tools-0.4.8" = { @@ -274,22 +301,13 @@ let sha512 = "XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ=="; }; }; - "@arcanis/slice-ansi-1.0.2" = { - name = "_at_arcanis_slash_slice-ansi"; - packageName = "@arcanis/slice-ansi"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@arcanis/slice-ansi/-/slice-ansi-1.0.2.tgz"; - sha512 = "lDL63z0W/L/WTgqrwVOuNyMAsTv+pvjybd21z9SWdStmQoXT59E/iVWwat3gYjcdTNBf6oHAMoyFm8dtjpXEYw=="; - }; - }; - "@ardatan/aggregate-error-0.0.1" = { + "@ardatan/aggregate-error-0.0.6" = { name = "_at_ardatan_slash_aggregate-error"; packageName = "@ardatan/aggregate-error"; - version = "0.0.1"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.1.tgz"; - sha512 = "UQ9BequOTIavs0pTHLMwQwKQF8tTV1oezY/H2O9chA+JNPFZSua55xpU5dPSjAU9/jLJ1VwU+HJuTVN8u7S6Fg=="; + url = "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.6.tgz"; + sha512 = "vyrkEHG1jrukmzTPtyWB4NLPauUw5bQeg4uhn8f+1SSynmrOcyvlb1GKQjjgoBzElLdfXCRYX8UnBlhklOHYRQ=="; }; }; "@azu/format-text-1.0.1" = { @@ -328,22 +346,31 @@ let sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.11.1" = { + "@babel/core-7.11.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.1"; + version = "7.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz"; - sha512 = "XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz"; + sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; }; }; - "@babel/generator-7.11.0" = { + "@babel/generator-7.11.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.0"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz"; - sha512 = "fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz"; + sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; + }; + }; + "@babel/generator-7.11.6" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; + sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -373,13 +400,13 @@ let sha512 = "5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg=="; }; }; - "@babel/helper-builder-react-jsx-experimental-7.10.5" = { + "@babel/helper-builder-react-jsx-experimental-7.11.5" = { name = "_at_babel_slash_helper-builder-react-jsx-experimental"; packageName = "@babel/helper-builder-react-jsx-experimental"; - version = "7.10.5"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.5.tgz"; - sha512 = "Buewnx6M4ttG+NLkKyt7baQn7ScC/Td+e99G914fRU8fGIUivDDgVIQeDHFa5e4CRSJQt58WpNHhsAZgtzVhsg=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz"; + sha512 = "Vc4aPJnRZKWfzeCBsqTBnzulVNjABVdahSPhtdMD3Vs80ykx4a87jTHtF/VR+alSrDmNvat7l13yrRHauGcHVw=="; }; }; "@babel/helper-compilation-targets-7.10.4" = { @@ -418,13 +445,13 @@ let sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.10.4" = { + "@babel/helper-explode-assignable-expression-7.11.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz"; - sha512 = "4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; + sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ=="; }; }; "@babel/helper-function-name-7.10.4" = { @@ -508,13 +535,13 @@ let sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; }; }; - "@babel/helper-remap-async-to-generator-7.10.4" = { + "@babel/helper-remap-async-to-generator-7.11.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz"; - sha512 = "86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; + sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA=="; }; }; "@babel/helper-replace-supers-7.10.4" = { @@ -589,13 +616,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.1" = { + "@babel/parser-7.11.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.1"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.1.tgz"; - sha512 = "u9QMIRdKVF7hfEkb3nu2LgZDIzCQPv+yHD9Eg6ruoJLjkrQ9fFz4IBSlF/9XwoNri9+2F1IY+dYuOfZrXq8t3w=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; + sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -1120,13 +1147,13 @@ let sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; }; }; - "@babel/plugin-transform-runtime-7.11.0" = { + "@babel/plugin-transform-runtime-7.11.5" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz"; - sha512 = "LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz"; + sha512 = "9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.10.4" = { @@ -1201,22 +1228,22 @@ let sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/polyfill-7.10.4" = { + "@babel/polyfill-7.11.5" = { name = "_at_babel_slash_polyfill"; packageName = "@babel/polyfill"; - version = "7.10.4"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.4.tgz"; - sha512 = "8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg=="; + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.11.5.tgz"; + sha512 = "FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g=="; }; }; - "@babel/preset-env-7.11.0" = { + "@babel/preset-env-7.11.5" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz"; - sha512 = "2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz"; + sha512 = "kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA=="; }; }; "@babel/preset-flow-7.10.4" = { @@ -1228,13 +1255,13 @@ let sha512 = "XI6l1CptQCOBv+ZKYwynyswhtOKwpZZp5n0LG1QKCo8erRhqjoQV6nvx61Eg30JHpysWQSBwA2AWRU3pBbSY5g=="; }; }; - "@babel/preset-modules-0.1.3" = { + "@babel/preset-modules-0.1.4" = { name = "_at_babel_slash_preset-modules"; packageName = "@babel/preset-modules"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; - sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; "@babel/preset-stage-2-7.8.3" = { @@ -1255,31 +1282,22 @@ let sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; }; }; - "@babel/register-7.10.5" = { + "@babel/register-7.11.5" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.10.5"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.10.5.tgz"; - sha512 = "eYHdLv43nyvmPn9bfNfrcC4+iYNwdQ8Pxk1MFJuU/U5LpSYl/PH4dFMazCYZDFVi8ueG3shvO+AQfLrxpYulQw=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.11.5.tgz"; + sha512 = "CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w=="; }; }; - "@babel/runtime-7.10.5" = { + "@babel/runtime-7.11.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.10.5"; + version = "7.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.5.tgz"; - sha512 = "otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg=="; - }; - }; - "@babel/runtime-7.11.1" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.1.tgz"; - sha512 = "nH5y8fLvVl3HAb+ezbgcgwrH8QbClWo8xzkOu7+oyqngo3EVorwpWJQaqXPjGRpfj7mQvsJCl/S8knkfkPWqrw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; + sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; "@babel/template-7.10.4" = { @@ -1291,13 +1309,13 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.11.0" = { + "@babel/traverse-7.11.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; - sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; + sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; }; }; "@babel/types-7.10.4" = { @@ -1309,22 +1327,76 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.11.0" = { + "@babel/types-7.11.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; - sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; + sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; }; }; - "@chemzqm/neovim-5.1.9" = { + "@bugsnag/browser-7.3.5" = { + name = "_at_bugsnag_slash_browser"; + packageName = "@bugsnag/browser"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.3.5.tgz"; + sha512 = "Zs54UH7rXJTQbcuKDr6a4Qn2SDHr7cq7XLd5EHuLCJ6OMBktBlM8vZSf1sOiCBE2EE2g/kC2rk6VJktsRIaUEA=="; + }; + }; + "@bugsnag/core-7.3.5" = { + name = "_at_bugsnag_slash_core"; + packageName = "@bugsnag/core"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.5.tgz"; + sha512 = "7zKFLcA6m9aaQ1p1AQx2iRaT3gE/MJqy0vGa/RhlKNdgMdMKYRGECWxJE66firvJT5ZwL7Bu11IkK6sLWHCBaw=="; + }; + }; + "@bugsnag/cuid-3.0.0" = { + name = "_at_bugsnag_slash_cuid"; + packageName = "@bugsnag/cuid"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.0.0.tgz"; + sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; + }; + }; + "@bugsnag/js-7.3.5" = { + name = "_at_bugsnag_slash_js"; + packageName = "@bugsnag/js"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.3.5.tgz"; + sha512 = "5KCeFEM7ntww2UbxbgW94TEwLHKzVLepDd8TNZeae2rdInt+fTc4o9oS0QxgubdLZHdLo9LNt8GTghl6F/9NwQ=="; + }; + }; + "@bugsnag/node-7.3.5" = { + name = "_at_bugsnag_slash_node"; + packageName = "@bugsnag/node"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.5.tgz"; + sha512 = "eN06NgphKYikBq/AXpiLO9tNx1H7cz8C78oQnR5fj2POulj+Zm9njr9dM6DEzGIvBDt952SwwcOA73jAiOmztQ=="; + }; + }; + "@bugsnag/safe-json-stringify-6.0.0" = { + name = "_at_bugsnag_slash_safe-json-stringify"; + packageName = "@bugsnag/safe-json-stringify"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz"; + sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; + }; + }; + "@chemzqm/neovim-5.2.6" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.1.9"; + version = "5.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.1.9.tgz"; - sha512 = "lV60tnl2jcJZj3Hb+IDg6uz2zsjsB2hIGAiaW5a452SlVeLmuUoDsy2WaqRbFqcIHZKG5GTP3ttnOlB+ltHWhg=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.6.tgz"; + sha512 = "9R4k2fvsX79dsNjxEjJaAlhdAZKx/DBGPHOXR3TVwJhX0TFPi9fvmHqJ8YFkAOweAVTXaiOdHv/LMerSBsA5Pw=="; }; }; "@cliqz-oss/firefox-client-0.3.1" = { @@ -1444,22 +1516,13 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; - "@emotion/babel-utils-0.6.10" = { - name = "_at_emotion_slash_babel-utils"; - packageName = "@emotion/babel-utils"; - version = "0.6.10"; + "@emmetio/extract-abbreviation-0.2.0" = { + name = "_at_emmetio_slash_extract-abbreviation"; + packageName = "@emmetio/extract-abbreviation"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.10.tgz"; - sha512 = "/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow=="; - }; - }; - "@emotion/hash-0.6.6" = { - name = "_at_emotion_slash_hash"; - packageName = "@emotion/hash"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz"; - sha512 = "ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ=="; + url = "https://registry.npmjs.org/@emmetio/extract-abbreviation/-/extract-abbreviation-0.2.0.tgz"; + sha512 = "eWIRoybKwQ0LkZw7aSULPFS+r2kp0+HdJlnw0HaE6g3AKbMNL4Ogwm2OTA9gNWZ5zdp6daOAOHFqjDqqhE5y/g=="; }; }; "@emotion/is-prop-valid-0.8.8" = { @@ -1471,15 +1534,6 @@ let sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="; }; }; - "@emotion/memoize-0.6.6" = { - name = "_at_emotion_slash_memoize"; - packageName = "@emotion/memoize"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz"; - sha512 = "h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ=="; - }; - }; "@emotion/memoize-0.7.4" = { name = "_at_emotion_slash_memoize"; packageName = "@emotion/memoize"; @@ -1489,24 +1543,6 @@ let sha512 = "Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="; }; }; - "@emotion/serialize-0.9.1" = { - name = "_at_emotion_slash_serialize"; - packageName = "@emotion/serialize"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.9.1.tgz"; - sha512 = "zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ=="; - }; - }; - "@emotion/stylis-0.7.1" = { - name = "_at_emotion_slash_stylis"; - packageName = "@emotion/stylis"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.7.1.tgz"; - sha512 = "/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ=="; - }; - }; "@emotion/stylis-0.8.5" = { name = "_at_emotion_slash_stylis"; packageName = "@emotion/stylis"; @@ -1516,15 +1552,6 @@ let sha512 = "h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="; }; }; - "@emotion/unitless-0.6.7" = { - name = "_at_emotion_slash_unitless"; - packageName = "@emotion/unitless"; - version = "0.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.6.7.tgz"; - sha512 = "Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg=="; - }; - }; "@emotion/unitless-0.7.5" = { name = "_at_emotion_slash_unitless"; packageName = "@emotion/unitless"; @@ -1534,15 +1561,6 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; - "@emotion/utils-0.8.2" = { - name = "_at_emotion_slash_utils"; - packageName = "@emotion/utils"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/utils/-/utils-0.8.2.tgz"; - sha512 = "rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw=="; - }; - }; "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" = { name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader"; packageName = "@endemolshinegroup/cosmiconfig-typescript-loader"; @@ -1552,6 +1570,15 @@ let sha512 = "ZHkXKq2XFFmAUdmSZrmqUSIrRM4O9gtkdpxMmV+LQl7kScUnbo6pMnXu6+FTDgZ12aW6SDoZoOJfS56WD+Eu6A=="; }; }; + "@eslint/eslintrc-0.1.3" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz"; + sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="; + }; + }; "@evocateur/libnpmaccess-3.1.2" = { name = "_at_evocateur_slash_libnpmaccess"; packageName = "@evocateur/libnpmaccess"; @@ -1588,49 +1615,85 @@ let sha512 = "EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w=="; }; }; - "@fluentui/date-time-utilities-7.3.1" = { + "@exodus/schemasafe-1.0.0-rc.2" = { + name = "_at_exodus_slash_schemasafe"; + packageName = "@exodus/schemasafe"; + version = "1.0.0-rc.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.2.tgz"; + sha512 = "W98NvvOe/Med3o66xTO03pd7a2omZebH79PV64gSE+ceDdU8uxQhFTa7ISiD1kseyqyOrMyW5/MNdsGEU02i3Q=="; + }; + }; + "@fluentui/date-time-utilities-7.8.1" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.3.1"; + version = "7.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.3.1.tgz"; - sha512 = "nC0ghnbJj8/9jM5Jn/Hg9RKKPn6ORS4sHrQk8iK/8R9A0EbYfPJS4wYlIrAhlgAbgkUTNcBgIM7M0q8dKfRTfw=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.8.1.tgz"; + sha512 = "2FsR7scZ6yS9h7MEUAunpLLYpHp4z7+DVgGlIBlNeL7YD5Vl0msj4pn7zRd1pcGfvoQfkWz3+ju3rBBl4LV4wQ=="; }; }; - "@fluentui/keyboard-key-0.2.8" = { + "@fluentui/dom-utilities-1.1.1" = { + name = "_at_fluentui_slash_dom-utilities"; + packageName = "@fluentui/dom-utilities"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.1.tgz"; + sha512 = "w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g=="; + }; + }; + "@fluentui/keyboard-key-0.2.12" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.8"; + version = "0.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.8.tgz"; - sha512 = "GJW3NjDdigTddYuxoOuBGhOs5Egweqs6iPTDSUN+oAtXI/poYHVtgjxaFQx1OeAzD8wLXofGneAe/03ZW+TESA=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.12.tgz"; + sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.124.2" = { + "@fluentui/react-7.139.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.124.2"; + version = "7.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.124.2.tgz"; - sha512 = "NFl5nHC68s3sDZMdjSnlasRR02Vb2KOTmtsLi8VX10T2jpt1G7VW3fcK5hh+lTO2jBN+GwF6DX/EIVF/wBLpMA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.139.0.tgz"; + sha512 = "Y3u80PnrK/ZnTlezo+Syfvy8UXkHEpwCHNW8hjezfOkhPVVI8fpmrPeHy2dDnqah5HDbuC6KUU9owWg/UojSCw=="; }; }; - "@fluentui/react-focus-7.12.27" = { + "@fluentui/react-focus-7.16.5" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.12.27"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.12.27.tgz"; - sha512 = "YIyqcoWhQ275STcrseqJ7vjlvYdLlMlaWpziMgqtidS7/yaMrCyCnB5zPzuKaePH8N8z2wtsqq10algj3UtwRw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.5.tgz"; + sha512 = "FlRqYSzkptXuKvsIiI9m1tf7g5pRcbu9S9rK6c8pHax/kDRsBuDRW2OajxjVYR36B6IyAgYjylWdk6zBJI5oSQ=="; }; }; - "@fluentui/react-icons-0.1.42" = { + "@fluentui/react-icons-0.3.4" = { name = "_at_fluentui_slash_react-icons"; packageName = "@fluentui/react-icons"; - version = "0.1.42"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.1.42.tgz"; - sha512 = "/VHMiEl/MeEuRBqrYn9+zdpU5ay7qwpRZiGmXc6WecY9Olh/mV+Pfvf2lntOFf5IACWOhGY6EVaiV3pE5Uf5zg=="; + url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.3.4.tgz"; + sha512 = "/6xyGL7EQVCn9TP1eV+VjKS0HuC7WGZHs0t604E40LEE1HCIbXx7Jm1KDlMqP36n1W8XVDgyEZlffTmEOVGRkg=="; + }; + }; + "@fluentui/react-window-provider-0.3.3" = { + name = "_at_fluentui_slash_react-window-provider"; + packageName = "@fluentui/react-window-provider"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-0.3.3.tgz"; + sha512 = "MVPf2hqOQ17LAZsuvGcr3oOHksAskUm+fCYdXFhbVoAgsCDVTIuH6i8XgHFd6YjBtzjZmI4+k/3NTQfDqBX8EQ=="; + }; + }; + "@fluentui/theme-0.3.2" = { + name = "_at_fluentui_slash_theme"; + packageName = "@fluentui/theme"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.3.2.tgz"; + sha512 = "Yt4VK2NKTc+Sao0+ZguXiQ0ZpN74h+7c+7YAyxaao2R/nwSHSnmH42VVlzBN+aL5kYDrbQ4P9Z8zPIwKEZ1u3A=="; }; }; "@graphql-cli/common-4.0.0" = { @@ -1651,94 +1714,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.0.16" = { + "@graphql-tools/delegate-6.2.3" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.0.16.tgz"; - sha512 = "mq/vTHaBGOWxqKqjkj8KJpH+hg6Y096nZYTLpUZcPf6eX1OhxEIkdw5NDN99ii2/NGAyw7ApoY7BWFEEneiiTg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.3.tgz"; + sha512 = "j4P7RaI5J9AvGcfBDITO6bZDeSvjMgDby2smn3L2dmXpPfMYh00KRRSZjzdMwSkLxi+0octh9buUAeCdvVMkKQ=="; }; }; - "@graphql-tools/graphql-file-loader-6.0.16" = { + "@graphql-tools/graphql-file-loader-6.2.3" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.0.16.tgz"; - sha512 = "qgYplQhnY90CnQiRZpM2svCzyZ7FAXaca+liZ6hqA9jfWUWh4N9Tnmy//BqrTmULGVeanPM/m8MyhZEWvvRNIg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.3.tgz"; + sha512 = "9K+foDqfcJXf2jNNOWWZnV+PdxJkKmzAY58qlbFEFfUeRC6ZmOA9B3vTkcFadVdSwIsaWHhaxqHrNAD+OfkAyQ=="; }; }; - "@graphql-tools/import-6.0.16" = { + "@graphql-tools/import-6.2.3" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.0.16.tgz"; - sha512 = "zZRxJwAtUsyIckjfiscteFwpaIuEh3EjuhXEaNviMuwhOSrYT0oWmelcPgp/VHT6N4NZD1/y5jxQ4KHK4MrAfg=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.3.tgz"; + sha512 = "2ftXR84aPy2ueAEEGw/yFvYGPbvJYs2m18FEODhAq5z4P285ZlCMluxTUR9yNjumzgQP5Eer4fl64ztsdJvCyg=="; }; }; - "@graphql-tools/json-file-loader-6.0.16" = { + "@graphql-tools/json-file-loader-6.2.3" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.0.16.tgz"; - sha512 = "djkzPmGvVpD3YRypibYRNTgVUUfkae0JXcEWP/gn/8Y8+mnwyE2EiBfGZoW6Ejw5xTKQ7PgmOyWUIJgdEVMCJg=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.3.tgz"; + sha512 = "7v445KZLVB3owbibu2HsFmVSsdDOn0NzYSqIXaaIZ7saqoVtG8etSt699kLw5gJM3j0Kjm7XDz9tK60Apes/xg=="; }; }; - "@graphql-tools/load-6.0.16" = { + "@graphql-tools/load-6.2.3" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.16.tgz"; - sha512 = "7nJUrQqou8lQG5x6tJQAl0N/ONP2oYEgSmN0QwjSxv8iz0aRDoK/nHzGlVk6/Sot58iogF0E+qx/vDKNJh2piw=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.3.tgz"; + sha512 = "3wmzrwf7tVY8rDRT2jxfQKlKgSB6P8OordFoOxpk1qNP2vmkUN9tWKxaI1ANkdm+et1D3ovUHeSoW6jKscnUAA=="; }; }; - "@graphql-tools/merge-6.0.16" = { + "@graphql-tools/merge-6.2.3" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.16.tgz"; - sha512 = "QWeTru5IAON9ruTqs48X3WndRjz4pamTfA90M/RICkgog1LsFbIFhHM2QF+hogoMqxhlhmjgfMjQl7xXtDT+9Q=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.3.tgz"; + sha512 = "qSSxdM2AKjnAHuChcnxIfzsGej78B56EE6ZD3tXMtKJOMQMhk4T4yXnKRHEw8fw7ZtNk/KqCmb6LJHy8Ws8frg=="; }; }; - "@graphql-tools/schema-6.0.16" = { + "@graphql-tools/schema-6.2.3" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.16.tgz"; - sha512 = "e5jqE13L5eywCc0Uqlf2ThgScj1KgrCQmwvm+giVK0Dh9goMbwLZt/ciEJSr/LYn/vsH5sec9Qu5Jml6IX7zLA=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.3.tgz"; + sha512 = "CV5vDfQhXidssLK5hjT55FfwRAvBoGW53lVBl0rbXrbsSX7H9iVHdUf4UaDIlMc6WcnnzOrRiue/khHz3rzDEg=="; }; }; - "@graphql-tools/url-loader-6.0.16" = { + "@graphql-tools/url-loader-6.2.3" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.0.16.tgz"; - sha512 = "b+dwCDTcWIGOCYNYUKr6nbkAi8uOmgYHCf1wXsG09gV8uchU74tL8ebxBoaIEU8C9GSqterK2Y7mNjWyw3UdQQ=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.3.tgz"; + sha512 = "cV/VR/lT1bHxwhrZlyG+sevl4zU0zZQHS7+TelTfAdKGrSswEozK98pPjkFP57+6ghitH6XoHUE91hFxtaODsA=="; }; }; - "@graphql-tools/utils-6.0.16" = { + "@graphql-tools/utils-6.2.3" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.16.tgz"; - sha512 = "WSYVqiIpda0CzXgHuKBJkqE0zZs4aruoVxn5KVMmqDoZbPVJ4f/pATVgKYyelOlBlx5gOfs8PCFpWcQhDB39LA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.3.tgz"; + sha512 = "eOhZy4y23r6AddokBqvFpQybtHvhTyZCc3VFWn8eIqF92vre90UKHbCX6Cf6VBo6i7l0ZwChPPbUzEiHOk+HJQ=="; }; }; - "@graphql-tools/wrap-6.0.16" = { + "@graphql-tools/wrap-6.2.3" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.0.16"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.0.16.tgz"; - sha512 = "Q1VECNmmRygX1qdlGEF6dimAiuX9rauqalJif2zL9Fa4uORSvPr3VxOA8A0+4ypz2QYL+PjqQ88rCATUZxpY9g=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.3.tgz"; + sha512 = "bxMXobcuKy8r7jKefQx5VH3FSyXVHKfDWfJ65Kq4oAC2+d7DUlpr3HZ6BWoMhfgUf6s6PPM26Us00TGsUQlAGg=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -1939,6 +2002,15 @@ let sha512 = "Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg=="; }; }; + "@jest/types-24.9.0" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz"; + sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw=="; + }; + }; "@jest/types-25.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; @@ -1966,6 +2038,24 @@ let sha512 = "44DWNv5gDR9EwrCTVQ4ZC99yPqVS0VCWrYIBl45qNR8XQy+4lbl0IQG8kBDf6NHwj4Ib4c2z1Fq1IUJOCbkZcw=="; }; }; + "@kwsites/file-exists-1.1.1" = { + name = "_at_kwsites_slash_file-exists"; + packageName = "@kwsites/file-exists"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz"; + sha512 = "m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw=="; + }; + }; + "@kwsites/promise-deferred-1.1.1" = { + name = "_at_kwsites_slash_promise-deferred"; + packageName = "@kwsites/promise-deferred"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz"; + sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; + }; + }; "@lerna/add-3.21.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; @@ -2497,13 +2587,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.65" = { + "@microsoft/load-themed-styles-1.10.97" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.65"; + version = "1.10.97"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.65.tgz"; - sha512 = "4sLbMM9aywtSMRHebh912/6n4/lC/go6QlTbbQfIBBtfy0oQJdDOW1KtfZfSGPggoPiNEzA7xnVsFCFyMnZyEg=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.97.tgz"; + sha512 = "FX8a2rXhYzXJWSoSjbxSyOvOo2SOHUjLG7JRWTf6rwiQDM/8fSTC/7TLkE2BAMg9n4vG+AxrgfN561VPnHQxrw=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -2524,13 +2614,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@nestjs/schematics-7.0.1" = { + "@nestjs/schematics-7.1.2" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "7.0.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.0.1.tgz"; - sha512 = "MOnJPqKPpuwBHDdw96gHoshd/QEYrUlLPF92xQFXm6uIOo1EGISg8OOSoji2isEtp2gHpO+bL8p/h4oPG10Fqw=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.1.2.tgz"; + sha512 = "iUszxXz5cFEZFKKFQGyjx0+U5Emj7ix1rhXmHw1v63xhazlgTbT6XPxf247CTP0uyVkcflWkiVi+JawWWix16A=="; }; }; "@netflix/nerror-1.1.3" = { @@ -2542,58 +2632,148 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@node-red/editor-api-1.1.2" = { + "@netlify/build-4.0.4" = { + name = "_at_netlify_slash_build"; + packageName = "@netlify/build"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/build/-/build-4.0.4.tgz"; + sha512 = "TXVFLp2z96Dl5MfaB0LgTIlD+9IThnjAsYsRrMJZXugOBgsIQzJr/uJql4ISKcK3b33T46amYT6+ULB6ZVJeLw=="; + }; + }; + "@netlify/cache-utils-1.0.3" = { + name = "_at_netlify_slash_cache-utils"; + packageName = "@netlify/cache-utils"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.3.tgz"; + sha512 = "M7hr8JDirjF9o+7JbHy0T59hfhQL7t9ywTpQ4h625jnJO7BaW+w0Y2CrH0M3QOfdukdof7rkUM2eyR8G0ReSZw=="; + }; + }; + "@netlify/config-0.11.11" = { + name = "_at_netlify_slash_config"; + packageName = "@netlify/config"; + version = "0.11.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/config/-/config-0.11.11.tgz"; + sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; + }; + }; + "@netlify/config-2.1.5" = { + name = "_at_netlify_slash_config"; + packageName = "@netlify/config"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.5.tgz"; + sha512 = "bsREmA1xLdThEZZwTcDZuTgu+eUO6bQJ/xLGmrCcerUn90lY7zh/P5w+1p5Kx0ebGeRQxQAmm1L9vQs2wUPcLg=="; + }; + }; + "@netlify/functions-utils-1.2.9" = { + name = "_at_netlify_slash_functions-utils"; + packageName = "@netlify/functions-utils"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.9.tgz"; + sha512 = "1iMgfIMDy38ip7hAZd644BJ7he641xeGyG7MkPZtuxESfYfS6IrWiPNMu1NcVsNytXFLIFVg4m8LD6IBSiz1EQ=="; + }; + }; + "@netlify/git-utils-1.0.2" = { + name = "_at_netlify_slash_git-utils"; + packageName = "@netlify/git-utils"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.2.tgz"; + sha512 = "rqaCUHlJFYwvcCL8l+wp/YMhGkuXo2ceEf9fpHCN8GFOlU3kSu0NLRlKFohIFk1pdrymG1D3M7Pt+s62EKLjwA=="; + }; + }; + "@netlify/open-api-0.16.0" = { + name = "_at_netlify_slash_open-api"; + packageName = "@netlify/open-api"; + version = "0.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.16.0.tgz"; + sha512 = "o3QI9hAe6lspQysWrB8CygMO4h+7B4qtPDkacitZ4VPBR26rX2TASq0/x1TNa4TnFG2lNgzkuBWhtXAmd/9tdw=="; + }; + }; + "@netlify/plugin-edge-handlers-1.1.0" = { + name = "_at_netlify_slash_plugin-edge-handlers"; + packageName = "@netlify/plugin-edge-handlers"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.1.0.tgz"; + sha512 = "JR7d1u48ne9+Y2bRGYmYvWDaGhkZccZuw12ba63q6EJTHMC+hMp8t+Le1G6Bds+SEEox4npt0VHyHfuWmCcMaA=="; + }; + }; + "@netlify/run-utils-1.0.1" = { + name = "_at_netlify_slash_run-utils"; + packageName = "@netlify/run-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.1.tgz"; + sha512 = "fx0A9xVgFQXjZ/uZCa4XtlaO7mPgwhanVHwQAcBDGOwps8fhuaVITCcPy/kPv+igOimvqWzOD3x/F0OrsXGpBw=="; + }; + }; + "@netlify/zip-it-and-ship-it-1.3.12" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "1.3.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.3.12.tgz"; + sha512 = "FQM/59HXMAKp9k4z6rXDA/FBKFSUaU3n5SFpF2/jScmpCmHBpF+pYIWZmVB4fY17cvq3KIcuSfzf9PqD1B73XQ=="; + }; + }; + "@node-red/editor-api-1.1.3" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.1.2.tgz"; - sha512 = "yvA7sO9kqpnojwtnO+K03CsRfU9XBIVYTnPHJYcA94IhxF/sm+iCL1VlZPEMXTEt4VvMfTRKY9U1bHIVAKBtLA=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.1.3.tgz"; + sha512 = "NejrCeQSPwvIaxxEiwOnU25Ylnu4ZEtumIIy2mWLd0IojE6HXDBGhAqfxtksIyg6TnrqKsID/JxK0mLgTs/npQ=="; }; }; - "@node-red/editor-client-1.1.2" = { + "@node-red/editor-client-1.1.3" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.1.2.tgz"; - sha512 = "cHsRxs/0QWqSO8LtTlwIsbEdTADjy3N5KOB2V1E3pNhz4zPy3+6472bnDF93HmywRen1wOWVXxBQTAf5aOHfaQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.1.3.tgz"; + sha512 = "oMVij+p/+RyRVOBSfvv2nt4pmurOOGH+KQglWVN3jiWs2D4mUXgsBfg/mbHn4wtvEBYtKFOQacXL7N22WES02g=="; }; }; - "@node-red/nodes-1.1.2" = { + "@node-red/nodes-1.1.3" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.1.2.tgz"; - sha512 = "sVwwrkCpT/padCcPMIQH4Yro4+qOYBBCkn85FnTY+7KlGLUPLhFQr4A30mWoJX5Wk+zTpe3nXqr9R0ccGrhWYg=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.1.3.tgz"; + sha512 = "XAMSiQrBPqpG7/XZqquZ5V1F/ibaDr/e96BrforFfkVGdzeb/5I+/MI2bSl3s/pJiuj4CuKSkQ7gWKbNwa4mvQ=="; }; }; - "@node-red/registry-1.1.2" = { + "@node-red/registry-1.1.3" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.1.2.tgz"; - sha512 = "ApbQviP0q77zI1BREFhbMbNzP972RB4BtZHUOFbXGbcSLaQpX7QLt7+gNTkwTEg5VwHt1nQPNWbAVdP+Aq3RiA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.1.3.tgz"; + sha512 = "ULvrgC7fpClTHluiQcc4EptaYRPEoKdqfozSxL6XJW5x1BRNU9Iv7+5txhKoumcy7a54bavol32VA7/JRyewjg=="; }; }; - "@node-red/runtime-1.1.2" = { + "@node-red/runtime-1.1.3" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.1.2.tgz"; - sha512 = "szt7L6/wWZax84VsgER8uZB3rnBHofjb2b1qQzRm4yG02O8YZ8elw1kKi0b6B6D+Xo5h3z29h/oJyYdBS8/9sA=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.1.3.tgz"; + sha512 = "tJWPDPCFmp2sB+YZaLtPHOuuwNXQdQ15tizz1vL9i0S+0VVXE8SX2WhBzbsBxSitpNxQ6zTfq8bK28Zh75HCVg=="; }; }; - "@node-red/util-1.1.2" = { + "@node-red/util-1.1.3" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.1.2.tgz"; - sha512 = "9G45g4W7HcCJ9IpIF76sCbDuqHWHmkAHI+lNE02TC8yvGzEOyb6VMvU0vph5JT499752WSlNQwk/g823VrqYLw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.1.3.tgz"; + sha512 = "Wa/L2bFRK9dR8K1zGlhp3Z9tqZgHsKaSK329YQGRIvAApbH5G//58V1oJdj3+9Gg8xza5YXx4Cw9hHs2m1du6A=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -2641,13 +2821,13 @@ let sha512 = "oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="; }; }; - "@npmcli/git-2.0.3" = { + "@npmcli/git-2.0.4" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.3.tgz"; - sha512 = "c/ODsV5ppjB12VDXKc6hzVNgg6ZJX/etILUn3WgF5NLAYBhQLJ3fBq6uB2jQD4OwqOzJdPT1/xA3Xh3aaWGk5w=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.4.tgz"; + sha512 = "OJZCmJ9DNn1cz9HPXXsPmUBnqaArot3CGYo63CyajHQk+g87rPXVOJByGsskQJhPsUUEXJcsZ2Q6bWd2jSwnBA=="; }; }; "@npmcli/installed-package-contents-1.0.5" = { @@ -2677,13 +2857,13 @@ let sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow=="; }; }; - "@npmcli/run-script-1.4.0" = { + "@npmcli/run-script-1.5.0" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.4.0.tgz"; - sha512 = "evlD0Ur2ILGyTP7FfMYi90x80bto9+nEbGjoWzdF+gmIX3HuA1nW0Ghj91JFaTJAHiXnDEEduZS24oAve/aeOA=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.5.0.tgz"; + sha512 = "z7AzLmsMtVntMRJt35M5VAjb/jH6yH37Q8Ku011JVR7rEoy+p2a6/NkwqChCRZORlJaS9rwjXmZKM6UmwXLkqA=="; }; }; "@oclif/color-0.1.2" = { @@ -2695,22 +2875,22 @@ let sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA=="; }; }; - "@oclif/command-1.7.0" = { + "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.7.0.tgz"; - sha512 = "TkknFtWcZI8te0E8sW+ohiblExrLx73rIcV4KdIzDX01u+oTZWZaap51F6TSGFnR/Gey0WctaDvJhZlt4xgKdA=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz"; + sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/config-1.16.0" = { + "@oclif/config-1.17.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.16.0.tgz"; - sha512 = "vOnMPQcHokC03WBCuLipTxksTwgZcmDOnH2H0UHqndfKKN9GVDzpZTH6zaFVQBdjTME5VtRzg9A2UaNmq6OXWw=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.17.0.tgz"; + sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; "@oclif/errors-1.3.3" = { @@ -2812,13 +2992,13 @@ let sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ=="; }; }; - "@octokit/endpoint-6.0.5" = { + "@octokit/endpoint-6.0.6" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.5"; + version = "6.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.5.tgz"; - sha512 = "70K5u6zd45ItOny6aHQAsea8HHQjlQq85yqOMe+Aj8dkhN2qSJ9T+Q3YjUjEYfPRBcuUWNgMn62DQnP/4LAIiQ=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.6.tgz"; + sha512 = "7Cc8olaCoL/mtquB7j/HTbPM+sY6Ebr4k2X2y4JoXpVKQ7r5xB4iGQE0IoO58wIPsUk4AzoT65AMEpymSbWTgQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -2857,13 +3037,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.7" = { + "@octokit/request-5.4.9" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.7"; + version = "5.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.7.tgz"; - sha512 = "FN22xUDP0i0uF38YMbOfx6TotpcENP5W8yJM1e/LieGXn6IoRxDMnBf7tx5RKSW4xuUZ/1P04NFZy5iY3Rax1A=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.9.tgz"; + sha512 = "CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA=="; }; }; "@octokit/request-error-1.2.1" = { @@ -2902,13 +3082,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-5.2.1" = { + "@octokit/types-5.5.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "5.2.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-5.2.1.tgz"; - sha512 = "PugtgEw8u++zAyBpDpSkR8K1OsT2l8QWp3ECL6bZHFoq9PfHDoKeGFWSuX2Z+Ghy93k1fkKf8tsmqNBv+8dEfQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz"; + sha512 = "UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -2956,13 +3136,22 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@primer/octicons-10.0.0" = { + "@prettier/plugin-pug-1.6.1" = { + name = "_at_prettier_slash_plugin-pug"; + packageName = "@prettier/plugin-pug"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.6.1.tgz"; + sha512 = "FqFByfSa72q2bxNocGlziXM/wAkhhIG5ecFU6+MddikqWTI+KIoeXRz6QHTtTWjcXqu6svlUNjNLhXMEMh25Hw=="; + }; + }; + "@primer/octicons-10.1.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-10.0.0.tgz"; - sha512 = "iuQubq62zXZjPmaqrsfsCZUqIJgZhmA6W0tKzIKGRbkoLnff4TFFCL87hfIRATZ5qZPM4m8ioT8/bXI7WVa9WQ=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-10.1.0.tgz"; + sha512 = "oXfV0uIe7I4cb3vUzBPlPZGL5SQ3+joyyRcmk28aJiGFySl8brzL0MJC63RahiNEnIFrL3D5BRVgz5ZGGuHCOg=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -3055,6 +3244,15 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; + "@rollup/plugin-babel-5.2.1" = { + name = "_at_rollup_slash_plugin-babel"; + packageName = "@rollup/plugin-babel"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz"; + sha512 = "Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A=="; + }; + }; "@rollup/plugin-commonjs-13.0.2" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -3064,6 +3262,24 @@ let sha512 = "9JXf2k8xqvMYfqmhgtB6eCgMN9fbxwF1XDF3mGKJc6pkAmt0jnsqurxQ0tC1akQKNSXCm7c3unQxa3zuxtZ7mQ=="; }; }; + "@rollup/plugin-commonjs-15.1.0" = { + name = "_at_rollup_slash_plugin-commonjs"; + packageName = "@rollup/plugin-commonjs"; + version = "15.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz"; + sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ=="; + }; + }; + "@rollup/plugin-json-4.1.0" = { + name = "_at_rollup_slash_plugin-json"; + packageName = "@rollup/plugin-json"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz"; + sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw=="; + }; + }; "@rollup/plugin-node-resolve-8.4.0" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; @@ -3073,6 +3289,15 @@ let sha512 = "LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ=="; }; }; + "@rollup/plugin-node-resolve-9.0.0" = { + name = "_at_rollup_slash_plugin-node-resolve"; + packageName = "@rollup/plugin-node-resolve"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz"; + sha512 = "gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg=="; + }; + }; "@rollup/pluginutils-3.1.0" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -3091,40 +3316,40 @@ let sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q=="; }; }; - "@samverschueren/stream-to-observable-0.3.0" = { + "@samverschueren/stream-to-observable-0.3.1" = { name = "_at_samverschueren_slash_stream-to-observable"; packageName = "@samverschueren/stream-to-observable"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz"; - sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; + url = "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz"; + sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.0.5" = { + "@schematics/angular-10.1.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.0.5"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.5.tgz"; - sha512 = "zg8QxgW3uLva/MSKMRYfV7dzj00SUki4nxYN4j1rw42VlwNPnFrPtzFVEilL6N7wFgoHP/6cZRgm4bfXYvLBvg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.2.tgz"; + sha512 = "7BHgSdP4yC0IuoiPGWBGQrwE5ilBhIOGozjKSHx41Utac45YKyXpmjr1Jw+SvFilgsnPEjZwc7VKqgINmeLkqA=="; }; }; - "@schematics/schematics-0.901.9" = { + "@schematics/schematics-0.1000.7" = { name = "_at_schematics_slash_schematics"; packageName = "@schematics/schematics"; - version = "0.901.9"; + version = "0.1000.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.901.9.tgz"; - sha512 = "Nca8Ig/mFFnhLmosbdWysX4N2HiwVOzA4gQj2TZnMCJ98Cftdebs388LstjsJwGtJyvAa2v4yoaPaUMIGVgQ9w=="; + url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1000.7.tgz"; + sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1000.5" = { + "@schematics/update-0.1001.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1000.5"; + version = "0.1001.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.5.tgz"; - sha512 = "xodvq3X4B90u8myMEp9ESPnD2aC4YtNXj1FOcJ+BnguRA7q9rq9EL9Xqdef8sx3PObbSiKC0OFLyxgw76WuC3Q=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.2.tgz"; + sha512 = "Z/P08k4FlbKNmxV5pe34yfKPLI2327CjBg26isO5qpR4nB1FVZkC39YXwFwJod3nU7DE6UMkKcA749k30k2KSg=="; }; }; "@serverless/cli-1.5.2" = { @@ -3145,13 +3370,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.34.1" = { + "@serverless/components-3.1.3" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.34.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.34.1.tgz"; - sha512 = "AmbGbeOufF0ZQN3yVbzh2MKxItdLgEaGhUNEKgw59xohMhwkzDHSW/FXulFQfunEEcCKCFnPE/Lzr/1GHnhVUQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.1.3.tgz"; + sha512 = "WVPM0lVwzzg1KuCGVWNnps/X4IyLdkFQ34XLLJq6PMtsOxeYs9GMg5j8C9TBrWN2s9eJjUpu2fq0KOt2L/s5yQ=="; }; }; "@serverless/core-1.1.2" = { @@ -3163,13 +3388,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.7.0" = { + "@serverless/enterprise-plugin-4.0.4" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.7.0"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.7.0.tgz"; - sha512 = "KAGj1HO0zAoBN4thsD+8S18fnvCLyHXnNFBfNiJsgGAzDIOwtwKqkMUR3z2LeQjAKuFeNJ8+3erexK75j50iBw=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.0.4.tgz"; + sha512 = "B+I1tZWWJN2Ziwp34FZ9umbu6cZ5Pv8lHA6iOtYzMqq6r22xF/9rwxY3fCdguo+Szd6t7RFb0zIW2RuBRgktVA=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3190,31 +3415,40 @@ let sha512 = "2c5A6HSWwXluknPNJ2s+Z4WfBwP7Kn6kgsEKD+5xlXpDpBFsRku/xJyO9eqRCwxTM41stgHNC6TRsZ03+wH/rw=="; }; }; - "@serverless/platform-client-1.1.1" = { + "@serverless/platform-client-1.1.10" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "1.1.1"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.1.tgz"; - sha512 = "vvS8Mn/nKaAIcP4r5wagsU7YoDQ6u5V3DuSOYx6e7fJiZ9vUKPpUbdUovUDxIoANC+Jo4SzuRxfL6MrK8qfZDw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.10.tgz"; + sha512 = "vMCYRdDaqQjPDlny3+mVNy0lr1P6RJ7hVkR2w9Bk783ZB894hobtMrTm8V8OQPwOvlAypmLnQsLPXwRNM+AMsw=="; }; }; - "@serverless/platform-client-china-1.0.32" = { + "@serverless/platform-client-2.0.2" = { + name = "_at_serverless_slash_platform-client"; + packageName = "@serverless/platform-client"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-2.0.2.tgz"; + sha512 = "3guXwRmHOujBy6Lmf7THtnfJQcLRYzpTRpL1rCxLko7OtIWcOth3TvW2JtWNu6qubauA+5kpLB2rdCaPefZYbQ=="; + }; + }; + "@serverless/platform-client-china-1.1.0" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.32"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.32.tgz"; - sha512 = "fZDmBNcT1w4rUTd4w6Nt0ONeQAfpUni37/v3SEMFWV5hCmjdh2LUIaaF1OC/sZA4KeYzcLTViJezymYkHXBHIA=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.1.0.tgz"; + sha512 = "QVk55zO5wcax3tPFp6IiZwf7yI0wZ64kNuR0eGM31g37AMt2+rBM6plE41zNKADRDBSqOtmnwEbsPiWlxZ/S9A=="; }; }; - "@serverless/platform-sdk-2.3.1" = { + "@serverless/platform-sdk-2.3.2" = { name = "_at_serverless_slash_platform-sdk"; packageName = "@serverless/platform-sdk"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.3.1.tgz"; - sha512 = "EiSizya9bK0+5uae3GH9uXuWAchZplkLO0tWOAXtnU5QWSg5zicANL9jKCw0dyhjUOvbcO0ddhFlG8EGYvJFSA=="; + url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.3.2.tgz"; + sha512 = "JSX0/EphGVvnb4RAgZYewtBXPuVsU2TFCuXh6EEZ4jxK3WgUwNYeYdwB8EuVLrm1/dYqu/UWUC0rPKb+ZDycJg=="; }; }; "@serverless/template-1.1.3" = { @@ -3235,13 +3469,13 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-china-0.1.22" = { + "@serverless/utils-china-0.1.28" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.22"; + version = "0.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.22.tgz"; - sha512 = "TYI1khc2Is3ESNwR2QrQx0fo8PfJto0IlDV3qgvfZ5ovCjPG6Ql1ziO8BpzDs5DgAO4TeNuwo28LJOUw/ANiKg=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.28.tgz"; + sha512 = "nxMBES1wR+U1U8UWaWd7CwKmoY18SRHT6h39ux8YGXgxeRd9pqKB4/TTLX4hHYMsqHteXufpFZQIhl0aGf9oww=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3271,13 +3505,31 @@ let sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; - "@sindresorhus/is-3.1.0" = { + "@sindresorhus/is-3.1.2" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.0.tgz"; - sha512 = "n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.2.tgz"; + sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; + }; + }; + "@sindresorhus/slugify-1.1.0" = { + name = "_at_sindresorhus_slash_slugify"; + packageName = "@sindresorhus/slugify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-1.1.0.tgz"; + sha512 = "ujZRbmmizX26yS/HnB3P9QNlNa4+UvHh+rIse3RbOXLp8yl6n1TxB4t7NHggtVgS8QmmOtzXo48kCxZGACpkPw=="; + }; + }; + "@sindresorhus/transliterate-0.1.1" = { + name = "_at_sindresorhus_slash_transliterate"; + packageName = "@sindresorhus/transliterate"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/transliterate/-/transliterate-0.1.1.tgz"; + sha512 = "QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ=="; }; }; "@slack/client-3.16.0" = { @@ -3289,94 +3541,49 @@ let sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg=="; }; }; - "@snyk/cli-interface-1.5.0" = { + "@snyk/cli-interface-2.9.1" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "1.5.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-1.5.0.tgz"; - sha512 = "+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.1.tgz"; + sha512 = "2zHRvEt4S0DO+hPRX3hp5ssELouJqgb/JUTmPDMr/32r//qooSTxojwSvAK2A6VYgYOHuo1S3VTpsSP/ywkPXA=="; }; }; - "@snyk/cli-interface-2.3.2" = { + "@snyk/cli-interface-2.9.2" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.2"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; - sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz"; + sha512 = "C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng=="; }; }; - "@snyk/cli-interface-2.8.0" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.8.0.tgz"; - sha512 = "St/G39iJG1zQK15L24kcVYM2gmFc/ylBCcBqU2DMZKJKwOPccKLUO6s+dWIUXMccQ+DFS6TuHPvuAKQNi9C4Yg=="; - }; - }; - "@snyk/cli-interface-2.8.1" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.8.1.tgz"; - sha512 = "pALcfgoY0hAavy/pBlDIqEu+FFC5m+D4bMnCwlQ26mObL/zzxp2+Ohx+HykCIom62u2J94SzAtRLFdm/2TgoOw=="; - }; - }; - "@snyk/cocoapods-lockfile-parser-3.4.0" = { + "@snyk/cocoapods-lockfile-parser-3.5.2" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; - version = "3.4.0"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.4.0.tgz"; - sha512 = "mAWgKIHFv0QEGpRvocVMxLAdJx7BmXtVOyQN/VtsGBoGFKqhO0jbtKUUVJC4b0jyKfVmEF2puo94i+1Uqz5q6A=="; + url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.5.2.tgz"; + sha512 = "fIiUNCmhDp7lVKTs/nHCnLK1roMkG15HhuQhtZXxiFW3EZ5H9IqMdtrxqjXuzVWt7X2h7lbF5OMBzD07NODtug=="; }; }; - "@snyk/composer-lockfile-parser-1.4.0" = { + "@snyk/composer-lockfile-parser-1.4.1" = { name = "_at_snyk_slash_composer-lockfile-parser"; packageName = "@snyk/composer-lockfile-parser"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.0.tgz"; - sha512 = "ga4YTRjJUuP0Ufr+t1IucwVjEFAv66JSBB/zVHP2zy/jmfA3l3ZjlGQSjsRC6Me9P2Z0esQ83AYNZvmIf9pq2w=="; + url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz"; + sha512 = "wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ=="; }; }; - "@snyk/dep-graph-1.18.3" = { + "@snyk/dep-graph-1.19.4" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.18.3"; + version = "1.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.18.3.tgz"; - sha512 = "7qWRTIJdZuc5VzDjdV2+03AHElyAZmhq7eV9BRu+jqrYjo9ohWBGEZgYslrTdvfqfJ8rkdrG3j0/0Aa25IxJcg=="; - }; - }; - "@snyk/dep-graph-1.18.4" = { - name = "_at_snyk_slash_dep-graph"; - packageName = "@snyk/dep-graph"; - version = "1.18.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.18.4.tgz"; - sha512 = "SePWsDyD7qrLxFifIieEl4GqyOODfOnP0hmUweTG5YcMroAV5nARGAUcjxREGzbXMcUpPfZhAaqFjYgzUDH8dQ=="; - }; - }; - "@snyk/dep-graph-1.19.0" = { - name = "_at_snyk_slash_dep-graph"; - packageName = "@snyk/dep-graph"; - version = "1.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.0.tgz"; - sha512 = "/0phOICMk4hkX2KtZgi+4KNd5G9oYDIlxQDQk+ui2xl4gonPvK6Q5MFzHP7Xet1YY/XoU33ox41i+IO48qZ+zQ=="; - }; - }; - "@snyk/dep-graph-1.19.3" = { - name = "_at_snyk_slash_dep-graph"; - packageName = "@snyk/dep-graph"; - version = "1.19.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.3.tgz"; - sha512 = "WJLUFKBokoFK5imi0t8Dkyj+uqtS/5Ziuf4oE/OOFX30UqP1ffMDkv9/3sqBJQVQ9FjdgsX3Cm8JZMtMlYRc6w=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz"; + sha512 = "h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw=="; }; }; "@snyk/docker-registry-v2-client-1.13.5" = { @@ -3397,49 +3604,13 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; - "@snyk/graphlib-2.1.9-patch" = { - name = "_at_snyk_slash_graphlib"; - packageName = "@snyk/graphlib"; - version = "2.1.9-patch"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.tgz"; - sha512 = "uFO/pNMm3pN15QB+hVMU7uaQXhsBNwEA8lOET/VDcdOzLptODhXzkJqSHqt0tZlpdAz6/6Uaj8jY00UvPFgFMA=="; - }; - }; - "@snyk/graphlib-2.1.9-patch.2" = { - name = "_at_snyk_slash_graphlib"; - packageName = "@snyk/graphlib"; - version = "2.1.9-patch.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.2.tgz"; - sha512 = "BjJzOXDNzoEMBOjSks7vadu5f0c39SeorJMi9vUvvWM5dcE22CZqcN9VMRW5DYTifUJiCWszkm5TOyfYfB0bfg=="; - }; - }; - "@snyk/inquirer-6.2.2-patch" = { - name = "_at_snyk_slash_inquirer"; - packageName = "@snyk/inquirer"; - version = "6.2.2-patch"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-6.2.2-patch.tgz"; - sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; - }; - }; - "@snyk/java-call-graph-builder-1.12.3" = { + "@snyk/java-call-graph-builder-1.13.2" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.12.3"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.12.3.tgz"; - sha512 = "eN32RcCq5J0Veo5NIbDUSb2KRNiVsZMt1w94bFYKxFt6F1tIoiv1CraXdTHSlgQosZ7tw93e8qdOKmQXOtK88Q=="; - }; - }; - "@snyk/lodash-4.17.15-patch" = { - name = "_at_snyk_slash_lodash"; - packageName = "@snyk/lodash"; - version = "4.17.15-patch"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/lodash/-/lodash-4.17.15-patch.tgz"; - sha512 = "e4+t34bGyjjRnwXwI14hqye9J/nRbG9iwaqTgXWHskm5qC+iK0UrjgYdWXiHJCf3Plbpr+1rpW+4LPzZnCGMhQ=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.13.2.tgz"; + sha512 = "YN3a93ttscqFQRUeThrxa7i2SJkFPfYn0VpFqdPB6mIJz2fRVLxUkMtlCbG0aSEUvWiLnGVHN0IYxwWEzhq11w=="; }; }; "@snyk/rpm-parser-2.0.0" = { @@ -3451,22 +3622,13 @@ let sha512 = "bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ=="; }; }; - "@snyk/ruby-semver-2.2.0" = { - name = "_at_snyk_slash_ruby-semver"; - packageName = "@snyk/ruby-semver"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.2.0.tgz"; - sha512 = "FqUayoVjcyCsQFYPm3DcaCKdFR4xmapUkCGY+bcNBs3jqCUw687PoP9CPQ1Jvtaw5YpfBNl/62jyntsWCeciuA=="; - }; - }; - "@snyk/snyk-cocoapods-plugin-2.3.0" = { + "@snyk/snyk-cocoapods-plugin-2.5.1" = { name = "_at_snyk_slash_snyk-cocoapods-plugin"; packageName = "@snyk/snyk-cocoapods-plugin"; - version = "2.3.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.3.0.tgz"; - sha512 = "4V1xJMqsK6J3jHu9UufKySorzA8O1vNLRIK1JgJf5KcXQCP44SJI5dk9Xr9iFGXXtGo8iI9gmokQcHlGpkPSJg=="; + url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.1.tgz"; + sha512 = "A+1xHD+SpmXQa0p+dWmiApFZtz/y37qAW9aWmFx2B1j7fwRBf9Qr89/6RbJOznf1a4nEitjzE3fa98yNZk/MNg=="; }; }; "@snyk/snyk-docker-pull-3.2.0" = { @@ -3478,13 +3640,13 @@ let sha512 = "uWKtjh29I/d0mfmfBN7w6RwwNBQxQVKrauF5ND/gqb0PVsKV22GIpkI+viWjI7KNKso6/B0tMmsv7TX2tsNcLQ=="; }; }; - "@sorg/log-2.1.0" = { + "@sorg/log-2.2.0" = { name = "_at_sorg_slash_log"; packageName = "@sorg/log"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sorg/log/-/log-2.1.0.tgz"; - sha512 = "weyuceH7eLZGlQLwA9+c2vxCWtWLe0vt4ma9qHzvB7aIbEZkAUXsONytEza6vNq2hIeL3/lRFRoGeiuBbnFfaA=="; + url = "https://registry.npmjs.org/@sorg/log/-/log-2.2.0.tgz"; + sha512 = "w5aH2k4caUWxO3dzJ0+GUJJGSqsg0gT6myhypQumlJXsKzYqzsZGZRWA2s/0zQIx6+B2wDvdweVogiWMAAbaKw=="; }; }; "@starptech/expression-parser-0.10.0" = { @@ -3766,13 +3928,13 @@ let sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; }; }; - "@types/babel-types-7.0.8" = { + "@types/babel-types-7.0.9" = { name = "_at_types_slash_babel-types"; packageName = "@types/babel-types"; - version = "7.0.8"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.8.tgz"; - sha512 = "jvu8g4LR7+p6ao30RhTREnEhHxmP4/R9D9/rOR/Kq14FztORty9SKgtOZUNZNMB9CXLxZ54EWu4dArUE8WdTsw=="; + url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz"; + sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA=="; }; }; "@types/babel__core-7.1.9" = { @@ -3802,13 +3964,13 @@ let sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; }; }; - "@types/babel__traverse-7.0.13" = { + "@types/babel__traverse-7.0.14" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.13"; + version = "7.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz"; - sha512 = "i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.14.tgz"; + sha512 = "8w9szzKs14ZtBVuP6Wn7nMLRJ0D6dfB0VEBEyRgxrZ/Ln49aNMykrghM2FaNn4FJRzNppCSa0Rv9pBRM5Xc3wg=="; }; }; "@types/babylon-6.16.5" = { @@ -3820,6 +3982,15 @@ let sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; }; }; + "@types/basic-auth-1.1.3" = { + name = "_at_types_slash_basic-auth"; + packageName = "@types/basic-auth"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/basic-auth/-/basic-auth-1.1.3.tgz"; + sha512 = "W3rv6J0IGlxqgE2eQ2pTb0gBjaGtejQpJ6uaCjz3UQ65+TFTPC5/lAE+POfx1YLdjtxvejJzsIAfd3MxWiVmfg=="; + }; + }; "@types/body-parser-1.19.0" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -3856,6 +4027,24 @@ let sha512 = "1zzPV9FDe1I/WHhRkf9SNgqtRJWZqrBWgu7JGveuHmmyR9CnAPCie2N/x+iHrgnpYBIcCJWHBoMRv2TRWktsvw=="; }; }; + "@types/chart.js-2.9.23" = { + name = "_at_types_slash_chart.js"; + packageName = "@types/chart.js"; + version = "2.9.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.23.tgz"; + sha512 = "4QQNE/b+digosu3mnj4E7aNQGKnlpzXa9JvQYPtexpO7v9gnDeqwc1DxF8vLJWLDCNoO6hH0EgO8K/7PtJl8wg=="; + }; + }; + "@types/clone-2.1.0" = { + name = "_at_types_slash_clone"; + packageName = "@types/clone"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/clone/-/clone-2.1.0.tgz"; + sha512 = "d/aS/lPOnUSruPhgNtT8jW39fHRVTLQy9sodysP1kkG8EdAtdZu1vt8NJaYA8w/6Z9j8izkAsx1A/yJhcYR1CA=="; + }; + }; "@types/color-name-1.1.1" = { name = "_at_types_slash_color-name"; packageName = "@types/color-name"; @@ -3919,13 +4108,40 @@ let sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; }; }; - "@types/emscripten-1.39.4" = { - name = "_at_types_slash_emscripten"; - packageName = "@types/emscripten"; - version = "1.39.4"; + "@types/decompress-4.2.3" = { + name = "_at_types_slash_decompress"; + packageName = "@types/decompress"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.39.4.tgz"; - sha512 = "k3LLVMFrdNA9UCvMDPWMbFrGPNb+GcPyw29ktJTo1RCN7RmxFG5XzPZcPKRlnLuLT/FRm8wp4ohvDwNY7GlROQ=="; + url = "https://registry.npmjs.org/@types/decompress/-/decompress-4.2.3.tgz"; + sha512 = "W24e3Ycz1UZPgr1ZEDHlK4XnvOr+CpJH3qNsFeqXwwlW/9END9gxn3oJSsp7gYdiQxrXUHwUUd3xuzVz37MrZQ=="; + }; + }; + "@types/download-6.2.4" = { + name = "_at_types_slash_download"; + packageName = "@types/download"; + version = "6.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/download/-/download-6.2.4.tgz"; + sha512 = "Lo5dy3ai6LNnbL663sgdzqL1eib11u1yKH6w3v3IXEOO4kRfQpMn1qWUTaumcHLACjFp1RcBx9tUXEvJoR3vcA=="; + }; + }; + "@types/ejs-2.7.0" = { + name = "_at_types_slash_ejs"; + packageName = "@types/ejs"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ejs/-/ejs-2.7.0.tgz"; + sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A=="; + }; + }; + "@types/engine.io-3.1.4" = { + name = "_at_types_slash_engine.io"; + packageName = "@types/engine.io"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.4.tgz"; + sha512 = "98rXVukLD6/ozrQ2O80NAlWDGA4INg+tqsEReWJldqyi2fulC9V7Use/n28SWgROXKm6003ycWV4gZHoF8GA6w=="; }; }; "@types/eslint-visitor-keys-1.0.0" = { @@ -3964,13 +4180,31 @@ let sha512 = "dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ=="; }; }; - "@types/express-serve-static-core-4.17.9" = { + "@types/express-serve-static-core-4.17.12" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.9"; + version = "4.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.9.tgz"; - sha512 = "DG0BYg6yO+ePW+XoDENYz8zhNGC3jDDEpComMYn7WJc4mY1Us8Rw9ax2YhJXxpyk2SF47PQAoQ0YyVT1a0bEkA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.12.tgz"; + sha512 = "EaEdY+Dty1jEU7U6J4CUWwxL+hyEGMkO5jan5gplfegUgCUsIUWqXxqw47uGjimeT4Qgkz/XUfwoau08+fgvKA=="; + }; + }; + "@types/fancy-log-1.3.0" = { + name = "_at_types_slash_fancy-log"; + packageName = "@types/fancy-log"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-1.3.0.tgz"; + sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; + }; + }; + "@types/fast-json-stable-stringify-2.0.0" = { + name = "_at_types_slash_fast-json-stable-stringify"; + packageName = "@types/fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha512 = "mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -3991,6 +4225,15 @@ let sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; }; }; + "@types/got-8.3.5" = { + name = "_at_types_slash_got"; + packageName = "@types/got"; + version = "8.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/got/-/got-8.3.5.tgz"; + sha512 = "AaXSrIF99SjjtPVNmCmYb388HML+PKEJb/xmj4SbL2ZO0hHuETZZzyDIKfOqaEoAHZEuX4sC+FRFrHYJoIby6A=="; + }; + }; "@types/graceful-fs-4.1.3" = { name = "_at_types_slash_graceful-fs"; packageName = "@types/graceful-fs"; @@ -4000,13 +4243,31 @@ let sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; }; }; - "@types/graphql-upload-8.0.3" = { + "@types/graphlib-2.1.7" = { + name = "_at_types_slash_graphlib"; + packageName = "@types/graphlib"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/graphlib/-/graphlib-2.1.7.tgz"; + sha512 = "K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg=="; + }; + }; + "@types/graphql-upload-8.0.4" = { name = "_at_types_slash_graphql-upload"; packageName = "@types/graphql-upload"; - version = "8.0.3"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.3.tgz"; - sha512 = "hmLg9pCU/GmxBscg8GCr1vmSoEmbItNNxdD5YH2TJkXm//8atjwuprB+xJBK714JG1dkxbbhp5RHX+Pz1KsCMA=="; + url = "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.4.tgz"; + sha512 = "0TRyJD2o8vbkmJF8InppFcPVcXKk+Rvlg/xvpHBIndSJYpmDWfmtx/ZAtl4f3jR2vfarpTqYgj8MZuJssSoU7Q=="; + }; + }; + "@types/hls.js-0.13.0" = { + name = "_at_types_slash_hls.js"; + packageName = "@types/hls.js"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.0.tgz"; + sha512 = "zeW+kWWUvMF7x8/M1kLRCX6C41UcKyDZC/Xy6biGqLhd+rkpv2juVO+tCwPSQPQuqL1VtseoQYdONCOxUZ38Sw=="; }; }; "@types/hosted-git-info-2.7.0" = { @@ -4036,6 +4297,33 @@ let sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; }; }; + "@types/http-errors-1.8.0" = { + name = "_at_types_slash_http-errors"; + packageName = "@types/http-errors"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-1.8.0.tgz"; + sha512 = "2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA=="; + }; + }; + "@types/http-proxy-1.17.4" = { + name = "_at_types_slash_http-proxy"; + packageName = "@types/http-proxy"; + version = "1.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz"; + sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; + }; + }; + "@types/inquirer-6.5.0" = { + name = "_at_types_slash_inquirer"; + packageName = "@types/inquirer"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-6.5.0.tgz"; + sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; + }; + }; "@types/istanbul-lib-coverage-2.0.3" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; @@ -4081,13 +4369,22 @@ let sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; }; }; - "@types/json-schema-7.0.5" = { + "@types/jscodeshift-0.7.1" = { + name = "_at_types_slash_jscodeshift"; + packageName = "@types/jscodeshift"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.7.1.tgz"; + sha512 = "4jkASx74qGl2OUK8NNFEq10QP0MXriOIqeBeNb1IdevHP8k8VDqS5Uv6nIixAA6ZUjjF6/SwOvecrjXkbcaFzw=="; + }; + }; + "@types/json-schema-7.0.6" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; - sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; }; }; "@types/json5-0.0.29" = { @@ -4099,6 +4396,15 @@ let sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; }; + "@types/json5-0.0.30" = { + name = "_at_types_slash_json5"; + packageName = "@types/json5"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.30.tgz"; + sha512 = "sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA=="; + }; + }; "@types/keygrip-1.0.2" = { name = "_at_types_slash_keygrip"; packageName = "@types/keygrip"; @@ -4117,13 +4423,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.11.3" = { + "@types/koa-2.11.4" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.3"; + version = "2.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.3.tgz"; - sha512 = "ABxVkrNWa4O/Jp24EYI/hRNqEVRlhB9g09p48neQp4m3xL1TJtdWk2NyNQSMCU45ejeELMQZBYyfstyVvO2H3Q=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.4.tgz"; + sha512 = "Etqs0kdqbuAsNr5k6mlZQelpZKVwMu9WPRHVVTLnceZlhr0pYmblRNJbCgoCMzKWWePldydU0AYEOX4Q9fnGUQ=="; }; }; "@types/koa-compose-3.2.5" = { @@ -4144,6 +4450,15 @@ let sha512 = "InCEXJNTv/59yO4VSfuvNrZHt7eeNtWQEgnieIA+mIC+MOWM9arOWG2eQ8Vhk6NbOre6/BidiXhkZYeDY9U35w=="; }; }; + "@types/lodash-4.14.161" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.161"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz"; + sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; + }; + }; "@types/long-4.0.1" = { name = "_at_types_slash_long"; packageName = "@types/long"; @@ -4153,6 +4468,15 @@ let sha512 = "5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="; }; }; + "@types/material-design-lite-1.1.16" = { + name = "_at_types_slash_material-design-lite"; + packageName = "@types/material-design-lite"; + version = "1.1.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/material-design-lite/-/material-design-lite-1.1.16.tgz"; + sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; + }; + }; "@types/mime-2.0.3" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; @@ -4180,6 +4504,33 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; + "@types/mithril-2.0.3" = { + name = "_at_types_slash_mithril"; + packageName = "@types/mithril"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mithril/-/mithril-2.0.3.tgz"; + sha512 = "cZHOdO2IiXYeyjeDYdbOisSdfaJRzfmRo3zVzgu33IWTMA0KEQObp9fdvqcuYdPz93iJ1yCl19GcEjo/9yv+yA=="; + }; + }; + "@types/mkdirp-0.5.2" = { + name = "_at_types_slash_mkdirp"; + packageName = "@types/mkdirp"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz"; + sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; + }; + }; + "@types/mkdirp-1.0.1" = { + name = "_at_types_slash_mkdirp"; + packageName = "@types/mkdirp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz"; + sha512 = "HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q=="; + }; + }; "@types/mocha-7.0.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; @@ -4189,13 +4540,31 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/node-10.17.28" = { + "@types/multer-1.4.3" = { + name = "_at_types_slash_multer"; + packageName = "@types/multer"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.3.tgz"; + sha512 = "tWsKbF5LYtXrJ7eOfI0aLBgEv9B7fnJe1JRXTj5+Z6EMfX0yHVsRFsNGnKyN8Bs0gtDv+JR37xAqsPnALyVTqg=="; + }; + }; + "@types/mysql-2.15.15" = { + name = "_at_types_slash_mysql"; + packageName = "@types/mysql"; + version = "2.15.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.15.tgz"; + sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; + }; + }; + "@types/node-10.17.35" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.28"; + version = "10.17.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz"; - sha512 = "dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.35.tgz"; + sha512 = "gXx7jAWpMddu0f7a+L+txMplp3FnHl53OhQIF9puXKq3hDGY/GjH+MF04oWnV/adPSCrbtHumDCFwzq2VhltWA=="; }; }; "@types/node-12.7.12" = { @@ -4207,31 +4576,49 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.15" = { + "@types/node-13.13.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.15"; + version = "13.13.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.15.tgz"; - sha512 = "kwbcs0jySLxzLsa2nWUAGOd/s21WU1jebrEdtzhsj1D4Yps1EOuyI1Qcu+FD56dL7NRNIJtDDjcqIG22NwkgLw=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.21.tgz"; + sha512 = "tlFWakSzBITITJSxHV4hg4KvrhR/7h3xbJdSFbYJBVzKubrASbnnIFuSgolUh7qKGo/ZeJPKUfbZ0WS6Jp14DQ=="; }; }; - "@types/node-14.0.27" = { + "@types/node-14.0.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.27"; + version = "14.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz"; - sha512 = "kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.26.tgz"; + sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="; }; }; - "@types/node-6.14.10" = { + "@types/node-14.11.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.10"; + version = "14.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.10.tgz"; - sha512 = "pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz"; + sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; + }; + }; + "@types/node-6.14.12" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "6.14.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-6.14.12.tgz"; + sha512 = "7iPCCv/SOqeGvz3CcBBnhG+3vBMntO3SMVcyUHmrJq6Lzdbi4dtSxk3JkIUm+JDGnT26mtxlNQHmTKlvDnjFwg=="; + }; + }; + "@types/node-8.10.64" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.64"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.64.tgz"; + sha512 = "/EwBIb+imu8Qi/A3NF9sJ9iuKo7yV+pryqjmeRqaU0C4wBAOhas5mdvoYeJ5PCKrh6thRSJHdoasFqh3BQGILA=="; }; }; "@types/node-fetch-2.5.7" = { @@ -4270,6 +4657,33 @@ let sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; }; + "@types/parse5-5.0.3" = { + name = "_at_types_slash_parse5"; + packageName = "@types/parse5"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz"; + sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; + }; + }; + "@types/pg-7.14.4" = { + name = "_at_types_slash_pg"; + packageName = "@types/pg"; + version = "7.14.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.4.tgz"; + sha512 = "yCKVMCcFPZSFHGg+8qjY368uf3ruyDBPjxvOU2ZcGa/vRFo5Ti5Y6z6vl+2hxtwm9VMWUGb6TWkIk3cIV8C0Cw=="; + }; + }; + "@types/pg-types-1.11.5" = { + name = "_at_types_slash_pg-types"; + packageName = "@types/pg-types"; + version = "1.11.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-1.11.5.tgz"; + sha512 = "L8ogeT6vDzT1vxlW3KITTCt+BVXXVkLXfZ/XNm6UqbcJgxf+KPO7yjWx7dQQE8RW07KopL10x2gNMs41+IkMGQ=="; + }; + }; "@types/q-1.5.4" = { name = "_at_types_slash_q"; packageName = "@types/q"; @@ -4279,13 +4693,13 @@ let sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; }; }; - "@types/qs-6.9.4" = { + "@types/qs-6.9.5" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.4"; + version = "6.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz"; - sha512 = "+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; + sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; }; }; "@types/range-parser-1.2.3" = { @@ -4369,6 +4783,24 @@ let sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="; }; }; + "@types/socket.io-2.1.10" = { + name = "_at_types_slash_socket.io"; + packageName = "@types/socket.io"; + version = "2.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.10.tgz"; + sha512 = "1fQMaDU/x2LPljEI/QI5IKl8sBYHM/zv32YYKvNrVEor7/1+MLqMqmWt8Bb8Vpf+PlIPBiTTC0BnrRx7ju3xOw=="; + }; + }; + "@types/socket.io-client-1.4.33" = { + name = "_at_types_slash_socket.io-client"; + packageName = "@types/socket.io-client"; + version = "1.4.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.33.tgz"; + sha512 = "m4LnxkljsI9fMsjwpW5QhRpMixo2BeeLpFmg0AE+sS4H1pzAd/cs/ftTiL60FLZgfFa8PFRPx5KsHu8O0bADKQ=="; + }; + }; "@types/source-list-map-0.1.2" = { name = "_at_types_slash_source-list-map"; packageName = "@types/source-list-map"; @@ -4378,6 +4810,15 @@ let sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; + "@types/sqlite3-3.1.6" = { + name = "_at_types_slash_sqlite3"; + packageName = "@types/sqlite3"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.6.tgz"; + sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA=="; + }; + }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -4396,6 +4837,15 @@ let sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; }; }; + "@types/through-0.0.30" = { + name = "_at_types_slash_through"; + packageName = "@types/through"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz"; + sha512 = "FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg=="; + }; + }; "@types/tough-cookie-4.0.0" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; @@ -4423,6 +4873,15 @@ let sha512 = "FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ=="; }; }; + "@types/url-join-4.0.0" = { + name = "_at_types_slash_url-join"; + packageName = "@types/url-join"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz"; + sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; + }; + }; "@types/vfile-3.0.2" = { name = "_at_types_slash_vfile"; packageName = "@types/vfile"; @@ -4441,22 +4900,22 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.47.0" = { + "@types/vscode-1.49.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.47.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.47.0.tgz"; - sha512 = "nJA37ykkz9FYA0ZOQUSc3OZnhuzEW2vUhUEo4MiduUo82jGwwcLfyvmgd/Q7b0WrZAAceojGhZybg319L24bTA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.49.0.tgz"; + sha512 = "wfNQmLmm1VdMBr6iuNdprWmC1YdrgZ9dQzadv+l2eSjJlElOdJw8OTm4RU4oGTBcfvG6RZI2jOcppkdSS18mZw=="; }; }; - "@types/webpack-4.41.17" = { + "@types/webpack-4.41.21" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.17"; + version = "4.41.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz"; - sha512 = "6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.21.tgz"; + sha512 = "2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA=="; }; }; "@types/webpack-sources-1.4.2" = { @@ -4486,13 +4945,13 @@ let sha512 = "Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ=="; }; }; - "@types/xml2js-0.4.5" = { - name = "_at_types_slash_xml2js"; - packageName = "@types/xml2js"; - version = "0.4.5"; + "@types/yargs-13.0.10" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "13.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.5.tgz"; - sha512 = "yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.10.tgz"; + sha512 = "MU10TSgzNABgdzKvQVW1nuuT+sgBMWeXNc3XOs5YXV5SDAK+PPja2eUuBNB9iqElu03xyEDqlnGw0jgl4nbqGQ=="; }; }; "@types/yargs-15.0.5" = { @@ -4513,6 +4972,15 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; + "@types/yauzl-2.9.1" = { + name = "_at_types_slash_yauzl"; + packageName = "@types/yauzl"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz"; + sha512 = "A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA=="; + }; + }; "@types/yoga-layout-1.9.2" = { name = "_at_types_slash_yoga-layout"; packageName = "@types/yoga-layout"; @@ -4522,193 +4990,247 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@types/zen-observable-0.8.0" = { + "@types/zen-observable-0.8.1" = { name = "_at_types_slash_zen-observable"; packageName = "@types/zen-observable"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz"; - sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; + url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.1.tgz"; + sha512 = "wmk0xQI6Yy7Fs/il4EpOcflG4uonUpYGqvZARESLc2oy4u69fkatFLbJOeW4Q6awO15P4rduAe6xkwHevpXcUQ=="; }; }; - "@typescript-eslint/eslint-plugin-3.8.0" = { + "@typescript-eslint/eslint-plugin-3.10.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.8.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.8.0.tgz"; - sha512 = "lFb4VCDleFSR+eo4Ew+HvrJ37ZH1Y9ZyE+qyP7EiwBpcCVxwmUc5PAqhShCQ8N8U5vqYydm74nss+a0wrrCErw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz"; + sha512 = "PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ=="; }; }; - "@typescript-eslint/experimental-utils-1.13.0" = { + "@typescript-eslint/experimental-utils-3.10.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "1.13.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz"; - sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz"; + sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-3.8.0" = { - name = "_at_typescript-eslint_slash_experimental-utils"; - packageName = "@typescript-eslint/experimental-utils"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz"; - sha512 = "o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w=="; - }; - }; - "@typescript-eslint/parser-1.13.0" = { + "@typescript-eslint/parser-3.10.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "1.13.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.13.0.tgz"; - sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz"; + sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-3.8.0" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.8.0.tgz"; - sha512 = "u5vjOBaCsnMVQOvkKCXAmmOhyyMmFFf5dbkM3TIbg3MZ2pyv5peE4gj81UAbTHwTOXEwf7eCQTUMKrDl/+qGnA=="; - }; - }; - "@typescript-eslint/types-3.8.0" = { + "@typescript-eslint/types-3.10.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "3.8.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.8.0.tgz"; - sha512 = "8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz"; + sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/typescript-estree-1.13.0" = { + "@typescript-eslint/typescript-estree-2.34.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "1.13.0"; + version = "2.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz"; - sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz"; + sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "@typescript-eslint/typescript-estree-3.8.0" = { + "@typescript-eslint/typescript-estree-3.10.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "3.8.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.8.0.tgz"; - sha512 = "MTv9nPDhlKfclwnplRNDL44mP2SY96YmPGxmMbMy6x12I+pERcxpIUht7DXZaj4mOKKtet53wYYXU0ABaiXrLw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz"; + sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/visitor-keys-3.8.0" = { + "@typescript-eslint/visitor-keys-3.10.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "3.8.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz"; - sha512 = "gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz"; + sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.7.41" = { + "@uifabric/foundation-7.9.5" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.7.41"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.7.41.tgz"; - sha512 = "Ts1yg58oMxCLT+hmJ9vfUpQm0zkj6lJUw+X9BhwL88DT8cUUEm43jqlnfC/d+3/gDaBV+YK6EalUrrB0EHrkDQ=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.5.tgz"; + sha512 = "r4KjYJAjSRgBGqeJXGKogYgzJS55/zcxmU3Gsps0BCMP8SCn55KZ31KiMYmjxoNnJAlGnhIq+h5zUEVRhpHN/Q=="; }; }; - "@uifabric/icons-7.3.67" = { + "@uifabric/icons-7.5.5" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.3.67"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.3.67.tgz"; - sha512 = "wN31oh/5aq72uhCErrykXhOOe1AKrqkDbApnOcYSG/5xaCh3BPfwhynjHg2y1cLxM/CQRckMfsu5lZ7OKZCYIA=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.5.tgz"; + sha512 = "lErlirRm3D4Lv63oxa/JFx+JUyHRX/pqNoolLQKlPKqNauHFcrcEEDRuZdtfSOJtF/1a09ZvIyirij3XwZjNBw=="; }; }; - "@uifabric/merge-styles-7.16.4" = { + "@uifabric/merge-styles-7.19.1" = { name = "_at_uifabric_slash_merge-styles"; packageName = "@uifabric/merge-styles"; - version = "7.16.4"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.16.4.tgz"; - sha512 = "OhOEtwYD74AARf4VZQJPan97QEvtTYcxBGVQfdE7YxFnvR1VdfMxOsV+9CAjAIFM+Xu5ibeKkEE/ZmJYnHkqsQ=="; + url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.1.tgz"; + sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A=="; }; }; - "@uifabric/react-hooks-7.7.0" = { + "@uifabric/react-hooks-7.13.4" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.7.0"; + version = "7.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.7.0.tgz"; - sha512 = "33iFd2mcS/XVGSQYyjBO5KKwFVq1WvG7KCio6vZXB/q2Rj9TWdkjLtsrM0C3YUDTS+vlKYSp1RuE/+tH00+8jQ=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.4.tgz"; + sha512 = "hyL3eQqbS7DrZCpkF1QDrC0TX+dV+yZZr5UgT3wAZMtzEMBFVgaiPHdv0zHgUbiQv5ktbQoY7yQp7clfVN65DA=="; }; }; - "@uifabric/set-version-7.0.19" = { + "@uifabric/set-version-7.0.23" = { name = "_at_uifabric_slash_set-version"; packageName = "@uifabric/set-version"; - version = "7.0.19"; + version = "7.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.19.tgz"; - sha512 = "p52z9Z5Kfl0kAU3DiPNPg+0vCdSAxlkRZEtEa+RwM6fh9XSo91n4C56FFdKDW7HJVuhGjMK7UEXuU6ELY1W7fg=="; + url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.23.tgz"; + sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.14.7" = { + "@uifabric/styling-7.16.5" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.14.7"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.14.7.tgz"; - sha512 = "J4nYc9QM4eCW+jGgRBW6C+1CsbdLfP9RanPn121YRKWYgg4SHdflCwJDfnNAPHSlvpPkQweVfbFVyHeTNCwIbw=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.5.tgz"; + sha512 = "mJcPam0ivtGfC8NEUQgpJFs8uG4ZRY1ml1RY9rOY6py5pTEno15xaq11yfRxv3ACxkuK9D9qZM23x0q8sWsCdg=="; }; }; - "@uifabric/utilities-7.25.0" = { + "@uifabric/utilities-7.32.2" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.25.0"; + version = "7.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.25.0.tgz"; - sha512 = "11QJq2dyYojVRxT/QvocI1m5tqqyeoX5K9HmqSGaAq5AIJBqdAUeFAIUuXAn7Gze7X+aLTFVF4Yxthh/ebVthw=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.32.2.tgz"; + sha512 = "x47zJIjezkfed17EfNRTr9wP6hHR+i0pBbr3eQYetpcVsAXcbZsd+D6divwy+kQOsdLQ8TozWqoVk3ySe6RfSw=="; }; }; - "@vue/cli-shared-utils-4.5.0" = { + "@vue/cli-shared-utils-4.5.6" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.0"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.0.tgz"; - sha512 = "sVIq0PvWW7W/CGuEm8LC+Ehod9yreaGaDva+oqVglTqE7lf0CtsAMRytFf37DgIwcM9TiMgdx8DCqdmotkhY9g=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.6.tgz"; + sha512 = "p6ePDlEa7Xc0GEt99KDOCwPZtR7UnoEaZLMfwPYU5LAWkdCmtAw8HPAY/WWcjtoiaAkY4k9tz7ZehQasZ9mJxg=="; }; }; - "@vue/cli-ui-4.5.0" = { + "@vue/cli-ui-4.5.6" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.0"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.0.tgz"; - sha512 = "N0Dc/KUFzXCSAWlTAq4wHIlE1RFIpf1kVh8kyO2ADippLbr+EpnhuSt725mk7twjRKqJLnu4j7AqDC55Tc735A=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.6.tgz"; + sha512 = "AmirESDgjeeTIvFc/OgQeNtYh1cfollyFdF3JSGaAy27rJJlbWfYRgHJoPFp7SD61FQQuqE+TOyiNjplHHt/Rg=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.0" = { + "@vue/cli-ui-addon-webpack-4.5.6" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.0"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.0.tgz"; - sha512 = "XGn9TtFI8leqNR0jSNeJMtkf81vNJn14RXHUQEDjF3jc2jQTiXbzy4I4YLBcq52vLv1qa0ucTY8HAb5sPf86Rg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.6.tgz"; + sha512 = "wjgzU4+cl93YXDrnSdZQmYRHyvCSgq24wPQFsfdXrobfP6a76wx+QedrLm7o2o0/BCHNCkDrTQLHxHvPiVm9PA=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.0" = { + "@vue/cli-ui-addon-widgets-4.5.6" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.0"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.0.tgz"; - sha512 = "8DDCGXQPHa6405/Qv0VXT17fhzhnm6XOpBVCJhKWWIP+uBhiEh+lg2hcNHC9ilW8R+N3jHzRSCoeUnjUKwSC1g=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.6.tgz"; + sha512 = "4Lpf59lr0pycIzKdTlZsgubJxCHDkAqcc4I60Gp6rggueksuhz2q3rAp7kfxwCzaZlAXXsqy6hoeyj+3sukqDQ=="; + }; + }; + "@vue/compiler-core-3.0.0" = { + name = "_at_vue_slash_compiler-core"; + packageName = "@vue/compiler-core"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0.tgz"; + sha512 = "XqPC7vdv4rFE77S71oCHmT1K4Ks3WE2Gi6Lr4B5wn0Idmp+NyQQBUHsCNieMDRiEpgtJrw+yOHslrsV0AfAsfQ=="; + }; + }; + "@vue/compiler-dom-3.0.0" = { + name = "_at_vue_slash_compiler-dom"; + packageName = "@vue/compiler-dom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0.tgz"; + sha512 = "ukDEGOP8P7lCPyStuM3F2iD5w2QPgUu2xwCW2XNeqPjFKIlR2xMsWjy4raI/cLjN6W16GtlMFaZdK8tLj5PRog=="; + }; + }; + "@vue/compiler-sfc-3.0.0" = { + name = "_at_vue_slash_compiler-sfc"; + packageName = "@vue/compiler-sfc"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0.tgz"; + sha512 = "1Bn4L5jNRm6tlb79YwqYUGGe+Yc9PRoRSJi67NJX6icdhf84+tRMtESbx1zCLL9QixQXu2+7aLkXHxvh4RpqAA=="; + }; + }; + "@vue/compiler-ssr-3.0.0" = { + name = "_at_vue_slash_compiler-ssr"; + packageName = "@vue/compiler-ssr"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0.tgz"; + sha512 = "Er41F9ZFyKB3YnNbE6JSTIGCVWve3NAQimgDOk4uP42OnckxBYKGBTutDeFNeqUZBMu/9vRHYrxlGFC9Z5jBVQ=="; + }; + }; + "@vue/reactivity-3.0.0" = { + name = "_at_vue_slash_reactivity"; + packageName = "@vue/reactivity"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0.tgz"; + sha512 = "mEGkztGQrAPZRhV7C6PorrpT3+NtuA4dY2QjMzzrW31noKhssWTajRZTwpLF39NBRrF5UU6cp9+1I0FfavMgEQ=="; + }; + }; + "@vue/runtime-core-3.0.0" = { + name = "_at_vue_slash_runtime-core"; + packageName = "@vue/runtime-core"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0.tgz"; + sha512 = "3ABMLeA0ZbeVNLbGGLXr+pNUwqXILOqz8WCVGfDWwQb+jW114Cm8djOHVVDoqdvRETQvDf8yHSUmpKHZpQuTkA=="; + }; + }; + "@vue/runtime-dom-3.0.0" = { + name = "_at_vue_slash_runtime-dom"; + packageName = "@vue/runtime-dom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0.tgz"; + sha512 = "f312n5w9gK6mVvkDSj6/Xnot1XjlKXzFBYybmoy6ahAVC8ExbQ+LOWti1IZM/adU8VMNdKaw7Q53Hxz3y5jX8g=="; + }; + }; + "@vue/shared-3.0.0" = { + name = "_at_vue_slash_shared"; + packageName = "@vue/shared"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0.tgz"; + sha512 = "4XWL/avABGxU2E2ZF1eZq3Tj7fvksCMssDZUHOykBIMmh5d+KcAnQMC5XHMhtnA0NAvktYsA2YpdsVwVmhWzvA=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -5089,42 +5611,6 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; - "@yarnpkg/core-2.1.1" = { - name = "_at_yarnpkg_slash_core"; - packageName = "@yarnpkg/core"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/core/-/core-2.1.1.tgz"; - sha512 = "qeBxz8nHjKAbGTP2ZcXBnXGfM7+cN0A73mIai/24uru1ayvCIgfjWL1uIj/MM+m+K5lJX0Dcn94ZBHWits9JWQ=="; - }; - }; - "@yarnpkg/fslib-2.1.0" = { - name = "_at_yarnpkg_slash_fslib"; - packageName = "@yarnpkg/fslib"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.1.0.tgz"; - sha512 = "E+f8w5yQZnTf1soyTWy7qdf+GmHsY+A0yEN4Di44/Txk6XRIMruyc1ShDi93mOI6ilnXxD87rNms18zJ8WnspA=="; - }; - }; - "@yarnpkg/json-proxy-2.1.0" = { - name = "_at_yarnpkg_slash_json-proxy"; - packageName = "@yarnpkg/json-proxy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/json-proxy/-/json-proxy-2.1.0.tgz"; - sha512 = "rOgCg2DkyviLgr80mUMTt9vzdf5RGOujQB26yPiXjlz4WNePLBshKlTNG9rKSoKQSOYEQcw6cUmosfOKDatrCw=="; - }; - }; - "@yarnpkg/libzip-2.1.0" = { - name = "_at_yarnpkg_slash_libzip"; - packageName = "@yarnpkg/libzip"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.1.0.tgz"; - sha512 = "39c7KuSWcYUqVxlBLZwfqdD/D6lS+jplNVWd6uAnk8EpnacaYGJRegvkqWyfw5c8KHukNMeEGF5JHrXPZYBM0w=="; - }; - }; "@yarnpkg/lockfile-1.1.0" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -5134,33 +5620,6 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-2.1.0" = { - name = "_at_yarnpkg_slash_parsers"; - packageName = "@yarnpkg/parsers"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.1.0.tgz"; - sha512 = "75OYQ6PMs1C3zm+W+T1xhLyVDX78zXQGEVHpWd4o/QwpAbhneB3/5FXVGRzI3gjPPWWSb/pKOPB1S6p0xmQD2Q=="; - }; - }; - "@yarnpkg/pnp-2.1.0" = { - name = "_at_yarnpkg_slash_pnp"; - packageName = "@yarnpkg/pnp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/pnp/-/pnp-2.1.0.tgz"; - sha512 = "b8NlB71EFifv1jDX47nFaRXrykROxHcS7YuGb2dQ+Gp9gqJ0thIaZ3yB9+qWF8acdWtNcMpjCug4xkfAAR5Odw=="; - }; - }; - "@yarnpkg/shell-2.1.0" = { - name = "_at_yarnpkg_slash_shell"; - packageName = "@yarnpkg/shell"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/shell/-/shell-2.1.0.tgz"; - sha512 = "9i9ZWqeKHGV0DOfdxTVq5zl73Li8Fg947v57uLBEaytNF+HywkDfouNkg/6HfgBrpI0WH8OJ9Pz/uDaE5cpctw=="; - }; - }; "@zeit/schemas-2.6.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; @@ -5251,13 +5710,13 @@ let sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e"; }; }; - "abab-2.0.4" = { + "abab-2.0.5" = { name = "abab"; packageName = "abab"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz"; - sha512 = "Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"; + sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; }; }; "abbrev-1.1.1" = { @@ -5278,15 +5737,6 @@ let sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; }; }; - "abstract-leveldown-0.12.4" = { - name = "abstract-leveldown"; - packageName = "abstract-leveldown"; - version = "0.12.4"; - src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz"; - sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; - }; - }; "abstract-leveldown-6.0.3" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -5314,13 +5764,13 @@ let sha512 = "TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ=="; }; }; - "abstract-logging-1.0.0" = { + "abstract-logging-2.0.0" = { name = "abstract-logging"; packageName = "abstract-logging"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-1.0.0.tgz"; - sha1 = "8b7deafd310559bc28f77724dd1bb30177278c1b"; + url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.0.tgz"; + sha512 = "/oA9z7JszpIioo6J6dB79LVUgJ3eD3cxkAmdCkvWWS+Y9tPtALs1rLqOekLUXUbYqM2fB9TTK0ibAyZJJOP/CA=="; }; }; "abstract-random-access-1.1.2" = { @@ -5341,15 +5791,6 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "accord-0.28.0" = { - name = "accord"; - packageName = "accord"; - version = "0.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/accord/-/accord-0.28.0.tgz"; - sha512 = "sPF34gqHegaCSryKf5wHJ8wREK1dTZnHmC9hsB7D8xjntRdd30DXDPKf0YVIcSvnXJmcYu5SCvZRz28H++kFhQ=="; - }; - }; "ace.improved-0.2.1" = { name = "ace.improved"; packageName = "ace.improved"; @@ -5449,13 +5890,13 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; - "acorn-jsx-5.2.0" = { + "acorn-jsx-5.3.1" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.2.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha512 = "HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; }; }; "acorn-loose-6.1.0" = { @@ -5530,13 +5971,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-2.1.0" = { + "addons-linter-2.5.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "2.1.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.1.0.tgz"; - sha512 = "ISCPobK6VdQ+5btMf1abkuD/9V+6RjnpJAVmEzjxDitk7HY03mLXVhA8SoD0XgngrI6cFlM2/i4OxfY4dHokpw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.5.0.tgz"; + sha512 = "d3GGf27ibN9ioxmjEiAFkGQRdyw5W+Gb2/9G55AZ6YygtBjtJDotTnSsE6Tz+mEFY4QKo/OaVs1XKjcZEl2fJA=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -5665,13 +6106,13 @@ let sha512 = "wn8fw19xKZwdGPO47jivonaHRTd+nGOMP1z11sgGeQzDy2xd5FG0R67dIMcKHDE2cJ5y+YXV30XVGUBPRSY7Hg=="; }; }; - "aggregate-error-3.0.1" = { + "aggregate-error-3.1.0" = { name = "aggregate-error"; packageName = "aggregate-error"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz"; - sha512 = "quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA=="; + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; "airplay-js-0.2.16" = { @@ -5728,15 +6169,6 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.12.0" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; - }; - }; "ajv-6.12.3" = { name = "ajv"; packageName = "ajv"; @@ -5746,6 +6178,24 @@ let sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="; }; }; + "ajv-6.12.4" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz"; + sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ=="; + }; + }; + "ajv-6.12.5" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz"; + sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="; + }; + }; "ajv-6.5.3" = { name = "ajv"; packageName = "ajv"; @@ -5800,13 +6250,13 @@ let sha512 = "0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw=="; }; }; - "alex-8.2.0" = { + "alex-9.0.1" = { name = "alex"; packageName = "alex"; - version = "8.2.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/alex/-/alex-8.2.0.tgz"; - sha512 = "aJX/ZkyGruiXKr26NJkbrYd+Quc8i0cP7B7b9TIX2AoLxHsV+0SJ0ca+26h8sw63LyrWQMkT7lZQlvMMOBKxqA=="; + url = "https://registry.npmjs.org/alex/-/alex-9.0.1.tgz"; + sha512 = "q560b+fVMXvu3WVkvoYBUGRHRXo9K9P/Fnt6Xcq1VhZow9MNqoQ5x7OJTYzSStAElaGxaJ7djTef9pJrM3GBXg=="; }; }; "align-text-0.1.4" = { @@ -5827,15 +6277,6 @@ let sha512 = "2Sy0hWhifVb8ycNFJgicL8fDPL2Ct1r62XOVxXnykn36z22MPZwnQlCmB2viQlY/lwfuO67GaQjUZ0rJgdVP7Q=="; }; }; - "almond-0.3.3" = { - name = "almond"; - packageName = "almond"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/almond/-/almond-0.3.3.tgz"; - sha1 = "a0e7c95ac7624d6417b4494b1e68bff693168a20"; - }; - }; "alphanum-sort-1.0.2" = { name = "alphanum-sort"; packageName = "alphanum-sort"; @@ -5854,6 +6295,24 @@ let sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; + "analytics-0.5.5" = { + name = "analytics"; + packageName = "analytics"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/analytics/-/analytics-0.5.5.tgz"; + sha512 = "43JBzud8n1OoN5TUehHpsp38rDyDteFgS9ZPWLyuj5JGc7JgjLAQNN1BCwyM9js4U7LIRxhEyWXPkifndMsOeA=="; + }; + }; + "analytics-utils-0.2.2" = { + name = "analytics-utils"; + packageName = "analytics-utils"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/analytics-utils/-/analytics-utils-0.2.2.tgz"; + sha512 = "fdbc+MeoNrkwCAbGD/qgedyvRbPnImmWiInAgZ51KpINmKITpdtWV+6riHVA1YBSrb8IyYlfxn98IeWyN9a0+Q=="; + }; + }; "ansi-0.3.1" = { name = "ansi"; packageName = "ansi"; @@ -5899,6 +6358,15 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; "ansi-colors-3.2.4" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -6214,13 +6682,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.30.2" = { + "apollo-2.30.3" = { name = "apollo"; packageName = "apollo"; - version = "2.30.2"; + version = "2.30.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.30.2.tgz"; - sha512 = "CKQVvfjbeFPVew9q/dGuRNpohenK7oBTKNnwDs89ImEGoPDd7BpXRQUu/mNjUANoDpd2ztYRwO+ZxxVE8P4+sA=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.30.3.tgz"; + sha512 = "5X0a2PaMOYUWhk0DIRzzwu18j6WiVWIvgmciQHY++QV+aKngspXWeqAn+mugSkwkC/GVycl/0Jv/OCdnemE7Og=="; }; }; "apollo-cache-1.3.5" = { @@ -6259,49 +6727,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.37.8" = { + "apollo-codegen-core-0.37.9" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.37.8"; + version = "0.37.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.8.tgz"; - sha512 = "5mIF75iJCGaPXPvWthQjrWKb6YD7KRioODAM6OF5r+foN70Mli2S3g7wCsnmQ0J1TtstntHVnXykHsWClj4NIg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.9.tgz"; + sha512 = "FfsLh/DZkwH1fb5mNaVonBVk9JdJp3D/Bj1AGthw9ldZmd/3s79YfsYXqOsCNJM1TZt6K/du08NMHSLS86YQBA=="; }; }; - "apollo-codegen-flow-0.35.8" = { + "apollo-codegen-flow-0.35.9" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.35.8"; + version = "0.35.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.8.tgz"; - sha512 = "nqTIvqmidL3/k6k0HcJOQfr/vG6a3i2CCKa+w1UwAR9zRJn487lvT3QGSRNuYaohB/wBdGtNk3a1V2FvFyH/xg=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.9.tgz"; + sha512 = "+9gJLQfSy04Y4DwPpicGLpKQ1GORo07sxQWKqJWMtVRj4exKMFXieNawDUKErvxqiwDKXcBO9B1q5MF8BcwWlA=="; }; }; - "apollo-codegen-scala-0.36.8" = { + "apollo-codegen-scala-0.36.9" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.36.8"; + version = "0.36.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.8.tgz"; - sha512 = "6/ulLUqlKUTac5mZNAaFtzYn5LnJbXeMLftCl1NL4dyzFRn4rj+gZjDRP5e74GfDCqLAMSPyVt/6OFBxFKrs7w=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.9.tgz"; + sha512 = "t1ew6IXsFL+sNvyy/kS0VWv8t1WjxC46lt1ISt5v5bgDVyGo2g+cH93SSeEFUjtv+hK3TyqSO1fM0SLHAy8oJA=="; }; }; - "apollo-codegen-swift-0.37.8" = { + "apollo-codegen-swift-0.37.9" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.37.8"; + version = "0.37.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.8.tgz"; - sha512 = "qRqXZg2fLBm5OhJopVwh3Y3RLXeurwAj+bH3xcpxiAX05qci9MVOxwej05nmSu4GUv1csJSLDn93ZjQfByabkQ=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.9.tgz"; + sha512 = "4N8s2yni41/jjbfsyoJ4yxbW8XbL6HbUbxRgvbmckGtoOjQS06PYUD56IibQWbsaBs8gEpu5Z/rE/dL2Y6hZug=="; }; }; - "apollo-codegen-typescript-0.37.8" = { + "apollo-codegen-typescript-0.37.9" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.37.8"; + version = "0.37.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.8.tgz"; - sha512 = "cYysqRnW2h1xKFEZH0o636IeKvWBeeTDZmNZEyfMcl2TtyMRd0cOFUmA0gokX0JK/QzvJuTJgBKD9le9W8wV2w=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.9.tgz"; + sha512 = "DFBa8vUbiVmd/kGG/mjq6umwWxFRYtzllmt2fwHIVCi9z4vDD8Y+6p9acwOxqjqKCVaJshRQCh94zGuW0gY6vA=="; }; }; "apollo-datasource-0.7.2" = { @@ -6349,13 +6817,22 @@ let sha512 = "YSdF/BKPbsnQpxWpmCE53pBJX44aaoif31Y22I/qKpB6ZSGzYijV5YBoCL5Q15H2oA/v/02Oazh9lbp4ek3eig=="; }; }; - "apollo-language-server-1.23.3" = { + "apollo-graphql-0.6.0" = { + name = "apollo-graphql"; + packageName = "apollo-graphql"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.6.0.tgz"; + sha512 = "BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg=="; + }; + }; + "apollo-language-server-1.23.4" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.23.3"; + version = "1.23.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.3.tgz"; - sha512 = "WbK5tlqDpyy5TKjo1tjLIAeeTjlpZpvXURB1Qlx7ZfTqaG1846u9lgYpKw6Ydx/+1Viy60K8z530/gOgI/KmvQ=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.4.tgz"; + sha512 = "PaA25SsAQ30iXfR0noESlNYDNb4RH5S7tjVxBTj53VRArp/gQDWJM6eDvFbH5RH3vXXpfHRVna6YfymDfTPdqg=="; }; }; "apollo-link-1.2.14" = { @@ -6439,13 +6916,13 @@ let sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; }; }; - "apollo-server-core-2.16.1" = { + "apollo-server-core-2.17.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.16.1"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.16.1.tgz"; - sha512 = "nuwn5ZBbmzPwDetb3FgiFFJlNK7ZBFg8kis/raymrjd3eBGdNcOyMTJDl6J9673X9Xqp+dXQmFYDW/G3G8S1YA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.17.0.tgz"; + sha512 = "rjAkBbKSrGLDfg/g5bohnPlQahmkAxgEBuMDVsoF3aa+RaEPXPUMYrLbOxntl0LWeLbPiMa/IyFF43dvlGqV7w=="; }; }; "apollo-server-env-2.4.5" = { @@ -6466,13 +6943,13 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.16.1" = { + "apollo-server-express-2.17.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.16.1"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.16.1.tgz"; - sha512 = "Oq5YNcaMYnRk6jDmA9LWf8oSd2KHDVe7jQ4wtooAvG9FVUD+FaFBgSkytXHMvtifQh2wdF07Ri8uDLMz6IQjTw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.17.0.tgz"; + sha512 = "PonpWOuM1DH3Cz0bu56Tusr3GXOnectC6AD/gy2GXK0v84E7tKTuxEY3SgsgxhvfvvhfwJbXTyIogL/wezqnCw=="; }; }; "apollo-server-plugin-base-0.9.1" = { @@ -6493,13 +6970,13 @@ let sha512 = "my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA=="; }; }; - "apollo-tracing-0.11.1" = { + "apollo-tracing-0.11.2" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.1.tgz"; - sha512 = "l7g+uILw7v32GA46IRXIx5XXbZhFI96BhSqrGK9yyvfq+NMcvVZrj3kIhRImPGhAjMdV+5biA/jztabElAbDjg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.2.tgz"; + sha512 = "QjmRd2ozGD+PfmF6U9w/w6jrclYSBNczN6Bzppr8qA5somEGl5pqdprIZYL28H0IapZiutA3x6p6ZVF/cVX8wA=="; }; }; "apollo-upload-client-11.0.0" = { @@ -6646,6 +7123,15 @@ let sha512 = "B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ=="; }; }; + "archiver-5.0.2" = { + name = "archiver"; + packageName = "archiver"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver/-/archiver-5.0.2.tgz"; + sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg=="; + }; + }; "archiver-utils-1.3.0" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -6736,6 +7222,15 @@ let sha512 = "fvDR4iYpZkbMqMbTfKynPGfpXDhFTxzZWSS7C3c70xQ8ElmFkjwVrg/NLcEA+R3s4Jz6mVrz/1vOLEAI+ycrSQ=="; }; }; + "aribts-2.1.12" = { + name = "aribts"; + packageName = "aribts"; + version = "2.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/aribts/-/aribts-2.1.12.tgz"; + sha512 = "kY0YXa72/R7ruTxDqMHCDHnhW9pYvDT+46hQ7tnVDJUb+kp9BJcnOeiRIDheKp4Kn6z630UVywIgiK+4mYgJfA=="; + }; + }; "arr-diff-1.1.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -6907,6 +7402,15 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; + "array-flat-polyfill-1.0.1" = { + name = "array-flat-polyfill"; + packageName = "array-flat-polyfill"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flat-polyfill/-/array-flat-polyfill-1.0.1.tgz"; + sha512 = "hfJmKupmQN0lwi0xG6FQ5U8Rd97RnIERplymOv/qpq8AoNKPPAnxJadjFA23FNWm88wykh9HmpLJUUwUtNU/iw=="; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -7195,6 +7699,15 @@ let sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; + "ascii-table-0.0.9" = { + name = "ascii-table"; + packageName = "ascii-table"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ascii-table/-/ascii-table-0.0.9.tgz"; + sha1 = "06a6604d6a55d4bf41a9a47d9872d7a78da31e73"; + }; + }; "asciidoctor.js-1.5.9" = { name = "asciidoctor.js"; packageName = "asciidoctor.js"; @@ -7240,15 +7753,6 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "asn1.js-4.10.1" = { - name = "asn1.js"; - packageName = "asn1.js"; - version = "4.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; - }; - }; "asn1.js-5.4.1" = { name = "asn1.js"; packageName = "asn1.js"; @@ -7321,6 +7825,24 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; + "ast-module-types-2.6.0" = { + name = "ast-module-types"; + packageName = "ast-module-types"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.6.0.tgz"; + sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA=="; + }; + }; + "ast-types-0.12.1" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.1.tgz"; + sha512 = "H2izJAyT2xwew4TxShpmxe6f9R5hHgJQy1QloLiUC2yrJMtyraBWNJL7903rpeCY9keNUipORR/zIUC2XcYKng=="; + }; + }; "ast-types-0.13.3" = { name = "ast-types"; packageName = "ast-types"; @@ -7330,6 +7852,24 @@ let sha512 = "XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA=="; }; }; + "ast-types-0.14.1" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.14.1.tgz"; + sha512 = "pfSiukbt23P1qMhNnsozLzhMLBs7EEeXqPyvPmnuZM+RMfwfqwDbSVKYflgGuVI7/VehR4oMks0igzdNAg4VeQ=="; + }; + }; + "ast-types-0.14.2" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz"; + sha512 = "O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA=="; + }; + }; "ast-types-0.9.6" = { name = "ast-types"; packageName = "ast-types"; @@ -7591,13 +8131,13 @@ let sha512 = "TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ=="; }; }; - "atomic-file-2.0.1" = { + "atomic-file-2.1.1" = { name = "atomic-file"; packageName = "atomic-file"; - version = "2.0.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/atomic-file/-/atomic-file-2.0.1.tgz"; - sha512 = "9JCWojeLDF8UhEv2UJlLlPGsLEs+EBnfB+kOhsvmFI2QilVrnIsAwr7YnF8lLEVuxB+HxFhvGK+ax0Y8Eh/BKA=="; + url = "https://registry.npmjs.org/atomic-file/-/atomic-file-2.1.1.tgz"; + sha512 = "Eh6pW+fRC2/1RxPq3hO8+PkZKv+wujzKky2MP/n69eC8yMkbNFfuEb/riZHqf13M7gr6Hvglpk/kISgBSBb6bQ=="; }; }; "atomic-sleep-1.0.0" = { @@ -7609,6 +8149,15 @@ let sha512 = "kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ=="; }; }; + "atomically-1.3.2" = { + name = "atomically"; + packageName = "atomically"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atomically/-/atomically-1.3.2.tgz"; + sha512 = "MAiqx5ir1nOoMeG2vLXJnj4oFROJYB1hMqa2aAo6GQVIkPdkIcrq9W9SR0OaRtvEowO7Y2bsXqKFuDMTO4iOAQ=="; + }; + }; "attach-ware-1.1.1" = { name = "attach-ware"; packageName = "attach-ware"; @@ -7690,13 +8239,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.726.0" = { + "aws-sdk-2.756.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.726.0"; + version = "2.756.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.726.0.tgz"; - sha512 = "QRQ7MaW5dprdr/T3vCTC+J8TeUfpM45yWsBuATPcCV/oO8afFHVySwygvGLY4oJuo5Mf4mJn3+JYTquo6CqiaA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.756.0.tgz"; + sha512 = "Hk6DzcsXq1WRg+UVHDH56iQz31kDtg/NRqtJL1A0BrZ/PtNSLTHsQQllpcAi09UxLDMzBoDXymZ8kYg0Migq8w=="; }; }; "aws-sign2-0.6.0" = { @@ -7717,13 +8266,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.0" = { + "aws4-1.10.1" = { name = "aws4"; packageName = "aws4"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz"; - sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"; + sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; }; }; "axios-0.18.1" = { @@ -7753,6 +8302,15 @@ let sha512 = "pMfGJ6gAQ7LRKTHgiRF+8iaUUeGAI0c8puLaqHLc7B8AR7W6GJLozK9RFeUHFjEGybC9/EB3r67WPd7e46zQ8w=="; }; }; + "b24.js-1.0.3" = { + name = "b24.js"; + packageName = "b24.js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/b24.js/-/b24.js-1.0.3.tgz"; + sha512 = "j2hHu0asf6HxacVmGJKFSsrfoG8nC0JEjujIpsmRVkr74nC6o5gs6YF6AQD3e7YyJ8PaKuA7k2uSL9A2mAG9Og=="; + }; + }; "babel-code-frame-6.26.0" = { name = "babel-code-frame"; packageName = "babel-code-frame"; @@ -7870,15 +8428,6 @@ let sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; - "babel-plugin-emotion-9.2.11" = { - name = "babel-plugin-emotion"; - packageName = "babel-plugin-emotion"; - version = "9.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz"; - sha512 = "dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ=="; - }; - }; "babel-plugin-istanbul-6.0.0" = { name = "babel-plugin-istanbul"; packageName = "babel-plugin-istanbul"; @@ -7897,15 +8446,6 @@ let sha512 = "u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g=="; }; }; - "babel-plugin-macros-2.8.0" = { - name = "babel-plugin-macros"; - packageName = "babel-plugin-macros"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; - sha512 = "SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg=="; - }; - }; "babel-plugin-minify-builtins-0.5.0" = { name = "babel-plugin-minify-builtins"; packageName = "babel-plugin-minify-builtins"; @@ -8590,6 +9130,15 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; + "bignumber.js-9.0.0" = { + name = "bignumber.js"; + packageName = "bignumber.js"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz"; + sha512 = "t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="; + }; + }; "bigspinner-3.1.0" = { name = "bigspinner"; packageName = "bigspinner"; @@ -8617,6 +9166,15 @@ let sha1 = "e24ebfa6b63cb0387c5fc174f86e5cc812ca7cc9"; }; }; + "binary-0.3.0" = { + name = "binary"; + packageName = "binary"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }; + }; "binary-extensions-1.13.1" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -8761,31 +9319,22 @@ let sha512 = "5LhLQeGxdVFumJTbveJS16Rc+Vzh/nbC6o80UMj6ZRvSkiVkk+4L782OMYI0VG1JTfUxiRFP4f+CZBFyuclLBg=="; }; }; - "bl-0.8.2" = { + "bl-1.2.3" = { name = "bl"; packageName = "bl"; - version = "0.8.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; - sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; + url = "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz"; + sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; }; }; - "bl-1.2.2" = { + "bl-4.0.3" = { name = "bl"; packageName = "bl"; - version = "1.2.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; - sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; - }; - }; - "bl-4.0.2" = { - name = "bl"; - packageName = "bl"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz"; - sha512 = "j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ=="; + url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz"; + sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="; }; }; "blake2b-2.1.3" = { @@ -8923,13 +9472,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "blueimp-md5-2.16.0" = { + "blueimp-md5-2.17.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.16.0"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.16.0.tgz"; - sha512 = "j4nzWIqEFpLSbdhUApHRGDwfXbV8ALhqOn+FY5L6XBdKPAXU9BpGgFSbDsgqogfqPPR9R2WooseWCsfhfEC6uQ=="; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.17.0.tgz"; + sha512 = "x5PKJHY5rHQYaADj6NwPUR2QRCUVSggPzrUKkeENpj871o9l9IefJbO2jkT5UvYykeOK9dx0VmkIo6dZ+vThYw=="; }; }; "bn.js-4.11.9" = { @@ -8941,13 +9490,13 @@ let sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="; }; }; - "bn.js-5.1.2" = { + "bn.js-5.1.3" = { name = "bn.js"; packageName = "bn.js"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz"; - sha512 = "40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="; + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz"; + sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ=="; }; }; "bncode-0.2.3" = { @@ -9031,6 +9580,15 @@ let sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; + "bootstrap-3.4.1" = { + name = "bootstrap"; + packageName = "bootstrap"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz"; + sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; + }; + }; "bootstrap-vue-helper-json-1.1.1" = { name = "bootstrap-vue-helper-json"; packageName = "bootstrap-vue-helper-json"; @@ -9382,13 +9940,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.13.0" = { + "browserslist-4.14.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.13.0"; + version = "4.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz"; - sha512 = "MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.3.tgz"; + sha512 = "GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ=="; }; }; "bser-2.1.1" = { @@ -9571,6 +10129,15 @@ let sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; }; }; + "buffer-indexof-polyfill-1.0.2" = { + name = "buffer-indexof-polyfill"; + packageName = "buffer-indexof-polyfill"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz"; + sha512 = "I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="; + }; + }; "buffer-queue-1.0.0" = { name = "buffer-queue"; packageName = "buffer-queue"; @@ -9580,6 +10147,15 @@ let sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002"; }; }; + "buffer-writer-2.0.0" = { + name = "buffer-writer"; + packageName = "buffer-writer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; + sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; + }; + }; "buffer-xor-1.0.3" = { name = "buffer-xor"; packageName = "buffer-xor"; @@ -9832,24 +10408,6 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; - "bytewise-1.1.0" = { - name = "bytewise"; - packageName = "bytewise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz"; - sha1 = "1d13cbff717ae7158094aa881b35d081b387253e"; - }; - }; - "bytewise-core-1.2.3" = { - name = "bytewise-core"; - packageName = "bytewise-core"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz"; - sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; - }; - }; "cacache-12.0.4" = { name = "cacache"; packageName = "cacache"; @@ -9886,15 +10444,6 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; - "cacheable-lookup-2.0.1" = { - name = "cacheable-lookup"; - packageName = "cacheable-lookup"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; - sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; - }; - }; "cacheable-lookup-5.0.3" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; @@ -10156,13 +10705,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001111" = { + "caniuse-lite-1.0.30001133" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001111"; + version = "1.0.30001133"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001111.tgz"; - sha512 = "xnDje2wchd/8mlJu8sXvWxOGvMgv+uT3iZ3bkIAynKOzToCssWCmkz/ZIkQBs/2pUB4uwnJKVORWQ31UkbVjOg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001133.tgz"; + sha512 = "s3XAUFaC/ntDb1O3lcw9K8MPeOW7KO3z9+GzAoBxfz1B0VdacXPMKgFUtG4KIsgmnbexmi013s9miVu4h+qMHw=="; + }; + }; + "canvas-2.6.1" = { + name = "canvas"; + packageName = "canvas"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/canvas/-/canvas-2.6.1.tgz"; + sha512 = "S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA=="; }; }; "capital-case-1.0.3" = { @@ -10300,6 +10858,15 @@ let sha1 = "11a05102d1c4c785b6d0415d336d5a3a1612913e"; }; }; + "chainsaw-0.1.0" = { + name = "chainsaw"; + packageName = "chainsaw"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + }; + }; "chalk-0.4.0" = { name = "chalk"; packageName = "chalk"; @@ -10489,6 +11056,33 @@ let sha512 = "6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg=="; }; }; + "chart.js-2.9.3" = { + name = "chart.js"; + packageName = "chart.js"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chart.js/-/chart.js-2.9.3.tgz"; + sha512 = "+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw=="; + }; + }; + "chartjs-color-2.4.1" = { + name = "chartjs-color"; + packageName = "chartjs-color"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz"; + sha512 = "haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w=="; + }; + }; + "chartjs-color-string-0.6.0" = { + name = "chartjs-color-string"; + packageName = "chartjs-color-string"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; + sha512 = "TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A=="; + }; + }; "charwise-3.0.1" = { name = "charwise"; packageName = "charwise"; @@ -10579,13 +11173,13 @@ let sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074"; }; }; - "chloride-2.2.14" = { + "chloride-2.3.0" = { name = "chloride"; packageName = "chloride"; - version = "2.2.14"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/chloride/-/chloride-2.2.14.tgz"; - sha512 = "Jp3kpDIO4MlcJCFi4jER9P7k3sAVvIwbe4QJtM9Nkp43e/GQ/98HU1wJS6NdU6cbzfGrKWmMdRB+VNRrCynzfw=="; + url = "https://registry.npmjs.org/chloride/-/chloride-2.3.0.tgz"; + sha512 = "9jcavUx9ZNW9hxkG24rS9QddHpOqLAZqcb5SRbABRa8NKcplBKKcZfNM5LMa3DQ/VfXBQzcLDjgSo3uHA1ibZg=="; }; }; "chloride-test-1.2.4" = { @@ -10633,31 +11227,22 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; - "chokidar-3.3.1" = { + "chokidar-3.3.0" = { name = "chokidar"; packageName = "chokidar"; - version = "3.3.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz"; - sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; - "chokidar-3.4.0" = { + "chokidar-3.4.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.4.0"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; - sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; - }; - }; - "chokidar-3.4.1" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz"; - sha512 = "TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz"; + sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; }; }; "chownr-0.0.2" = { @@ -10894,15 +11479,6 @@ let sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; - "clean-css-4.2.1" = { - name = "clean-css"; - packageName = "clean-css"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz"; - sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; - }; - }; "clean-css-4.2.3" = { name = "clean-css"; packageName = "clean-css"; @@ -10912,6 +11488,15 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; + "clean-deep-3.4.0" = { + name = "clean-deep"; + packageName = "clean-deep"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-deep/-/clean-deep-3.4.0.tgz"; + sha512 = "Lo78NV5ItJL/jl+B5w0BycAisaieJGXK1qYi/9m4SjR8zbqmrUtO7Yhro40wEShGmmxs/aJLI/A+jNhdkXK8mw=="; + }; + }; "clean-git-ref-2.0.1" = { name = "clean-git-ref"; packageName = "clean-git-ref"; @@ -10966,13 +11551,13 @@ let sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; - "cli-boxes-2.2.0" = { + "cli-boxes-2.2.1" = { name = "cli-boxes"; packageName = "cli-boxes"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz"; - sha512 = "gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w=="; + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; }; "cli-color-0.1.7" = { @@ -11119,13 +11704,22 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; - "cli-ux-5.4.9" = { + "cli-ux-5.4.10" = { name = "cli-ux"; packageName = "cli-ux"; - version = "5.4.9"; + version = "5.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.9.tgz"; - sha512 = "4yCKJbFQqNQxf1v0E5T5aBJLt3SbW6dXc/R7zHp4ycdPMg9fAy5f2vhPsWgXEGCMQg+fgN0Sp7EYcZ1XGkFyUA=="; + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.10.tgz"; + sha512 = "s48Efw04VtGyQEwXDrERobMc2DF2DyYQ+2nmNsM7clxOVDtbRI9OjbXRwPeS6G2aFuHy0bB8GUq5MzkmkYt7yw=="; + }; + }; + "cli-ux-5.5.0" = { + name = "cli-ux"; + packageName = "cli-ux"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.5.0.tgz"; + sha512 = "aXoHgEOtkem8sJmQrU/jXsojCq8uOp8++9lybCbt9mFDyPouSNawSdoPjuM00PPaSPCJThvY0VNYOQNd6gGQCA=="; }; }; "cli-width-1.1.1" = { @@ -11182,15 +11776,6 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "clipanion-2.4.4" = { - name = "clipanion"; - packageName = "clipanion"; - version = "2.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/clipanion/-/clipanion-2.4.4.tgz"; - sha512 = "KjyCBz8xplftHjIK/nOqq/9b3hPlXbAAo/AxoITrO4yySpQ6a9QSJDAfOx9PfcRUHteeqbdNxZKSPfeFqQ7plg=="; - }; - }; "clipboard-2.0.6" = { name = "clipboard"; packageName = "clipboard"; @@ -11317,15 +11902,6 @@ let sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; }; }; - "clone-0.2.0" = { - name = "clone"; - packageName = "clone"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; - sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; - }; - }; "clone-1.0.4" = { name = "clone"; packageName = "clone"; @@ -11515,13 +12091,13 @@ let sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; }; }; - "coc.nvim-0.0.77" = { + "coc.nvim-0.0.79" = { name = "coc.nvim"; packageName = "coc.nvim"; - version = "0.0.77"; + version = "0.0.79"; src = fetchurl { - url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.77.tgz"; - sha512 = "wwn3ca7iMKuH/a6NAV7HL95xkEK5DzrKJ1dWGKBs+HZHFLhzXVYhjA0RL8x8Xf62TBEQGhH1wlKtBxkluGd1oQ=="; + url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.79.tgz"; + sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A=="; }; }; "code-error-fragment-0.0.230" = { @@ -11533,6 +12109,15 @@ let sha512 = "cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw=="; }; }; + "code-excerpt-3.0.0" = { + name = "code-excerpt"; + packageName = "code-excerpt"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-excerpt/-/code-excerpt-3.0.0.tgz"; + sha512 = "VHNTVhd7KsLGOqfX3SyeO8RyYPMp1GJOg194VITk04WMYCv4plV68YWe6TJZxd9MhobjtpMRnVky01gqZsalaw=="; + }; + }; "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; @@ -11956,6 +12541,15 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; + "commander-3.0.2" = { + name = "commander"; + packageName = "commander"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; + sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; + }; + }; "commander-4.1.0" = { name = "commander"; packageName = "commander"; @@ -11992,6 +12586,15 @@ let sha512 = "s7EA+hDtTYNhuXkTlhqew4txMZVdszBmKWSPEMxGr8ru8JXR7bLUFIAtPhcSuFdJQ0ILMxnJi8GkQL0yvDy/YA=="; }; }; + "commander-6.1.0" = { + name = "commander"; + packageName = "commander"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz"; + sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -12010,6 +12613,15 @@ let sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; + "common-path-prefix-2.0.0" = { + name = "common-path-prefix"; + packageName = "common-path-prefix"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-2.0.0.tgz"; + sha512 = "Lb9qbwwyQdRDmyib0qur7BC9/GHIbviTaQebayFsGC/n77AwFhZINCcJkQx2qVv9LJsA8F5ex65F2qrOfWGUyw=="; + }; + }; "common-tags-1.8.0" = { name = "common-tags"; packageName = "common-tags"; @@ -12145,6 +12757,15 @@ let sha512 = "FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg=="; }; }; + "compress-commons-4.0.1" = { + name = "compress-commons"; + packageName = "compress-commons"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.1.tgz"; + sha512 = "xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA=="; + }; + }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -12199,6 +12820,24 @@ let sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; + "concat-with-sourcemaps-1.1.0" = { + name = "concat-with-sourcemaps"; + packageName = "concat-with-sourcemaps"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"; + sha512 = "4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg=="; + }; + }; + "concordance-4.0.0" = { + name = "concordance"; + packageName = "concordance"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concordance/-/concordance-4.0.0.tgz"; + sha512 = "l0RFuB8RLfCS0Pt2Id39/oCPykE01pyxgAFypWTlaGRgvLkZrtczZ8atEHpTeEIW+zYWXTBuA9cCSeEOScxReQ=="; + }; + }; "conf-1.4.0" = { name = "conf"; packageName = "conf"; @@ -12208,13 +12847,13 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; - "conf-6.2.4" = { + "conf-7.1.2" = { name = "conf"; packageName = "conf"; - version = "6.2.4"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz"; - sha512 = "GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ=="; + url = "https://registry.npmjs.org/conf/-/conf-7.1.2.tgz"; + sha512 = "r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg=="; }; }; "config-1.31.0" = { @@ -12235,13 +12874,13 @@ let sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; - "configstore-3.1.2" = { + "configstore-3.1.5" = { name = "configstore"; packageName = "configstore"; - version = "3.1.2"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; - sha512 = "vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw=="; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.5.tgz"; + sha512 = "nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA=="; }; }; "configstore-4.0.0" = { @@ -12379,6 +13018,15 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; + "consolidate-0.16.0" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz"; + sha512 = "Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ=="; + }; + }; "constant-case-3.0.3" = { name = "constant-case"; packageName = "constant-case"; @@ -12623,6 +13271,15 @@ let sha1 = "f67a4938c5233443564250479c67014bac878499"; }; }; + "convert-to-spaces-1.0.2" = { + name = "convert-to-spaces"; + packageName = "convert-to-spaces"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz"; + sha1 = "7e3e48bbe6d997b1417ddca2868204b4d3d85715"; + }; + }; "convict-6.0.0" = { name = "convict"; packageName = "convict"; @@ -12767,6 +13424,15 @@ let sha512 = "7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A=="; }; }; + "copy-template-dir-1.4.0" = { + name = "copy-template-dir"; + packageName = "copy-template-dir"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-template-dir/-/copy-template-dir-1.4.0.tgz"; + sha512 = "xkXSJhvKz4MfLbVkZ7GyCaFo4ciB3uKI/HHzkGwj1eyTH5+7RTFxW5CE0irWAZgV5oFcO9hd6+NVXAtY9hlo7Q=="; + }; + }; "cordova-app-hello-world-5.0.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; @@ -12938,6 +13604,15 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; + "cp-file-6.2.0" = { + name = "cp-file"; + packageName = "cp-file"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz"; + sha512 = "fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA=="; + }; + }; "cp-file-7.0.0" = { name = "cp-file"; packageName = "cp-file"; @@ -12947,13 +13622,13 @@ let sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; }; }; - "cpy-8.1.0" = { + "cpy-8.1.1" = { name = "cpy"; packageName = "cpy"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-8.1.0.tgz"; - sha512 = "XwlImkjPxMr01qXqC564VD4rfcDQ2eKtYmFlCy0ixsLRJ1cwYVUBh+v47jsQTO1IrmvdjqO813VpDQ0JiTuOdA=="; + url = "https://registry.npmjs.org/cpy/-/cpy-8.1.1.tgz"; + sha512 = "vqHT+9o67sMwJ5hUd/BAOYeemkU+MuFRsK2c36Xc3eefQpAsp1kAsyDxEDcc5JS1+y9l/XHPrIsVTcyGGmkUUQ=="; }; }; "crc-0.2.0" = { @@ -13001,6 +13676,15 @@ let sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; }; }; + "crc32-stream-4.0.0" = { + name = "crc32-stream"; + packageName = "crc32-stream"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.0.tgz"; + sha512 = "tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw=="; + }; + }; "create-ecdh-4.0.4" = { name = "create-ecdh"; packageName = "create-ecdh"; @@ -13010,15 +13694,6 @@ let sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; }; }; - "create-emotion-9.2.12" = { - name = "create-emotion"; - packageName = "create-emotion"; - version = "9.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/create-emotion/-/create-emotion-9.2.12.tgz"; - sha512 = "P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA=="; - }; - }; "create-error-class-3.0.2" = { name = "create-error-class"; packageName = "create-error-class"; @@ -13091,13 +13766,13 @@ let sha512 = "MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw=="; }; }; - "cross-fetch-3.0.5" = { + "cross-fetch-3.0.6" = { name = "cross-fetch"; packageName = "cross-fetch"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.5.tgz"; - sha512 = "FFLcLtraisj5eteosnX1gf01qYDCOc4fDy0+euOt8Kn9YBY2NtXL/pCoYPavw24NIQkQqm5ZOLsGD5Zzj0gyew=="; + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz"; + sha512 = "KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ=="; }; }; "cross-spawn-4.0.2" = { @@ -13289,6 +13964,15 @@ let sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4"; }; }; + "css-ripple-effect-1.0.5" = { + name = "css-ripple-effect"; + packageName = "css-ripple-effect"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/css-ripple-effect/-/css-ripple-effect-1.0.5.tgz"; + sha1 = "6963b752aaf59babbd3fea3ec0da5d44e9122efb"; + }; + }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -13586,13 +14270,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "cuss-1.20.0" = { + "cuss-1.21.0" = { name = "cuss"; packageName = "cuss"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-1.20.0.tgz"; - sha512 = "ca6Z5roeWhHgXeDLn0g3SLrG68Cb9922MvHme7Q/dz4XfwuxcBLalW4RqFUyZOiczzAqKc2XVtR2Kof+sIfinQ=="; + url = "https://registry.npmjs.org/cuss/-/cuss-1.21.0.tgz"; + sha512 = "X3VvImImJ5q6w0wOgJtxAX+RC06d26egp/A/vdSxqOrsRtAA9biXAkc4PZGj/3gx0+z+gDFri6BpcpwuG1/UEw=="; }; }; "custom-error-instance-2.1.1" = { @@ -13667,6 +14351,168 @@ let sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; + "d3-array-2.7.1" = { + name = "d3-array"; + packageName = "d3-array"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz"; + sha512 = "dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q=="; + }; + }; + "d3-color-2.0.0" = { + name = "d3-color"; + packageName = "d3-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz"; + sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ=="; + }; + }; + "d3-delaunay-5.3.0" = { + name = "d3-delaunay"; + packageName = "d3-delaunay"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.3.0.tgz"; + sha512 = "amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w=="; + }; + }; + "d3-dispatch-2.0.0" = { + name = "d3-dispatch"; + packageName = "d3-dispatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz"; + sha512 = "S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA=="; + }; + }; + "d3-dsv-2.0.0" = { + name = "d3-dsv"; + packageName = "d3-dsv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-2.0.0.tgz"; + sha512 = "E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w=="; + }; + }; + "d3-force-2.1.1" = { + name = "d3-force"; + packageName = "d3-force"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz"; + sha512 = "nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew=="; + }; + }; + "d3-format-2.0.0" = { + name = "d3-format"; + packageName = "d3-format"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz"; + sha512 = "Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="; + }; + }; + "d3-geo-2.0.1" = { + name = "d3-geo"; + packageName = "d3-geo"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz"; + sha512 = "M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A=="; + }; + }; + "d3-geo-projection-3.0.0" = { + name = "d3-geo-projection"; + packageName = "d3-geo-projection"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-3.0.0.tgz"; + sha512 = "1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA=="; + }; + }; + "d3-hierarchy-2.0.0" = { + name = "d3-hierarchy"; + packageName = "d3-hierarchy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz"; + sha512 = "SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw=="; + }; + }; + "d3-interpolate-2.0.1" = { + name = "d3-interpolate"; + packageName = "d3-interpolate"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz"; + sha512 = "c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ=="; + }; + }; + "d3-path-2.0.0" = { + name = "d3-path"; + packageName = "d3-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz"; + sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="; + }; + }; + "d3-quadtree-2.0.0" = { + name = "d3-quadtree"; + packageName = "d3-quadtree"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-2.0.0.tgz"; + sha512 = "b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw=="; + }; + }; + "d3-scale-3.2.2" = { + name = "d3-scale"; + packageName = "d3-scale"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.2.tgz"; + sha512 = "3Mvi5HfqPFq0nlyeFlkskGjeqrR/790pINMHc4RXKJ2E6FraTd3juaRIRZZHyMAbi3LjAMW0EH4FB1WgoGyeXg=="; + }; + }; + "d3-shape-2.0.0" = { + name = "d3-shape"; + packageName = "d3-shape"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-shape/-/d3-shape-2.0.0.tgz"; + sha512 = "djpGlA779ua+rImicYyyjnOjeubyhql1Jyn1HK0bTyawuH76UQRWXd+pftr67H6Fa8hSwetkgb/0id3agKWykw=="; + }; + }; + "d3-time-2.0.0" = { + name = "d3-time"; + packageName = "d3-time"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz"; + sha512 = "2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q=="; + }; + }; + "d3-time-format-3.0.0" = { + name = "d3-time-format"; + packageName = "d3-time-format"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz"; + sha512 = "UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag=="; + }; + }; + "d3-timer-2.0.0" = { + name = "d3-timer"; + packageName = "d3-timer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz"; + sha512 = "TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA=="; + }; + }; "dag-map-1.0.2" = { name = "dag-map"; packageName = "dag-map"; @@ -13856,6 +14702,15 @@ let sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; }; }; + "dataloader-2.0.0" = { + name = "dataloader"; + packageName = "dataloader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dataloader/-/dataloader-2.0.0.tgz"; + sha512 = "YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="; + }; + }; "date-fns-1.30.1" = { name = "date-fns"; packageName = "date-fns"; @@ -13892,6 +14747,15 @@ let sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; + "date-time-2.1.0" = { + name = "date-time"; + packageName = "date-time"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz"; + sha512 = "/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g=="; + }; + }; "dateformat-2.2.0" = { name = "dateformat"; packageName = "dateformat"; @@ -13910,22 +14774,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.32" = { + "dayjs-1.8.36" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.32"; + version = "1.8.36"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.32.tgz"; - sha512 = "V91aTRu5btP+uzGHaaOfodckEfBWhmi9foRP7cauAO1PTB8+tZ9o0Jec7q6TIIRY1N4q1IfiKsZunkB/AEWqMQ=="; - }; - }; - "de-indent-1.0.2" = { - name = "de-indent"; - packageName = "de-indent"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; - sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz"; + sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; "deasync-0.1.15" = { @@ -13964,13 +14819,13 @@ let sha512 = "mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg=="; }; }; - "debounce-fn-3.0.1" = { + "debounce-fn-4.0.0" = { name = "debounce-fn"; packageName = "debounce-fn"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz"; - sha512 = "aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q=="; + url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz"; + sha512 = "8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ=="; }; }; "debounced-seeker-1.0.0" = { @@ -14054,13 +14909,13 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.2.0" = { + "debug-4.3.0" = { name = "debug"; packageName = "debug"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz"; + sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg=="; }; }; "debug-fabulous-1.1.0" = { @@ -14162,15 +15017,6 @@ let sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; }; }; - "decompress-response-5.0.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz"; - sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; - }; - }; "decompress-response-6.0.0" = { name = "decompress-response"; packageName = "decompress-response"; @@ -14333,13 +15179,13 @@ let sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; - "deepcopy-2.0.0" = { + "deepcopy-2.1.0" = { name = "deepcopy"; packageName = "deepcopy"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepcopy/-/deepcopy-2.0.0.tgz"; - sha512 = "d5ZK7pJw7F3k6M5vqDjGiiUS9xliIyWkdzBjnPhnSeRGjkYOGZMCFkdKVwV/WiHOe0NwzB8q+iDo7afvSf0arA=="; + url = "https://registry.npmjs.org/deepcopy/-/deepcopy-2.1.0.tgz"; + sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; "deepmerge-2.1.0" = { @@ -14459,15 +15305,6 @@ let sha512 = "8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A=="; }; }; - "deferred-leveldown-0.2.0" = { - name = "deferred-leveldown"; - packageName = "deferred-leveldown"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz"; - sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; - }; - }; "deferred-leveldown-5.3.0" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; @@ -14567,6 +15404,15 @@ let sha512 = "BLHItGr82rUbHhjMu41d+vw9Md49i81jmZSV00HdTq4t+RTHywmEht/23mNFpUl2YeLYJZJyGz4rdlMAyOxNeg=="; }; }; + "delaunator-4.0.1" = { + name = "delaunator"; + packageName = "delaunator"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/delaunator/-/delaunator-4.0.1.tgz"; + sha512 = "WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag=="; + }; + }; "delay-4.4.0" = { name = "delay"; packageName = "delay"; @@ -14666,15 +15512,6 @@ let sha512 = "9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w=="; }; }; - "deprecated-0.0.1" = { - name = "deprecated"; - packageName = "deprecated"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; - sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; - }; - }; "deprecated-decorator-0.1.6" = { name = "deprecated-decorator"; packageName = "deprecated-decorator"; @@ -14819,6 +15656,87 @@ let sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; + "detective-amd-3.0.0" = { + name = "detective-amd"; + packageName = "detective-amd"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.0.tgz"; + sha512 = "kOpKHyabdSKF9kj7PqYHLeHPw+TJT8q2u48tZYMkIcas28el1CYeLEJ42Nm+563/Fq060T5WknfwDhdX9+kkBQ=="; + }; + }; + "detective-cjs-3.1.1" = { + name = "detective-cjs"; + packageName = "detective-cjs"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-cjs/-/detective-cjs-3.1.1.tgz"; + sha512 = "JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg=="; + }; + }; + "detective-es6-2.2.0" = { + name = "detective-es6"; + packageName = "detective-es6"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.2.0.tgz"; + sha512 = "fSpNY0SLER7/sVgQZ1NxJPwmc9uCTzNgdkQDhAaj8NPYwr7Qji9QBcmbNvtMCnuuOGMuKn3O7jv0An+/WRWJZQ=="; + }; + }; + "detective-less-1.0.2" = { + name = "detective-less"; + packageName = "detective-less"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-less/-/detective-less-1.0.2.tgz"; + sha512 = "Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA=="; + }; + }; + "detective-postcss-3.0.1" = { + name = "detective-postcss"; + packageName = "detective-postcss"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-3.0.1.tgz"; + sha512 = "tfTS2GdpUal5NY0aCqI4dpEy8Xfr88AehYKB0iBIZvo8y2g3UsrcDnrp9PR2FbzoW7xD5Rip3NJW7eCSvtqdUw=="; + }; + }; + "detective-sass-3.0.1" = { + name = "detective-sass"; + packageName = "detective-sass"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-sass/-/detective-sass-3.0.1.tgz"; + sha512 = "oSbrBozRjJ+QFF4WJFbjPQKeakoaY1GiR380NPqwdbWYd5wfl5cLWv0l6LsJVqrgWfFN1bjFqSeo32Nxza8Lbw=="; + }; + }; + "detective-scss-2.0.1" = { + name = "detective-scss"; + packageName = "detective-scss"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-scss/-/detective-scss-2.0.1.tgz"; + sha512 = "VveyXW4WQE04s05KlJ8K0bG34jtHQVgTc9InspqoQxvnelj/rdgSAy7i2DXAazyQNFKlWSWbS+Ro2DWKFOKTPQ=="; + }; + }; + "detective-stylus-1.0.0" = { + name = "detective-stylus"; + packageName = "detective-stylus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz"; + sha1 = "50aee7db8babb990381f010c63fabba5b58e54cd"; + }; + }; + "detective-typescript-5.8.0" = { + name = "detective-typescript"; + packageName = "detective-typescript"; + version = "5.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-5.8.0.tgz"; + sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg=="; + }; + }; "dezalgo-1.0.3" = { name = "dezalgo"; packageName = "dezalgo"; @@ -14918,13 +15836,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.1.11" = { + "diff2html-3.1.13" = { name = "diff2html"; packageName = "diff2html"; - version = "3.1.11"; + version = "3.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.11.tgz"; - sha512 = "EtzNnfhT4XzxIUvIw5mhUGxGYDzce9lxkqtSHWq4yas+UrEjwzm5A2pYIaFOikupbFITd9RaHpu0ocErJ1myRw=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.13.tgz"; + sha512 = "Gs4NbtynANYqkPbbGqZN6zwWJq6JofAb5it76xnEUTpFjWJndaCCjFVUoD7yFjEPB36MtwTtT/ptWcKyD9Vw9g=="; }; }; "diff3-0.0.3" = { @@ -15062,13 +15980,22 @@ let sha512 = "vkg0bv+FUwSuPxBWzdNPQVNmXQlIbvz1Ygi+A1XefNUhEzfmM+RNndjtjlDgxD/ZUhFir9PX7Hw9iIDVujsOoA=="; }; }; - "dispensary-0.52.0" = { + "diskusage-1.1.3" = { + name = "diskusage"; + packageName = "diskusage"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diskusage/-/diskusage-1.1.3.tgz"; + sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; + }; + }; + "dispensary-0.55.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.52.0"; + version = "0.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.52.0.tgz"; - sha512 = "A13TTo/2yaK/Z3So4OdzodBTbyTMpqVOH15cbmUuKvl+T1cOLn0VGQjibrG9cELa9mkLfhjFodqYQWkOGkG9Ig=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.55.0.tgz"; + sha512 = "5+6E0kQNVWIZCGwTw34B48bJQyUuvwJD6hsI/b7ScKbjfrzUIgod/ROsTX6t9d3O031A9O5RPVHIqkX4ZzcAfw=="; }; }; "diveSync-0.3.0" = { @@ -15188,15 +16115,6 @@ let sha512 = "cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg=="; }; }; - "dockerfile-ast-0.0.19" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.19.tgz"; - sha512 = "iDRNFeAB2j4rh/Ecc2gh3fjciVifCMsszfCfHlYF5Wv8yybjZLiRDZUBt/pS3xrAz8uWT8fCHLq4pOQMmwCDwA=="; - }; - }; "dockerfile-ast-0.0.27" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -15215,6 +16133,15 @@ let sha512 = "221P0R4+tx5C1ra99alQxmdRvtfKMbBE7MkESN4VEBN5CX90wijrcIg+EiRaGTCCT5OPk5KBeKy+EIOnmEu4xA=="; }; }; + "dockerfile-ast-0.0.30" = { + name = "dockerfile-ast"; + packageName = "dockerfile-ast"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.30.tgz"; + sha512 = "QOeP5NjbjoSLtnMz6jzBLsrKtywLEVPoCOAwA54cQpulyKb1gBnZ63tr6Amq8oVDvu5PXa3aifBVw+wcoCGHKg=="; + }; + }; "dockerfile-language-service-0.1.0" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; @@ -15296,6 +16223,15 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; + "dom-serializer-1.1.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.1.0.tgz"; + sha512 = "ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ=="; + }; + }; "dom-storage-2.1.0" = { name = "dom-storage"; packageName = "dom-storage"; @@ -15341,13 +16277,13 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.0.1" = { + "domelementtype-2.0.2" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; - sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz"; + sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA=="; }; }; "domexception-1.0.1" = { @@ -15404,13 +16340,13 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.0.12" = { + "dompurify-1.0.11" = { name = "dompurify"; packageName = "dompurify"; - version = "2.0.12"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.0.12.tgz"; - sha512 = "Fl8KseK1imyhErHypFPA8qpq9gPzlsJ/EukA6yk9o0gX23p1TzC+rh9LqNg1qvErRTc0UNMYlKxEGSfSh43NDg=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-1.0.11.tgz"; + sha512 = "XywCTXZtc/qCX3iprD1pIklRVk/uhl8BKpkTxr+ZyMVUzSUg7wkQXRBp/euJ5J5moa1QvfpvaPQVP71z1O59dQ=="; }; }; "domutils-1.4.3" = { @@ -15440,13 +16376,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "domutils-2.1.0" = { + "domutils-2.3.0" = { name = "domutils"; packageName = "domutils"; - version = "2.1.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.1.0.tgz"; - sha512 = "CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.3.0.tgz"; + sha512 = "xWC75PM3QF6MjE5e58OzwTX0B/rPQnlqH0YyXB/c056RtVJA+eu60da2I/bdnEHzEYC00g8QaZUlAbqOZVbOsw=="; }; }; "dot-case-3.0.3" = { @@ -15458,22 +16394,22 @@ let sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA=="; }; }; - "dot-prop-4.2.0" = { + "dot-prop-4.2.1" = { name = "dot-prop"; packageName = "dot-prop"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; - sha512 = "tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ=="; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz"; + sha512 = "l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ=="; }; }; - "dot-prop-5.2.0" = { + "dot-prop-5.3.0" = { name = "dot-prop"; packageName = "dot-prop"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz"; - sha512 = "uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A=="; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; }; "dot-qs-0.2.0" = { @@ -15521,13 +16457,13 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; - "dotnet-deps-parser-4.10.0" = { + "dotnet-deps-parser-5.0.0" = { name = "dotnet-deps-parser"; packageName = "dotnet-deps-parser"; - version = "4.10.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.10.0.tgz"; - sha512 = "dEO1oTvreaDCtcvhRdOmmAMubyC+MWqVr1c/1Wvasi+NW4NZeB67qGh1taqowUFh+aCXtPw3SP2eExn6aNkhwA=="; + url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-5.0.0.tgz"; + sha512 = "1l9K4UnQQHSfKgeHeLrxnB53AidCZqPyf9dkRL4/fZl8//NPiiDD43zHtgylw8DHlO7gvM8+O5a0UPHesNYZKw=="; }; }; "downgrade-root-1.2.2" = { @@ -15557,6 +16493,15 @@ let sha512 = "xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ=="; }; }; + "download-8.0.0" = { + name = "download"; + packageName = "download"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-8.0.0.tgz"; + sha512 = "ASRY5QhDk7FK+XrQtQyvhpDKanLluEEQtWl/J7Lxuf/b+i8RYh997QeXvL85xitrmRKVlx9c7eTrcRdq2GS4eA=="; + }; + }; "download-git-repo-1.1.0" = { name = "download-git-repo"; packageName = "download-git-repo"; @@ -15647,13 +16592,13 @@ let sha512 = "b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg=="; }; }; - "duplexer-0.1.1" = { + "duplexer-0.1.2" = { name = "duplexer"; packageName = "duplexer"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"; + sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; }; "duplexer2-0.0.2" = { @@ -15863,22 +16808,22 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "ejs-3.1.3" = { + "ejs-3.1.5" = { name = "ejs"; packageName = "ejs"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz"; - sha512 = "wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg=="; + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz"; + sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.520" = { + "electron-to-chromium-1.3.570" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.520"; + version = "1.3.570"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.520.tgz"; - sha512 = "q6H9E1sXDCjRHP+X06vcP+N0ki8ZvYoRPZfKnDuiRX10WWXxEHzKFVf4O9rBFMpuPtR3M+2KAdJnugJoBBp3Rw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz"; + sha512 = "Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg=="; }; }; "elegant-spinner-1.0.1" = { @@ -15908,6 +16853,15 @@ let sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; + "elf-tools-1.1.2" = { + name = "elf-tools"; + packageName = "elf-tools"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/elf-tools/-/elf-tools-1.1.2.tgz"; + sha512 = "x+p+XNxLk8ittsYN7294mCnQ2i48udu3UGdHBv2gw1u1MVigXctcfbp5H9ebqTJnDxkbs6PdOSBOAdYGGDN7uA=="; + }; + }; "elliptic-6.5.3" = { name = "elliptic"; packageName = "elliptic"; @@ -16008,15 +16962,6 @@ let sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; }; }; - "emotion-9.2.12" = { - name = "emotion"; - packageName = "emotion"; - version = "9.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/emotion/-/emotion-9.2.12.tgz"; - sha512 = "hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ=="; - }; - }; "emphasize-1.5.0" = { name = "emphasize"; packageName = "emphasize"; @@ -16098,15 +17043,6 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "end-of-stream-1.1.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; - sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; - }; - }; "end-of-stream-1.4.1" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -16323,13 +17259,13 @@ let sha512 = "jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ=="; }; }; - "envinfo-7.7.2" = { + "envinfo-7.7.3" = { name = "envinfo"; packageName = "envinfo"; - version = "7.7.2"; + version = "7.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.7.2.tgz"; - sha512 = "k3Eh5bKuQnZjm49/L7H4cHzs2FlL5QjbTB3JrPxoTI8aJG7hVMe4uKyJxSYH4ahseby2waUwk5OaKX/nAsaYgg=="; + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz"; + sha512 = "46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA=="; }; }; "epidemic-broadcast-trees-7.0.0" = { @@ -16395,6 +17331,15 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; + "error-stack-parser-2.0.6" = { + name = "error-stack-parser"; + packageName = "error-stack-parser"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz"; + sha512 = "d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ=="; + }; + }; "errorhandler-1.5.1" = { name = "errorhandler"; packageName = "errorhandler"; @@ -16413,6 +17358,15 @@ let sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; }; }; + "es-abstract-1.18.0-next.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.18.0-next.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz"; + sha512 = "elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ=="; + }; + }; "es-array-method-boxes-properly-1.0.0" = { name = "es-array-method-boxes-properly"; packageName = "es-array-method-boxes-properly"; @@ -16584,13 +17538,13 @@ let sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; }; }; - "escalade-3.0.2" = { + "escalade-3.1.0" = { name = "escalade"; packageName = "escalade"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz"; - sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz"; + sha512 = "mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig=="; }; }; "escape-goat-2.1.1" = { @@ -16737,22 +17691,13 @@ let sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; - "eslint-7.5.0" = { + "eslint-7.9.0" = { name = "eslint"; packageName = "eslint"; - version = "7.5.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz"; - sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; - }; - }; - "eslint-7.6.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz"; - sha512 = "QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz"; + sha512 = "V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA=="; }; }; "eslint-plugin-no-unsanitized-3.1.2" = { @@ -16773,6 +17718,15 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; + "eslint-plugin-vue-7.0.0-beta.3" = { + name = "eslint-plugin-vue"; + packageName = "eslint-plugin-vue"; + version = "7.0.0-beta.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0-beta.3.tgz"; + sha512 = "/p23IRPN9gFNN7dzesrctt06Kvs9E3VRB8BGIAPSEaQNk5yhlKUzntPARjUpsTWW+DQg0mqglZptfkUJK4+4EQ=="; + }; + }; "eslint-scope-3.7.3" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -16791,13 +17745,13 @@ let sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; }; - "eslint-scope-5.1.0" = { + "eslint-scope-5.1.1" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; "eslint-utils-1.4.3" = { @@ -16827,6 +17781,15 @@ let sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; + "eslint-visitor-keys-2.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; + }; + }; "esm-3.2.25" = { name = "esm"; packageName = "esm"; @@ -16881,13 +17844,13 @@ let sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="; }; }; - "espree-7.2.0" = { + "espree-7.3.0" = { name = "espree"; packageName = "espree"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz"; - sha512 = "H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g=="; + url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz"; + sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw=="; }; }; "esprima-1.1.1" = { @@ -16944,13 +17907,13 @@ let sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; }; }; - "esrecurse-4.2.1" = { + "esrecurse-4.3.0" = { name = "esrecurse"; packageName = "esrecurse"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; }; "essentials-1.1.1" = { @@ -17007,13 +17970,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.1.0" = { + "estraverse-5.2.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"; - sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; }; }; "estree-walker-0.6.1" = { @@ -17034,6 +17997,15 @@ let sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; }; }; + "estree-walker-2.0.1" = { + name = "estree-walker"; + packageName = "estree-walker"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.1.tgz"; + sha512 = "tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg=="; + }; + }; "esutils-1.0.0" = { name = "esutils"; packageName = "esutils"; @@ -17088,15 +18060,6 @@ let sha512 = "HnSYx1BsJ87/p6swwzv+2v6B4X+uxUteoDfRxsAb1S1BePzQqOLevVmkdA15GHJVd9A9Ok6wygUR18Hu0YeV9g=="; }; }; - "event-loop-spinner-1.1.0" = { - name = "event-loop-spinner"; - packageName = "event-loop-spinner"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-1.1.0.tgz"; - sha512 = "YVFs6dPpZIgH665kKckDktEVvSBccSYJmoZUfhNUdv5d3Xv+Q+SKF4Xis1jolq9aBzuW1ZZhQh/m/zU/TPdDhw=="; - }; - }; "event-loop-spinner-2.0.0" = { name = "event-loop-spinner"; packageName = "event-loop-spinner"; @@ -17187,6 +18150,15 @@ let sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; }; }; + "eventemitter3-3.1.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; + sha512 = "ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="; + }; + }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -17196,13 +18168,13 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "eventemitter3-4.0.4" = { + "eventemitter3-4.0.7" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "4.0.4"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz"; - sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; "events-1.1.1" = { @@ -17502,6 +18474,15 @@ let sha1 = "3a2ad27f7bebc90fc533d110d7c6d83097bcd057"; }; }; + "express-logging-1.1.1" = { + name = "express-logging"; + packageName = "express-logging"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-logging/-/express-logging-1.1.1.tgz"; + sha1 = "62839618cbab5bb3610f1a1c1485352fe9d26c2a"; + }; + }; "express-normalize-query-params-middleware-0.5.1" = { name = "express-normalize-query-params-middleware"; packageName = "express-normalize-query-params-middleware"; @@ -17520,6 +18501,15 @@ let sha512 = "WQGmghzn+loQsIQUEnLZ0HVKCLhIBVcURvrAhyt6mOqsFsG2tBYhaNKX728EOz2aMXRhEQhkQ+RXQsIFpbS6IA=="; }; }; + "express-openapi-7.0.0" = { + name = "express-openapi"; + packageName = "express-openapi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.0.tgz"; + sha512 = "ryjUF/MuYEh13jXKNOD7kw/o6n1MTywDP08n5/BqFRd9IaTX33vZEKhk9NlsvGfD63lNre/84CN0hPLvWEe7qQ=="; + }; + }; "express-session-1.17.1" = { name = "express-session"; packageName = "express-session"; @@ -17844,6 +18834,15 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; + "fast-equals-1.6.3" = { + name = "fast-equals"; + packageName = "fast-equals"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-equals/-/fast-equals-1.6.3.tgz"; + sha512 = "4WKW0AL5+WEqO0zWavAfYGY1qwLsBgE//DN4TTcVEN2UlINgkv9b3vm2iHicoenWKSX9mKWmGOsU/iI5IST7pQ=="; + }; + }; "fast-glob-2.2.7" = { name = "fast-glob"; packageName = "fast-glob"; @@ -17898,6 +18897,15 @@ let sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9"; }; }; + "fast-levenshtein-1.1.4" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; + sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + }; + }; "fast-levenshtein-2.0.6" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; @@ -17934,6 +18942,15 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; + "fast-stringify-1.1.2" = { + name = "fast-stringify"; + packageName = "fast-stringify"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-stringify/-/fast-stringify-1.1.2.tgz"; + sha512 = "SfslXjiH8km0WnRiuPfpUKwlZjW5I878qsOm+2x8x3TgqmElOOLh1rgJFb+PolNdNRK3r8urEefqx0wt7vx1dA=="; + }; + }; "fast-text-encoding-1.0.3" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; @@ -17952,6 +18969,15 @@ let sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; }; }; + "fastest-levenshtein-1.0.12" = { + name = "fastest-levenshtein"; + packageName = "fastest-levenshtein"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; + }; + }; "fastparse-1.1.2" = { name = "fastparse"; packageName = "fastparse"; @@ -18114,6 +19140,15 @@ let sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; }; }; + "file-size-0.0.5" = { + name = "file-size"; + packageName = "file-size"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/file-size/-/file-size-0.0.5.tgz"; + sha1 = "057d43c3a3ed735da3f90d6052ab380f1e6d5e3b"; + }; + }; "file-type-10.11.0" = { name = "file-type"; packageName = "file-type"; @@ -18123,13 +19158,22 @@ let sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="; }; }; - "file-type-14.1.3" = { + "file-type-11.1.0" = { name = "file-type"; packageName = "file-type"; - version = "14.1.3"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-14.1.3.tgz"; - sha512 = "fTTNfpY1QxlpKCrA5bRxZL/6f7+6jUCJkOCCzFkAI+tmLu5lfX+4Zo22GG1orRhVH7Dx0fHtMFXq0++NDjKn/w=="; + url = "https://registry.npmjs.org/file-type/-/file-type-11.1.0.tgz"; + sha512 = "rM0UO7Qm9K7TWTtA6AShI/t7H5BPjDeGVDaNyg9BjHAj3PysKy7+8C8D137R88jnR3rFJZQB/tFgydl5sN5m7g=="; + }; + }; + "file-type-14.7.1" = { + name = "file-type"; + packageName = "file-type"; + version = "14.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-14.7.1.tgz"; + sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; "file-type-3.9.0" = { @@ -18222,6 +19266,15 @@ let sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; }; }; + "filenamify-3.0.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-3.0.0.tgz"; + sha512 = "5EFZ//MsvJgXjBAFJ+Bh2YaCTRF/VP1YOmGrgt+KJ4SFRLjI87EIdwLLuT6wQX0I4F9W41xutobzczjsOKlI/g=="; + }; + }; "filenamify-4.1.0" = { name = "filenamify"; packageName = "filenamify"; @@ -18240,6 +19293,15 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; + "filesize-6.1.0" = { + name = "filesize"; + packageName = "filesize"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz"; + sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; + }; + }; "filestream-5.0.0" = { name = "filestream"; packageName = "filestream"; @@ -18312,15 +19374,6 @@ let sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; }; }; - "find-index-0.1.1" = { - name = "find-index"; - packageName = "find-index"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; - sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; - }; - }; "find-process-1.4.3" = { name = "find-process"; packageName = "find-process"; @@ -18339,15 +19392,6 @@ let sha512 = "UME7hNwBfzeISSFQcBEDemEEskpOjI/shPrpJM5PI4DSdn6hX0dmz+2dL70blZER2z8tSnTRL+2rfzlYgtbBoQ=="; }; }; - "find-root-1.1.0" = { - name = "find-root"; - packageName = "find-root"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz"; - sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="; - }; - }; "find-up-1.1.2" = { name = "find-up"; packageName = "find-up"; @@ -18384,6 +19428,15 @@ let sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; }; + "find-up-5.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; + }; + }; "find-versions-2.0.0" = { name = "find-versions"; packageName = "find-versions"; @@ -18456,15 +19509,6 @@ let sha512 = "BPfcUISOV6+UwF6uqo5QS8iuFL6XZvHCm+1iuynIJ7fe1zea69Is77/n/098fp0a9sZ94lvT8rpYB15S/riSaA=="; }; }; - "first-chunk-stream-1.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; - sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; - }; - }; "first-chunk-stream-2.0.0" = { name = "first-chunk-stream"; packageName = "first-chunk-stream"; @@ -18528,13 +19572,13 @@ let sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; }; }; - "flat-5.0.0" = { + "flat-5.0.2" = { name = "flat"; packageName = "flat"; - version = "5.0.0"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-5.0.0.tgz"; - sha512 = "6KSMM+cHHzXC/hpldXApL2S8Uz+QZv+tq5o/L0KQYleoG+GcwrnIJhTWC7tCOiKQp8D/fIvryINU1OZCCwevjA=="; + url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"; + sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; }; }; "flat-cache-1.3.4" = { @@ -18609,6 +19653,15 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; + "flatten-1.0.3" = { + name = "flatten"; + packageName = "flatten"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz"; + sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="; + }; + }; "flow-bin-0.118.0" = { name = "flow-bin"; packageName = "flow-bin"; @@ -18618,13 +19671,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.130.0" = { + "flow-parser-0.134.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.130.0"; + version = "0.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.130.0.tgz"; - sha512 = "h9NATB7QsKhj2ucgEH2XzB7p+5ubk8IZX5u/qHkN+oyQoECi1diq6mYfIuYBOyL35f3AhJf/YDkBYQBTqqYK+w=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.134.0.tgz"; + sha512 = "VmRba5YXKmVqIH3xNzUJ4pNobxXEOl6h36m+0f5dZ6/av9YlRpls/yBnPESQ4qBUbyyp7iqoc1Feo1lFw3u1YQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -18744,6 +19797,15 @@ let sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; + "flush-write-stream-2.0.0" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-2.0.0.tgz"; + sha512 = "uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g=="; + }; + }; "fn-name-2.0.1" = { name = "fn-name"; packageName = "fn-name"; @@ -18762,13 +19824,22 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.12.1" = { + "folder-walker-3.2.0" = { + name = "folder-walker"; + packageName = "folder-walker"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/folder-walker/-/folder-walker-3.2.0.tgz"; + sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; + }; + }; + "follow-redirects-1.13.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz"; - sha512 = "tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz"; + sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="; }; }; "follow-redirects-1.5.10" = { @@ -18879,13 +19950,13 @@ let sha512 = "47VfT5AYpxn1bnsnH6UfpBWKpMVnSz42MZwH+hwz/wACd9THyUu/fRoCRIT758fzCAbRoHIlkVUAL+WmlxSKeg=="; }; }; - "fork-ts-checker-webpack-plugin-5.0.4" = { + "fork-ts-checker-webpack-plugin-5.1.0" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "5.0.4"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.4.tgz"; - sha512 = "nSEqM3KhAjTf8VmuZym2k6WadIasvXybJExFegqMJDkTrOBOY8yGjsXG2FGFJls3DOHtXKzrr3Bv0ZD1LaM7cA=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.1.0.tgz"; + sha512 = "vuKyEjSLGbhQbEr5bifXXOkr9iV73L6n72mHoHIv7okvrf7O7z6RKeplM6C6ATPsukoQivij+Ba1vcptL60Z2g=="; }; }; "form-data-1.0.0-rc3" = { @@ -19005,13 +20076,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.8.1" = { + "fp-ts-2.8.2" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.1.tgz"; - sha512 = "HuA/6roEliHoBgEOLCKmGRcM90e2trW/ITZZ9d9P/ra7PreqQagC3Jg6OzqWkai13KUbG90b8QO9rHPBGK/ckw=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.2.tgz"; + sha512 = "YKLBW75Rp+L9DuY1jr7QO6mZLTmJjy7tOqSAMcB2q2kBomqLjBMyV7dotpcnZmUYY6khMsfgYWtPbUDOFcNmkA=="; }; }; "fragment-cache-0.2.1" = { @@ -19077,6 +20148,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "from2-array-0.0.4" = { + name = "from2-array"; + packageName = "from2-array"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/from2-array/-/from2-array-0.0.4.tgz"; + sha1 = "eafc16b65f6e2719bcd57fdc1869005ac1332cd6"; + }; + }; "fs-capacitor-2.0.4" = { name = "fs-capacitor"; packageName = "fs-capacitor"; @@ -19257,6 +20337,15 @@ let sha512 = "oITW9GoYFZwYWR2aMDdUvr6W9O5mtzSizIVEUdeCQaFD6+BylwPSEP2+ZFWv1UYpE9kiPS3Hb0knh2PmFJcj6A=="; }; }; + "fs-routes-7.0.1" = { + name = "fs-routes"; + packageName = "fs-routes"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-7.0.1.tgz"; + sha512 = "kSAfx/P8oLSi5+tblecTETcJJ/Q+qL+xzGx4hns/+gHXMkTOZEzG73/2dBDW1FFy5+ZW080XoMaBAN2kCN55aQ=="; + }; + }; "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; @@ -19392,13 +20481,22 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "fuse.js-3.6.1" = { + "fuse.js-6.4.1" = { name = "fuse.js"; packageName = "fuse.js"; - version = "3.6.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz"; - sha512 = "hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw=="; + url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.1.tgz"; + sha512 = "+hAS7KYgLXontDh/vqffs7wIBw0ceb9Sx8ywZQhOsiQGcSO5zInGhttWOUYQYlvV/yYMJOacQ129Xs3mP3+oZQ=="; + }; + }; + "fuzzy-0.1.3" = { + name = "fuzzy"; + packageName = "fuzzy"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz"; + sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"; }; }; "fuzzy-search-3.2.1" = { @@ -19446,15 +20544,6 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; - "gaze-0.5.2" = { - name = "gaze"; - packageName = "gaze"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"; - sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; - }; - }; "gaze-1.1.3" = { name = "gaze"; packageName = "gaze"; @@ -19518,6 +20607,15 @@ let sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; }; + "generic-names-2.0.1" = { + name = "generic-names"; + packageName = "generic-names"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz"; + sha512 = "kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ=="; + }; + }; "genfun-5.0.0" = { name = "genfun"; packageName = "genfun"; @@ -19536,6 +20634,15 @@ let sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; }; }; + "get-amd-module-type-3.0.0" = { + name = "get-amd-module-type"; + packageName = "get-amd-module-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-3.0.0.tgz"; + sha512 = "99Q7COuACPfVt18zH9N4VAMyb81S6TUgJm2NgV6ERtkh9VIkAaByZkW530wl3lLN5KTtSrK9jVLxYsoP5hQKsw=="; + }; + }; "get-assigned-identifiers-1.2.0" = { name = "get-assigned-identifiers"; packageName = "get-assigned-identifiers"; @@ -19617,6 +20724,15 @@ let sha512 = "/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw=="; }; }; + "get-port-5.1.1" = { + name = "get-port"; + packageName = "get-port"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz"; + sha512 = "g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ=="; + }; + }; "get-prototype-chain-1.0.1" = { name = "get-prototype-chain"; packageName = "get-prototype-chain"; @@ -19707,13 +20823,13 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-stream-5.1.0" = { + "get-stream-5.2.0" = { name = "get-stream"; packageName = "get-stream"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; - sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; "get-uri-2.0.4" = { @@ -19734,13 +20850,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-5.11.0" = { + "getmac-5.15.0" = { name = "getmac"; packageName = "getmac"; - version = "5.11.0"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-5.11.0.tgz"; - sha512 = "p3g41fJt9du5KKkIXaJm7bcUrwUxn8Jg/8AVBgUmBNdCCorczRJXHLqWSETJuib9dptwNuNcfbct/OoM/meiMA=="; + url = "https://registry.npmjs.org/getmac/-/getmac-5.15.0.tgz"; + sha512 = "+XN9PwRDWkZ1xFaQR5GOAPDqlK+eNi5M0QBfqeeJvFJaDrwZzplYg1N8uoOZSB9RtDoPcG58Xq2dOYnbZ23N2Q=="; }; }; "getpass-0.1.6" = { @@ -19770,6 +20886,15 @@ let sha1 = "ee95be37106fd8748a96f8d1db4baea89e1bfa8a"; }; }; + "gh-release-fetch-1.0.4" = { + name = "gh-release-fetch"; + packageName = "gh-release-fetch"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-1.0.4.tgz"; + sha512 = "uL2T1vCOr5HAuY1Cbtj+h1AOTWZ0Qvubi1s7KCRqKOiytVlTDHLYoPJ9TIJLEmNYbmuCtZVOtYsojf3REAAgbQ=="; + }; + }; "git-apply-delta-0.0.7" = { name = "git-apply-delta"; packageName = "git-apply-delta"; @@ -19851,6 +20976,15 @@ let sha1 = "7f51b804924d6c603fc142e3302998d4e0b4d906"; }; }; + "git-repo-info-2.1.1" = { + name = "git-repo-info"; + packageName = "git-repo-info"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/git-repo-info/-/git-repo-info-2.1.1.tgz"; + sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="; + }; + }; "git-rev-sync-2.0.0" = { name = "git-rev-sync"; packageName = "git-rev-sync"; @@ -19887,22 +21021,31 @@ let sha512 = "8mqO63M60lCiNR+6ROvXuX4VI6pVAru4wMn3uUfxq0xmpNwrZYC4Rkrt5rSGUPumJ43ZUJyeMXXq60v03PUY/g=="; }; }; - "git-up-4.0.1" = { + "git-up-4.0.2" = { name = "git-up"; packageName = "git-up"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/git-up/-/git-up-4.0.1.tgz"; - sha512 = "LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw=="; + url = "https://registry.npmjs.org/git-up/-/git-up-4.0.2.tgz"; + sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.1.2" = { + "git-url-parse-11.1.3" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.1.2"; + version = "11.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.2.tgz"; - sha512 = "gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.3.tgz"; + sha512 = "GPsfwticcu52WQ+eHp0IYkAyaOASgYdtsQDIt4rUp6GbiNt1P9ddrh3O0kQB0eD4UJZszVqNT3+9Zwcg40fywA=="; + }; + }; + "git-url-parse-11.2.0" = { + name = "git-url-parse"; + packageName = "git-url-parse"; + version = "11.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.2.0.tgz"; + sha512 = "KPoHZg8v+plarZvto4ruIzzJLFQoRx+sUs5DQSr07By9IBKguVd+e6jwrFR6/TP6xrCJlNV1tPqLO1aREc7O2g=="; }; }; "gitconfiglocal-1.0.0" = { @@ -19914,6 +21057,15 @@ let sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b"; }; }; + "gitconfiglocal-2.1.0" = { + name = "gitconfiglocal"; + packageName = "gitconfiglocal"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz"; + sha512 = "qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg=="; + }; + }; "github-from-package-0.0.0" = { name = "github-from-package"; packageName = "github-from-package"; @@ -19950,15 +21102,6 @@ let sha512 = "0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw=="; }; }; - "glob-3.1.21" = { - name = "glob"; - packageName = "glob"; - version = "3.1.21"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; - sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; - }; - }; "glob-3.2.11" = { name = "glob"; packageName = "glob"; @@ -19968,15 +21111,6 @@ let sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; }; }; - "glob-4.5.3" = { - name = "glob"; - packageName = "glob"; - version = "4.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; - sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; - }; - }; "glob-5.0.15" = { name = "glob"; packageName = "glob"; @@ -20013,6 +21147,15 @@ let sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; }; }; + "glob-7.1.3" = { + name = "glob"; + packageName = "glob"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + }; + }; "glob-7.1.5" = { name = "glob"; packageName = "glob"; @@ -20067,15 +21210,6 @@ let sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; - "glob-stream-3.1.18" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "3.1.18"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; - sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; - }; - }; "glob-stream-6.1.0" = { name = "glob-stream"; packageName = "glob-stream"; @@ -20094,15 +21228,6 @@ let sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; }; }; - "glob-watcher-0.0.6" = { - name = "glob-watcher"; - packageName = "glob-watcher"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; - sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; - }; - }; "glob-watcher-5.0.5" = { name = "glob-watcher"; packageName = "glob-watcher"; @@ -20112,15 +21237,6 @@ let sha512 = "zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw=="; }; }; - "glob2base-0.0.12" = { - name = "glob2base"; - packageName = "glob2base"; - version = "0.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; - sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; - }; - }; "global-4.3.2" = { name = "global"; packageName = "global"; @@ -20130,6 +21246,15 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; + "global-4.4.0" = { + name = "global"; + packageName = "global"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global/-/global-4.4.0.tgz"; + sha512 = "wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w=="; + }; + }; "global-agent-2.1.12" = { name = "global-agent"; packageName = "global-agent"; @@ -20139,6 +21264,15 @@ let sha512 = "caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg=="; }; }; + "global-cache-dir-1.0.1" = { + name = "global-cache-dir"; + packageName = "global-cache-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/global-cache-dir/-/global-cache-dir-1.0.1.tgz"; + sha512 = "wYGh6O3Xkx1LsMXQpObr/uu3PsFpbWhpbslgn9Xq52rbDZ6YOwJcQtU5R4lSEQgCDtXLItV9EH5X1F/VnBTAlw=="; + }; + }; "global-dirs-0.1.1" = { name = "global-dirs"; packageName = "global-dirs"; @@ -20365,15 +21499,6 @@ let sha512 = "uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="; }; }; - "globule-0.1.0" = { - name = "globule"; - packageName = "globule"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; - sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; - }; - }; "globule-1.3.2" = { name = "globule"; packageName = "globule"; @@ -20446,31 +21571,31 @@ let sha1 = "d9430ba32f6a30218243884418767340aafc0400"; }; }; - "got-10.6.0" = { + "got-11.4.0" = { name = "got"; packageName = "got"; - version = "10.6.0"; + version = "11.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-10.6.0.tgz"; - sha512 = "3LIdJNTdCFbbJc+h/EH0V5lpNpbJ6Bfwykk21lcQvQsEcrzdi/ltCyQehFHLzJ/ka0UMH4Slg0hkYvAZN9qUDg=="; + url = "https://registry.npmjs.org/got/-/got-11.4.0.tgz"; + sha512 = "XysJZuZNVpaQ37Oo2LV90MIkPeYITehyy1A0QzO1JwOXm8EWuEf9eeGk2XuHePvLEGnm9AVOI37bHwD6KYyBtg=="; }; }; - "got-10.7.0" = { + "got-11.5.2" = { name = "got"; packageName = "got"; - version = "10.7.0"; + version = "11.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; - sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; + url = "https://registry.npmjs.org/got/-/got-11.5.2.tgz"; + sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; - "got-11.5.1" = { + "got-11.7.0" = { name = "got"; packageName = "got"; - version = "11.5.1"; + version = "11.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.5.1.tgz"; - sha512 = "reQEZcEBMTGnujmQ+Wm97mJs/OK6INtO6HmLI+xt3+9CvnRwWjXutUvb2mqr+Ao4Lu05Rx6+udx9sOQAmExMxA=="; + url = "https://registry.npmjs.org/got/-/got-11.7.0.tgz"; + sha512 = "7en2XwH2MEqOsrK0xaKhbWibBoZqy+f1RSUoIeF1BLcnf+pyQdDsljWMfmOh+QKJwuvDIiKx38GtPh5wFdGGjg=="; }; }; "got-6.7.1" = { @@ -20644,15 +21769,6 @@ let sha512 = "6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA=="; }; }; - "graphql-tag-2.10.4" = { - name = "graphql-tag"; - packageName = "graphql-tag"; - version = "2.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.4.tgz"; - sha512 = "O7vG5BT3w6Sotc26ybcvLKNTdfr4GfsIVMD+LdYqXCeJIYPRyp8BIsDOUtxw7S1PYvRw5vH3278J2EDezR6mfA=="; - }; - }; "graphql-tag-2.11.0" = { name = "graphql-tag"; packageName = "graphql-tag"; @@ -20761,22 +21877,22 @@ let sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ=="; }; }; - "gulp-3.9.1" = { + "gulp-4.0.2" = { name = "gulp"; packageName = "gulp"; - version = "3.9.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; - sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; + url = "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz"; + sha512 = "dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA=="; }; }; - "gulp-clean-css-3.10.0" = { + "gulp-clean-css-4.3.0" = { name = "gulp-clean-css"; packageName = "gulp-clean-css"; - version = "3.10.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.10.0.tgz"; - sha512 = "7Isf9Y690o/Q5MVjEylH1H7L8WeZ89woW7DnhD5unTintOdZb67KdOayRgp9trUFo+f9UyJtuatV42e/+kghPg=="; + url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz"; + sha512 = "mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg=="; }; }; "gulp-cli-2.3.0" = { @@ -20788,6 +21904,24 @@ let sha512 = "zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A=="; }; }; + "gulp-concat-2.6.1" = { + name = "gulp-concat"; + packageName = "gulp-concat"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz"; + sha1 = "633d16c95d88504628ad02665663cee5a4793353"; + }; + }; + "gulp-dart-sass-1.0.2" = { + name = "gulp-dart-sass"; + packageName = "gulp-dart-sass"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-dart-sass/-/gulp-dart-sass-1.0.2.tgz"; + sha512 = "8fLttA824mbuc0jRVlGs00zWYZXBckat6INawx5kp66Eqsz5srNWTA51t0mbfB4C8a/a/GZ9muYLwXGklgAHlw=="; + }; + }; "gulp-eslint-3.0.1" = { name = "gulp-eslint"; packageName = "gulp-eslint"; @@ -20797,13 +21931,13 @@ let sha1 = "04e57e3e18c6974267c12cf6855dc717d4a313bd"; }; }; - "gulp-less-3.5.0" = { - name = "gulp-less"; - packageName = "gulp-less"; - version = "3.5.0"; + "gulp-plumber-1.2.1" = { + name = "gulp-plumber"; + packageName = "gulp-plumber"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-less/-/gulp-less-3.5.0.tgz"; - sha512 = "FQLY7unaHdTOXG0jlwxeBQcWoPPrTMQZRA7HfYwSNi9IPVx5l7GJEN72mG4ri2yigp/f/VNGUAJnFMJHBmH3iw=="; + url = "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.1.tgz"; + sha512 = "mctAi9msEAG7XzW5ytDVZ9PxWMzzi1pS2rBH7lA095DhMa6KEXjm+St0GOCc567pJKJ/oCvosVAZEpAey0q2eQ=="; }; }; "gulp-sourcemaps-2.6.5" = { @@ -20815,22 +21949,22 @@ let sha512 = "SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg=="; }; }; - "gulp-typescript-4.0.2" = { - name = "gulp-typescript"; - packageName = "gulp-typescript"; - version = "4.0.2"; + "gulp-tslint-8.1.4" = { + name = "gulp-tslint"; + packageName = "gulp-tslint"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.2.tgz"; - sha512 = "Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA=="; + url = "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.4.tgz"; + sha512 = "wBoZIEMJRz9urHwolsvQpngA9l931p6g/Liwz1b/KrsVP6jEBFZv/o0NS1TFCQZi/l8mXxz8+v3twhf4HOXxPQ=="; }; }; - "gulp-uglify-3.0.2" = { - name = "gulp-uglify"; - packageName = "gulp-uglify"; - version = "3.0.2"; + "gulp-typescript-5.0.1" = { + name = "gulp-typescript"; + packageName = "gulp-typescript"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.2.tgz"; - sha512 = "gk1dhB74AkV2kzqPMQBLA3jPoIAPd/nlNzP2XMDSG8XZrqnlCiDGAqC+rZOumzFvB5zOphlFh6yr3lgcAb/OOg=="; + url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.1.tgz"; + sha512 = "YuMMlylyJtUSHG1/wuSVTrZp60k1dMEFKYOvDf7OvbAJWrDtxxD4oZon4ancdWwzjj30ztiidhe4VXJniF0pIQ=="; }; }; "gulp-util-3.0.8" = { @@ -21211,6 +22345,15 @@ let sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; }; }; + "hasha-5.2.0" = { + name = "hasha"; + packageName = "hasha"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz"; + sha512 = "2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw=="; + }; + }; "hasher-1.2.0" = { name = "hasher"; packageName = "hasher"; @@ -21247,13 +22390,13 @@ let sha512 = "0FfLHmfArWOizbdwjL+Rc9QIBzqP80juicNl4S4NEPq5OYWBCgYrtYDPUDoSyQQ9IQlBn9W7++fpYQNzZSq/wQ=="; }; }; - "hast-util-from-parse5-5.0.3" = { + "hast-util-from-parse5-6.0.0" = { name = "hast-util-from-parse5"; packageName = "hast-util-from-parse5"; - version = "5.0.3"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz"; - sha512 = "gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA=="; + url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.0.tgz"; + sha512 = "3ZYnfKenbbkhhNdmOQqgH10vnvPivTdsOJCri+APn0Kty+nRkDHArnaX9Hiaf8H+Ig+vkNptL+SRY/6RwWJk1Q=="; }; }; "hast-util-has-property-1.0.4" = { @@ -21274,13 +22417,13 @@ let sha512 = "mFblNpLvFbD8dG2Nw5dJBYZkxIHeph1JAh5yr4huI7T5m8cV0zaXNiqzKPX/JdjA+tIDF7c33u9cxK132KRjyQ=="; }; }; - "hast-util-is-element-1.0.4" = { + "hast-util-is-element-1.1.0" = { name = "hast-util-is-element"; packageName = "hast-util-is-element"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.0.4.tgz"; - sha512 = "NFR6ljJRvDcyPP5SbV7MyPBgF47X3BsskLnmw1U34yL+X6YC0MoBx9EyMg8Jtx4FzGH95jw8+c1VPLHaRA0wDQ=="; + url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz"; + sha512 = "oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ=="; }; }; "hast-util-parse-selector-2.2.4" = { @@ -21499,6 +22642,15 @@ let sha1 = "6f36e770769275113a57ae1a6007001af771cff6"; }; }; + "hls-b24.js-0.12.3" = { + name = "hls-b24.js"; + packageName = "hls-b24.js"; + version = "0.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hls-b24.js/-/hls-b24.js-0.12.3.tgz"; + sha512 = "C8nwzS33zKvR7grYIoHvp8wPxBvk9sEJ6dsh3Bx+T/4jNNhDksqLS73NIWqHvInjRiOsrXgEY4+h/NjNbzzh0g=="; + }; + }; "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; @@ -21914,6 +23066,15 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; + "http-proxy-middleware-1.0.5" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.0.5.tgz"; + sha512 = "CKzML7u4RdGob8wuKI//H8Ein6wNTEQR7yjVEzPbhBLGdOfkfvgTnp2HLnniKBDP9QW4eG10/724iTWLBeER3g=="; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -22211,13 +23372,22 @@ let sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; }; }; - "idb-kv-store-4.4.0" = { + "icss-utils-4.1.1" = { + name = "icss-utils"; + packageName = "icss-utils"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz"; + sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; + }; + }; + "idb-kv-store-4.5.0" = { name = "idb-kv-store"; packageName = "idb-kv-store"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/idb-kv-store/-/idb-kv-store-4.4.0.tgz"; - sha1 = "22c56a8d5f90bd88f818a859db9c58627de278be"; + url = "https://registry.npmjs.org/idb-kv-store/-/idb-kv-store-4.5.0.tgz"; + sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA=="; }; }; "ieee754-1.1.13" = { @@ -22409,13 +23579,13 @@ let sha1 = "97b38fd444114eec16824a935f8da575b57aa1ce"; }; }; - "import-jsx-3.1.0" = { + "import-jsx-4.0.0" = { name = "import-jsx"; packageName = "import-jsx"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-jsx/-/import-jsx-3.1.0.tgz"; - sha512 = "lTuMdQ/mRXC+xQSGPDvAg1VkODlX78j5hZv2tneJ+zuo7GH/XhUF/YVKoeF382a4jO4GYw9jgganbMhEcxwb0g=="; + url = "https://registry.npmjs.org/import-jsx/-/import-jsx-4.0.0.tgz"; + sha512 = "CnjJ2BZFJzbFDmYG5S47xPQjMlSbZLyLJuG4znzL4TdPtJBxHtFP1xVmR+EYX4synFSldiY3B6m00XkPM3zVnA=="; }; }; "import-lazy-2.1.0" = { @@ -22526,15 +23696,6 @@ let sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; }; }; - "indx-0.2.3" = { - name = "indx"; - packageName = "indx"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/indx/-/indx-0.2.3.tgz"; - sha1 = "15dcf56ee9cf65c0234c513c27fbd580e70fbc50"; - }; - }; "infer-owner-1.0.4" = { name = "infer-owner"; packageName = "infer-owner"; @@ -22544,13 +23705,13 @@ let sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; - "inflected-2.0.4" = { + "inflected-2.1.0" = { name = "inflected"; packageName = "inflected"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/inflected/-/inflected-2.0.4.tgz"; - sha512 = "HQPzFLTTUvwfeUH6RAGjD8cHS069mBqXG5n4qaxX7sJXBhVQrsGgF+0ZJGkSuN6a8pcUWB/GXStta11kKi/WvA=="; + url = "https://registry.npmjs.org/inflected/-/inflected-2.1.0.tgz"; + sha512 = "hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w=="; }; }; "inflight-1.0.6" = { @@ -22625,22 +23786,22 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "ink-2.7.1" = { + "ink-3.0.6" = { name = "ink"; packageName = "ink"; - version = "2.7.1"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-2.7.1.tgz"; - sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.6.tgz"; + sha512 = "MOaRUKlDdyzBr6IhiBpBA5+9tv+OlVvQrEErQlN2dfofJ0Q52Xc3gZ5YtgGj0UVD24Ex79WL2QZGJh0emz+jDQ=="; }; }; - "ink-text-input-3.3.0" = { + "ink-text-input-4.0.1" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "3.3.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-3.3.0.tgz"; - sha512 = "gO4wrOf2ie3YuEARTIwGlw37lMjFn3Gk6CKIDrMlHb46WFMagZU7DplohjM24zynlqfnXA5UDEIfC2NBcvD8kg=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.1.tgz"; + sha512 = "wiqkrB2tgnCnv51r2LpNLVfgrd/V+UXF3ccry+/Q7on9CBt8LVavX6NDYRMdXljuM+CcFV/sVro0bCr5oxB05w=="; }; }; "inline-source-map-0.6.2" = { @@ -22760,15 +23921,6 @@ let sha512 = "5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg=="; }; }; - "inquirer-7.2.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.2.0.tgz"; - sha512 = "E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ=="; - }; - }; "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; @@ -22778,13 +23930,13 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "inquirer-autocomplete-prompt-1.0.2" = { + "inquirer-autocomplete-prompt-1.1.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.0.2.tgz"; - sha512 = "vNmAhhrOQwPnUm4B9kz1UB7P98rVF1z8txnjp53r40N0PBCuqoRWqjg3Tl0yz0UkDg7rEUtZ2OZpNc7jnOU9Zw=="; + url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.1.0.tgz"; + sha512 = "mrSeUSFGnTSid/DCKG+E+IcN4MaOnT2bW7NuSagZAguD4k3hZ0UladdYNP4EstZOwgeqv0C3M1zYa1QIIf0Oyg=="; }; }; "insert-module-globals-7.2.0" = { @@ -23066,13 +24218,22 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; - "irc-framework-4.7.0" = { + "ipaddr.js-2.0.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.0.tgz"; + sha512 = "S54H9mIj0rbxRIyrDMEuuER86LdlgUg9FSeZ8duQb6CUG2iRrA36MYVQBSprTF/ZeAwvyQ5mDGuNvIPM0BIl3w=="; + }; + }; + "irc-framework-4.9.0" = { name = "irc-framework"; packageName = "irc-framework"; - version = "4.7.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.7.0.tgz"; - sha512 = "XKXQ8RDr6BpJb4xGIUxzkaeOApkaJCLfAuawAieBg4skD7EP2Ag2C1P/hPAJgLrIAVRKZqTpiWnQDx9gIzdLsA=="; + url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.9.0.tgz"; + sha512 = "cUYMnnKwcNpXtEw/CXnEwUtglmaWZbfu0E/0iI7bENC3bASPNfcvcyTsFQcdknpnoFLyh5kXpQCjPBWKTbOQAQ=="; }; }; "irc-replies-2.0.1" = { @@ -23282,13 +24443,13 @@ let sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; }; }; - "is-callable-1.2.0" = { + "is-callable-1.2.1" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz"; - sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz"; + sha512 = "wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg=="; }; }; "is-canonical-base64-1.1.1" = { @@ -23480,6 +24641,15 @@ let sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f"; }; }; + "is-expression-4.0.0" = { + name = "is-expression"; + packageName = "is-expression"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz"; + sha512 = "zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A=="; + }; + }; "is-extendable-0.1.1" = { name = "is-extendable"; packageName = "is-extendable"; @@ -23741,6 +24911,15 @@ let sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; }; }; + "is-negative-zero-2.0.0" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + }; "is-npm-1.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -23930,13 +25109,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-plain-object-4.1.1" = { + "is-plain-object-5.0.0" = { name = "is-plain-object"; packageName = "is-plain-object"; - version = "4.1.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-4.1.1.tgz"; - sha512 = "5Aw8LLVsDlZsETVMhoMXzqsXwQqr/0vlnBYzIXJbYo2F4yYlhLHs+Ez7Bod7IIQKWkJbJfxrWD7pA1Dw1TKrwA=="; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; }; }; "is-posix-bracket-0.1.1" = { @@ -23966,6 +25145,15 @@ let sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; + "is-promise-4.0.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz"; + sha512 = "hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="; + }; + }; "is-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -24110,13 +25298,13 @@ let sha512 = "eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA=="; }; }; - "is-ssh-1.3.1" = { + "is-ssh-1.3.2" = { name = "is-ssh"; packageName = "is-ssh"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.1.tgz"; - sha512 = "0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg=="; + url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.2.tgz"; + sha512 = "elEw0/0c2UscLrNG+OAorbP539E3rhliKPg+hDMWN9VwrDXfYK+4PBEykDPfxlYYtQvl84TascnQyobfQLHEhQ=="; }; }; "is-stream-1.1.0" = { @@ -24236,13 +25424,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-valid-domain-0.0.14" = { + "is-valid-domain-0.0.15" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.0.14"; + version = "0.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.14.tgz"; - sha512 = "MTUz/3y25zTtutAfwrLyFK+1l2IL4bcq2iHVdYHIPQbvBJLunlYu9dsQdtLwD9HKPDyxCDlKnSbGcRwvjVeCxA=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.15.tgz"; + sha512 = "Mcq4a6oLR+ugNyUlZ8WbuJBCm6hB50B6bgZcr0z7qm4mjbmw+WuqLAxR0eV+jnmtRcSSd++21wD4aQJZb7YZZg=="; }; }; "is-valid-glob-1.0.0" = { @@ -24407,6 +25595,15 @@ let sha512 = "zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg=="; }; }; + "iserror-0.0.2" = { + name = "iserror"; + packageName = "iserror"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iserror/-/iserror-0.0.2.tgz"; + sha1 = "bd53451fe2f668b9f2402c1966787aaa2c7c0bf5"; + }; + }; "isexe-1.1.2" = { name = "isexe"; packageName = "isexe"; @@ -24425,15 +25622,6 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "iso8601-duration-1.2.0" = { - name = "iso8601-duration"; - packageName = "iso8601-duration"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/iso8601-duration/-/iso8601-duration-1.2.0.tgz"; - sha512 = "ErTBd++b17E8nmWII1K1uZtBgD1E8RjyvwmxlCjPHNqHMD7gmcMHOw0E8Ro/6+QT4PhHRSnnMo7bxa1vFPkwhg=="; - }; - }; "isobject-2.1.0" = { name = "isobject"; packageName = "isobject"; @@ -24461,15 +25649,6 @@ let sha512 = "S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="; }; }; - "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"; - }; - }; "isomorphic-git-0.78.5" = { name = "isomorphic-git"; packageName = "isomorphic-git"; @@ -24614,13 +25793,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.18.0" = { + "jaeger-client-3.18.1" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.18.0"; + version = "3.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.18.0.tgz"; - sha512 = "xZ9WvZDWLkZFq7SObpLwu1asMCKCgBRNcDxxGSvK+ZQ7OZyJC5xPlU+rJa4+s/P6autPBVwHpqMGbOERFxWuuA=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.18.1.tgz"; + sha512 = "eZLM2U6rJvYo0XbzQYFeMYfp29gQix7SKlmDReorp9hJkUwXZtTyxW81AcKdmFCjLHO5tFysTX+394BnjEnUZg=="; }; }; "jake-10.8.2" = { @@ -24659,6 +25838,15 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; + "jest-get-type-24.9.0" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz"; + sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="; + }; + }; "jest-haste-map-25.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; @@ -24695,6 +25883,15 @@ let sha512 = "KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA=="; }; }; + "jest-validate-24.9.0" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz"; + sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ=="; + }; + }; "jest-worker-25.5.0" = { name = "jest-worker"; packageName = "jest-worker"; @@ -24704,6 +25901,15 @@ let sha512 = "/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw=="; }; }; + "jest-worker-26.3.0" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "26.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz"; + sha512 = "Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw=="; + }; + }; "jetpack-id-1.0.0" = { name = "jetpack-id"; packageName = "jetpack-id"; @@ -24758,13 +25964,13 @@ let sha512 = "qL4+1iycQjZ1fs8zk3jSRk7cg3ROBUHk7GKtiLAQLFzLPKErnILUvz5DLszSQvz3s1sTjPbywLDISVUtBY6HaA=="; }; }; - "jpeg-js-0.4.1" = { + "jpeg-js-0.4.2" = { name = "jpeg-js"; packageName = "jpeg-js"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.1.tgz"; - sha512 = "jA55yJiB5tCXEddos8JBbvW+IMrqY0y1tjjx9KNVtA+QPmu7ND5j0zkKopClpUTsaETL135uOM2XfcYG4XRjmw=="; + url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz"; + sha512 = "+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw=="; }; }; "jpeg-turbo-0.4.0" = { @@ -24794,13 +26000,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.17.6" = { + "jquery.terminal-2.18.3" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.17.6"; + version = "2.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.17.6.tgz"; - sha512 = "NPAxHodxrs6hLXNW9VAfijYkBFtoL/pyzpDDu2vX2slUyLekkUD9JBM4V0NcAuOvhB2eW4hLFChoYD5B2uu9Sg=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.18.3.tgz"; + sha512 = "zzMVGYlAC+luF7Omm9UY1/nuvp00mozSgcGImObWSS3uDRtcxnxlwxQLC8tvlTT+koyfOvCBaWgB6AD4DvWVpQ=="; }; }; "js-base64-2.6.4" = { @@ -24812,13 +26018,13 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-beautify-1.11.0" = { + "js-beautify-1.13.0" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.11.0.tgz"; - sha512 = "a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz"; + sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA=="; }; }; "js-message-1.0.5" = { @@ -25046,15 +26252,6 @@ let sha512 = "FD/SedD78LCdSvJaOUQAXseT8oQBb5z6IVYaQaCrVUlu9zOAr1BDdKyVYQaSD/GDsAMrXpKcOyBD4LIl8nfjHw=="; }; }; - "json-file-plus-3.3.1" = { - name = "json-file-plus"; - packageName = "json-file-plus"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-file-plus/-/json-file-plus-3.3.1.tgz"; - sha512 = "wo0q1UuiV5NsDPQDup1Km8IwEeqe+olr8tkWxeJq9Bjtcp7DZ0l+yrg28fSC3DEtrE311mhTZ54QGS6oiqnZEA=="; - }; - }; "json-merge-patch-0.2.3" = { name = "json-merge-patch"; packageName = "json-merge-patch"; @@ -25073,13 +26270,13 @@ let sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; - "json-parse-even-better-errors-2.2.0" = { + "json-parse-even-better-errors-2.3.1" = { name = "json-parse-even-better-errors"; packageName = "json-parse-even-better-errors"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.2.0.tgz"; - sha512 = "2tLgY7LRNZ9Hd6gmCuBG5/OjRHQpSgJQqJoYyLLOhUgn8LdOYrjaZLcxkWnDads+AD/haWWioPNziXQcgvQJ/g=="; + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; }; "json-parse-helpfulerror-1.0.3" = { @@ -25217,6 +26414,15 @@ let sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; }; }; + "json-stringify-pretty-compact-2.0.0" = { + name = "json-stringify-pretty-compact"; + packageName = "json-stringify-pretty-compact"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz"; + sha512 = "WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ=="; + }; + }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -25298,6 +26504,15 @@ let sha512 = "b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA=="; }; }; + "jsonc-parser-2.3.1" = { + name = "jsonc-parser"; + packageName = "jsonc-parser"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz"; + sha512 = "H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="; + }; + }; "jsonfile-1.0.1" = { name = "jsonfile"; packageName = "jsonfile"; @@ -25343,6 +26558,15 @@ let sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; + "jsonlines-0.1.1" = { + name = "jsonlines"; + packageName = "jsonlines"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz"; + sha1 = "4fcd246dc5d0e38691907c44ab002f782d1d94cc"; + }; + }; "jsonlint-1.6.2" = { name = "jsonlint"; packageName = "jsonlint"; @@ -25469,13 +26693,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.3.0" = { + "jszip-3.4.0" = { name = "jszip"; packageName = "jszip"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.3.0.tgz"; - sha512 = "EJ9k766htB1ZWnsV5ZMDkKLgA+201r/ouFF8R2OigVjVdcm2rurcBrrdXaeqBJbqnUVMko512PYmlncBKE1Huw=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; + sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; }; }; "jszip-3.5.0" = { @@ -25523,6 +26747,15 @@ let sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; }; }; + "jwa-2.0.0" = { + name = "jwa"; + packageName = "jwa"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz"; + sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; + }; + }; "jws-3.2.2" = { name = "jws"; packageName = "jws"; @@ -25532,6 +26765,15 @@ let sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; }; }; + "jws-4.0.0" = { + name = "jws"; + packageName = "jws"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz"; + sha512 = "KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg=="; + }; + }; "jwt-decode-2.2.0" = { name = "jwt-decode"; packageName = "jwt-decode"; @@ -25677,6 +26919,15 @@ let sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; }; }; + "keep-func-props-3.0.1" = { + name = "keep-func-props"; + packageName = "keep-func-props"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/keep-func-props/-/keep-func-props-3.0.1.tgz"; + sha512 = "5AsrYCiCHIUxuw/G2r7xcoTW/NTf5IFwAe1fkwf2ifM/KZzEojaTylh1Pppu60oEixww1rfcWJaRGLi3eAJsrQ=="; + }; + }; "kew-0.7.0" = { name = "kew"; packageName = "kew"; @@ -25749,13 +27000,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.1" = { + "keyv-4.0.3" = { name = "keyv"; packageName = "keyv"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz"; - sha512 = "xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz"; + sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; }; }; "killable-1.0.1" = { @@ -25920,6 +27171,15 @@ let sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; }; }; + "lambda-local-1.7.3" = { + name = "lambda-local"; + packageName = "lambda-local"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lambda-local/-/lambda-local-1.7.3.tgz"; + sha512 = "T+iwIkuQT0JvTQhvNBTikLhpEJk3ovNoC33niE4QNmYOUrCOdo86PcPkgppOZl+NJXXHebdPHDJ40zqBJ9VMzg=="; + }; + }; "last-one-wins-1.0.4" = { name = "last-one-wins"; packageName = "last-one-wins"; @@ -26082,13 +27342,13 @@ let sha1 = "544ff7032b7b83c68f0701328d9297aa694340f9"; }; }; - "ldapjs-2.0.0-pre.5" = { + "ldapjs-2.1.1" = { name = "ldapjs"; packageName = "ldapjs"; - version = "2.0.0-pre.5"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ldapjs/-/ldapjs-2.0.0-pre.5.tgz"; - sha512 = "nmcSqdUjS7dzloToGCrSX3/TCdKJqLKUD+mMeo2K+NAkRkyn2iDZJRVusUFwFykXcaAr8hPX2qOKzc9PeTA4MQ=="; + url = "https://registry.npmjs.org/ldapjs/-/ldapjs-2.1.1.tgz"; + sha512 = "XzF2BEGeM/nenYDAJvkDMYovZ07fIGalrYD+suprSqUWPCWpoa+a4vWl5g8o/En85m6NHWBpirDFNClWLAd77w=="; }; }; "lead-1.0.0" = { @@ -26127,15 +27387,6 @@ let sha512 = "Tqyx4nggb9nkLD6p4hyIz7UiVNg5u3OnCP2h0hS/HXpheH88rsoNEgNB8xTnpPMw6zWXGZ7Cpg1zhWPlsJ0/TQ=="; }; }; - "less-2.7.3" = { - name = "less"; - packageName = "less"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; - sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ=="; - }; - }; "level-5.0.1" = { name = "level"; packageName = "level"; @@ -26235,15 +27486,6 @@ let sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew=="; }; }; - "level-sublevel-6.6.5" = { - name = "level-sublevel"; - packageName = "level-sublevel"; - version = "6.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.5.tgz"; - sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA=="; - }; - }; "level-supports-1.0.1" = { name = "level-supports"; packageName = "level-supports"; @@ -26262,15 +27504,6 @@ let sha512 = "iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ=="; }; }; - "levelup-0.19.1" = { - name = "levelup"; - packageName = "levelup"; - version = "0.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-0.19.1.tgz"; - sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; - }; - }; "levelup-4.4.0" = { name = "levelup"; packageName = "levelup"; @@ -26460,13 +27693,13 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; - "link-check-4.5.0" = { + "link-check-4.5.1" = { name = "link-check"; packageName = "link-check"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-4.5.0.tgz"; - sha512 = "7PWHakA/+O5uaZ9yD290fiG2PUK9weoHAMgtoH3VPllL8ukYHe1YEbwgK9jjnUSE7Xa3zgT41mg+7TnZAPLxkQ=="; + url = "https://registry.npmjs.org/link-check/-/link-check-4.5.1.tgz"; + sha512 = "g0tu3Nkj/rpl1b6rQHRlaaSZ16iRqRDNP30jLUfRK0uNN98H56YVZlJXLjWcyjsj4f2+xZdxqeV398dx38MzfQ=="; }; }; "linkify-it-2.2.0" = { @@ -26487,6 +27720,15 @@ let sha512 = "gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ=="; }; }; + "listenercount-1.0.1" = { + name = "listenercount"; + packageName = "listenercount"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz"; + sha1 = "84c8a72ab59c4725321480c975e6508342e70937"; + }; + }; "listr-0.14.3" = { name = "listr"; packageName = "listr"; @@ -26568,6 +27810,15 @@ let sha512 = "dYB1lbwqHgPTrruy9glukCu8Ya9vzj6TMfouCtj2H/GuJ+8syioisgKTBPxnCi6m8K8jINKfTOxOHngFkUYqHw=="; }; }; + "load-plugin-3.0.0" = { + name = "load-plugin"; + packageName = "load-plugin"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-3.0.0.tgz"; + sha512 = "od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -26631,6 +27882,15 @@ let sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; }; + "locate-path-6.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; + }; + }; "locks-0.2.2" = { name = "locks"; packageName = "locks"; @@ -26640,22 +27900,13 @@ let sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced"; }; }; - "locutus-2.0.11" = { + "locutus-2.0.12" = { name = "locutus"; packageName = "locutus"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/locutus/-/locutus-2.0.11.tgz"; - sha512 = "C0q1L38lK5q1t+wE0KY21/9szrBHxye6o2z5EJzU+5B79tubNOC+nLAEzTTn1vPUGoUuehKh8kYKqiVUTWRyaQ=="; - }; - }; - "lodash-1.0.2" = { - name = "lodash"; - packageName = "lodash"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; - sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; + url = "https://registry.npmjs.org/locutus/-/locutus-2.0.12.tgz"; + sha512 = "wnzhY9xOdDb2djr17kQhTh9oZgEfp78zI27KRRiiV1GnPXWA2xfVODbpH3QgpIuUMLupM02+6X/rJXvktTpnoA=="; }; }; "lodash-2.4.2" = { @@ -26694,15 +27945,6 @@ let sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; }; }; - "lodash-4.17.15" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.15"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; - }; - }; "lodash-4.17.19" = { name = "lodash"; packageName = "lodash"; @@ -26712,6 +27954,15 @@ let sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="; }; }; + "lodash-4.17.20" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.20"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; + sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; + }; + }; "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; @@ -27099,6 +28350,15 @@ let sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; }; }; + "lodash.camelcase-4.3.0" = { + name = "lodash.camelcase"; + packageName = "lodash.camelcase"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + }; "lodash.clone-4.5.0" = { name = "lodash.clone"; packageName = "lodash.clone"; @@ -27126,15 +28386,6 @@ let sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.constant-3.0.0" = { - name = "lodash.constant"; - packageName = "lodash.constant"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.constant/-/lodash.constant-3.0.0.tgz"; - sha1 = "bfe05cce7e515b3128925d6362138420bd624910"; - }; - }; "lodash.debounce-4.0.8" = { name = "lodash.debounce"; packageName = "lodash.debounce"; @@ -27144,6 +28395,15 @@ let sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; }; }; + "lodash.deburr-4.1.0" = { + name = "lodash.deburr"; + packageName = "lodash.deburr"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-4.1.0.tgz"; + sha1 = "ddb1bbb3ef07458c0177ba07de14422cb033ff9b"; + }; + }; "lodash.defaults-4.2.0" = { name = "lodash.defaults"; packageName = "lodash.defaults"; @@ -27180,6 +28440,15 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; + "lodash.findkey-4.6.0" = { + name = "lodash.findkey"; + packageName = "lodash.findkey"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.findkey/-/lodash.findkey-4.6.0.tgz"; + sha1 = "83058e903b51cbb759d09ccf546dea3ea39c4718"; + }; + }; "lodash.flatmap-4.5.0" = { name = "lodash.flatmap"; packageName = "lodash.flatmap"; @@ -27198,6 +28467,15 @@ let sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; }; }; + "lodash.flattendeep-4.4.0" = { + name = "lodash.flattendeep"; + packageName = "lodash.flattendeep"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + }; + }; "lodash.foreach-2.4.1" = { name = "lodash.foreach"; packageName = "lodash.foreach"; @@ -27243,15 +28521,6 @@ let sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; }; }; - "lodash.has-4.5.2" = { - name = "lodash.has"; - packageName = "lodash.has"; - version = "4.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz"; - sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; - }; - }; "lodash.identity-2.4.1" = { name = "lodash.identity"; packageName = "lodash.identity"; @@ -27288,6 +28557,15 @@ let sha1 = "0a11ba631d0e95c23c7f2f4cbb9a692ed178e705"; }; }; + "lodash.invert-4.3.0" = { + name = "lodash.invert"; + packageName = "lodash.invert"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.invert/-/lodash.invert-4.3.0.tgz"; + sha1 = "8ffe20d4b616f56bea8f1aa0c6ebd80dcf742aee"; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -27315,15 +28593,6 @@ let sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; }; }; - "lodash.isarray-4.0.0" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz"; - sha1 = "2aca496b28c4ca6d726715313590c02e6ea34403"; - }; - }; "lodash.isboolean-3.0.3" = { name = "lodash.isboolean"; packageName = "lodash.isboolean"; @@ -27360,15 +28629,6 @@ let sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1"; }; }; - "lodash.isfunction-3.0.9" = { - name = "lodash.isfunction"; - packageName = "lodash.isfunction"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; - sha512 = "AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="; - }; - }; "lodash.isinteger-4.0.4" = { name = "lodash.isinteger"; packageName = "lodash.isinteger"; @@ -27378,6 +28638,15 @@ let sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343"; }; }; + "lodash.islength-4.0.1" = { + name = "lodash.islength"; + packageName = "lodash.islength"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.islength/-/lodash.islength-4.0.1.tgz"; + sha1 = "4e9868d452575d750affd358c979543dc20ed577"; + }; + }; "lodash.ismatch-4.4.0" = { name = "lodash.ismatch"; packageName = "lodash.ismatch"; @@ -27405,6 +28674,15 @@ let sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"; }; }; + "lodash.isobject-3.0.2" = { + name = "lodash.isobject"; + packageName = "lodash.isobject"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; + sha1 = "3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"; + }; + }; "lodash.isplainobject-4.0.6" = { name = "lodash.isplainobject"; packageName = "lodash.isplainobject"; @@ -27423,15 +28701,6 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; - "lodash.isundefined-3.0.1" = { - name = "lodash.isundefined"; - packageName = "lodash.isundefined"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz"; - sha1 = "23ef3d9535565203a66cefd5b830f848911afb48"; - }; - }; "lodash.iteratee-4.7.0" = { name = "lodash.iteratee"; packageName = "lodash.iteratee"; @@ -27459,15 +28728,6 @@ let sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; }; }; - "lodash.keys-4.2.0" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"; - sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"; - }; - }; "lodash.map-4.6.0" = { name = "lodash.map"; packageName = "lodash.map"; @@ -27558,15 +28818,6 @@ let sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; }; }; - "lodash.partialright-4.2.1" = { - name = "lodash.partialright"; - packageName = "lodash.partialright"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.partialright/-/lodash.partialright-4.2.1.tgz"; - sha1 = "0130d80e83363264d40074f329b8a3e7a8a1cc4b"; - }; - }; "lodash.pick-4.4.0" = { name = "lodash.pick"; packageName = "lodash.pick"; @@ -27621,6 +28872,15 @@ let sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; }; }; + "lodash.sample-4.2.1" = { + name = "lodash.sample"; + packageName = "lodash.sample"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.sample/-/lodash.sample-4.2.1.tgz"; + sha1 = "5e4291b0c753fa1abeb0aab8fb29df1b66f07f6d"; + }; + }; "lodash.set-4.3.2" = { name = "lodash.set"; packageName = "lodash.set"; @@ -27630,13 +28890,13 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; - "lodash.size-4.2.0" = { - name = "lodash.size"; - packageName = "lodash.size"; - version = "4.2.0"; + "lodash.snakecase-4.1.1" = { + name = "lodash.snakecase"; + packageName = "lodash.snakecase"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.size/-/lodash.size-4.2.0.tgz"; - sha1 = "71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86"; + url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; + sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d"; }; }; "lodash.some-4.6.0" = { @@ -27774,15 +29034,6 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; - "lodash.values-4.3.0" = { - name = "lodash.values"; - packageName = "lodash.values"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"; - sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"; - }; - }; "lodash.xorby-4.7.0" = { name = "lodash.xorby"; packageName = "lodash.xorby"; @@ -27801,6 +29052,15 @@ let sha512 = "sxChESNYJ/EcQv8C7xpmxhtTOngoXuMEqGDAkhXBEmt3MAzM3SM/TmIBOqnMEVdrOv1+VgZoYbo6U2GemQiU4g=="; }; }; + "log-process-errors-5.1.2" = { + name = "log-process-errors"; + packageName = "log-process-errors"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-process-errors/-/log-process-errors-5.1.2.tgz"; + sha512 = "s4kmYHrzj543xUAIxc/cpmoiGZcbFwKRqqwO49DbgH+hFoSTswi0sYZuJKjUUc73b49MRPQGl0CNl8cx98/Wtg=="; + }; + }; "log-symbols-1.0.2" = { name = "log-symbols"; packageName = "log-symbols"; @@ -27828,6 +29088,15 @@ let sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; + "log-symbols-4.0.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz"; + sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA=="; + }; + }; "log-update-1.0.2" = { name = "log-update"; packageName = "log-update"; @@ -27855,15 +29124,6 @@ let sha512 = "ILKe88NeMt4gmDvk/eb615U/IVn7K9KWGkoYbdatQ69Z65nj1ZzjM6fHXfcs0Uge+e+EGnMW7DY4T9yko8vWFg=="; }; }; - "log4js-5.3.0" = { - name = "log4js"; - packageName = "log4js"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-5.3.0.tgz"; - sha512 = "PZHXaXJKMKEscvQxSnTjM4UosQalSDlNpMw63eCKW+/DiAFKIZPW1jGyIPXZDjiEYFusMfiI7zzvnxeGozUcAw=="; - }; - }; "log4js-6.3.0" = { name = "log4js"; packageName = "log4js"; @@ -27882,22 +29142,13 @@ let sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; - "logic-solver-2.0.1" = { - name = "logic-solver"; - packageName = "logic-solver"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/logic-solver/-/logic-solver-2.0.1.tgz"; - sha1 = "e9fa47002eb5d8cda7616d41639b97552eb674be"; - }; - }; - "loglevel-1.6.8" = { + "loglevel-1.7.0" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.8"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; - sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz"; + sha512 = "i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -28206,15 +29457,6 @@ let sha1 = "d637764ea33a929bd00f34d2a23c2256d0d5fb5b"; }; }; - "ltgt-2.1.3" = { - name = "ltgt"; - packageName = "ltgt"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; - sha1 = "10851a06d9964b971178441c23c9e52698eece34"; - }; - }; "ltgt-2.2.1" = { name = "ltgt"; packageName = "ltgt"; @@ -28233,13 +29475,13 @@ let sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; }; }; - "lunr-2.3.8" = { + "lunr-2.3.6" = { name = "lunr"; packageName = "lunr"; - version = "2.3.8"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz"; - sha512 = "oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg=="; + url = "https://registry.npmjs.org/lunr/-/lunr-2.3.6.tgz"; + sha512 = "swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q=="; }; }; "lynx-0.2.0" = { @@ -28395,15 +29637,6 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "make-error-cause-1.2.2" = { - name = "make-error-cause"; - packageName = "make-error-cause"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz"; - sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d"; - }; - }; "make-fetch-happen-5.0.2" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -28584,13 +29817,13 @@ let sha512 = "YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg=="; }; }; - "markdown-it-11.0.0" = { + "markdown-it-11.0.1" = { name = "markdown-it"; packageName = "markdown-it"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.0.tgz"; - sha512 = "+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.1.tgz"; + sha512 = "aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ=="; }; }; "markdown-it-8.4.2" = { @@ -28620,13 +29853,13 @@ let sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA=="; }; }; - "markdown-it-deflist-2.0.3" = { + "markdown-it-deflist-2.1.0" = { name = "markdown-it-deflist"; packageName = "markdown-it-deflist"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.0.3.tgz"; - sha512 = "/BNZ8ksW42bflm1qQLnRI09oqU2847Z7MVavrR0MORyKLtiUYOMpwtlAfMSZAQU9UCvaUZMpgVAqoS3vpToJxw=="; + url = "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz"; + sha512 = "3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg=="; }; }; "markdown-it-emoji-1.4.0" = { @@ -28728,13 +29961,13 @@ let sha512 = "UhD2Oj6cZV3ycYPoelt4hTkwKIK3zbPP1wjjdpCq7UGtWQOFalDFDv1s2zBYV6aR2gMs/X8kpJcOYsQmUbiXDw=="; }; }; - "markdown-link-extractor-1.2.3" = { + "markdown-link-extractor-1.2.6" = { name = "markdown-link-extractor"; packageName = "markdown-link-extractor"; - version = "1.2.3"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.3.tgz"; - sha512 = "BGgBPPNjRpwKzkMxuY5YG2ntPmSL8UMnGiYxRR/9etK3ABLv9SsKHt70PUxv6MaBSC3TnpRsvcIOmnCFWvjcRA=="; + url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.6.tgz"; + sha512 = "WDiwWTzR/zk0n0As7q1KCB1Jd/T7nJ7IEr6E1QKZR1Agd/xRmB0FjM2IrtC7IZ1ZwxflBE0aLe4pkX8d+rzV8w=="; }; }; "markdown-serve-0.3.3" = { @@ -28764,6 +29997,15 @@ let sha512 = "1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q=="; }; }; + "markdown-table-2.0.0" = { + name = "markdown-table"; + packageName = "markdown-table"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz"; + sha512 = "Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A=="; + }; + }; "marked-0.3.19" = { name = "marked"; packageName = "marked"; @@ -28773,6 +30015,15 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; + "marked-0.6.3" = { + name = "marked"; + packageName = "marked"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz"; + sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ=="; + }; + }; "marked-0.7.0" = { name = "marked"; packageName = "marked"; @@ -28791,6 +30042,15 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; + "marked-1.1.1" = { + name = "marked"; + packageName = "marked"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz"; + sha512 = "mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="; + }; + }; "marked-terminal-4.1.0" = { name = "marked-terminal"; packageName = "marked-terminal"; @@ -28872,6 +30132,24 @@ let sha512 = "YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g=="; }; }; + "material-design-icons-3.0.1" = { + name = "material-design-icons"; + packageName = "material-design-icons"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz"; + sha1 = "9a71c48747218ebca51e51a66da682038cdcb7bf"; + }; + }; + "material-design-lite-1.3.0" = { + name = "material-design-lite"; + packageName = "material-design-lite"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/material-design-lite/-/material-design-lite-1.3.0.tgz"; + sha1 = "d004ce3fee99a1eeb74a78b8a325134a5f1171d3"; + }; + }; "math-random-1.0.4" = { name = "math-random"; packageName = "math-random"; @@ -28890,6 +30168,24 @@ let sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg=="; }; }; + "maxstache-1.0.7" = { + name = "maxstache"; + packageName = "maxstache"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/maxstache/-/maxstache-1.0.7.tgz"; + sha1 = "2231d5180ba783d5ecfc31c45fedac7ae4276984"; + }; + }; + "maxstache-stream-1.0.4" = { + name = "maxstache-stream"; + packageName = "maxstache-stream"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/maxstache-stream/-/maxstache-stream-1.0.4.tgz"; + sha1 = "9c7f5cab7e5fdd2d90da86143b4e9631ea328040"; + }; + }; "md5-2.2.1" = { name = "md5"; packageName = "md5"; @@ -28926,6 +30222,24 @@ let sha512 = "xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw=="; }; }; + "md5-hex-2.0.0" = { + name = "md5-hex"; + packageName = "md5-hex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz"; + sha1 = "d0588e9f1c74954492ecd24ac0ac6ce997d92e33"; + }; + }; + "md5-o-matic-0.1.1" = { + name = "md5-o-matic"; + packageName = "md5-o-matic"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz"; + sha1 = "822bccd65e117c514fab176b25945d54100a03c3"; + }; + }; "md5.js-1.3.5" = { name = "md5.js"; packageName = "md5.js"; @@ -28953,13 +30267,22 @@ let sha512 = "3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg=="; }; }; - "mdast-util-to-nlcst-3.2.3" = { + "mdast-util-compact-2.0.1" = { + name = "mdast-util-compact"; + packageName = "mdast-util-compact"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz"; + sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; + }; + }; + "mdast-util-to-nlcst-4.0.0" = { name = "mdast-util-to-nlcst"; packageName = "mdast-util-to-nlcst"; - version = "3.2.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-3.2.3.tgz"; - sha512 = "hPIsgEg7zCvdU6/qvjcR6lCmJeRuIEpZGY5xBV+pqzuMOvQajyyF8b6f24f8k3Rw8u40GwkI3aAxUXr3bB2xag=="; + url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-4.0.0.tgz"; + sha512 = "CPDf82bVAVImJTZgZ9S1yxGczDyoYi1R+edzz8EVFUPvT3RN0RZnnSnMikawLf6ukAKj6pyhsG0exSO7UEA3DA=="; }; }; "mdmanifest-1.0.8" = { @@ -28971,13 +30294,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.31" = { + "mdn-browser-compat-data-1.0.35" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.31"; + version = "1.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.31.tgz"; - sha512 = "GVQQYWgoH3jbBaIy8M4hrg34qaNpPedtZvwAjUmkpHq4FXKKCea8Ji5rlS32YJSU9dt7TPvuWWX7Cce5mZyFPA=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.35.tgz"; + sha512 = "7SMAEZgBaElDNcqFhmInBnSo+c+MOzprt7hrGNcEo9hMhDiPQ7L4dwEt6gunudjI0jXenPJaW0S8U4ckeP2uhw=="; }; }; "mdn-data-2.0.4" = { @@ -29088,13 +30411,13 @@ let sha512 = "qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw=="; }; }; - "mem-6.1.0" = { + "mem-6.1.1" = { name = "mem"; packageName = "mem"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-6.1.0.tgz"; - sha512 = "RlbnLQgRHk5lwqTtpEkBTQ2ll/CG/iB+J4Hy2Wh97PjgZgXgWJWrFF+XXujh3UUVLvR4OOTgZzcWMMwnehlEUg=="; + url = "https://registry.npmjs.org/mem/-/mem-6.1.1.tgz"; + sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; "mem-fs-1.2.0" = { @@ -29286,13 +30609,13 @@ let sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; }; }; - "meow-7.0.1" = { + "meow-7.1.1" = { name = "meow"; packageName = "meow"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-7.0.1.tgz"; - sha512 = "tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw=="; + url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"; + sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; }; }; "merge-1.2.1" = { @@ -29322,6 +30645,15 @@ let sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; }; }; + "merge-source-map-1.1.0" = { + name = "merge-source-map"; + packageName = "merge-source-map"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; + sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; + }; + }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -29358,13 +30690,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.2.8" = { + "metals-languageclient-0.3.1" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.2.8"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.2.8.tgz"; - sha512 = "RGy28w9iYwGt3im5Da6YjD9eF6GTKtrRvluWy8StfwbHvI/KsobF1zmyVX/fD0wvNUCY0am867rImkjs1paTzA=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.1.tgz"; + sha512 = "+bxUq6HmdHlqEBIyCyr41KsoLJLQ4DRBn9sVXPhZUlhoA/pBMNSq4LVlLUEnBvRYMhxwbAGV6XYuUMKd0vMokA=="; }; }; "metalsmith-2.3.0" = { @@ -29412,6 +30744,24 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; + "micro-api-client-3.3.0" = { + name = "micro-api-client"; + packageName = "micro-api-client"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micro-api-client/-/micro-api-client-3.3.0.tgz"; + sha512 = "y0y6CUB9RLVsy3kfgayU28746QrNMpSm9O/AYGNsBgOkJr/X/Jk0VLGoO8Ude7Bpa8adywzF+MzXNZRFRsNPhg=="; + }; + }; + "micro-memoize-2.1.2" = { + name = "micro-memoize"; + packageName = "micro-memoize"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micro-memoize/-/micro-memoize-2.1.2.tgz"; + sha512 = "COjNutiFgnDHXZEIM/jYuZPwq2h8zMUeScf6Sh6so98a+REqdlpaNS7Cb2ffGfK5I+xfgoA3Rx49NGuNJTJq3w=="; + }; + }; "microbuffer-1.0.0" = { name = "microbuffer"; packageName = "microbuffer"; @@ -29538,15 +30888,6 @@ let sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; - "mime-db-1.43.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; - }; - }; "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; @@ -29565,15 +30906,6 @@ let sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; }; }; - "mime-types-2.1.26" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.26"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; - }; - }; "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; @@ -29691,15 +31023,6 @@ let sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; }; }; - "minimatch-0.2.14" = { - name = "minimatch"; - packageName = "minimatch"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }; - }; "minimatch-0.3.0" = { name = "minimatch"; packageName = "minimatch"; @@ -29709,15 +31032,6 @@ let sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; }; }; - "minimatch-2.0.10" = { - name = "minimatch"; - packageName = "minimatch"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; - sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; - }; - }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -29826,13 +31140,13 @@ let sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; }; }; - "minipass-fetch-1.3.0" = { + "minipass-fetch-1.3.1" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.0.tgz"; - sha512 = "Yb23ESZZ/8QxiBvSpJ4atbVMVDx2CXrerzrtQzQ67eLqKg+zFIkYFTagk3xh6fdo+e/FvDtVuCD4QcuYDRR3hw=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.1.tgz"; + sha512 = "N0ddPAD8OZnoAHUYj1ZH4ZJVna+ucy7if777LrdeIV1ko8f46af4jbyM5EC1gN4xc9Wq5c3C38GnxRJ2gneXRA=="; }; }; "minipass-flush-1.0.5" = { @@ -29889,13 +31203,22 @@ let sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; - "minizlib-2.1.0" = { + "minizlib-2.1.2" = { name = "minizlib"; packageName = "minizlib"; - version = "2.1.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz"; - sha512 = "EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; + "mirakurun-3.2.0" = { + name = "mirakurun"; + packageName = "mirakurun"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.2.0.tgz"; + sha512 = "zRMza+rxE5XUgUDy8lbt1qAKA9TKcApnwmP+06chBZXinxwEiaRbto7vE8is7ky6+qCS9Q7Erf91kbhAsLwydw=="; }; }; "mired-0.0.0" = { @@ -29934,6 +31257,15 @@ let sha1 = "53d500266cbd09cda9d94c4cf392e60589b5b324"; }; }; + "mithril-2.0.4" = { + name = "mithril"; + packageName = "mithril"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mithril/-/mithril-2.0.4.tgz"; + sha512 = "mgw+DMZlhMS4PpprF6dl7ZoeZq5GGcAuWnrg5e12MvaGauc4jzWsDZtVGRCktsiQczOEUr2K5teKbE5k44RlOg=="; + }; + }; "mixin-deep-1.3.2" = { name = "mixin-deep"; packageName = "mixin-deep"; @@ -30015,31 +31347,22 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-4.15.4" = { + "mobx-4.15.7" = { name = "mobx"; packageName = "mobx"; - version = "4.15.4"; + version = "4.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-4.15.4.tgz"; - sha512 = "nyuHPqmKnVOnbvkjR8OrijBtovxAHYC+JU8/qBqvBw4Dez/n+zzxqNHbZNFy7/07+wwc/Qz7JS9WSfy1LcYISA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-4.15.7.tgz"; + sha512 = "X4uQvuf2zYKHVO5kRT5Utmr+J9fDnRgxWWnSqJ4oiccPTQU38YG+/O3nPmOhUy4jeHexl7XJJpWDBgEnEfp+8w=="; }; }; - "mobx-react-6.2.5" = { + "mobx-react-5.4.4" = { name = "mobx-react"; packageName = "mobx-react"; - version = "6.2.5"; + version = "5.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-6.2.5.tgz"; - sha512 = "LxtXXW0GkOAO6VOIg2m/6WL6ZuKlzOWwESIFdrWelI0ZMIvtKCMZVUuulcO5GAWSDsH0ApaMkGLoaPqKjzyziQ=="; - }; - }; - "mobx-react-lite-2.0.7" = { - name = "mobx-react-lite"; - packageName = "mobx-react-lite"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-2.0.7.tgz"; - sha512 = "YKAh2gThC6WooPnVZCoC+rV1bODAKFwkhxikzgH18wpBjkgTkkR9Sb0IesQAH5QrAEH/JQVmy47jcpQkf2Au3Q=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.4.tgz"; + sha512 = "2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ=="; }; }; "mocha-2.5.3" = { @@ -30051,13 +31374,22 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; - "mocha-8.1.1" = { + "mocha-7.2.0" = { name = "mocha"; packageName = "mocha"; - version = "8.1.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.1.tgz"; - sha512 = "p7FuGlYH8t7gaiodlFreseLxEmxTgvyG9RgPHODFPySNhwUehu8NIb0vdSt3WFckSneswZ0Un5typYcWElk7HQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; + sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; + }; + }; + "mocha-8.1.3" = { + name = "mocha"; + packageName = "mocha"; + version = "8.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; + sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; }; }; "mock-require-3.0.3" = { @@ -30087,6 +31419,15 @@ let sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="; }; }; + "module-definition-3.3.0" = { + name = "module-definition"; + packageName = "module-definition"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.0.tgz"; + sha512 = "HTplA9xwDzH67XJFC1YvZMUElWJD28DV0dUq7lhTs+JKJamUOWA/CcYWSlhW5amJO66uWtY7XdltT+LfX0wIVg=="; + }; + }; "module-deps-6.2.3" = { name = "module-deps"; packageName = "module-deps"; @@ -30096,6 +31437,15 @@ let sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; }; }; + "moize-5.4.7" = { + name = "moize"; + packageName = "moize"; + version = "5.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/moize/-/moize-5.4.7.tgz"; + sha512 = "7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw=="; + }; + }; "mold-source-map-0.4.0" = { name = "mold-source-map"; packageName = "mold-source-map"; @@ -30123,6 +31473,15 @@ let sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; }; }; + "moment-2.28.0" = { + name = "moment"; + packageName = "moment"; + version = "2.28.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz"; + sha512 = "Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="; + }; + }; "moment-2.7.0" = { name = "moment"; packageName = "moment"; @@ -30195,6 +31554,15 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; + "move-file-1.2.0" = { + name = "move-file"; + packageName = "move-file"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/move-file/-/move-file-1.2.0.tgz"; + sha512 = "USHrRmxzGowUWAGBbJPdFjHzEqtxDU03pLHY0Rfqgtnq+q8FOIs8wvkkf+Udmg77SJKs47y9sI0jJvQeYsmiCA=="; + }; + }; "mp4-box-encoding-1.4.1" = { name = "mp4-box-encoding"; packageName = "mp4-box-encoding"; @@ -30582,13 +31950,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "mutexify-1.3.0" = { + "mutexify-1.3.1" = { name = "mutexify"; packageName = "mutexify"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.0.tgz"; - sha512 = "WNPlgZ3AHETGSa4jeRP4aW6BPQ/a++MwoMFFIgrDg80+m70mbxuNOrevANfBDmur82zxTFAY3OwvMAvqrkV2sA=="; + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.1.tgz"; + sha512 = "nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g=="; }; }; "muxrpc-6.5.0" = { @@ -30645,6 +32013,15 @@ let sha1 = "37585555a4ff1985309edac7c2a045a466be6c32"; }; }; + "mysql-2.18.1" = { + name = "mysql"; + packageName = "mysql"; + version = "2.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz"; + sha512 = "Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig=="; + }; + }; "mz-2.7.0" = { name = "mz"; packageName = "mz"; @@ -30933,13 +32310,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.5" = { + "nearley-2.19.7" = { name = "nearley"; packageName = "nearley"; - version = "2.19.5"; + version = "2.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.5.tgz"; - sha512 = "qoh1ZXXl0Kpn40tFhmgvffUAlbpRMcjLUagNVnT1JmliUIsB4tFabmCNhD97+tkf9FZ/SLhhYzNow0V3GitzDg=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.7.tgz"; + sha512 = "Y+KNwhBPcSJKeyQCFjn8B/MIe+DDlhaaDgjVldhy5xtFewIbiQgcbZV8k2gCVwkI1ZsKCnjIYZbR+0Fim5QYgg=="; }; }; "neat-csv-2.1.0" = { @@ -31014,6 +32391,15 @@ let sha512 = "o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA=="; }; }; + "needle-2.5.2" = { + name = "needle"; + packageName = "needle"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz"; + sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ=="; + }; + }; "negotiator-0.3.0" = { name = "negotiator"; packageName = "negotiator"; @@ -31060,15 +32446,6 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; - "nested-error-stacks-2.0.1" = { - name = "nested-error-stacks"; - packageName = "nested-error-stacks"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz"; - sha512 = "SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A=="; - }; - }; "nested-error-stacks-2.1.0" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -31078,6 +32455,33 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; + "netlify-4.5.1" = { + name = "netlify"; + packageName = "netlify"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify/-/netlify-4.5.1.tgz"; + sha512 = "Ke6lXulj8Jd4qzAmHv5VHvqAWoV+EkQUKiBDvpZuUAGA12UDRP4vl7gvJkxmwZ5Z/trIOgiOC9n8y/NHlvFbXA=="; + }; + }; + "netlify-redirect-parser-2.5.0" = { + name = "netlify-redirect-parser"; + packageName = "netlify-redirect-parser"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-2.5.0.tgz"; + sha512 = "pF8BiOr3Pa4kQLLiOu53I0d30EIUDM0DYqYvCQmKD96cMX2qLh/QsxT0Zh18IrL5a0IWQ236/o76lTe0yEEw6w=="; + }; + }; + "netlify-redirector-0.2.0" = { + name = "netlify-redirector"; + packageName = "netlify-redirector"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.2.0.tgz"; + sha512 = "5SSUu++MXvE/tik90Hx7lzISBHCl5k4TqpVeTuBEoHp5K7uWitY7c3MjPNiY3kB83GSZiTNLbuIY7bo6mpyU3Q=="; + }; + }; "netmask-1.0.6" = { name = "netmask"; packageName = "netmask"; @@ -31195,13 +32599,13 @@ let sha512 = "dWJ3XUoAoWoau24xOM59Y1FPozv7DyYWy+rdUaXj9Ow0hBCVuwqDQbXzTF7H+HskyTVpTkRPXYPu4YsMEScmRw=="; }; }; - "nlcst-search-1.5.1" = { + "nlcst-search-2.0.0" = { name = "nlcst-search"; packageName = "nlcst-search"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-1.5.1.tgz"; - sha512 = "G3ws0fgNlVsUvHvA2G1PTjyxzGOJ0caI0+WOvlZzev5iSUTX+R1q4lnlL4Y7E+he4ZMUW/0FMn9rYwdYon/13g=="; + url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-2.0.0.tgz"; + sha512 = "+3xdctMFTcG+76vKAa0wObNg1EYq7IIQlZcL+HxSFXkHO1DgSPRjsPJrmelVIvMg7rk+wmBcdPEoScv/CTT1Zw=="; }; }; "nlcst-to-string-2.0.4" = { @@ -31249,13 +32653,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.18.0" = { + "node-abi-2.19.1" = { name = "node-abi"; packageName = "node-abi"; - version = "2.18.0"; + version = "2.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.18.0.tgz"; - sha512 = "yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz"; + sha512 = "HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A=="; }; }; "node-addon-api-1.7.2" = { @@ -31267,13 +32671,22 @@ let sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; }; }; - "node-appc-0.2.49" = { + "node-addon-api-2.0.0" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz"; + sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="; + }; + }; + "node-appc-1.1.1" = { name = "node-appc"; packageName = "node-appc"; - version = "0.2.49"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.49.tgz"; - sha512 = "PldEN7CgEy7ekSZyomgpajLX7STCZPDJI6rGy7FCbWi7ZJgTt9/C3omCxPkIKVjtwcXzXoSA31zUWUnBzTkEUg=="; + url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.1.tgz"; + sha512 = "QYOmRUq9B0LfVZ5MWQlbv8tHa4pzQ+YbagjUUvMIx6lVjhCjG9pPMRyPFK7/HXiQ+WrsiuydSbJgsBZt1p18Rg=="; }; }; "node-bitmap-0.0.1" = { @@ -31331,6 +32744,15 @@ let sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; + "node-environment-flags-1.0.6" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; + }; + }; "node-fetch-1.6.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -31367,6 +32789,15 @@ let sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="; }; }; + "node-fetch-2.6.1" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"; + sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; + }; + }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -31385,6 +32816,15 @@ let sha512 = "iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg=="; }; }; + "node-forge-0.10.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"; + sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; + }; + }; "node-forge-0.2.24" = { name = "node-forge"; packageName = "node-forge"; @@ -31403,13 +32843,22 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; - "node-forge-0.9.0" = { + "node-forge-0.9.1" = { name = "node-forge"; packageName = "node-forge"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; - sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.1.tgz"; + sha512 = "G6RlQt5Sb4GMBzXvhfkeFmbqR6MzhtnT7VTHuLadjkii3rdYHNdw0m8zA4BTxVIh68FicCQ2NSUANpsqkr9jvQ=="; + }; + }; + "node-gyp-3.8.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; + sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; }; }; "node-gyp-4.0.0" = { @@ -31520,13 +32969,13 @@ let sha512 = "SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw=="; }; }; - "node-notifier-7.0.2" = { + "node-notifier-8.0.0" = { name = "node-notifier"; packageName = "node-notifier"; - version = "7.0.2"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.2.tgz"; - sha512 = "ux+n4hPVETuTL8+daJXTOC6uKLgMsl1RYfFv7DKRzyvzBapqco0rZZ9g72ZN8VS6V+gvNYHYa/ofcCY8fkJWsA=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz"; + sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; }; }; "node-persist-2.1.0" = { @@ -31628,13 +33077,22 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.60" = { + "node-releases-1.1.61" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.60"; + version = "1.1.61"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz"; - sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz"; + sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="; + }; + }; + "node-source-walk-4.2.0" = { + name = "node-source-walk"; + packageName = "node-source-walk"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-source-walk/-/node-source-walk-4.2.0.tgz"; + sha512 = "hPs/QMe6zS94f5+jG3kk9E7TNm4P2SulrKiLWMzKszBfNZvL/V6wseHlTd7IvfW0NZWqPtK3+9yYNr+3USGteA=="; }; }; "node-ssdp-2.9.1" = { @@ -31763,6 +33221,15 @@ let sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; }; }; + "noop2-2.0.0" = { + name = "noop2"; + packageName = "noop2"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/noop2/-/noop2-2.0.0.tgz"; + sha1 = "4b636015e9882b54783c02b412f699d8c5cd0a5b"; + }; + }; "nopt-1.0.10" = { name = "nopt"; packageName = "nopt"; @@ -31817,6 +33284,15 @@ let sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; }; }; + "nopt-5.0.0" = { + name = "nopt"; + packageName = "nopt"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; + }; + }; "normalize-html-whitespace-1.0.0" = { name = "normalize-html-whitespace"; packageName = "normalize-html-whitespace"; @@ -32069,22 +33545,22 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.5" = { + "npm-registry-fetch-4.0.7" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "4.0.5"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz"; - sha512 = "yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz"; + sha512 = "cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ=="; }; }; - "npm-registry-fetch-8.1.3" = { + "npm-registry-fetch-8.1.4" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "8.1.3"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.3.tgz"; - sha512 = "xpBFcg13wkFR0SsscvemmrIe1Sxe1SPgGUOAb7+5Uo6fR8SIRMenMHeDSjfyulv1px66/y0Ib40rtKO20PcgPg=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.4.tgz"; + sha512 = "UaLGFQP7VCuyBsb7S5P5od3av/Zy9JW6K5gbMigjZCYnEpIkWWRiLQTKVpxM4QocfPcsjm+xtyrDNm4jdqwNEg=="; }; }; "npm-run-path-2.0.2" = { @@ -32258,22 +33734,22 @@ let sha512 = "pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ=="; }; }; - "oas-linter-3.1.3" = { + "oas-linter-3.2.0" = { name = "oas-linter"; packageName = "oas-linter"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.1.3.tgz"; - sha512 = "jFWBHjSoqODGo7cKA/VWqqWSLbHNtnyCEpa2nMMS64SzCUbZDk63Oe7LqQZ2qJA0K2VRreYLt6cVkYy6MqNRDg=="; + url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.0.tgz"; + sha512 = "LP5F1dhjULEJV5oGRg6ROztH2FddzttrrUEwq5J2GB2Zy938mg0vwt1+Rthn/qqDHtj4Qgq21duNGHh+Ew1wUg=="; }; }; - "oas-resolver-2.4.2" = { + "oas-resolver-2.5.0" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.2.tgz"; - sha512 = "iJo7wE/MhuCJefkcpCS/NlE8MunRgRvgPozpeLSZUg0zmU8PBkzUwdtzpmjGDd7QjEuUi0SZ/y1wIrFIH+FNiA=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.0.tgz"; + sha512 = "69OF0iCTDXXp3ttAEPUcCz/eSJd6eyrWAIrPit2wnL7Q4Ti82Q2dXQVMdz5S+JPCgtZOETnTgPs/EsMuH2vIzg=="; }; }; "oas-schema-walker-1.1.5" = { @@ -32294,15 +33770,6 @@ let sha512 = "l/SxykuACi2U51osSsBXTxdsFc8Fw41xI7AsZkzgVgWJAzoEFaaNptt35WgY9C3757RUclsm6ye5GvSyYoozLQ=="; }; }; - "oas-validator-4.0.7" = { - name = "oas-validator"; - packageName = "oas-validator"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-4.0.7.tgz"; - sha512 = "ppSW68iIIhvzFwSvY51NJPLM0uFjkHKAdoXKO+Pq6Ej1qU5Nvi9I3dQt6W8y/B+UYIP8yXr9YTEuvzG7sQH/ww=="; - }; - }; "oauth-0.9.15" = { name = "oauth"; packageName = "oauth"; @@ -32493,13 +33960,13 @@ let sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w=="; }; }; - "object-treeify-1.1.26" = { + "object-treeify-1.1.28" = { name = "object-treeify"; packageName = "object-treeify"; - version = "1.1.26"; + version = "1.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.26.tgz"; - sha512 = "0WTfU7SGM8umY4YPpOg+oHXL66E6dPVCr+sMR6KitPmvg8CkVrHUUZYEFtx0+5Wb0HjFEsBwBYXyGRNeX7c/oQ=="; + url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.28.tgz"; + sha512 = "FoBGZexpq9jJr6mDgV8wv711vreKyzRcw65TKeXzHh98+TNmPZfGYznpel3WceM869WsnSCyUuK46rPUG9+Rpg=="; }; }; "object-visit-1.0.1" = { @@ -32520,6 +33987,15 @@ let sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; + "object.assign-4.1.1" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz"; + sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA=="; + }; + }; "object.defaults-1.1.0" = { name = "object.defaults"; packageName = "object.defaults"; @@ -32646,13 +34122,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.124.2" = { + "office-ui-fabric-react-7.139.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.124.2"; + version = "7.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.124.2.tgz"; - sha512 = "c/6KlNWImaI0N9w9azzTlI3/svkUroNvdZrYBSKHlGVf5CU/GQPEUSmkuaLq6aPZeU7pmr2qUKlZq2sPyrLIOQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.139.0.tgz"; + sha512 = "kqt3LUKUJfPie/32bmWxMcn3VdZoH5yiicdOj8B/huu1WPDDmhM+UlsUX2AmLeAEmqkH8XZxlgpmym96dhstaA=="; }; }; "omggif-1.0.10" = { @@ -32664,6 +34140,15 @@ let sha512 = "LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="; }; }; + "omit.js-2.0.2" = { + name = "omit.js"; + packageName = "omit.js"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/omit.js/-/omit.js-2.0.2.tgz"; + sha512 = "hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg=="; + }; + }; "on-change-network-0.0.2" = { name = "on-change-network"; packageName = "on-change-network"; @@ -32799,13 +34284,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "onetime-5.1.1" = { + "onetime-5.1.2" = { name = "onetime"; packageName = "onetime"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.1.tgz"; - sha512 = "ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg=="; + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; "ono-4.0.11" = { @@ -32871,6 +34356,24 @@ let sha512 = "lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA=="; }; }; + "open-7.2.0" = { + name = "open"; + packageName = "open"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.2.0.tgz"; + sha512 = "4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ=="; + }; + }; + "open-7.2.1" = { + name = "open"; + packageName = "open"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.2.1.tgz"; + sha512 = "xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA=="; + }; + }; "openapi-default-setter-2.1.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; @@ -32880,6 +34383,15 @@ let sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A=="; }; }; + "openapi-default-setter-7.0.1" = { + name = "openapi-default-setter"; + packageName = "openapi-default-setter"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.0.1.tgz"; + sha512 = "O9jhaZPEEJzI1HSG3Yw5rOIC0EpZ9PjRJgtksXKuSMyEoxUDnl7zQ27LuFRR1ykSMVhMt8vHMrQBQIwLW8S0yQ=="; + }; + }; "openapi-framework-0.26.0" = { name = "openapi-framework"; packageName = "openapi-framework"; @@ -32889,6 +34401,15 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; + "openapi-framework-7.0.1" = { + name = "openapi-framework"; + packageName = "openapi-framework"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.0.1.tgz"; + sha512 = "ENQHf+tEqeGp6vykUYiw0uHvMEM3Oqi0SaBs8JlciEuo/fhhqrPmNzNa45xPFYWKYRJ5KpdFWcDlOIYf9gRkog=="; + }; + }; "openapi-jsonschema-parameters-1.2.0" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; @@ -32898,6 +34419,15 @@ let sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ=="; }; }; + "openapi-jsonschema-parameters-7.0.1" = { + name = "openapi-jsonschema-parameters"; + packageName = "openapi-jsonschema-parameters"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.0.1.tgz"; + sha512 = "PuzKYEILBg4mu9uyoHn7wUGPrx3ds9YJr8t0yvOhAkNITWmXCjuh/HgfoOi+6MUu2Rapj+6tk6lYfeVPcgqi3g=="; + }; + }; "openapi-request-coercer-2.4.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; @@ -32907,6 +34437,15 @@ let sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; }; }; + "openapi-request-coercer-7.0.1" = { + name = "openapi-request-coercer"; + packageName = "openapi-request-coercer"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.0.1.tgz"; + sha512 = "nKSRnLX7KQ3Iu1TTZ+1PdEoz0Ke47vH4EcZIM9EOkdqadCFj2pSG/6oMcyqipCs2X7oMFi9Df/UGDRnTdzmPog=="; + }; + }; "openapi-request-validator-4.2.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; @@ -32916,6 +34455,15 @@ let sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; }; }; + "openapi-request-validator-7.0.1" = { + name = "openapi-request-validator"; + packageName = "openapi-request-validator"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.0.1.tgz"; + sha512 = "qQBI3iiQ2JFokg3tdIOLo38ny7xRNzJZgcMwAS13WFSrUE9kcA6JAHI2cC5x3Q0EPpOtxWnzOaXwiZUJJ7MDOQ=="; + }; + }; "openapi-response-validator-4.0.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; @@ -32925,13 +34473,22 @@ let sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; }; }; - "openapi-sampler-1.0.0-beta.16" = { + "openapi-response-validator-7.0.1" = { + name = "openapi-response-validator"; + packageName = "openapi-response-validator"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.0.1.tgz"; + sha512 = "Fxr9YdQ6s7/SIvvM888iWnc1GUn/fFxTaMFqHkUv0/eNCYoBfOwAKj9aptaRfL+BJXlsVdXWCJd3GWkwn8sIJA=="; + }; + }; + "openapi-sampler-1.0.0-beta.14" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.0.0-beta.16"; + version = "1.0.0-beta.14"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.16.tgz"; - sha512 = "05+GvwMagTY7GxoDQoWJfmAUFlxfebciiEzqKmu4iq6+MqBEn62AMUkn0CTxyKhnUGIaR2KXjTeslxIeJwVIOw=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.14.tgz"; + sha512 = "NNmH9YAN5AaCE4w6MQXdCrmsOJJQTswHVSp075+h+iiG+OTonpZE8HzwocozovD2imx4lamkuxGLs4E4bO4Z+g=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -32943,6 +34500,15 @@ let sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA=="; }; }; + "openapi-schema-validator-7.0.1" = { + name = "openapi-schema-validator"; + packageName = "openapi-schema-validator"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.0.1.tgz"; + sha512 = "P/dmF14xWbyaFVcoS1Fs2tUP4AhJO+eEnZV+jbApeo3569/Z2fiki6Mb6Rs7cfi0ewNnV4L4HiYH+HPZaKWnjQ=="; + }; + }; "openapi-security-handler-2.0.4" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; @@ -32952,6 +34518,15 @@ let sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ=="; }; }; + "openapi-security-handler-7.0.1" = { + name = "openapi-security-handler"; + packageName = "openapi-security-handler"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.0.1.tgz"; + sha512 = "fiRJE2Z5F0tY9QBssBX9g8Txtr0oj1BOU0nOZ6QHHXQdCYxebszGgcXD63uy0UJQwzwVOMs/AlCnKNVS/yMSEg=="; + }; + }; "openapi-to-graphql-2.1.0" = { name = "openapi-to-graphql"; packageName = "openapi-to-graphql"; @@ -32979,6 +34554,24 @@ let sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="; }; }; + "openapi-types-7.0.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.0.tgz"; + sha512 = "AikFLY/joHpJz+6OcyWUfXR0xjsh0jXR+oxcB1oosjH3YFZI3uPTJcmuf7koBFQyjd9GYmClmCSK8mGZ7thsOQ=="; + }; + }; + "openapi-types-7.0.1" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.1.tgz"; + sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A=="; + }; + }; "opencollective-1.0.3" = { name = "opencollective"; packageName = "opencollective"; @@ -32997,22 +34590,22 @@ let sha512 = "8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="; }; }; - "opener-1.5.1" = { + "opener-1.5.2" = { name = "opener"; packageName = "opener"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz"; - sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; + url = "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"; + sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; }; }; - "openid-2.0.6" = { + "openid-2.0.7" = { name = "openid"; packageName = "openid"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; - sha1 = "707375e59ab9f73025899727679b20328171c9aa"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.7.tgz"; + sha512 = "xH6qaz/hS55rEX8xURz4HRUO96cpj821WY6UEG9rgcusZ8Jsq54jGWP1EMCjGvgngonw8vgSljM1i2OESv16Gw=="; }; }; "opentracing-0.14.4" = { @@ -33204,31 +34797,31 @@ let sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww=="; }; }; - "ora-4.0.5" = { + "ora-4.1.1" = { name = "ora"; packageName = "ora"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.0.5.tgz"; - sha512 = "jCDgm9DqvRcNIAEv2wZPrh7E5PcQiDUnbnWbAfu4NGAE2ZNqPFbDixmWldy1YG2QfLeQhuiu6/h5VRrk6cG50w=="; + url = "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz"; + sha512 = "sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A=="; }; }; - "orchestrator-0.3.8" = { - name = "orchestrator"; - packageName = "orchestrator"; - version = "0.3.8"; + "ora-5.0.0" = { + name = "ora"; + packageName = "ora"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; - sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; + url = "https://registry.npmjs.org/ora/-/ora-5.0.0.tgz"; + sha512 = "s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw=="; }; }; - "ordered-read-streams-0.1.0" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "0.1.0"; + "ora-5.1.0" = { + name = "ora"; + packageName = "ora"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; - sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; + url = "https://registry.npmjs.org/ora/-/ora-5.1.0.tgz"; + sha512 = "9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w=="; }; }; "ordered-read-streams-1.0.1" = { @@ -33546,6 +35139,15 @@ let sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; + "p-locate-5.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; + }; + }; "p-map-2.1.0" = { name = "p-map"; packageName = "p-map"; @@ -33600,13 +35202,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.6.0" = { + "p-queue-6.6.1" = { name = "p-queue"; packageName = "p-queue"; - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.0.tgz"; - sha512 = "zPHXPNy9jZsiym0PpJjvnHQysx1fSd/QdaNVwiDRLU2KFChD6h9CkCB6b8i3U8lBwJyA+mHgNZCzcy77glUssQ=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.1.tgz"; + sha512 = "miQiSxLYPYBxGkrldecZC18OTLjdUqnlRebGzPRiVxB8mco7usCmm7hFuxiTvp93K18JnLtE4KMMycjAu/cQQg=="; }; }; "p-reduce-1.0.0" = { @@ -33618,6 +35220,15 @@ let sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; }; }; + "p-reduce-2.1.0" = { + name = "p-reduce"; + packageName = "p-reduce"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz"; + sha512 = "2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw=="; + }; + }; "p-retry-3.0.1" = { name = "p-retry"; packageName = "p-retry"; @@ -33681,6 +35292,15 @@ let sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; + "p-wait-for-3.1.0" = { + name = "p-wait-for"; + packageName = "p-wait-for"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-wait-for/-/p-wait-for-3.1.0.tgz"; + sha512 = "0Uy19uhxbssHelu9ynDMcON6BmMk6pH8551CvxROhiz3Vx+yC4RqxjyIDk2V4ll0g9177RKT++PK4zcV58uJ7A=="; + }; + }; "p-waterfall-1.0.0" = { name = "p-waterfall"; packageName = "p-waterfall"; @@ -33744,6 +35364,15 @@ let sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; + "packet-reader-1.0.0" = { + name = "packet-reader"; + packageName = "packet-reader"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; + sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; + }; + }; "packet-stream-2.0.5" = { name = "packet-stream"; packageName = "packet-stream"; @@ -33888,13 +35517,13 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.5" = { + "parse-asn1-5.1.6" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; }; }; "parse-english-4.1.3" = { @@ -33915,6 +35544,15 @@ let sha512 = "NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg=="; }; }; + "parse-entities-2.0.0" = { + name = "parse-entities"; + packageName = "parse-entities"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz"; + sha512 = "kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ=="; + }; + }; "parse-filepath-1.0.2" = { name = "parse-filepath"; packageName = "parse-filepath"; @@ -33942,6 +35580,15 @@ let sha1 = "9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"; }; }; + "parse-github-url-1.0.2" = { + name = "parse-github-url"; + packageName = "parse-github-url"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz"; + sha512 = "kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw=="; + }; + }; "parse-gitignore-1.0.1" = { name = "parse-gitignore"; packageName = "parse-gitignore"; @@ -34014,6 +35661,15 @@ let sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ=="; }; }; + "parse-json-5.1.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"; + sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; + }; + }; "parse-latin-4.2.1" = { name = "parse-latin"; packageName = "parse-latin"; @@ -34032,6 +35688,15 @@ let sha1 = "bedfe0d2118aeb84be75e7b025419ec8a61140a7"; }; }; + "parse-ms-2.1.0" = { + name = "parse-ms"; + packageName = "parse-ms"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz"; + sha512 = "kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA=="; + }; + }; "parse-node-version-1.0.1" = { name = "parse-node-version"; packageName = "parse-node-version"; @@ -34059,13 +35724,13 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; - "parse-path-4.0.1" = { + "parse-path-4.0.2" = { name = "parse-path"; packageName = "parse-path"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.1.tgz"; - sha512 = "d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA=="; + url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.2.tgz"; + sha512 = "HSqVz6iuXSiL8C1ku5Gl1Z5cwDd9Wo0q8CoffdAghP6bz8pJa1tcMC+m4N+z6VAS8QdksnIGq1TB6EgR4vPR6w=="; }; }; "parse-semver-1.1.1" = { @@ -34113,13 +35778,13 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-url-5.0.1" = { + "parse-url-5.0.2" = { name = "parse-url"; packageName = "parse-url"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.1.tgz"; - sha512 = "flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg=="; + url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.2.tgz"; + sha512 = "Czj+GIit4cdWtxo3ISZCvLiUjErSo0iI3wJ+q9Oi3QuMYTI6OZu+7cewMWZ+C1YAnKhYTk6/TLuhIgCypLthPA=="; }; }; "parse5-1.5.1" = { @@ -34158,13 +35823,13 @@ let sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; }; }; - "parse5-5.1.1" = { + "parse5-6.0.1" = { name = "parse5"; packageName = "parse5"; - version = "5.1.1"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; - sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; + url = "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"; + sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; }; }; "parsejson-0.0.1" = { @@ -34356,6 +36021,15 @@ let sha512 = "bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA=="; }; }; + "patch-console-1.0.0" = { + name = "patch-console"; + packageName = "patch-console"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/patch-console/-/patch-console-1.0.0.tgz"; + sha512 = "nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA=="; + }; + }; "patch-package-6.2.2" = { name = "patch-package"; packageName = "patch-package"; @@ -34716,6 +36390,69 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "pg-8.3.0" = { + name = "pg"; + packageName = "pg"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.3.0.tgz"; + sha512 = "jQPKWHWxbI09s/Z9aUvoTbvGgoj98AU7FDCcQ7kdejupn/TcNpx56v2gaOTzXkzOajmOEJEdi9eTh9cA2RVAjQ=="; + }; + }; + "pg-connection-string-2.3.0" = { + name = "pg-connection-string"; + packageName = "pg-connection-string"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.3.0.tgz"; + sha512 = "ukMTJXLI7/hZIwTW7hGMZJ0Lj0S2XQBCJ4Shv4y1zgQ/vqVea+FLhzywvPj0ujSuofu+yA4MYHGZPTsgjBgJ+w=="; + }; + }; + "pg-int8-1.0.1" = { + name = "pg-int8"; + packageName = "pg-int8"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; + sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; + }; + }; + "pg-pool-3.2.1" = { + name = "pg-pool"; + packageName = "pg-pool"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz"; + sha512 = "BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA=="; + }; + }; + "pg-protocol-1.2.5" = { + name = "pg-protocol"; + packageName = "pg-protocol"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.5.tgz"; + sha512 = "1uYCckkuTfzz/FCefvavRywkowa6M5FohNMF5OjKrqo9PSR8gYc8poVmwwYQaBxhmQdBjhtP514eXy9/Us2xKg=="; + }; + }; + "pg-types-2.2.0" = { + name = "pg-types"; + packageName = "pg-types"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; + sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; + }; + }; + "pgpass-1.0.2" = { + name = "pgpass"; + packageName = "pgpass"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz"; + sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; + }; + }; "phantomjs-prebuilt-2.1.16" = { name = "phantomjs-prebuilt"; packageName = "phantomjs-prebuilt"; @@ -34842,22 +36579,22 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-6.4.0" = { + "pino-6.6.1" = { name = "pino"; packageName = "pino"; - version = "6.4.0"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.4.0.tgz"; - sha512 = "TRDp5fJKRBtVlxd4CTox3rJL+TzwQztB/VNmT5n87zFgKVU7ztnmZkcX1zypPP+3ZZcveOTYKJy74UXdVBaXFQ=="; + url = "https://registry.npmjs.org/pino/-/pino-6.6.1.tgz"; + sha512 = "DOgm7rn6ctBkBYemHXSLj7+j3o3U1q1FWBXbHcprur8mA93QcJSycEkEqhqKiFB9Mx/3Qld2FGr6+9yfQza0kA=="; }; }; - "pino-std-serializers-2.4.2" = { + "pino-std-serializers-2.5.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.4.2.tgz"; - sha512 = "WaL504dO8eGs+vrK+j4BuQQq6GLKeCCcHaMB2ItygzVURcL1CycwNEUHTD/lHFHs/NL5qAz2UKrjYWXKSf4aMQ=="; + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.5.0.tgz"; + sha512 = "wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg=="; }; }; "pipe-functions-1.3.0" = { @@ -35112,13 +36849,13 @@ let sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; - "polished-3.6.5" = { + "polished-3.6.7" = { name = "polished"; packageName = "polished"; - version = "3.6.5"; + version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.6.5.tgz"; - sha512 = "VwhC9MlhW7O5dg/z7k32dabcAFW1VI2+7fSe8cE/kXcfL7mVdoa5UxciYGW2sJU78ldDLT6+ROEKIZKFNTnUXQ=="; + url = "https://registry.npmjs.org/polished/-/polished-3.6.7.tgz"; + sha512 = "b4OViUOihwV0icb9PHmWbR+vPqaSzSAEbgLskvb7ANPATVXGiYv/TQFHQo65S53WU9i5EQ1I03YDOJW7K0bmYg=="; }; }; "portfinder-1.0.28" = { @@ -35185,13 +36922,22 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; - "postcss-calc-7.0.2" = { + "postcss-7.0.34" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.34"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz"; + sha512 = "H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw=="; + }; + }; + "postcss-calc-7.0.4" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz"; - sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.4.tgz"; + sha512 = "0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw=="; }; }; "postcss-colormin-4.0.3" = { @@ -35293,13 +37039,13 @@ let sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; }; }; - "postcss-load-config-2.1.0" = { + "postcss-load-config-2.1.1" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; - sha512 = "4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q=="; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.1.tgz"; + sha512 = "D2ENobdoZsW0+BHy4x1CAkXtbXtYWYRIxL/JbtRBqrRGOPtJ2zoga/bEZWhV/ShWB5saVxJMzbMdSyA/vv4tXw=="; }; }; "postcss-markdown-0.36.0" = { @@ -35374,6 +37120,15 @@ let sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; + "postcss-modules-3.2.2" = { + name = "postcss-modules"; + packageName = "postcss-modules"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-3.2.2.tgz"; + sha512 = "JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw=="; + }; + }; "postcss-modules-extract-imports-1.1.0" = { name = "postcss-modules-extract-imports"; packageName = "postcss-modules-extract-imports"; @@ -35383,6 +37138,15 @@ let sha1 = "b614c9720be6816eaee35fb3a5faa1dba6a05ddb"; }; }; + "postcss-modules-extract-imports-2.0.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"; + sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; + }; + }; "postcss-modules-local-by-default-1.2.0" = { name = "postcss-modules-local-by-default"; packageName = "postcss-modules-local-by-default"; @@ -35392,6 +37156,15 @@ let sha1 = "f7d80c398c5a393fa7964466bd19500a7d61c069"; }; }; + "postcss-modules-local-by-default-3.0.3" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; + sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="; + }; + }; "postcss-modules-scope-1.1.0" = { name = "postcss-modules-scope"; packageName = "postcss-modules-scope"; @@ -35401,6 +37174,15 @@ let sha1 = "d6ea64994c79f97b62a72b426fbe6056a194bb90"; }; }; + "postcss-modules-scope-2.2.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; + }; + }; "postcss-modules-values-1.3.0" = { name = "postcss-modules-values"; packageName = "postcss-modules-values"; @@ -35410,6 +37192,15 @@ let sha1 = "ecffa9d7e192518389f42ad0e83f72aec456ea20"; }; }; + "postcss-modules-values-3.0.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; + sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; + }; + }; "postcss-normalize-charset-4.0.1" = { name = "postcss-normalize-charset"; packageName = "postcss-normalize-charset"; @@ -35617,6 +37408,15 @@ let sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; + "postcss-selector-parser-6.0.3" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.3.tgz"; + sha512 = "0ClFaY4X1ra21LRqbW6y3rUbWcxnSVkDFG57R7Nxus9J9myPFlv+jYDMohzpkBx0RrjjiqjtycpchQ+PLGmZ9w=="; + }; + }; "postcss-svgo-4.0.2" = { name = "postcss-svgo"; packageName = "postcss-svgo"; @@ -35662,6 +37462,51 @@ let sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; + "postcss-values-parser-1.5.0" = { + name = "postcss-values-parser"; + packageName = "postcss-values-parser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz"; + sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ=="; + }; + }; + "postgres-array-2.0.0" = { + name = "postgres-array"; + packageName = "postgres-array"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; + sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; + }; + }; + "postgres-bytea-1.0.0" = { + name = "postgres-bytea"; + packageName = "postgres-bytea"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; + sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + }; + }; + "postgres-date-1.0.7" = { + name = "postgres-date"; + packageName = "postgres-date"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; + sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; + }; + }; + "postgres-interval-1.2.0" = { + name = "postgres-interval"; + packageName = "postgres-interval"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; + sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; + }; + }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -35671,13 +37516,13 @@ let sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw=="; }; }; - "posthtml-0.13.1" = { + "posthtml-0.13.3" = { name = "posthtml"; packageName = "posthtml"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.13.1.tgz"; - sha512 = "8aJZ63WYL9YsAZVcrIn6U0dSYbna7hcTceZjnbH7dilg01t4t3JDx0UovbhGFscFJg/++qhECCjGEQuJAqD7dA=="; + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.13.3.tgz"; + sha512 = "5NL2bBc4ihAyoYnY0EAQrFQbJNE1UdvgC1wjYts0hph7jYeU2fa5ki3/9U45ce9V6M1vLMEgUX2NXe/bYL+bCQ=="; }; }; "posthtml-parser-0.4.2" = { @@ -35689,6 +37534,15 @@ let sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg=="; }; }; + "posthtml-parser-0.5.0" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.0.tgz"; + sha512 = "BsZFAqOeX9lkJJPKG2JmGgtm6t++WibU7FeS40FNNGZ1KS2szRSRQ8Wr2JLvikDgAecrQ/9V4sjugTAin2+KVw=="; + }; + }; "posthtml-render-1.2.3" = { name = "posthtml-render"; packageName = "posthtml-render"; @@ -35707,6 +37561,15 @@ let sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g=="; }; }; + "precinct-6.3.1" = { + name = "precinct"; + packageName = "precinct"; + version = "6.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/precinct/-/precinct-6.3.1.tgz"; + sha512 = "JAwyLCgTylWminoD7V0VJwMElWmwrVSR6r9HaPWCoswkB4iFzX7aNtO7VBfAVPy+NhmjKb8IF8UmlWJXzUkOIQ=="; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -35779,6 +37642,15 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; + "prettier-2.1.2" = { + name = "prettier"; + packageName = "prettier"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz"; + sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="; + }; + }; "prettier-bytes-1.0.4" = { name = "prettier-bytes"; packageName = "prettier-bytes"; @@ -35797,6 +37669,15 @@ let sha512 = "TtYxuFUMVxudJTSnPScaBqHZm/48ndvX3KLFzhejJYbRzRybmM9RdBfn9YzgN0itfPrYxCesIZGJqyXXZJOR2w=="; }; }; + "prettier-eslint-11.0.0" = { + name = "prettier-eslint"; + packageName = "prettier-eslint"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-11.0.0.tgz"; + sha512 = "ACjL7T8m10HCO7DwYdXwhNWuZzQv86JkZAhVpzFV9brTMWi3i6LhqoELFaXf6RetDngujz89tnbDmGyvDl+rzA=="; + }; + }; "prettier-eslint-8.8.2" = { name = "prettier-eslint"; packageName = "prettier-eslint"; @@ -35806,15 +37687,6 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-eslint-9.0.2" = { - name = "prettier-eslint"; - packageName = "prettier-eslint"; - version = "9.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-9.0.2.tgz"; - sha512 = "u6EQqxUhaGfra9gy9shcR7MT7r/2twwEfRGy1tfzyaJvLQwSg34M9IU5HuF7FsLW2QUgr5VIUc56EPWibw1pdw=="; - }; - }; "prettier-stylelint-0.4.2" = { name = "prettier-stylelint"; packageName = "prettier-stylelint"; @@ -35833,13 +37705,13 @@ let sha512 = "urhX7U/F+fu8sztEs/Z7CxNS8PdEytEwGKhQaH5fxxCdRmHGT45FoClyDlcZrMk9cK/8JpX/asFmTOHtSGJfLg=="; }; }; - "pretty-bytes-5.3.0" = { + "pretty-bytes-5.4.1" = { name = "pretty-bytes"; packageName = "pretty-bytes"; - version = "5.3.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha512 = "hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="; + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; + sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA=="; }; }; "pretty-format-23.6.0" = { @@ -35851,6 +37723,15 @@ let sha512 = "zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw=="; }; }; + "pretty-format-24.9.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz"; + sha512 = "00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA=="; + }; + }; "pretty-hash-1.0.1" = { name = "pretty-hash"; packageName = "pretty-hash"; @@ -35869,6 +37750,15 @@ let sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; + "pretty-ms-5.1.0" = { + name = "pretty-ms"; + packageName = "pretty-ms"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-5.1.0.tgz"; + sha512 = "4gaK1skD2gwscCfkswYQRmddUb2GJZtzDGRjHWadVHtK/DIKFufa12MvES6/xu1tVbUYeia5bmLcwJtZJQUqnw=="; + }; + }; "prettyjson-1.2.1" = { name = "prettyjson"; packageName = "prettyjson"; @@ -35923,13 +37813,13 @@ let sha512 = "dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw=="; }; }; - "prismjs-1.20.0" = { + "prismjs-1.21.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz"; - sha512 = "AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.21.0.tgz"; + sha512 = "uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw=="; }; }; "private-0.1.8" = { @@ -36076,15 +37966,6 @@ let sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; }; }; - "promise-deferred-2.0.3" = { - name = "promise-deferred"; - packageName = "promise-deferred"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-deferred/-/promise-deferred-2.0.3.tgz"; - sha512 = "n10XaoznCzLfyPFOlEE8iurezHpxrYzyjgq/1eW9Wk1gJwur/N7BdBmjJYJpqMeMcXK4wEbzo2EvZQcqjYcKUQ=="; - }; - }; "promise-inflight-1.0.1" = { name = "promise-inflight"; packageName = "promise-inflight"; @@ -36139,13 +38020,13 @@ let sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg=="; }; }; - "promiseback-2.0.3" = { - name = "promiseback"; - packageName = "promiseback"; - version = "2.0.3"; + "promise.prototype.finally-3.1.2" = { + name = "promise.prototype.finally"; + packageName = "promise.prototype.finally"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/promiseback/-/promiseback-2.0.3.tgz"; - sha512 = "VZXdCwS0ppVNTIRfNsCvVwJAaP2b+pxQF7lM8DMWfmpNWyTxB6O5YNbzs+8z0ki/KIBHKHk308NTIl4kJUem3w=="; + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz"; + sha512 = "A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA=="; }; }; "promised-temp-0.1.0" = { @@ -36274,13 +38155,13 @@ let sha512 = "SmjEuAf3hc3h3rWZ6V1YaaQw2MNJWK848gLJgzx/sefOJdNLujKinJVXIS0q2cBQpQn2Q32TinawZyDZPzm4kQ=="; }; }; - "protocols-1.4.7" = { + "protocols-1.4.8" = { name = "protocols"; packageName = "protocols"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/protocols/-/protocols-1.4.7.tgz"; - sha512 = "Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg=="; + url = "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz"; + sha512 = "IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg=="; }; }; "protoduck-5.0.1" = { @@ -36337,15 +38218,6 @@ let sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56"; }; }; - "prr-0.0.0" = { - name = "prr"; - packageName = "prr"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; - sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; - }; - }; "prr-1.0.1" = { name = "prr"; packageName = "prr"; @@ -36463,6 +38335,15 @@ let sha512 = "qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ=="; }; }; + "pug-error-2.0.0" = { + name = "pug-error"; + packageName = "pug-error"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz"; + sha512 = "sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ=="; + }; + }; "pug-filters-3.1.1" = { name = "pug-filters"; packageName = "pug-filters"; @@ -36481,6 +38362,15 @@ let sha512 = "i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA=="; }; }; + "pug-lexer-5.0.0" = { + name = "pug-lexer"; + packageName = "pug-lexer"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.0.tgz"; + sha512 = "52xMk8nNpuyQ/M2wjZBN5gXQLIylaGkAoTk5Y1pBhVqaopaoj8Z0iVzpbFZAqitL4RHNVDZRnJDsqEYe99Ti0A=="; + }; + }; "pug-linker-3.0.6" = { name = "pug-linker"; packageName = "pug-linker"; @@ -37345,13 +39235,13 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "querystringify-2.1.1" = { + "querystringify-2.2.0" = { name = "querystringify"; packageName = "querystringify"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; - sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"; + sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; }; }; "queue-4.5.1" = { @@ -37525,6 +39415,15 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; + "random-item-3.0.0" = { + name = "random-item"; + packageName = "random-item"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-item/-/random-item-3.0.0.tgz"; + sha512 = "IpO3Jk9/Dt79R7iS/Fn2d2asGXahMNnXLNRsgSmjTTtiS0tZ972BWEEm9uUgm3YAon5YFUt8126FA9wJAjmeZw=="; + }; + }; "random-iterate-1.0.1" = { name = "random-iterate"; packageName = "random-iterate"; @@ -37687,6 +39586,15 @@ let sha512 = "YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w=="; }; }; + "react-devtools-core-4.8.2" = { + name = "react-devtools-core"; + packageName = "react-devtools-core"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.8.2.tgz"; + sha512 = "3Lv3nI8FPAwKqUco35oOlgf+4j8mgYNnIcDv2QTfxEqg2G69q17ZJ8ScU9aBnymS28YC1OW+kTxLmdIQeTN8yg=="; + }; + }; "react-dom-16.13.1" = { name = "react-dom"; packageName = "react-dom"; @@ -37696,13 +39604,22 @@ let sha512 = "81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag=="; }; }; - "react-dropdown-aria-2.0.7" = { - name = "react-dropdown-aria"; - packageName = "react-dropdown-aria"; - version = "2.0.7"; + "react-dropdown-1.8.0" = { + name = "react-dropdown"; + packageName = "react-dropdown"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-dropdown-aria/-/react-dropdown-aria-2.0.7.tgz"; - sha512 = "wRjmmMUmA/q33ZugY0lTka4b6jY1ehp8qgHG2yeda64z5I0gTOtyxUVI/tA9ZBlBqysDN22hMGHNMnPb2sg+Qw=="; + url = "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.8.0.tgz"; + sha512 = "B1vkFk2vkUOf5JFd+Gk8yJdZkSoE4F689Lb93vc0pLcu6cabqlGMYgIzLJuzT+BMy7guk+OXbLDs0pMX8BvEbw=="; + }; + }; + "react-hot-loader-4.12.21" = { + name = "react-hot-loader"; + packageName = "react-hot-loader"; + version = "4.12.21"; + src = fetchurl { + url = "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.21.tgz"; + sha512 = "Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA=="; }; }; "react-is-16.13.1" = { @@ -37714,6 +39631,15 @@ let sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; }; + "react-lifecycles-compat-3.0.4" = { + name = "react-lifecycles-compat"; + packageName = "react-lifecycles-compat"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; + sha512 = "fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="; + }; + }; "react-reconciler-0.24.0" = { name = "react-reconciler"; packageName = "react-reconciler"; @@ -37795,22 +39721,22 @@ let sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "read-package-json-2.1.1" = { + "read-package-json-2.1.2" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz"; - sha512 = "dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz"; + sha512 = "D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA=="; }; }; - "read-package-json-fast-1.1.3" = { + "read-package-json-fast-1.2.1" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; - version = "1.1.3"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.1.3.tgz"; - sha512 = "MmFqiyfCXV2Dmm4jH24DEGhxdkUDFivJQj4oPZQPOKywxR7HWBE6WnMWDAapfFHi3wm1b+mhR+XHlUH0CL8axg=="; + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.1.tgz"; + sha512 = "OFbpwnHcv74Oa5YN5WvbOBfLw6yPmPcwvyJJw/tj9cWFBF7juQUDLDSZiOjEcgzfweWeeROOmbPpNN1qm4hcRg=="; }; }; "read-package-tree-5.3.1" = { @@ -37975,6 +39901,15 @@ let sha512 = "+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="; }; }; + "readdir-glob-1.0.0" = { + name = "readdir-glob"; + packageName = "readdir-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.0.0.tgz"; + sha512 = "km0DIcwQVZ1ZUhXhMWpF74/Wm5aFEd5/jDiVWF1Hkw2myPQovG8vCQ8+FQO2KXE9npQQvCnAMZhhWuUee4WcCQ=="; + }; + }; "readdir-scoped-modules-1.1.0" = { name = "readdir-scoped-modules"; packageName = "readdir-scoped-modules"; @@ -37993,13 +39928,13 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.3.0" = { + "readdirp-3.2.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.3.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; - sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; "readdirp-3.4.0" = { @@ -38056,6 +39991,15 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; + "recast-0.17.2" = { + name = "recast"; + packageName = "recast"; + version = "0.17.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.17.2.tgz"; + sha512 = "YHFvn4rBXl8eIjALjUiOV/AP3xFpyGNGNHDw9mAncAWuIdgnBKjbZQ9+P3VlsKcNaNapRVFlTEX1dvDRlYwyxg=="; + }; + }; "recast-0.18.10" = { name = "recast"; packageName = "recast"; @@ -38065,13 +40009,13 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; - "recast-0.19.1" = { + "recast-0.20.3" = { name = "recast"; packageName = "recast"; - version = "0.19.1"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.19.1.tgz"; - sha512 = "8FCjrBxjeEU2O6I+2hyHyBFH1siJbMBLwIRvVr1T3FD2cL754sOaJDsJ/8h3xYltasbJ8jqWRIhMuDGBSiSbjw=="; + url = "https://registry.npmjs.org/recast/-/recast-0.20.3.tgz"; + sha512 = "jrEPzRV5B7wfRiN0UYMtjgIx1Hp8MRHdLcMYqMNd0DoOe1CB5JmPL/04I7WPuuApCs7LCSisYK/FfKnPEaJrzw=="; }; }; "rechoir-0.6.2" = { @@ -38146,13 +40090,13 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; - "redoc-2.0.0-rc.36" = { + "redoc-2.0.0-rc.8-1" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.36"; + version = "2.0.0-rc.8-1"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.36.tgz"; - sha512 = "vTK1slMn1FcV4QwiBxFL6adIzYoOPzrkRsVyedGj4SrqjIJXuQ5HWVsxpMGoru45tgp3bs7Jy3TBOcEdOYjbbg=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.8-1.tgz"; + sha512 = "/YoCdcl2QtveKz4CTXaqtOfCIaVgZZgcnfUNC5xK7xBl/LxTiNj3tUbgFmrYMLTZGzNdQ9TUJpsa7lXDKcr8Pw=="; }; }; "reduce-component-1.0.1" = { @@ -38182,13 +40126,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "reftools-1.1.4" = { + "reftools-1.1.6" = { name = "reftools"; packageName = "reftools"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/reftools/-/reftools-1.1.4.tgz"; - sha512 = "Y8VEk3OXPwuU+ZAAPiR0YhYy9iBSO3NBRnXHGfqW6c2mo2V+fQ0cwRA38Ny6z9ZzcAo6HjmVvAri+wz3+8fsdQ=="; + url = "https://registry.npmjs.org/reftools/-/reftools-1.1.6.tgz"; + sha512 = "rQfJ025lvPjw9qyQuNPqE+cRs5qVs7BMrZwgRJnmuMcX/8r/eJE8f5/RCunJWViXKHmN5K2DFafYzglLOHE/tw=="; }; }; "regenerate-1.4.1" = { @@ -38299,13 +40243,13 @@ let sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; }; }; - "regexpu-core-4.7.0" = { + "regexpu-core-4.7.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; }; "registry-auth-token-3.3.2" = { @@ -38371,13 +40315,13 @@ let sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; }; }; - "rehype-parse-6.0.2" = { + "rehype-parse-7.0.1" = { name = "rehype-parse"; packageName = "rehype-parse"; - version = "6.0.2"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.2.tgz"; - sha512 = "0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug=="; + url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-7.0.1.tgz"; + sha512 = "fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw=="; }; }; "rehype-retext-2.0.4" = { @@ -38488,6 +40432,15 @@ let sha512 = "fM5eZPBvu2pVNoq3ZPW22q+5Ativ1oLozq2qYt9I2oNyxiUd/tDl0iLLntEVAegpZIslPWg1brhcP1VsaSVUag=="; }; }; + "remark-frontmatter-2.0.0" = { + name = "remark-frontmatter"; + packageName = "remark-frontmatter"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-2.0.0.tgz"; + sha512 = "uNOQt4tO14qBFWXenF0MLC4cqo3dv8qiHPGyjCl1rwOT0LomSHpcElbjjVh5CwzElInB38HD8aSRVugKQjeyHA=="; + }; + }; "remark-html-2.0.2" = { name = "remark-html"; packageName = "remark-html"; @@ -38497,13 +40450,22 @@ let sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; }; }; - "remark-message-control-5.0.0" = { + "remark-mdx-2.0.0-next.8" = { + name = "remark-mdx"; + packageName = "remark-mdx"; + version = "2.0.0-next.8"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.8.tgz"; + sha512 = "mjP0yo6BgjYrx5a+gKWYRFWbGnRiWi4Fdf17xGCr9VkSMnG4Dyo06spqbaLfHwl0KkQ/RQZlR2sn1mKnYduJdw=="; + }; + }; + "remark-message-control-6.0.0" = { name = "remark-message-control"; packageName = "remark-message-control"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-5.0.0.tgz"; - sha512 = "JQYGtMoMP2gUWzoR1rFU4GEr4HAieoDlD1jmwEYP82bnmHFPv2AK6ImVwFcrB4DcCFCM6bFBTOWMLzt06cz5vA=="; + url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-6.0.0.tgz"; + sha512 = "k9bt7BYc3G7YBdmeAhvd3VavrPa/XlKWR3CyHjr4sLO9xJyly8WHHT3Sp+8HPR8lEUv+/sZaffL7IjMLV0f6BA=="; }; }; "remark-parse-1.1.0" = { @@ -38542,22 +40504,22 @@ let sha512 = "QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg=="; }; }; - "remark-parse-7.0.2" = { + "remark-parse-8.0.3" = { name = "remark-parse"; packageName = "remark-parse"; - version = "7.0.2"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-7.0.2.tgz"; - sha512 = "9+my0lQS80IQkYXsMA8Sg6m9QfXYJBnXjWYN5U+kFc5/n69t+XZVXU/ZBYr3cYH8FheEGf1v87rkFDhJ8bVgMA=="; + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz"; + sha512 = "E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q=="; }; }; - "remark-retext-3.1.3" = { + "remark-retext-4.0.0" = { name = "remark-retext"; packageName = "remark-retext"; - version = "3.1.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-retext/-/remark-retext-3.1.3.tgz"; - sha512 = "UujXAm28u4lnUvtOZQFYfRIhxX+auKI9PuA2QpQVTT7gYk1OgX6o0OUrSo1KOa6GNrFX+OODOtS5PWIHPxM7qw=="; + url = "https://registry.npmjs.org/remark-retext/-/remark-retext-4.0.0.tgz"; + sha512 = "cYCchalpf25bTtfXF24ribYvqytPKq0TiEhqQDBHvVEEsApebwruPWP1cTcvTFBidmpXyqzycm+y8ng7Kmvc8Q=="; }; }; "remark-stringify-1.1.0" = { @@ -38587,6 +40549,24 @@ let sha512 = "eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg=="; }; }; + "remark-stringify-8.1.1" = { + name = "remark-stringify"; + packageName = "remark-stringify"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz"; + sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; + }; + }; + "remote-git-tags-3.0.0" = { + name = "remote-git-tags"; + packageName = "remote-git-tags"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz"; + sha512 = "C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w=="; + }; + }; "remove-array-items-1.1.1" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -38839,6 +40819,15 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; + "require-package-name-2.0.1" = { + name = "require-package-name"; + packageName = "require-package-name"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz"; + sha1 = "c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"; + }; + }; "require-relative-0.8.7" = { name = "require-relative"; packageName = "require-relative"; @@ -38857,15 +40846,6 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "requireg-0.2.2" = { - name = "requireg"; - packageName = "requireg"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/requireg/-/requireg-0.2.2.tgz"; - sha512 = "nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg=="; - }; - }; "requirejs-2.3.6" = { name = "requirejs"; packageName = "requirejs"; @@ -38902,13 +40882,13 @@ let sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; - "resolve-1.7.1" = { + "resolve-2.0.0-next.1" = { name = "resolve"; packageName = "resolve"; - version = "1.7.1"; + version = "2.0.0-next.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz"; - sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.1.tgz"; + sha512 = "ZGTmuLZAW++TDjgslfUMRZcv7kXHv8z0zwxvuRWOPjnqc56HVsn1lVaqsWOZeQ8MwiilPVJLrcPVKG909QsAfA=="; }; }; "resolve-alpn-1.0.0" = { @@ -39118,22 +41098,22 @@ let sha512 = "yr1PgaBDde+25aJXrnt3p1jvT8FVLVat2Bx8XeAWX13KXo8OT+3nWGU3HWxM4YFJvmfqvJYJZG2d7xxaO774gw=="; }; }; - "retext-equality-4.3.0" = { + "retext-equality-5.2.0" = { name = "retext-equality"; packageName = "retext-equality"; - version = "4.3.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/retext-equality/-/retext-equality-4.3.0.tgz"; - sha512 = "jW+6X5BrxVEaZ71qLIaqK6/Y+jqlxijVOcPH2SdHtNaMIHJWvBf5fd1IgHmEp0UREth0YQSI7KNtJurrSPQyMA=="; + url = "https://registry.npmjs.org/retext-equality/-/retext-equality-5.2.0.tgz"; + sha512 = "qfyDsVvwI6RsbyBi5GDRnutDbRMQj5zzK5oVg6ddKhONle2ZmQ/DBg9mz9QLKdnGhp8aW5xoVskXgwHufSQa3g=="; }; }; - "retext-profanities-5.0.0" = { + "retext-profanities-6.1.0" = { name = "retext-profanities"; packageName = "retext-profanities"; - version = "5.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-5.0.0.tgz"; - sha512 = "zaPCKtrMDLs0U/2yN3V3rpYn1VZ3hW+AsEZdovWIRlEYZPCaUmkChOSob45LOQYJUnM+YZIahXuU9zHPm+aTKQ=="; + url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-6.1.0.tgz"; + sha512 = "40Ym0WOgy7rRY4tR2iL01g3Y5Ql+9NBV21hycIhNX3uv+6vjaWB30NWN+tTcxNIWBJEwXHoTDMiVdAMm6ZpHVA=="; }; }; "rethinkdb-2.4.2" = { @@ -39361,13 +41341,13 @@ let sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c"; }; }; - "roarr-2.15.3" = { + "roarr-2.15.4" = { name = "roarr"; packageName = "roarr"; - version = "2.15.3"; + version = "2.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz"; - sha512 = "AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA=="; + url = "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz"; + sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; }; "rollup-1.32.1" = { @@ -39379,13 +41359,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.23.0" = { + "rollup-2.28.1" = { name = "rollup"; packageName = "rollup"; - version = "2.23.0"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.23.0.tgz"; - sha512 = "vLNmZFUGVwrnqNAJ/BvuLk1MtWzu4IuoqsH9UWK5AIdO3rt8/CSiJNvPvCIvfzrbNsqKbNzPAG1V2O4eTe2XZg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; + sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39586,6 +41566,15 @@ let sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; + "rw-1.3.3" = { + name = "rw"; + packageName = "rw"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz"; + sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4"; + }; + }; "rwlock-5.0.0" = { name = "rwlock"; packageName = "rwlock"; @@ -39676,6 +41665,15 @@ let sha512 = "BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg=="; }; }; + "rxjs-6.6.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz"; + sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; + }; + }; "s.color-0.0.13" = { name = "s.color"; packageName = "s.color"; @@ -39757,6 +41755,15 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; + "safe-join-0.1.3" = { + name = "safe-join"; + packageName = "safe-join"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-join/-/safe-join-0.1.3.tgz"; + sha512 = "Ylh1EWn4pmL57HRV/oi4Ye7ws5AxKkdGpyDdWsvZob5VLH8xnQpG8tqmHD5v4SdKlN7hyrBjYt7Jm3faeC+uJg=="; + }; + }; "safe-json-stringify-1.2.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; @@ -39820,13 +41827,22 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-formatter-0.4.13" = { + "sass-1.26.11" = { + name = "sass"; + packageName = "sass"; + version = "1.26.11"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.26.11.tgz"; + sha512 = "W1l/+vjGjIamsJ6OnTe0K37U2DBO/dgsv2Z4c89XQ8ZOO6l/VwkqwLSqoYzJeJs6CLuGSTRWc91GbQFL3lvrvw=="; + }; + }; + "sass-formatter-0.4.15" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.13"; + version = "0.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.13.tgz"; - sha512 = "EhNMkRZSZHcHrg/w0XgBoW96pcY11SBJ69mCI2S3Eo2sce2CSd66AqxAS05eC8yoc4BVg/Fr2KZty5B3gt6xGw=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.15.tgz"; + sha512 = "EpjwQsya8DmefZawi1sNoCjKw6IGE4z18h9lKd0QPgoGGkis8nqK+mfCMS4B8OaEa0To//71yQyGV1OW1/t60g=="; }; }; "sax-0.5.8" = { @@ -39910,6 +41926,15 @@ let sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; }; }; + "schema-utils-2.7.1" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; + sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; + }; + }; "scoped-regex-1.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -39991,13 +42016,13 @@ let sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; }; }; - "selfsigned-1.10.7" = { + "selfsigned-1.10.8" = { name = "selfsigned"; packageName = "selfsigned"; - version = "1.10.7"; + version = "1.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; - sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz"; + sha512 = "2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w=="; }; }; "semaphore-async-await-1.5.1" = { @@ -40027,6 +42052,15 @@ let sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; }; }; + "semver-4.3.2" = { + name = "semver"; + packageName = "semver"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz"; + sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; + }; + }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -40090,15 +42124,6 @@ let sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; }; }; - "semver-5.5.1" = { - name = "semver"; - packageName = "semver"; - version = "5.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz"; - sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="; - }; - }; "semver-5.7.1" = { name = "semver"; packageName = "semver"; @@ -40198,15 +42223,6 @@ let sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; - "semver-regex-2.0.0" = { - name = "semver-regex"; - packageName = "semver-regex"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz"; - sha512 = "mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw=="; - }; - }; "semver-truncate-1.1.2" = { name = "semver-truncate"; packageName = "semver-truncate"; @@ -40297,15 +42313,6 @@ let sha1 = "ae02af3a424793d8ccbf212d69174e0c54dffe38"; }; }; - "sequencify-0.0.7" = { - name = "sequencify"; - packageName = "sequencify"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"; - sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; - }; - }; "serialize-error-7.0.1" = { name = "serialize-error"; packageName = "serialize-error"; @@ -40315,15 +42322,6 @@ let sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; }; }; - "serialize-javascript-3.1.0" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz"; - sha512 = "JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg=="; - }; - }; "serialize-javascript-4.0.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; @@ -40333,6 +42331,15 @@ let sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; }; }; + "serialize-javascript-5.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + }; + }; "serialize-to-js-3.1.1" = { name = "serialize-to-js"; packageName = "serialize-to-js"; @@ -40738,13 +42745,13 @@ let sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; }; }; - "side-channel-1.0.2" = { + "side-channel-1.0.3" = { name = "side-channel"; packageName = "side-channel"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.2.tgz"; - sha512 = "7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA=="; + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz"; + sha512 = "A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g=="; }; }; "sift-7.0.1" = { @@ -40765,13 +42772,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-2.0.6" = { + "sign-addon-3.1.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "2.0.6"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.6.tgz"; - sha512 = "/8SQPNCrrZKMthdDf1IfI4XMbq8k9YsiiMyVeQL8xhhQSsZho6ZvEUBFSA70N0eznLZyab3k1d2CNOchYRYA6Q=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.1.0.tgz"; + sha512 = "zZ7nKc5/3QWM3skYBosGDvYQf2jkKhW2u8BELrZoN1wgCSOnwsV9T47Vx9uaNbA3CyZ+V9XSA0tDVHoV1QfVPw=="; }; }; "signal-exit-3.0.3" = { @@ -40846,6 +42853,15 @@ let sha512 = "xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg=="; }; }; + "simple-git-2.20.1" = { + name = "simple-git"; + packageName = "simple-git"; + version = "2.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.20.1.tgz"; + sha512 = "aa9s2ZLjXlHCVGbDXQLInMLvLkxKEclqMU9X5HMXi3tLWLxbWObz1UgtyZha6ocHarQtFp0OjQW9KHVR1g6wbA=="; + }; + }; "simple-git-2.5.0" = { name = "simple-git"; packageName = "simple-git"; @@ -41206,22 +43222,31 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-config-3.1.0" = { + "snyk-config-3.1.1" = { name = "snyk-config"; packageName = "snyk-config"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.1.0.tgz"; - sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.1.1.tgz"; + sha512 = "wwrMIEDozfLJ8LmakCsCC1FQ0siIX5icCQPCbUKKgRbeVsZ27NjPJs37BpTXX4rcHkaWpe8TbH3yOtp23qmszg=="; }; }; - "snyk-docker-plugin-3.16.0" = { + "snyk-cpp-plugin-1.5.0" = { + name = "snyk-cpp-plugin"; + packageName = "snyk-cpp-plugin"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.5.0.tgz"; + sha512 = "nBZ0cBmpT4RVJUFzYydQJOxwjcdXk7NtRJE1UIIOafQa2FcvIl3GBezfrCJ6pu61svOAf5r8Qi/likx6F15K1A=="; + }; + }; + "snyk-docker-plugin-3.21.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.16.0"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.16.0.tgz"; - sha512 = "i11WxMhsZxcFKn123LeA+u77NN7uWqWgPfQ6dvkACJnvouWHZidkOAxBOmYU49x8VS7dEQSe2Ym0bgr6EHn4cQ=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.21.0.tgz"; + sha512 = "A7oJS3QGR7bwm1qeeczCb8PDfi8go1KM6VWph/drJHBQ7JxVKKLb3j4AzrMmIM96mGZFbmyNOL4pznwumaOM8g=="; }; }; "snyk-go-parser-1.4.1" = { @@ -41233,22 +43258,22 @@ let sha512 = "StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w=="; }; }; - "snyk-go-plugin-1.16.0" = { + "snyk-go-plugin-1.16.2" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.16.0"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.16.0.tgz"; - sha512 = "XNGHEFyP+pCzcqmXnj5T/1Oy6AZzm2WkTSuUpohWQ/09ecMRCCv2yrr/kwMQemrKN4+7CoJS/9xfm3GnNlzVHA=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.16.2.tgz"; + sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q=="; }; }; - "snyk-gradle-plugin-3.5.1" = { + "snyk-gradle-plugin-3.6.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.5.1"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.5.1.tgz"; - sha512 = "8tZwQCqRbjp1azvc+bBRXSbn2AjbUpFAM6qoSpM/IZpfGl1RaOtz4/JTkGFxj+iBhTFoAkGxEunT66eO0pHZZw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.6.3.tgz"; + sha512 = "j/eQSLSsK3DHmvVX2fNig4+ugYrKlCOV8Xvo6OYFkNzhMpdyNFiGWTS1uyP1HH75Gyc78MaLANMgjlSYePukzQ=="; }; }; "snyk-module-1.9.1" = { @@ -41278,40 +43303,31 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.18.2" = { + "snyk-mvn-plugin-2.19.4" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.18.2"; + version = "2.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.18.2.tgz"; - sha512 = "A36YmfpeEXGsKoChm644DysKG40d5y5MZnldkpsbrLz37R3JMxkt4igMACZ9QJZAkiWjVs28hOKyyT1vuMPlHg=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.19.4.tgz"; + sha512 = "kYPUKOugnNd31PFqx1YHJTo90pospELYHME4AzBx8dkMDgs5ZPjAmQXSxegQ3AMUqfqcETMSTzlKHe6uHujI8A=="; }; }; - "snyk-nodejs-lockfile-parser-1.22.0" = { + "snyk-nodejs-lockfile-parser-1.28.1" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.22.0"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.22.0.tgz"; - sha512 = "l6jLoJxqcIIkQopSdQuAstXdMw5AIgLu+uGc5CYpHyw8fYqOwna8rawwofNeGuwJAAv4nEiNiexeYaR88OCq6Q=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.28.1.tgz"; + sha512 = "0zbmtidYLI2ia/DQD4rZm2YKrhfHLvHlVBdF2cMAGPwhOoKW5ovG9eBO4wNQdvjxNi7b4VeUyAj8SfuhjDraDQ=="; }; }; - "snyk-nodejs-lockfile-parser-1.26.3" = { - name = "snyk-nodejs-lockfile-parser"; - packageName = "snyk-nodejs-lockfile-parser"; - version = "1.26.3"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.26.3.tgz"; - sha512 = "mBQ6vhnXAeyMxlnl9amjJWpA+/3qqXwM8Sj/P+9uH2TByOFLxdGzMNQFcl3q/H2yUdcs/epVdXJp09A2dK2glA=="; - }; - }; - "snyk-nuget-plugin-1.18.1" = { + "snyk-nuget-plugin-1.19.3" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.18.1"; + version = "1.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.18.1.tgz"; - sha512 = "Bq+IzbyewxIrUhgdFaDKS5wCNixERC7QBitKsZGM3uCOr9fJM8rr5qg5SS9UIU7eyeKvzuVO/V1yDzjo1cKvUw=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.3.tgz"; + sha512 = "KwKoMumwcXVz/DQH80ifXfX7CTnm29bmHJ2fczjCGohxLGb4EKBGQtA3t7K98O7lTISQGgXDxnWIaM9ZXkxPdw=="; }; }; "snyk-paket-parser-1.6.0" = { @@ -41323,13 +43339,13 @@ let sha512 = "6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q=="; }; }; - "snyk-php-plugin-1.9.0" = { + "snyk-php-plugin-1.9.2" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.9.0"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.0.tgz"; - sha512 = "uORrEoC47dw0ITZYu5vKqQtmXnbbQs+ZkWeo5bRHGdf10W8e4rNr1S1R4bReiLrSbSisYhVHeFMkdOAiLIPJVQ=="; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz"; + sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; }; }; "snyk-policy-1.14.1" = { @@ -41512,13 +43528,13 @@ let sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA=="; }; }; - "socks-2.4.1" = { + "socks-2.4.4" = { name = "socks"; packageName = "socks"; - version = "2.4.1"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.4.1.tgz"; - sha512 = "8mWHeYC1OA0500qzb+sqwm0Hzi8oBpeuI1JugoBVMEJtJvxSgco8xFSK+NRnZcHeeWjTbF82KUDo5sXH22TY5A=="; + url = "https://registry.npmjs.org/socks/-/socks-2.4.4.tgz"; + sha512 = "7LmHN4IHj1Vpd/k8D872VGCHJ6yIVyeFkfIBExRmGPYQ/kdUkpdg9eKh9oOzYYYKQhuxavayJHTnmBG+EzluUA=="; }; }; "socks-proxy-agent-4.0.2" = { @@ -41620,6 +43636,15 @@ let sha512 = "mbkiyA2clyfwAyOFIzMvsV6ny2KrKEIhFVASJxWfsmgfUEymgLIS2MLHHcGIQMkrcKhPErRaMR5Dzv0EEn+BWg=="; }; }; + "sodium-native-3.2.0" = { + name = "sodium-native"; + packageName = "sodium-native"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-3.2.0.tgz"; + sha512 = "8aq/vQSegLwsRch8Sb/Bpf9aAqlNe5dp0+NVhb9UjHv42zDZ0D5zX3wBRUbXK9Ejum9uZE6DUgT4vVLlUFRBWg=="; + }; + }; "sodium-universal-2.0.0" = { name = "sodium-universal"; packageName = "sodium-universal"; @@ -41629,13 +43654,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-1.0.2" = { + "sonic-boom-1.1.0" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.0.2.tgz"; - sha512 = "sRMmXu7uFDXoniGvtLHuQk5KWovLWoi6WKASn7rw0ro41mPf0fOolkGp4NE6680CbxvNh26zWNyFQYYWXe33EA=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.1.0.tgz"; + sha512 = "JyOf+Xt7GBN4tAic/DD1Bitw6OMgSHAnswhPeOiLpfRoSjPNjEIi73UF3OxHzhSNn9WavxGuCZzprFCGFSNwog=="; }; }; "sorcery-0.10.0" = { @@ -41683,13 +43708,13 @@ let sha512 = "e2RHeY1iM6dT9od3RoqeJSyz3O7naNFsGy34+EFEcwghjAncuOXC2/Xwq87S4FbypqLVp6PcizYEsGEGsGIDXA=="; }; }; - "sorted-array-functions-1.2.0" = { + "sorted-array-functions-1.3.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz"; - sha512 = "sWpjPhIZJtqO77GN+LD8dDsDKcWZ9GCOJNqKzi1tvtjGIzwfoyuRH8S0psunmc6Z5P+qfDqztSbwYR5X/e1UTg=="; + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.3.0.tgz"; + sha512 = "2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA=="; }; }; "sorted-immutable-list-1.1.0" = { @@ -41863,13 +43888,13 @@ let sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; }; }; - "spawn-please-0.3.0" = { + "spawn-please-0.4.1" = { name = "spawn-please"; packageName = "spawn-please"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; - sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; + url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.4.1.tgz"; + sha512 = "YJwFL/shPyY5fddOU1XXkShCDNVkMDGKsGlpB91FKOkRGa+pVAe+A5/CUUwLrZ3e89prqbTXaGapCzTlmc3HaA=="; }; }; "spawn-sync-1.0.15" = { @@ -41917,13 +43942,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.5" = { + "spdx-license-ids-3.0.6" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; }; }; "spdy-1.32.5" = { @@ -42097,6 +44122,15 @@ let sha1 = "825236a78d52a18ff912a631ad3034c15ded5fe3"; }; }; + "split2-1.1.1" = { + name = "split2"; + packageName = "split2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-1.1.1.tgz"; + sha1 = "162d9b18865f02ab2f2ad9585522db9b54c481f9"; + }; + }; "split2-2.2.0" = { name = "split2"; packageName = "split2"; @@ -42106,13 +44140,13 @@ let sha512 = "RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw=="; }; }; - "split2-3.1.1" = { + "split2-3.2.2" = { name = "split2"; packageName = "split2"; - version = "3.1.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz"; - sha512 = "emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q=="; + url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; + sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; "sprintf-0.1.5" = { @@ -42151,15 +44185,6 @@ let sha512 = "/0d2YTn8ZFVpIPAU230S9ZLF8WDkSSRWvh/UOLM7zzvkCchum1TtouRgyV8OfgOaYilSGU4lSSqzwBXJVlAwUw=="; }; }; - "sqlite3-4.1.1" = { - name = "sqlite3"; - packageName = "sqlite3"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz"; - sha512 = "CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg=="; - }; - }; "sqlite3-4.2.0" = { name = "sqlite3"; packageName = "sqlite3"; @@ -42169,6 +44194,24 @@ let sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; }; }; + "sqlite3-5.0.0" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.0.tgz"; + sha512 = "rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw=="; + }; + }; + "sqlstring-2.3.1" = { + name = "sqlstring"; + packageName = "sqlstring"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz"; + sha1 = "475393ff9e91479aea62dcaf0ca3d14983a7fb40"; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -42223,13 +44266,13 @@ let sha512 = "UF+4+khFXILLBqtu9HfrpUwYnDXIdAyJe3u9X4GrApuoakxuSKwaUGakUxLPyo6COyV2brMqufUgf+fDOI8Ftw=="; }; }; - "ssb-config-3.4.4" = { + "ssb-config-3.4.5" = { name = "ssb-config"; packageName = "ssb-config"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-config/-/ssb-config-3.4.4.tgz"; - sha512 = "J3fsWb5nS6PqObZLW2tclEz/bkRQ5pcF9goXanYGVsoH71F6W4f5sOnck9szeubI8srNaiL9pa0kPRv/lojHiw=="; + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-3.4.5.tgz"; + sha512 = "DyCrGIsl01GkdHreAkkaDUorV7SAgRSqKn/htg4ZwbvH6g0NAdOi84x/8ehzDuojPev78hbkWjZXgIqi+/Jo0g=="; }; }; "ssb-db-20.3.0" = { @@ -42250,13 +44293,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.2.0" = { + "ssb-friends-4.2.1" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.2.0.tgz"; - sha512 = "X8UewxMCZImUoYX9eNHdym6oFcfEA610iuyn2cGcHtYZre1J2WiKtCLBB2KIjwWZqlOs1mARE+mkVPYnduZy4Q=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.2.1.tgz"; + sha512 = "DgArf97p2MQxOKn9jWmyxA/6HUiyZkk5QFYohS/qo7CAFJzBJobgoJuvEGjzCgszJAZ/WmGwjYTrKTqFHwMEuQ=="; }; }; "ssb-git-0.5.0" = { @@ -42286,13 +44329,13 @@ let sha512 = "lbizlDBCtOOnbnz7zS81NOtnAyHnXu9E3gxrAJHZe7oyxINRI7IpQ8J79to9aXzkb8+2M32R8K4whmsAHGvJAg=="; }; }; - "ssb-invite-2.1.5" = { + "ssb-invite-2.1.6" = { name = "ssb-invite"; packageName = "ssb-invite"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-invite/-/ssb-invite-2.1.5.tgz"; - sha512 = "nihgFMmw+OVz8X/ES47wcfY2at0E9MdSPjHm1yUpG8E5sgORLcdrtOXSRKs6Nd2EXk7FcP49EUr0trUt3G9cFw=="; + url = "https://registry.npmjs.org/ssb-invite/-/ssb-invite-2.1.6.tgz"; + sha512 = "cR2sMFu27K7JNAiHCJ5qsp5kihlxi0/KftJ58gFzQbC8kLQ9iLLFUVDvQMi/Qxubf6Xs37Qh49FH3RzPLGt9ag=="; }; }; "ssb-issues-1.0.0" = { @@ -42457,13 +44500,13 @@ let sha512 = "/QX6+DJkghqq1ZTbgYpOvaI+gx2O7ee1TRUM9yiOlVjh1XAQBevcBj0zO+W3TsNllX86urqBrySd/AEfFfUpIw=="; }; }; - "ssb-ref-2.14.0" = { + "ssb-ref-2.14.2" = { name = "ssb-ref"; packageName = "ssb-ref"; - version = "2.14.0"; + version = "2.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.0.tgz"; - sha512 = "RQfeGpgiRBuJePyG/1wRp2KrPXS9Ue0z/HU/svlECto+EVcQ77tFz9s/KYWKBt2Z7cem03uBrQ2GF/n2Ed+4Ig=="; + url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.2.tgz"; + sha512 = "pPkwNX/Rrr0bV/8d8dC/f+T/LcKA9ZF1SGHrUuVpoqo8iE3gLMu0Zz5TRoUReXKW6+ehNzUzIjcpYTw+wWeZkA=="; }; }; "ssb-replicate-1.3.2" = { @@ -42484,13 +44527,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-validate-4.1.1" = { + "ssb-validate-4.1.3" = { name = "ssb-validate"; packageName = "ssb-validate"; - version = "4.1.1"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.1.tgz"; - sha512 = "3OsB6qTYlOMUqy4S1i0NuBtiqRW0s9z1Uf+Yqhjcqt7Zu8LTZk59HyhB1gfYmC3xzR/UnHeI7LkJZOt2+r//gA=="; + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.3.tgz"; + sha512 = "g7tOs4nCwHk+G/FZ1N2RmaCkaTNS9hoh/BBP12EH8Jf1PWlkOJtTCak78FHjSTAGFCq/i8Y1ZFQXPNKSK7p3wg=="; }; }; "ssb-ws-6.2.3" = { @@ -42619,6 +44662,15 @@ let sha1 = "e923598a9be51e617682cb21cf1b2818a449ada2"; }; }; + "stack-generator-2.0.5" = { + name = "stack-generator"; + packageName = "stack-generator"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.5.tgz"; + sha512 = "/t1ebrbHkrLrDuNMdeAcsvynWgoH/i4o8EGGfX7dEYDoTXOYVAkEpFdtshlvabzc6JlJ8Kf9YdFEoz7JkzGN9Q=="; + }; + }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -42637,6 +44689,24 @@ let sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }; }; + "stack-utils-2.0.2" = { + name = "stack-utils"; + packageName = "stack-utils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz"; + sha512 = "0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg=="; + }; + }; + "stackframe-1.2.0" = { + name = "stackframe"; + packageName = "stackframe"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz"; + sha512 = "GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA=="; + }; + }; "stampit-1.2.0" = { name = "stampit"; packageName = "stampit"; @@ -42691,6 +44761,15 @@ let sha512 = "D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ=="; }; }; + "static-server-2.2.1" = { + name = "static-server"; + packageName = "static-server"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/static-server/-/static-server-2.2.1.tgz"; + sha512 = "j5eeW6higxYNmXMIT8iHjsdiViTpQDthg7o+SHsRtqdbxscdHqBHXwrXjHC8hL3F0Tsu34ApUpDkwzMBPBsrLw=="; + }; + }; "statistics-3.3.0" = { name = "statistics"; packageName = "statistics"; @@ -42700,6 +44779,15 @@ let sha1 = "ec7b4750ff03ab24a64dd9b357a78316bead78aa"; }; }; + "statsd-client-0.4.5" = { + name = "statsd-client"; + packageName = "statsd-client"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.5.tgz"; + sha512 = "tmTpFMxpBcq92CTMq81d1W47GEazy76Hi+aNKvKJloMplQZe+L1jekSg95YG8ieq6j2Q9MboCaLIMdsF20+eGg=="; + }; + }; "statsd-parser-0.0.4" = { name = "statsd-parser"; packageName = "statsd-parser"; @@ -42808,15 +44896,6 @@ let sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; - "stream-buffers-3.0.2" = { - name = "stream-buffers"; - packageName = "stream-buffers"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz"; - sha512 = "DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ=="; - }; - }; "stream-collector-1.0.1" = { name = "stream-collector"; packageName = "stream-collector"; @@ -42853,15 +44932,6 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "stream-consume-0.1.1" = { - name = "stream-consume"; - packageName = "stream-consume"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz"; - sha512 = "tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg=="; - }; - }; "stream-counter-0.2.0" = { name = "stream-counter"; packageName = "stream-counter"; @@ -42970,15 +45040,6 @@ let sha512 = "PS6wT2ZyyR38Cy+lE6PBEI1ZmO2HdzZoLeDGG0zZbYikCZd0dh8FUoSeFzgWLItpBYw1WJmPVRLpykRV+lAWLQ=="; }; }; - "stream-to-promise-2.2.0" = { - name = "stream-to-promise"; - packageName = "stream-to-promise"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-2.2.0.tgz"; - sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; - }; - }; "stream-to-promise-3.0.0" = { name = "stream-to-promise"; packageName = "stream-to-promise"; @@ -43096,6 +45157,15 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; + "string-argv-0.3.1" = { + name = "string-argv"; + packageName = "string-argv"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"; + sha512 = "a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg=="; + }; + }; "string-env-interpolation-1.0.1" = { name = "string-env-interpolation"; packageName = "string-env-interpolation"; @@ -43105,6 +45175,15 @@ let sha512 = "78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg=="; }; }; + "string-hash-1.1.3" = { + name = "string-hash"; + packageName = "string-hash"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz"; + sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b"; + }; + }; "string-kit-0.11.8" = { name = "string-kit"; packageName = "string-kit"; @@ -43204,13 +45283,13 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trim-1.2.1" = { + "string.prototype.trim-1.2.2" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz"; - sha512 = "MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.2.tgz"; + sha512 = "b5yrbl3BXIjHau9Prk7U0RRYcUYdN4wGSVaqoBQS50CCE3KBuYU0TYRNPFCP7aVoNMX87HKThdMRVIP3giclKg=="; }; }; "string.prototype.trimend-1.0.1" = { @@ -43285,6 +45364,15 @@ let sha512 = "fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A=="; }; }; + "stringify-entities-3.0.1" = { + name = "stringify-entities"; + packageName = "stringify-entities"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz"; + sha512 = "Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ=="; + }; + }; "stringify-package-1.0.1" = { name = "stringify-package"; packageName = "stringify-package"; @@ -43375,13 +45463,13 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; - "strip-bom-1.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "1.0.0"; + "strip-ansi-control-characters-2.0.0" = { + name = "strip-ansi-control-characters"; + packageName = "strip-ansi-control-characters"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"; - sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; + url = "https://registry.npmjs.org/strip-ansi-control-characters/-/strip-ansi-control-characters-2.0.0.tgz"; + sha512 = "Q0/k5orrVGeaOlIOUn1gybGU0IcAbgHQT1faLo5hik4DqClKVSaka5xOhNNoRgtfztHVxCYxi7j71mrWom0bIw=="; }; }; "strip-bom-2.0.0" = { @@ -43627,13 +45715,13 @@ let sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902"; }; }; - "styled-components-5.1.1" = { + "styled-components-5.2.0" = { name = "styled-components"; packageName = "styled-components"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/styled-components/-/styled-components-5.1.1.tgz"; - sha512 = "1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg=="; + url = "https://registry.npmjs.org/styled-components/-/styled-components-5.2.0.tgz"; + sha512 = "9qE8Vgp8C5cpGAIdFaQVAl89Zgx1TDM4Yf4tlHbO9cPijtpSXTMLHy9lmP0lb+yImhgPFb1AmZ1qMUubmg3HLg=="; }; }; "stylehacks-4.0.3" = { @@ -43690,24 +45778,6 @@ let sha512 = "luHn2OAMGJouOnadm6Fim6WXodQ2AWDkWjYq0rMdyEwzO5PdE4LzoXAEn9LL2snmBAlwUp1URVOTF7lZR3KU+Q=="; }; }; - "stylis-3.5.4" = { - name = "stylis"; - packageName = "stylis"; - version = "3.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz"; - sha512 = "8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="; - }; - }; - "stylis-rule-sheet-0.0.10" = { - name = "stylis-rule-sheet"; - packageName = "stylis-rule-sheet"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz"; - sha512 = "nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="; - }; - }; "stylus-0.54.8" = { name = "stylus"; packageName = "stylus"; @@ -43744,13 +45814,13 @@ let sha512 = "cm7TQq9I8dA5LKUr+r8W7RzQlLsmTdCr6wXmjYueOoh/bQu55ODEw7GFhT42pUyoaLtO2rgmx1+8cSIjY9lR9g=="; }; }; - "subscriptions-transport-ws-0.9.17" = { + "subscriptions-transport-ws-0.9.18" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { - url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.17.tgz"; - sha512 = "hNHi2N80PBz4T0V0QhnnsMGvG3XDFDS9mS6BhZ3R12T6EBywC8d/uJscsga0cVO4DKtXCkCRrWm2sOYrbOdhEA=="; + url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.18.tgz"; + sha512 = "tztzcBTNoEbuErsVQpTN2xUNN/efAZXyCyL5m3x4t6SKrEiTL2N8SaKWBFWM4u56pL79ULif3zjyeq+oV+nOaA=="; }; }; "sudo-block-1.2.0" = { @@ -43762,31 +45832,31 @@ let sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463"; }; }; - "suf-cli-0.1.1" = { + "suf-cli-0.1.3" = { name = "suf-cli"; packageName = "suf-cli"; - version = "0.1.1"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.1.tgz"; - sha512 = "0znmYibLknX0bWsnqW9rzM8IvKux3rTSnW52l5teIC+QAgS/StUl5f4WyLPBw+posfbOgoX+03xHPV4sMxY64Q=="; + url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.3.tgz"; + sha512 = "dM85t6+egHKKM7ChM1JpkZUeXNczRb7vAQN3Y8UAyRjeW6UvfChPi8YbV73eTUBp6N7VfKqwwrsYsbdEb/u0Rg=="; }; }; - "suf-node-1.1.1" = { + "suf-node-1.2.1" = { name = "suf-node"; packageName = "suf-node"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/suf-node/-/suf-node-1.1.1.tgz"; - sha512 = "XiyPqLdiHJ3CMphADCJg/JVQYcj3JfO8NomlLubSdGYgppfzE+g/7Fyusza/Kr7lC919BdwbfIqFxK8VO7+l4w=="; + url = "https://registry.npmjs.org/suf-node/-/suf-node-1.2.1.tgz"; + sha512 = "LFLshqEwm1bXd3fEl0STYXZzEHbAz8HwsyItA8vvxhMZrIo+CpB7RrtLvor6mk+7SdfgJhmV3RdIdDIcPAJTTg=="; }; }; - "suf-regex-0.0.22" = { + "suf-regex-0.0.23" = { name = "suf-regex"; packageName = "suf-regex"; - version = "0.0.22"; + version = "0.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.22.tgz"; - sha512 = "6pArSj93hCItDrV+FC8tkf18M5p1tqWjf3T9b/LSYv/V9MeaN3JUqFPU/JMcBkUl2ny7BzTk+bJW4IGzORThNQ=="; + url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.23.tgz"; + sha512 = "Rupps+hO04fiskhx5YwBaiB8Bbwsy8fsqDfT8FED6DWkumWClb3em+yukbNgmAvUIbLAm7ibJoN+2Pl4golkQw=="; }; }; "sugarss-1.0.1" = { @@ -43897,6 +45967,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "supports-color-6.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; + }; + }; "supports-color-6.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -43915,6 +45994,15 @@ let sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; }; }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; "supports-hyperlinks-1.0.1" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; @@ -44041,13 +46129,22 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.31.1" = { + "swagger-ui-dist-3.30.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.31.1"; + version = "3.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.31.1.tgz"; - sha512 = "+IuIxXX8grZcDVLaC12WCGy62iHJ2v8kTptU4H4EgY/ue6tKeMu/jzIAs+pLFOuYwfG4+VQ+CrC9UeHR9oNKBw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.30.2.tgz"; + sha512 = "hAu/ig5N8i0trXXbrC7rwbXV4DhpEAsZhYXDs1305OjmDgjGC0thINbb0197idy3Pp+B6w7u426SUM43GAP7qw=="; + }; + }; + "swagger-ui-dist-3.34.0" = { + name = "swagger-ui-dist"; + packageName = "swagger-ui-dist"; + version = "3.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.34.0.tgz"; + sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; "swagger2openapi-5.4.0" = { @@ -44059,15 +46156,6 @@ let sha512 = "f5QqfXawiVijhjMtYqWZ55ESHPZFqrPC8L9idhIiuSX8O2qsa1i4MVGtCM3TQF+Smzr/6WfT/7zBuzG3aTgPAA=="; }; }; - "swagger2openapi-6.2.2" = { - name = "swagger2openapi"; - packageName = "swagger2openapi"; - version = "6.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-6.2.2.tgz"; - sha512 = "A8RWwzkymhF/ZfO0AylEZ2eCaN2jvAJU3bdtXQzkW5QvuyBMUBcyfB2tkHMTpXWYDmt7uKHwPGRZ0doPejtARA=="; - }; - }; "sway-1.0.0" = { name = "sway"; packageName = "sway"; @@ -44140,13 +46228,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.26.10" = { + "systeminformation-4.27.5" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.26.10"; + version = "4.27.5"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.26.10.tgz"; - sha512 = "bO4FIzrjESAfh4KHwkUJym3jvKtJ4oJ2PG0BBQGBmKa0pF2oanpkB7CF4ZsSX7vfp3+GKaLzioVwpV/3Tyk+lQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.5.tgz"; + sha512 = "EysogxKqREk54ZYDEFcsCODv8GymKZcyiSfegYit8dKhPjzuQr+KX4GFHjssWjYrWFEIM2bYNsFrZX5eufeAXg=="; }; }; "syswide-cas-5.3.0" = { @@ -44339,13 +46427,13 @@ let sha512 = "MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ=="; }; }; - "tar-6.0.2" = { + "tar-6.0.5" = { name = "tar"; packageName = "tar"; - version = "6.0.2"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz"; - sha512 = "Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg=="; + url = "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz"; + sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg=="; }; }; "tar-fs-2.1.0" = { @@ -44375,13 +46463,13 @@ let sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; }; }; - "tar-stream-2.1.3" = { + "tar-stream-2.1.4" = { name = "tar-stream"; packageName = "tar-stream"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz"; - sha512 = "Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA=="; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz"; + sha512 = "o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw=="; }; }; "taskkill-3.1.0" = { @@ -44519,6 +46607,15 @@ let sha512 = "LB83o9bfZGrntdqPuRdanIVCPReam9SOZKW0fOy5I9X3A854GGWi0tjCqoXEk84XIEYBc/x9Hq3EFop/H5wJaw=="; }; }; + "tempy-0.3.0" = { + name = "tempy"; + packageName = "tempy"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz"; + sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ=="; + }; + }; "term-canvas-0.0.5" = { name = "term-canvas"; packageName = "term-canvas"; @@ -44546,13 +46643,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.42.0" = { + "terminal-kit-1.43.0" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.42.0"; + version = "1.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.42.0.tgz"; - sha512 = "l9GCV47Gm+A+nshoOhvEpcUSQE27k0gRRSxowQodI2nc6uOw/RVr0U3zgj61zLQStCLDqQ6JVfV1vAdlF0lFjA=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.43.0.tgz"; + sha512 = "OuPvQzx6oxr3oE2Y78NgRy0TetmurGa/vshYV02Kd6XDWctHO/sHpjnLe3Jhi8FrUkL0XAZMGlxjLeDtRFL4wg=="; }; }; "terser-3.17.0" = { @@ -44573,13 +46670,22 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-webpack-plugin-1.4.4" = { + "terser-webpack-plugin-1.4.5" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz"; - sha512 = "U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; + sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; + }; + }; + "terser-webpack-plugin-3.0.7" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.7.tgz"; + sha512 = "5JqibUOctE6Ou4T00IVGYTQJBOhu24jz0PpqYeitQJJ3hlZY2ZKSwzzuqjmBH8MzbdWMgIefpmHwTkvwm6Q4CQ=="; }; }; "test-exclude-6.0.0" = { @@ -44771,15 +46877,6 @@ let sha1 = "f41a1c31df5e129e4314446f66eca05cd6a30480"; }; }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; - }; - }; "through2-2.0.5" = { name = "through2"; packageName = "through2"; @@ -44789,6 +46886,15 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; + "through2-3.0.1" = { + name = "through2"; + packageName = "through2"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; + sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; + }; + }; "through2-3.0.2" = { name = "through2"; packageName = "through2"; @@ -44798,6 +46904,15 @@ let sha512 = "enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ=="; }; }; + "through2-4.0.2" = { + name = "through2"; + packageName = "through2"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"; + sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; + }; + }; "through2-filter-3.0.0" = { name = "through2-filter"; packageName = "through2-filter"; @@ -44807,6 +46922,15 @@ let sha512 = "jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA=="; }; }; + "through2-map-3.0.0" = { + name = "through2-map"; + packageName = "through2-map"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/through2-map/-/through2-map-3.0.0.tgz"; + sha1 = "a6c3026ce63b4898a997d540506b66ffd970f271"; + }; + }; "thunkify-2.1.2" = { name = "thunkify"; packageName = "thunkify"; @@ -44870,6 +46994,15 @@ let sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; }; }; + "time-zone-1.0.0" = { + name = "time-zone"; + packageName = "time-zone"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz"; + sha1 = "99c5bf55958966af6d06d83bdf3800dc82faec5d"; + }; + }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -44978,13 +47111,13 @@ let sha512 = "W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw=="; }; }; - "tlds-1.207.0" = { + "tlds-1.208.0" = { name = "tlds"; packageName = "tlds"; - version = "1.207.0"; + version = "1.208.0"; src = fetchurl { - url = "https://registry.npmjs.org/tlds/-/tlds-1.207.0.tgz"; - sha512 = "k7d7Q1LqjtAvhtEOs3yN14EabsNO8ZCoY6RESSJDB9lst3bTx3as/m1UuAeCKzYxiyhR1qq72ZPhpSf+qlqiwg=="; + url = "https://registry.npmjs.org/tlds/-/tlds-1.208.0.tgz"; + sha512 = "6kbY7GJpRQXwBddSOAbVUZXjObbCGFXliWWN+kOSEoRWIOyRWLB6zdeKC/Tguwwenl/KsUx016XR50EdHYsxZw=="; }; }; "tmp-0.0.29" = { @@ -45023,15 +47156,6 @@ let sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; - "tmp-0.2.0" = { - name = "tmp"; - packageName = "tmp"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.2.0.tgz"; - sha512 = "spsb5g6EiPmteS5TcOAECU3rltCMDMp4VMU2Sb0+WttN4qGobEkMAd+dkr1cubscN08JGNDX765dPbGImbG7MQ=="; - }; - }; "tmp-0.2.1" = { name = "tmp"; packageName = "tmp"; @@ -45302,6 +47426,15 @@ let sha512 = "y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="; }; }; + "tomlify-j0.4-3.0.0" = { + name = "tomlify-j0.4"; + packageName = "tomlify-j0.4"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tomlify-j0.4/-/tomlify-j0.4-3.0.0.tgz"; + sha512 = "2Ulkc8T7mXJ2l0W476YC/A209PR38Nw8PuaCNtk9uI3t1zzFdGQeWYGQvmj2PZkVvRC/Yoi4xQKMRnWc/N29tQ=="; + }; + }; "too-wordy-0.1.6" = { name = "too-wordy"; packageName = "too-wordy"; @@ -45320,6 +47453,15 @@ let sha512 = "ePZfjs1ajL4b8jT4MeVId+9Ci5hJCzAtNIEXIHyFYmKmQuX+eHC/RNv6tuLMUhrGrhJ+sYWW/lBF/LKILHGZEA=="; }; }; + "topojson-client-3.1.0" = { + name = "topojson-client"; + packageName = "topojson-client"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz"; + sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw=="; + }; + }; "topsort-0.0.2" = { name = "topsort"; packageName = "topsort"; @@ -45383,15 +47525,6 @@ let sha1 = "42d88dd116618bcf00d6106dd5446f3427902ff1"; }; }; - "touch-2.0.2" = { - name = "touch"; - packageName = "touch"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-2.0.2.tgz"; - sha512 = "qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A=="; - }; - }; "touch-3.1.0" = { name = "touch"; packageName = "touch"; @@ -45671,6 +47804,24 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; + "ts-loader-6.2.2" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"; + sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; + }; + }; + "ts-loader-8.0.1" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.1.tgz"; + sha512 = "I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ=="; + }; + }; "ts-log-2.1.4" = { name = "ts-log"; packageName = "ts-log"; @@ -45707,13 +47858,13 @@ let sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="; }; }; - "tsconfig-paths-webpack-plugin-3.2.0" = { + "tsconfig-paths-webpack-plugin-3.3.0" = { name = "tsconfig-paths-webpack-plugin"; packageName = "tsconfig-paths-webpack-plugin"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz"; - sha512 = "S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g=="; + url = "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.3.0.tgz"; + sha512 = "MpQeZpwPY4gYASCUjY4yt2Zj8yv86O8f++3Ai4o0yI0fUC6G1syvnL9VuY71PBgimRYDQU47f12BEmJq9wRaSw=="; }; }; "tslib-1.11.1" = { @@ -45734,13 +47885,13 @@ let sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; }; - "tslib-2.0.0" = { + "tslib-2.0.1" = { name = "tslib"; packageName = "tslib"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz"; - sha512 = "lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz"; + sha512 = "SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="; }; }; "tslint-5.20.1" = { @@ -45752,6 +47903,15 @@ let sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; }; }; + "tslint-6.1.2" = { + name = "tslint"; + packageName = "tslint"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; + sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; + }; + }; "tsscmp-1.0.6" = { name = "tsscmp"; packageName = "tsscmp"; @@ -45914,13 +48074,13 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; - "twig-1.15.1" = { + "twig-1.15.2" = { name = "twig"; packageName = "twig"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.15.1.tgz"; - sha512 = "SPGkUM0p7hjgo+y5Dlm/XCSuZe0G3kfcgRPrxkMFln5e8bvQbxDOsia8QEo8xqXfjLR1Emp9FGkVYHya2b8qdA=="; + url = "https://registry.npmjs.org/twig/-/twig-1.15.2.tgz"; + sha512 = "n7w76E8gzguhcLyKcjlT3sYWGdBTgZY2DO/frcbZ5Fk7LwMRoTathvWMFxZyJ2HYRJ+rEzccw6nu3fsy7ceGGQ=="; }; }; "twitter-1.7.1" = { @@ -45950,13 +48110,13 @@ let sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; - "type-2.0.0" = { + "type-2.1.0" = { name = "type"; packageName = "type"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.0.0.tgz"; - sha512 = "KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="; + url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz"; + sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="; }; }; "type-check-0.3.2" = { @@ -45986,15 +48146,6 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; - "type-fest-0.10.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz"; - sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; - }; - }; "type-fest-0.11.0" = { name = "type-fest"; packageName = "type-fest"; @@ -46004,6 +48155,15 @@ let sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; }; }; + "type-fest-0.12.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.12.0.tgz"; + sha512 = "53RyidyjvkGpnWPMF9bQgFtWp+Sl8O2Rp13VavmJgfAP9WWG6q6TkrKU8iyJdnwnfgHI6k2hTlgqH4aSdjoTbg=="; + }; + }; "type-fest-0.13.1" = { name = "type-fest"; packageName = "type-fest"; @@ -46013,6 +48173,15 @@ let sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; }; + "type-fest-0.15.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.15.1.tgz"; + sha512 = "n+UXrN8i5ioo7kqT/nF8xsEzLaqFra7k32SEsSPwvXVGyAcRgV/FUQN/sgfptJTR1oRmmq7z4IXMFSM7im7C9A=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -46094,15 +48263,6 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.9.5" = { - name = "typescript"; - packageName = "typescript"; - version = "3.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz"; - sha512 = "hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ=="; - }; - }; "typescript-3.9.7" = { name = "typescript"; packageName = "typescript"; @@ -46112,6 +48272,15 @@ let sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; }; }; + "typescript-4.0.3" = { + name = "typescript"; + packageName = "typescript"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; + sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -46139,24 +48308,6 @@ let sha512 = "CQEfGC+p0SoBARI4N2LrGsWJsp4/OE+uKZ68xsWYKHWqMFq4DFQHqOVlK0deEricSN01NmDTqjap63Pw/DHieg=="; }; }; - "typewise-1.0.3" = { - name = "typewise"; - packageName = "typewise"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz"; - sha1 = "1067936540af97937cc5dcf9922486e9fa284651"; - }; - }; - "typewise-core-1.2.0" = { - name = "typewise-core"; - packageName = "typewise-core"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz"; - sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195"; - }; - }; "typewiselite-1.0.0" = { name = "typewiselite"; packageName = "typewiselite"; @@ -46220,13 +48371,13 @@ let sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; }; - "uglify-js-3.10.1" = { + "uglify-js-3.10.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.1"; + version = "3.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz"; - sha512 = "RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; + sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; }; }; "uglify-js-3.4.10" = { @@ -46400,6 +48551,15 @@ let sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="; }; }; + "underscore-1.11.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz"; + sha512 = "xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="; + }; + }; "underscore-1.2.1" = { name = "underscore"; packageName = "underscore"; @@ -46454,13 +48614,13 @@ let sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; }; }; - "undertaker-1.2.1" = { + "undertaker-1.3.0" = { name = "undertaker"; packageName = "undertaker"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz"; - sha512 = "71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA=="; + url = "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz"; + sha512 = "/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg=="; }; }; "undertaker-registry-1.0.1" = { @@ -46589,13 +48749,13 @@ let sha512 = "lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw=="; }; }; - "unified-8.4.2" = { + "unified-9.2.0" = { name = "unified"; packageName = "unified"; - version = "8.4.2"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz"; - sha512 = "JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA=="; + url = "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz"; + sha512 = "vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg=="; }; }; "unified-diff-3.0.1" = { @@ -46616,22 +48776,22 @@ let sha512 = "iDJYH82TgcezQA4IZzhCNJQx7vBsGk4h9s4Q7Fscrb3qcPsxBqVrVNYez2W3sBVTxuU1bFAhyRpA6ba/R4j93A=="; }; }; - "unified-engine-7.0.0" = { + "unified-engine-8.0.0" = { name = "unified-engine"; packageName = "unified-engine"; - version = "7.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-7.0.0.tgz"; - sha512 = "zH/MvcISpWg3JZtCoY/GYBw1WnVHkhnPoMBWpmuvAifCPSS9mzT9EbtimesJp6t2nnr/ojI0mg3TmkO1CjIwVA=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.0.0.tgz"; + sha512 = "vLUezxCnjzz+ya4pYouRQVMT8k82Rk4fIj406UidRnSFJdGXFaQyQklAnalsQHJrLqAlaYPkXPUa1upfVSHGCA=="; }; }; - "unified-message-control-2.0.0" = { + "unified-message-control-3.0.1" = { name = "unified-message-control"; packageName = "unified-message-control"; - version = "2.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-2.0.0.tgz"; - sha512 = "6TE36M/YIQhUr+XlG+YKXDCCTC2FPtCgXIwtdJcHLnrRGR1ZjYwZMH2pnp7a4OaE7sST9GUqQPjVHM7TRTTlyQ=="; + url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.1.tgz"; + sha512 = "K2Kvvp1DBzeuxYLLsumZh/gDWUTl4e2z/P3VReFirC78cfHKtQifbhnfRrSBtKtd1Uc6cvYTW0/SZIUaMAEcTg=="; }; }; "union-0.5.0" = { @@ -46697,15 +48857,6 @@ let sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; - "unique-stream-1.0.0" = { - name = "unique-stream"; - packageName = "unique-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; - sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; - }; - }; "unique-stream-2.3.1" = { name = "unique-stream"; packageName = "unique-stream"; @@ -46769,6 +48920,15 @@ let sha512 = "7xxyvKiZ1SC9vL5qrMqKub1T31gRHfau4242F69CcaOrXt//5PmRVOmDZ36UAEgiT+tZWzmQmbNZn+mVtnR9HQ=="; }; }; + "unist-util-inspect-5.0.1" = { + name = "unist-util-inspect"; + packageName = "unist-util-inspect"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz"; + sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; + }; + }; "unist-util-is-1.0.0" = { name = "unist-util-is"; packageName = "unist-util-is"; @@ -46841,6 +49001,15 @@ let sha512 = "tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A=="; }; }; + "unist-util-remove-position-2.0.1" = { + name = "unist-util-remove-position"; + packageName = "unist-util-remove-position"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz"; + sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA=="; + }; + }; "unist-util-stringify-position-1.1.2" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; @@ -46904,13 +49073,13 @@ let sha512 = "0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw=="; }; }; - "universal-analytics-0.4.20" = { + "universal-analytics-0.4.23" = { name = "universal-analytics"; packageName = "universal-analytics"; - version = "0.4.20"; + version = "0.4.23"; src = fetchurl { - url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz"; - sha512 = "gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw=="; + url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz"; + sha512 = "lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A=="; }; }; "universal-user-agent-4.0.1" = { @@ -47093,6 +49262,15 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; + "unzipper-0.10.11" = { + name = "unzipper"; + packageName = "unzipper"; + version = "0.10.11"; + src = fetchurl { + url = "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz"; + sha512 = "+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw=="; + }; + }; "upath-1.2.0" = { name = "upath"; packageName = "upath"; @@ -47129,13 +49307,13 @@ let sha512 = "grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ=="; }; }; - "update-notifier-4.1.0" = { + "update-notifier-4.1.1" = { name = "update-notifier"; packageName = "update-notifier"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz"; - sha512 = "w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew=="; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.1.tgz"; + sha512 = "9y+Kds0+LoLG6yN802wVXoIfxYEwh3FlZwzMwpCZp62S2i1/Jzeqb9Eeeju3NSHccGGasfGlK5/vEHbAifYRDg=="; }; }; "upnp-device-client-1.0.2" = { @@ -47192,13 +49370,13 @@ let sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; }; }; - "uri-js-4.2.2" = { + "uri-js-4.4.0" = { name = "uri-js"; packageName = "uri-js"; - version = "4.2.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; + sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; }; }; "urijs-1.19.2" = { @@ -47300,15 +49478,6 @@ let sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; }; }; - "url-template-2.0.8" = { - name = "url-template"; - packageName = "url-template"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz"; - sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; - }; - }; "url-to-options-1.0.1" = { name = "url-to-options"; packageName = "url-to-options"; @@ -47318,6 +49487,15 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; + "url-toolkit-2.2.0" = { + name = "url-toolkit"; + packageName = "url-toolkit"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.0.tgz"; + sha512 = "Rde0c9S4fJK3FaHim3DSgdQ8IFrSXcZCpAJo9T7/FA+BoQGhK0ow3mpwGQLJCPYsNn6TstpW7/7DzMpSpz9F9w=="; + }; + }; "urlencode-1.1.0" = { name = "urlencode"; packageName = "urlencode"; @@ -47345,15 +49523,6 @@ let sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; - "user-home-1.1.1" = { - name = "user-home"; - packageName = "user-home"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; - sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; - }; - }; "user-home-2.0.0" = { name = "user-home"; packageName = "user-home"; @@ -47570,15 +49739,6 @@ let sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; - "uuid-3.3.3" = { - name = "uuid"; - packageName = "uuid"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; - sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; - }; - }; "uuid-3.4.0" = { name = "uuid"; packageName = "uuid"; @@ -47588,22 +49748,13 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-7.0.1" = { + "uuid-7.0.3" = { name = "uuid"; packageName = "uuid"; - version = "7.0.1"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-7.0.1.tgz"; - sha512 = "yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA=="; - }; - }; - "uuid-8.1.0" = { - name = "uuid"; - packageName = "uuid"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz"; - sha512 = "CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="; + url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; + sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; }; }; "uuid-8.3.0" = { @@ -47642,15 +49793,6 @@ let sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d"; }; }; - "v8flags-2.1.1" = { - name = "v8flags"; - packageName = "v8flags"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz"; - sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; - }; - }; "v8flags-3.1.3" = { name = "v8flags"; packageName = "v8flags"; @@ -47831,6 +49973,267 @@ let sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; }; }; + "vega-5.15.0" = { + name = "vega"; + packageName = "vega"; + version = "5.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega/-/vega-5.15.0.tgz"; + sha512 = "uygUtkZJm3/HNvNGLQSugZld4qvaiOMtH34tOGuS/MSGj7MaP0CLoFrthlas30lyMPQ42UfzX8tk5X+I91dFKQ=="; + }; + }; + "vega-canvas-1.2.4" = { + name = "vega-canvas"; + packageName = "vega-canvas"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.4.tgz"; + sha512 = "BI44AIAa13xSindGXMQm0FAhI2zx3F3conFmXhey63hqGsfvH/19nv+A0PEvSVa/lK4iPneMTpw583iffDiq3w=="; + }; + }; + "vega-crossfilter-4.0.4" = { + name = "vega-crossfilter"; + packageName = "vega-crossfilter"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.4.tgz"; + sha512 = "mXKhHxkgxJPwtTrMgK3Uw1bStfD+rmfKXsUvdIh1ZwmpheGOQM2Uflo3tQNh9j9wqu8xHywCcddohKpSRBt8HQ=="; + }; + }; + "vega-dataflow-5.7.2" = { + name = "vega-dataflow"; + packageName = "vega-dataflow"; + version = "5.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.2.tgz"; + sha512 = "O6CEchGAQtEhDKfI3UHWVUbUcXSMsq5JrefvvB2hldx3XbHkEQioXtgAnK6OosyKpB1dJlVvFRMR40pwdNO1hw=="; + }; + }; + "vega-encode-4.8.2" = { + name = "vega-encode"; + packageName = "vega-encode"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.8.2.tgz"; + sha512 = "+PEimVqZysvLEScU/EJrpElBrNMcDHeVGmMhLkswxfVrFix4ialV3/iGB9Wcr5g1pOQcsBdNn7qUy2bjvAvIvA=="; + }; + }; + "vega-event-selector-2.0.5" = { + name = "vega-event-selector"; + packageName = "vega-event-selector"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-2.0.5.tgz"; + sha512 = "bRm02Fnd+YrZDni0yr5y9Co1Z1zrjd7hkwY+gi/Y7zDFOxnESGrbYtpHvWT8fL9AqmYU3wDpsJZGyP4htRUNAQ=="; + }; + }; + "vega-expression-2.7.0" = { + name = "vega-expression"; + packageName = "vega-expression"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-expression/-/vega-expression-2.7.0.tgz"; + sha512 = "fMnHtcFfVAxuwjsKGh0qqP8OJNVABGIg0aSp33Jxh1D86LwDwaRe+EtwF1fv8YKD2AEiBl4UObC68QMT56MekQ=="; + }; + }; + "vega-force-4.0.6" = { + name = "vega-force"; + packageName = "vega-force"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-force/-/vega-force-4.0.6.tgz"; + sha512 = "acB5DshAhSbaxKAk/DgzUK4ondTAZbD3tRY4Cy0NmZL+6QqM3RRePM1PQBAFAQMp9kXT9X/fh8tOlMKx/rwQnQ=="; + }; + }; + "vega-format-1.0.3" = { + name = "vega-format"; + packageName = "vega-format"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-format/-/vega-format-1.0.3.tgz"; + sha512 = "hZpYZM/KRNnd+qmJ5oCGHvOzlxga9d2anqw+ji/jbA41piMzsyAa2f8CAoHpXgzsZNkGp+BL2Oya+251uZOjQw=="; + }; + }; + "vega-functions-5.7.3" = { + name = "vega-functions"; + packageName = "vega-functions"; + version = "5.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.7.3.tgz"; + sha512 = "9X9bKhKZvglfRaFIDg2yRyBzayabsQHRAyVk0bJBU04mgfj6myKRhO6JF4av+LgNHyJFsOPeJxkiOYZ3x6Z6rg=="; + }; + }; + "vega-geo-4.3.6" = { + name = "vega-geo"; + packageName = "vega-geo"; + version = "4.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.6.tgz"; + sha512 = "miRnxnf3KSgmHMR0H8y3NSg58BnijVtxg508PDrw3T4ARRYxGf5yglcEYFcc06iRYTV3B43pOg0Se5dLowmTEw=="; + }; + }; + "vega-hierarchy-4.0.8" = { + name = "vega-hierarchy"; + packageName = "vega-hierarchy"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.0.8.tgz"; + sha512 = "8O2asfoAEaW8Hfu/06m6t5BErrNo0OJzU8XyKon8aeGY2YbQMKT7fiEzUrzDC39Zb2suThuzBOjpcwiu7rh/Hg=="; + }; + }; + "vega-loader-4.3.2" = { + name = "vega-loader"; + packageName = "vega-loader"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.3.2.tgz"; + sha512 = "g+hd4xCxGP4zlSdvvprDrHTulUN1xB1k63ooqtCzhps3fji7N8DQ3RWPTJZLyuwYpjxim3BYrp4aJk3OHElcaA=="; + }; + }; + "vega-parser-6.0.4" = { + name = "vega-parser"; + packageName = "vega-parser"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.0.4.tgz"; + sha512 = "AxFvM0JgS/hyqlIdcN1B74PRO5cpU9SRRh8wBfirHRkFWPxqfP2EeFmQxisGV5wSqAUVTqqqk0suWQuU3YHPcQ=="; + }; + }; + "vega-projection-1.4.4" = { + name = "vega-projection"; + packageName = "vega-projection"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.4.4.tgz"; + sha512 = "v1Tx/8khpOmzpscXkxq2+MGjs7jG3A8yFfQJ8kTh8eIko0f5V+QLujTfEvdllYXw6f3DE6K2fYInb71B0GAjIw=="; + }; + }; + "vega-regression-1.0.8" = { + name = "vega-regression"; + packageName = "vega-regression"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.0.8.tgz"; + sha512 = "NdLoDctaxtCKP4udGg2SmplyK8098L8EAFEy/TEECx0wbRcBzPs2e/U4uCShzoPHILFULdOqs+sq/xwhp9X3lA=="; + }; + }; + "vega-runtime-6.1.2" = { + name = "vega-runtime"; + packageName = "vega-runtime"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.2.tgz"; + sha512 = "baaMe8PKynJlJfpcZR4jHDSbTM9TYzU4x/XLphQ/6lZnF9WMH+gGOVlVRWZCLH4K0sgCxBMKC/THOpRFkO6jJA=="; + }; + }; + "vega-scale-7.1.0" = { + name = "vega-scale"; + packageName = "vega-scale"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.1.0.tgz"; + sha512 = "8QgHarFLgnX60DL9h91GNSzvXtBVUfCx57+XKUlCROfHti4KASTRMicBgfJ3lwJBACNefpEW+9ut+1iuIHONwQ=="; + }; + }; + "vega-scenegraph-4.9.1" = { + name = "vega-scenegraph"; + packageName = "vega-scenegraph"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.1.tgz"; + sha512 = "4OyFlMXwecM7C18zrXeBgckzLaFncLdnj1ExcF3dFfsgPLBSRW2x+eCRQZmD12UHoLFGuehB5s3YNfoQtCP5YA=="; + }; + }; + "vega-selections-5.1.3" = { + name = "vega-selections"; + packageName = "vega-selections"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.3.tgz"; + sha512 = "fy+EBPA3pA3i4IeQ2EUHQI83RZMCS4ZoXu1RI1Oa/CFLu8iXxwraRaD9sUH93GPj4pU22g4ywjbHzsrZ7x4ONg=="; + }; + }; + "vega-statistics-1.7.8" = { + name = "vega-statistics"; + packageName = "vega-statistics"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.8.tgz"; + sha512 = "JkxS7hkFLOMBgEOfITQ1kisLGuWtJ0gAhxQ1OmuIx5Un9yyFY3+hk8HSgeZHwIPktsV+2Bx5aPUHES85YzBD/Q=="; + }; + }; + "vega-time-2.0.3" = { + name = "vega-time"; + packageName = "vega-time"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-time/-/vega-time-2.0.3.tgz"; + sha512 = "LXsB5Ej56jcDRvoWHp1YegNuZSD+cFWGBEWobRXbigmRNDfa4HGmzUon46G+KBj+VeRRGeu5Zq4LSG2goWmIYw=="; + }; + }; + "vega-transforms-4.9.2" = { + name = "vega-transforms"; + packageName = "vega-transforms"; + version = "4.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.9.2.tgz"; + sha512 = "vDI8jJOlnswSuEf6BekI04jWNttgOLzDRONaWZGTH8X5yI3GgkB4Ts45U0LayRExQSq7gxt95k/02jXGGzOTpA=="; + }; + }; + "vega-typings-0.18.2" = { + name = "vega-typings"; + packageName = "vega-typings"; + version = "0.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.18.2.tgz"; + sha512 = "t7PAmcqPUmSV44l2NVJOoblhomPlgjO7rxAUs/HXnmyVbGHI+6ulUPjGBWWZU1ebu09T+SYazAwjr6lAd2CHgQ=="; + }; + }; + "vega-util-1.15.1" = { + name = "vega-util"; + packageName = "vega-util"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-util/-/vega-util-1.15.1.tgz"; + sha512 = "kEbRQiVUP42dyou2LF8I+3TlBtk4TODTlnLzdSoI//uahXvDnz1ulfprWljfcHPbVjziObaFNWkpT56oSMTx+g=="; + }; + }; + "vega-view-5.8.2" = { + name = "vega-view"; + packageName = "vega-view"; + version = "5.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-view/-/vega-view-5.8.2.tgz"; + sha512 = "d+u5FGs3t7LUVRoGimvroHkbO2orrtJMUt2P8UVu4alMdDcgZUSmwOZWc/gMkBGlWD8P9q7832xTWdJ3gSXL4A=="; + }; + }; + "vega-view-transforms-4.5.7" = { + name = "vega-view-transforms"; + packageName = "vega-view-transforms"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.7.tgz"; + sha512 = "dcrEHJL/+KPAe7Eq4Me7rq5+O13yWL1X/n3Fu6xKGL2TnBSBy4WVla+WFBdD82GRIU0Fi5DFkL/dE3cTeitvag=="; + }; + }; + "vega-voronoi-4.1.4" = { + name = "vega-voronoi"; + packageName = "vega-voronoi"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.1.4.tgz"; + sha512 = "z5aAprA9XbdKZ2oAs1tWR9Cw+W9LQJZCn9kH+x6VmnqiVhCbMZPDoZK9sIgso163RDF9Fdu+0zLXX58l+AjzWA=="; + }; + }; + "vega-wordcloud-4.1.2" = { + name = "vega-wordcloud"; + packageName = "vega-wordcloud"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.2.tgz"; + sha512 = "LZzqaRuE0bR9x9e9dLax6GYnUO+MtJhGx5fRk4F0Q8+X2f0u/BfOyMG459tnbyZQIy9SP8ZBLBlkp+ujmK8XXQ=="; + }; + }; "vendors-1.0.4" = { name = "vendors"; packageName = "vendors"; @@ -47840,13 +50243,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.1.0" = { + "verda-1.1.1" = { name = "verda"; packageName = "verda"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.1.0.tgz"; - sha512 = "6f3bwfXNkjDivAsPFIfCXtCstEh08Q15C6aGnF9wRNfaYhJCXuHRLh39V3b+vjCvvLOeFZ/MeBDZVx81f6dktg=="; + url = "https://registry.npmjs.org/verda/-/verda-1.1.1.tgz"; + sha512 = "8nki9HjTh39EFuIYY2snCCdIDU0z4LmFN7tQ9oZByW2AQpPYpWDHwRqewWgUt9PVcDsXDSZbJWSuJwGnyAj8gg=="; }; }; "verror-1.1.0" = { @@ -47966,6 +50369,15 @@ let sha512 = "sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA=="; }; }; + "vfile-location-3.1.0" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.1.0.tgz"; + sha512 = "FCZ4AN9xMcjFIG1oGmZKo61PjwJHRVA+0/tPUP2ul4uIwjGGndIxavEMRpWn5p4xwm/ZsdXp9YNygf1ZyE4x8g=="; + }; + }; "vfile-message-1.1.1" = { name = "vfile-message"; packageName = "vfile-message"; @@ -48047,15 +50459,6 @@ let sha512 = "Z4EcsX9aYNJZD1M+0jCeQ0t+5ETlHE88B2SF1fCuVxfn+XxHGJVec6tbHGqpULk4esOOLJEipAScOCDGHk+teQ=="; }; }; - "vinyl-0.4.6" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; - sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; - }; - }; "vinyl-0.5.3" = { name = "vinyl"; packageName = "vinyl"; @@ -48083,15 +50486,6 @@ let sha1 = "b104d9e4409ffa325faadd520642d0a3b488b365"; }; }; - "vinyl-fs-0.3.14" = { - name = "vinyl-fs"; - packageName = "vinyl-fs"; - version = "0.3.14"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; - sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; - }; - }; "vinyl-fs-3.0.3" = { name = "vinyl-fs"; packageName = "vinyl-fs"; @@ -48137,13 +50531,13 @@ let sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow=="; }; }; - "vls-0.2.0" = { + "vls-0.5.3" = { name = "vls"; packageName = "vls"; - version = "0.2.0"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.2.0.tgz"; - sha512 = "B6xMWi3sOVSitcLx4zKWB5vh1DLL0Okkqy5Fa7rHSmqvPhDDn7idU+vwjWZW8IzHQO1T+brxvDjbKuSnEXNPRw=="; + url = "https://registry.npmjs.org/vls/-/vls-0.5.3.tgz"; + sha512 = "NQKKl3JgiFuo52ra5gjlo5E/TztchkYRaKEWrBlMACNnnDlKkyFPRkQO/tE7A25Hs+y0t/HoOTsMGnAmhQY7Fg=="; }; }; "vm-browserify-1.1.2" = { @@ -48173,13 +50567,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.77.0" = { + "vsce-1.79.5" = { name = "vsce"; packageName = "vsce"; - version = "1.77.0"; + version = "1.79.5"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.77.0.tgz"; - sha512 = "8vOTCI3jGmOm0JJFu/BMAbqxpaSuka4S3hV9E6K5aWBUsDM1SGFExkIxHblnsI8sls43xP61DHorYT+K0F+GFA=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.79.5.tgz"; + sha512 = "KZFOthGwxWFwoGqwrkzfTfyCZGuniTofnJ1a/dCzQ2HP93u1UuCKrTQyGT+SuGHu8sNqdBYNe0hb9GC3qCN7fg=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -48191,13 +50585,40 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.3.1" = { + "vscode-css-languageservice-4.1.0" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.3.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.1.tgz"; - sha512 = "Vdz2cyoTP2tLWikhFdouK8dAQ3gVhLPxsFkIscM30Quh6rd/YejTeZEYC/W+b0iKumHYebDeo1GUFbf0ptySRw=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.0.tgz"; + sha512 = "iTX3dTp0Y0RFWhIux5jasI8r9swdiWVB1Z3OrZ10iDHxzkETjVPxAQ5BEQU4ag0Awc8TTg1C7sJriHQY2LO14g=="; + }; + }; + "vscode-css-languageservice-4.3.4" = { + name = "vscode-css-languageservice"; + packageName = "vscode-css-languageservice"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.4.tgz"; + sha512 = "/0HCaxiSL0Rmm3sJ+iyZekljKEYKo1UHSzX4UFOo5VDLgRhKomJf7g1p8glcbCHXB/70IcH8IhKnwlTznf8RPQ=="; + }; + }; + "vscode-debugadapter-testsupport-1.41.0" = { + name = "vscode-debugadapter-testsupport"; + packageName = "vscode-debugadapter-testsupport"; + version = "1.41.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.41.0.tgz"; + sha512 = "3aEDm+B6trSxUJWETbNBM5qbEAUbzPpLZ9YT9ez+C1ITG4uaioc8GIQtkVk1kpxP++WPWo0LVjYY8CbVRCRapg=="; + }; + }; + "vscode-debugprotocol-1.41.0" = { + name = "vscode-debugprotocol"; + packageName = "vscode-debugprotocol"; + version = "1.41.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.41.0.tgz"; + sha512 = "Sxp7kDDuhpEZiDaIfhM0jLF3RtMqvc6CpoESANE77t351uezsd/oDoqALLcOnmmsDzTgQ3W0sCvM4gErnjDFpA=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -48209,6 +50630,15 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; + "vscode-emmet-helper-2.0.0" = { + name = "vscode-emmet-helper"; + packageName = "vscode-emmet-helper"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.0.tgz"; + sha512 = "ytR+Ajxs6zeYI0b4bPsl+nPU8xm852piJUtIwO1ajp1Pw7lwn3VeR+f4ynmxOl9IjfOdF2kW9T/qIkeFbKLwYw=="; + }; + }; "vscode-html-languageservice-2.1.12" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; @@ -48218,13 +50648,22 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.8.0" = { + "vscode-json-languageservice-3.8.4" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.8.0"; + version = "3.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.0.tgz"; - sha512 = "sYz5JElJMIlPoqhrRfG3VKnDjnPinLdblIiEVsJgTz1kj2hWD2q5BSbo+evH/5/jKDXDLfA8kb0lHC4vd5g5zg=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz"; + sha512 = "njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw=="; + }; + }; + "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" = { @@ -48254,13 +50693,13 @@ let sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; }; }; - "vscode-jsonrpc-5.1.0-next.1" = { + "vscode-jsonrpc-6.0.0-next.5" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "5.1.0-next.1"; + version = "6.0.0-next.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz"; - sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.5.tgz"; + sha512 = "IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -48272,13 +50711,22 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-7.0.0-next.1" = { + "vscode-languageclient-7.0.0-next.9" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "7.0.0-next.1"; + version = "7.0.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.1.tgz"; - sha512 = "JrjCUhLpQZxQ5VpWpilOHDMhVsn0fdN5jBh1uFNhSr5c2loJvRdr9Km2EuSQOFfOQsBKx0+xvY8PbsypNEcJ6w=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz"; + sha512 = "lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A=="; + }; + }; + "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 = "RYUKn0DgHTFcS8kS4VaNCjNMaQXYqiXdN9bKrFjXzu5RPKfjIYcoh47oVWwZj4L3R/DPB0Se7HPaDatvYY2XgQ=="; }; }; "vscode-languageserver-4.0.0" = { @@ -48344,13 +50792,22 @@ let sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; - "vscode-languageserver-protocol-3.16.0-next.2" = { + "vscode-languageserver-protocol-3.16.0-next.7" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.16.0-next.2"; + version = "3.16.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz"; - sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.7.tgz"; + sha512 = "tOjrg+K3RddJ547zpC9/LAgTbzadkPuHlqJFFWIcKjVhiJOh73XyY+Ngcu9wukGaTsuSGjJ0W8rlmwanixa0FQ=="; + }; + }; + "vscode-languageserver-protocol-3.5.1" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz"; + sha512 = "1fPDIwsAv1difCV+8daOrJEGunClNJWqnUHq/ncWrjhitKWXgGmRCjlwZ3gDUTt54yRcvXz1PXJDaRNvNH6pYA=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -48398,15 +50855,6 @@ let sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; - "vscode-languageserver-types-3.16.0-next.1" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.16.0-next.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz"; - sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; - }; - }; "vscode-languageserver-types-3.16.0-next.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -48416,6 +50864,33 @@ let sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; + "vscode-languageserver-types-3.16.0-next.3" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.16.0-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.3.tgz"; + sha512 = "s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg=="; + }; + }; + "vscode-languageserver-types-3.5.0" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz"; + sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; + }; + }; + "vscode-nls-2.0.2" = { + name = "vscode-nls"; + packageName = "vscode-nls"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz"; + sha1 = "808522380844b8ad153499af5c3b03921aea02da"; + }; + }; "vscode-nls-3.2.5" = { name = "vscode-nls"; packageName = "vscode-nls"; @@ -48434,6 +50909,15 @@ let sha512 = "7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="; }; }; + "vscode-nls-5.0.0" = { + name = "vscode-nls"; + packageName = "vscode-nls"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz"; + sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="; + }; + }; "vscode-test-1.4.0" = { name = "vscode-test"; packageName = "vscode-test"; @@ -48488,13 +50972,13 @@ let sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; - "vscode-web-custom-data-0.1.4" = { + "vscode-web-custom-data-0.3.1" = { name = "vscode-web-custom-data"; packageName = "vscode-web-custom-data"; - version = "0.1.4"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-web-custom-data/-/vscode-web-custom-data-0.1.4.tgz"; - sha512 = "EFS8t2g3gMjvYY3sTknzHaURQ5AnemMcnKriZx43w97bsmEfEPaBJwJpuj/Zx9k4SwK+97dRtkKb2lvWQ2v0rw=="; + url = "https://registry.npmjs.org/vscode-web-custom-data/-/vscode-web-custom-data-0.3.1.tgz"; + sha512 = "pFWfUyoJoROfzk7l8+QK1aHsAcfb8fJP8iaEghMbASbYieaGOOnfovNjPIrJmhNf84RGn36R6r2030i9Eld7vA=="; }; }; "vstream-0.1.0" = { @@ -48506,13 +50990,22 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; - "vue-2.6.11" = { + "vue-2.6.12" = { name = "vue"; packageName = "vue"; - version = "2.6.11"; + version = "2.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz"; - sha512 = "VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz"; + sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; + }; + }; + "vue-3.0.0" = { + name = "vue"; + packageName = "vue"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-3.0.0.tgz"; + sha512 = "ZMrAARZ32sGIaYKr7Fk2GZEBh/VhulSrGxcGBiAvbN4fhjl3tuJyNFbbbLFqGjndbLoBW66I2ECq8ICdvkKdJw=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -48524,6 +51017,15 @@ let sha512 = "8CzRVrAsFkB9lpl600cRCNR9OUnrSYYAIVF9/qW4pP0TMXbhrd1F1wEAAN6E0CPimjTLB+qSt6zWS4vb2wC8Wg=="; }; }; + "vue-codemod-0.0.4" = { + name = "vue-codemod"; + packageName = "vue-codemod"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-codemod/-/vue-codemod-0.0.4.tgz"; + sha512 = "mAI9g4CcY3GJOOt/fTOC8Cz9lYtBEuSiDizQHgvcX0HpoKw1bNZBPaNUqFoNxnk6+nGZVgt0/CXYnq80rRK9vg=="; + }; + }; "vue-eslint-parser-2.0.3" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; @@ -48551,15 +51053,6 @@ let sha512 = "Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q=="; }; }; - "vue-jscodeshift-adapter-2.1.0" = { - name = "vue-jscodeshift-adapter"; - packageName = "vue-jscodeshift-adapter"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-jscodeshift-adapter/-/vue-jscodeshift-adapter-2.1.0.tgz"; - sha512 = "xDn8kpZ0/yG9Z1Z+osrfnd1k1y5AJIdUtqHWNJY2eRz37Gs1tftiZ8BUK89Pab0ddnwhZqh5eNFfOT0SFlZnWQ=="; - }; - }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -48569,24 +51062,6 @@ let sha512 = "ikg8ruE17tIXF9mrVvKoOR3oyM9nk0TcmUHyeBWod5ILEH9DRN0+seX4gwsSbjdxMYlIIvmnCFPQeMdlcJqPJQ=="; }; }; - "vue-sfc-descriptor-to-string-1.0.0" = { - name = "vue-sfc-descriptor-to-string"; - packageName = "vue-sfc-descriptor-to-string"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-sfc-descriptor-to-string/-/vue-sfc-descriptor-to-string-1.0.0.tgz"; - sha512 = "VYNMsrIPZQZau5Gk8IVtgonN1quOznP9/pLIF5m2c4R30KCDDe3NwthrsM7lSUY2K4lezcb8j3Wu8cQhBuZEMQ=="; - }; - }; - "vue-template-compiler-2.6.11" = { - name = "vue-template-compiler"; - packageName = "vue-template-compiler"; - version = "2.6.11"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz"; - sha512 = "KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA=="; - }; - }; "w3c-hr-time-1.0.2" = { name = "w3c-hr-time"; packageName = "w3c-hr-time"; @@ -48605,6 +51080,15 @@ let sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; }; }; + "wait-port-0.2.9" = { + name = "wait-port"; + packageName = "wait-port"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/wait-port/-/wait-port-0.2.9.tgz"; + sha512 = "hQ/cVKsNqGZ/UbZB/oakOGFqic00YAMM5/PEj3Bt4vKarv2jWIWzDbqlwT94qMs/exAQAsvMOq99sZblV92zxQ=="; + }; + }; "walk-2.3.14" = { name = "walk"; packageName = "walk"; @@ -48713,13 +51197,13 @@ let sha512 = "wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw=="; }; }; - "web-push-3.4.3" = { + "web-push-3.4.4" = { name = "web-push"; packageName = "web-push"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/web-push/-/web-push-3.4.3.tgz"; - sha512 = "nt/hRSlfRDTwvem//7jle1+cy62lBoxFshad8ai2Q4SlHZS00oHnrw5Dul3jSWXR+bOcnZkwnRs3tW+daNTuyA=="; + url = "https://registry.npmjs.org/web-push/-/web-push-3.4.4.tgz"; + sha512 = "tB0F+ccobsfw5jTWBinWJKyd/YdCdRbKj+CFSnsJeEgFYysOULvWFYyeCxn9KuQvG/3UF1t3cTAcJzBec5LCWA=="; }; }; "web-tree-sitter-0.16.4" = { @@ -48758,22 +51242,22 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webidl-conversions-5.0.0" = { + "webidl-conversions-6.1.0" = { name = "webidl-conversions"; packageName = "webidl-conversions"; - version = "5.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; - sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; }; }; - "webpack-4.43.0" = { + "webpack-4.44.0" = { name = "webpack"; packageName = "webpack"; - version = "4.43.0"; + version = "4.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; - sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.0.tgz"; + sha512 = "wAuJxK123sqAw31SpkPiPW3iKHgFUiKvO7E7UZjtdExcsRe3fgav4mvoMM7vvpjLHVoJ6a0Mtp2fzkoA13e0Zw=="; }; }; "webpack-4.44.1" = { @@ -48785,6 +51269,15 @@ let sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; }; }; + "webpack-4.44.2" = { + name = "webpack"; + packageName = "webpack"; + version = "4.44.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; + sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -48821,13 +51314,13 @@ let sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; }; - "webpack-node-externals-1.7.2" = { + "webpack-node-externals-2.5.1" = { name = "webpack-node-externals"; packageName = "webpack-node-externals"; - version = "1.7.2"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz"; - sha512 = "ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg=="; + url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.1.tgz"; + sha512 = "RWxKGibUU5kuJT6JDYmXGa3QsZskqIaiBvZ2wBxHlJzWVJPOyBMnroXf23uxEHnj1rYS8jNdyUfrNAXJ2bANNw=="; }; }; "webpack-sources-1.4.3" = { @@ -48839,13 +51332,22 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "websocket-1.0.31" = { + "webpack-stream-5.2.1" = { + name = "webpack-stream"; + packageName = "webpack-stream"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-5.2.1.tgz"; + sha512 = "WvyVU0K1/VB1NZ7JfsaemVdG0PXAQUqbjUNW4A58th4pULvKMQxG+y33HXTL02JvD56ko2Cub+E2NyPwrLBT/A=="; + }; + }; + "websocket-1.0.32" = { name = "websocket"; packageName = "websocket"; - version = "1.0.31"; + version = "1.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz"; - sha512 = "VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ=="; + url = "https://registry.npmjs.org/websocket/-/websocket-1.0.32.tgz"; + sha512 = "i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q=="; }; }; "websocket-driver-0.6.5" = { @@ -48893,6 +51395,15 @@ let sha512 = "hkwjMQTbBiwdJn3vEVjOyNwKZISp6r4GEl/J0N6Ukw2oeaETIylvAlf7G0o+a9FcFMThBIle0iCPYLTwumCOaQ=="; }; }; + "well-known-symbols-2.0.0" = { + name = "well-known-symbols"; + packageName = "well-known-symbols"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz"; + sha512 = "ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q=="; + }; + }; "whatwg-encoding-1.0.5" = { name = "whatwg-encoding"; packageName = "whatwg-encoding"; @@ -48911,15 +51422,6 @@ let sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; }; }; - "whatwg-fetch-3.3.1" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.3.1.tgz"; - sha512 = "faXTmGDcLuEPBpJwb5LQfyxvubKiE+RlbmmweFGKjvIPFj4uHTTfdtTIkdTRhC6OSH9S9eyYbx8kZ0UEaQqYTA=="; - }; - }; "whatwg-mimetype-2.3.0" = { name = "whatwg-mimetype"; packageName = "whatwg-mimetype"; @@ -48947,13 +51449,13 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.1.0" = { + "whatwg-url-8.2.2" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.1.0"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz"; - sha512 = "vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz"; + sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -49172,13 +51674,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "windows-release-3.3.1" = { + "windows-release-3.3.3" = { name = "windows-release"; packageName = "windows-release"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/windows-release/-/windows-release-3.3.1.tgz"; - sha512 = "Pngk/RDCaI/DkuHPlGTdIkDiTAnAkyMjoQMZqRsxydNl1qGXNIoZrB7RK8g53F2tEgQBMqQJHQdYZuQEEAu54A=="; + url = "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz"; + sha512 = "OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg=="; }; }; "winreg-0.0.12" = { @@ -49956,13 +52458,13 @@ let sha512 = "3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw=="; }; }; - "xstream-11.12.0" = { + "xstream-11.13.0" = { name = "xstream"; packageName = "xstream"; - version = "11.12.0"; + version = "11.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/xstream/-/xstream-11.12.0.tgz"; - sha512 = "rceZqhyRPJdmDNh8hyFEnOacNrL4pTVkNZzoLvFqOVaIZHbM3bS15ycqI5V9eJXCRMfgEapwzcNzPjkIRUkv2Q=="; + url = "https://registry.npmjs.org/xstream/-/xstream-11.13.0.tgz"; + sha512 = "IiTO53rJ+Y5Jj7qMq0f3nwWU1KsajkJkzudTXJa/f3DQ1ifw5O6z/IFZuYF4osfPKhU85jyGaSfY3zqdiMNTVw=="; }; }; "xtend-2.1.2" = { @@ -49974,15 +52476,6 @@ let sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; }; }; - "xtend-3.0.0" = { - name = "xtend"; - packageName = "xtend"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; - sha1 = "5cce7407baf642cba7becda568111c493f59665a"; - }; - }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -50091,13 +52584,13 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; - "yaml-language-server-0.7.2" = { + "yaml-language-server-0.10.1" = { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.7.2"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.7.2.tgz"; - sha512 = "3jBsYrtnlaI5H6psW+0qzVh9LoQ21fuvC8KIupjPbQURb6cAMUGH5aElKREAevSSpgs7VIoqU1ZMCglIHm32OA=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz"; + sha512 = "R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ=="; }; }; "yamljs-0.3.0" = { @@ -50163,15 +52656,6 @@ let sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg=="; }; }; - "yargs-15.3.1" = { - name = "yargs"; - packageName = "yargs"; - version = "15.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; - sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; - }; - }; "yargs-15.4.1" = { name = "yargs"; packageName = "yargs"; @@ -50280,6 +52764,15 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; + "yargs-parser-20.2.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.0.tgz"; + sha512 = "2agPoRFPoIcFzOIp6656gcvsg2ohtscpw2OINr/q46+Sq41xz2OYLqx5HRHabmFU1OARIPAYH5uteICE7mn/5A=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -50316,6 +52809,15 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; + "yargs-unparser-1.6.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; + sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; + }; + }; "yargs-unparser-1.6.1" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -50325,15 +52827,6 @@ let sha512 = "qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA=="; }; }; - "yarn-1.22.0" = { - name = "yarn"; - packageName = "yarn"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.0.tgz"; - sha512 = "KMHP/Jq53jZKTY9iTUt3dIVl/be6UPs2INo96+BnZHLKxYNTfwMmlgHTaMWyGZoO74RI4AIFvnWhYrXq2USJkg=="; - }; - }; "yarn-1.22.4" = { name = "yarn"; packageName = "yarn"; @@ -50343,6 +52836,15 @@ let sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA=="; }; }; + "yarn-1.22.5" = { + name = "yarn"; + packageName = "yarn"; + version = "1.22.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.5.tgz"; + sha512 = "5uzKXwdMc++mYktXqkfpNYT9tY8ViWegU58Hgbo+KXzrzzhEyP1Ip+BTtXloLrXNcNlxFJbLiFKGaS9vK9ym6Q=="; + }; + }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -50397,13 +52899,13 @@ let sha512 = "pLIhhU9z/G+kjOXmJ2bPFm3nejfbH+f1fjYRSOteEXDBrv1EoJE/e+kuHixSXfCYfTkxjYsvRaDX+1QykLCnpQ=="; }; }; - "yeoman-generator-4.11.0" = { + "yeoman-generator-4.12.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.11.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.11.0.tgz"; - sha512 = "++t6t2Z6HjL5F1/UM7+uNvGknKmQdF8tstJx8WKzsUSEpB+19kLVtapSfQIh9uWqm0L59fLWDzUui//WXoynPw=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.12.0.tgz"; + sha512 = "lozwklVQHwUXMM1o8BgxEB8F5BB7vkHW4pjAo1Zt5sJ7FOlWhd6DJ4ZxJ2OK0w+gNYkY/ocPMkUV7DTz/uqEEg=="; }; }; "yn-3.1.1" = { @@ -50514,6 +53016,15 @@ let sha512 = "r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ=="; }; }; + "zip-stream-4.0.2" = { + name = "zip-stream"; + packageName = "zip-stream"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.2.tgz"; + sha512 = "TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g=="; + }; + }; "zmq-2.15.3" = { name = "zmq"; packageName = "zmq"; @@ -50538,23 +53049,23 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.0.5"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.5.tgz"; - sha512 = "Qsa90IGPApJS9HL6Ih7Z8S8mIdriWYEintsT9cfI0WMVYyjvSNZQBf1SvnNU3IEboV4RFnpfXJNmQz1Q4KsRFQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.2.tgz"; + sha512 = "dBcqFTuT71CCkH4BoV2cN5RP5k8ggzOBijNNtwkQv7N4gNcdcczhoPtEa2v4Oo8mPcTwxf/C3RXZ+NicdROJOw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1000.5" - sources."@angular-devkit/core-10.0.5" - sources."@angular-devkit/schematics-10.0.5" - sources."@schematics/angular-10.0.5" - sources."@schematics/update-0.1000.5" + sources."@angular-devkit/architect-0.1001.2" + sources."@angular-devkit/core-10.1.2" + sources."@angular-devkit/schematics-10.1.2" + sources."@schematics/angular-10.1.2" + sources."@schematics/update-0.1001.2" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -50565,7 +53076,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bluebird-3.7.2" @@ -50580,12 +53091,12 @@ in ]; }) sources."caseless-0.12.0" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."chownr-1.1.4" sources."cli-cursor-3.1.0" sources."cli-spinners-2.4.0" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -50669,13 +53180,14 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-7.1.0" + sources."inquirer-7.3.3" sources."ip-1.1.5" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" @@ -50685,22 +53197,15 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" + sources."jsonc-parser-2.3.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.19" - (sources."log-symbols-3.0.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."lodash-4.17.20" + sources."log-symbols-4.0.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" (sources."make-fetch-happen-5.0.2" // { @@ -50742,7 +53247,7 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-1.4.8" sources."npm-pick-manifest-6.1.0" - (sources."npm-registry-fetch-4.0.5" // { + (sources."npm-registry-fetch-4.0.7" // { dependencies = [ sources."hosted-git-info-2.8.8" sources."lru-cache-5.1.1" @@ -50754,12 +53259,16 @@ in sources."oauth-sign-0.9.0" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" - sources."onetime-5.1.1" - sources."open-7.0.4" - sources."ora-4.0.4" + sources."onetime-5.1.2" + sources."open-7.2.0" + sources."ora-5.0.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -50791,7 +53300,7 @@ in }) sources."punycode-2.1.1" sources."qs-6.5.2" - sources."read-package-json-2.1.1" + sources."read-package-json-2.1.2" sources."read-package-tree-5.3.1" (sources."readable-stream-2.3.7" // { dependencies = [ @@ -50810,7 +53319,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.5" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.2" @@ -50832,7 +53341,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."ssri-6.0.1" sources."stream-each-1.2.3" @@ -50846,7 +53355,7 @@ in ]; }) sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."symbol-observable-1.2.0" (sources."tar-4.4.13" // { dependencies = [ @@ -50864,16 +53373,15 @@ in sources."typedarray-0.0.6" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - (sources."universal-analytics-0.4.20" // { + (sources."universal-analytics-0.4.23" // { dependencies = [ - sources."debug-3.2.6" sources."uuid-3.4.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."util-promisify-2.1.0" - sources."uuid-8.1.0" + sources."uuid-8.3.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -50897,18 +53405,18 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.3.tgz"; - sha512 = "mWxMMWKzTmhmTgAeAVestZf4CRcC4lBD5l521J2fsdGpGx9dQGiwqQZqNcwROJDE+Lg0YfXYYqP1UUKhZwYz6Q=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.4.tgz"; + sha512 = "KItaWFEf/X4LLY2XCidjD00oUp4Ay7y9Hu26+T8dPqV+qnMwOL+MGHhYXsJz+4JaeNJu1Ofwc4onmShpwHQruA=="; }; dependencies = [ - sources."@antora/playbook-builder-2.3.3" + sources."@antora/playbook-builder-2.3.4" sources."@iarna/toml-2.2.5" sources."argparse-1.0.10" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."commander-5.1.0" + sources."commander-6.1.0" sources."convict-6.0.0" sources."decamelize-1.2.0" sources."esprima-4.0.1" @@ -50934,24 +53442,24 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.3.tgz"; - sha512 = "kY2j2gsBo1U4Jn+WqK09chsFgXbbUvafgqGo3SzFDdjpsG/NvIylLK3g+bbZ0X9N7FysXytlAhyAYlOJDvXjGw=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.4.tgz"; + sha512 = "uRiFJ/nG5bxjDmFOur27ae7A1J7r+OFVocEwx+vVLRvVYfNHxYP0fI2uUrmJTci8xJ92NLH9VLHpfsHypsoq9Q=="; }; dependencies = [ - sources."@antora/asciidoc-loader-2.3.3" - sources."@antora/content-aggregator-2.3.3" - sources."@antora/content-classifier-2.3.3" - sources."@antora/document-converter-2.3.3" + sources."@antora/asciidoc-loader-2.3.4" + sources."@antora/content-aggregator-2.3.4" + sources."@antora/content-classifier-2.3.4" + sources."@antora/document-converter-2.3.4" sources."@antora/expand-path-helper-1.0.0" - sources."@antora/navigation-builder-2.3.3" - sources."@antora/page-composer-2.3.3" - sources."@antora/playbook-builder-2.3.3" - sources."@antora/redirect-producer-2.3.3" - sources."@antora/site-mapper-2.3.3" - sources."@antora/site-publisher-2.3.3" - sources."@antora/ui-loader-2.3.3" + sources."@antora/navigation-builder-2.3.4" + sources."@antora/page-composer-2.3.4" + sources."@antora/playbook-builder-2.3.4" + sources."@antora/redirect-producer-2.3.4" + sources."@antora/site-mapper-2.3.4" + sources."@antora/site-publisher-2.3.4" + sources."@antora/ui-loader-2.3.4" sources."@iarna/toml-2.2.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -50961,7 +53469,7 @@ in sources."async-lock-1.2.4" sources."balanced-match-1.0.0" sources."base64-js-0.0.2" - sources."bl-4.0.2" + sources."bl-4.0.3" sources."bops-0.0.7" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -50975,7 +53483,7 @@ in sources."cache-directory-2.0.0" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" sources."pump-3.0.0" ]; @@ -51021,6 +53529,8 @@ in ]; }) sources."end-of-stream-1.4.4" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" sources."exit-on-epipe-1.0.1" @@ -51079,6 +53589,7 @@ in ]; }) sources."handlebars-4.7.6" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."http-cache-semantics-4.1.0" sources."ieee754-1.1.13" @@ -51087,11 +53598,16 @@ in sources."inherits-2.0.4" sources."is-absolute-1.0.0" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" + sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" + sources."is-regex-1.1.1" sources."is-relative-1.0.0" + sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -51129,8 +53645,9 @@ in sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."now-and-later-2.0.1" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."once-1.4.0" sources."opal-runtime-1.0.11" (sources."ordered-read-streams-1.0.1" // { @@ -51184,9 +53701,19 @@ in sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stream-shift-1.0.1" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."string_decoder-1.3.0" sources."through-2.3.8" - sources."through2-3.0.2" + sources."through2-4.0.2" (sources."through2-filter-3.0.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -51207,7 +53734,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.4" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -51247,18 +53774,18 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.11.0.tgz"; - sha512 = "H/i+fpbf/W9c446Ud+bDSeoUv5pW03orTm3hwVs9TtCt6332He8PK/CHydFnY/uvMKAmWPG5m2DruWIe7f1XMg=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.12.0.tgz"; + sha512 = "bUyvGm6DOiyLxKwUcGe/ItuSu1/iAHp31hw/c04f4QWyTk2znuyDK/KD6Jn7xqIj1+zRuCVSgUPvRH9R+bfpKg=="; }; dependencies = [ - sources."abab-2.0.4" + sources."abab-2.0.5" sources."acorn-6.4.1" sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" sources."agent-base-5.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -51268,7 +53795,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" sources."browser-process-hrtime-1.0.0" @@ -51286,7 +53813,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."domexception-1.0.1" @@ -51315,9 +53842,11 @@ in sources."https-proxy-agent-4.0.0" sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" + sources."is-docker-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" + sources."is-wsl-2.2.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsdom-13.2.0" @@ -51326,7 +53855,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" @@ -51340,6 +53869,7 @@ in sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."onetime-2.0.1" + sources."open-7.1.0" sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."papaparse-4.6.0" @@ -51356,7 +53886,7 @@ in sources."request-promise-native-1.0.9" sources."restore-cursor-2.0.0" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-3.1.11" @@ -51382,7 +53912,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" @@ -51410,19 +53940,19 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "7.4.1"; + version = "7.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.4.1.tgz"; - sha512 = "90IWWqDIPX3M0vwkmnZ0Ct/EY2b75DYbsw2ZbVxaj57ASdbajhS7Pxhc7MC/L+07nBge+xMRHvQRoKdcfWHd0w=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.1.tgz"; + sha512 = "18EfBO48ojVm7YzwyPc8PRjas9KcIVjdlD+v7tIImKzrf5THcpAYxvzUvZUspSbLIIIqwTgKj/loqamkwOk/XA=="; }; dependencies = [ - sources."@angular-devkit/core-9.1.9" - (sources."@angular-devkit/schematics-9.1.9" // { + sources."@angular-devkit/core-10.0.7" + (sources."@angular-devkit/schematics-10.0.7" // { dependencies = [ - sources."ora-4.0.3" + sources."ora-4.0.4" ]; }) - (sources."@angular-devkit/schematics-cli-0.901.9" // { + (sources."@angular-devkit/schematics-cli-0.1000.7" // { dependencies = [ sources."inquirer-7.1.0" ]; @@ -51434,18 +53964,20 @@ in sources."chalk-2.4.2" ]; }) - (sources."@nestjs/schematics-7.0.1" // { + (sources."@nestjs/schematics-7.1.2" // { dependencies = [ - sources."@angular-devkit/core-9.1.7" - sources."@angular-devkit/schematics-9.1.7" + sources."@angular-devkit/core-9.1.12" + sources."@angular-devkit/schematics-9.1.12" sources."ora-4.0.3" + sources."rxjs-6.5.4" ]; }) - sources."@schematics/schematics-0.901.9" + sources."@schematics/schematics-0.1000.7" sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" + sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -51454,7 +53986,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.17" // { + (sources."@types/webpack-4.41.21" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -51481,7 +54013,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" - sources."ajv-6.12.0" + sources."ajv-6.12.3" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."ansi-escapes-4.3.1" @@ -51493,7 +54025,7 @@ in sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-unique-0.3.2" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -51519,7 +54051,7 @@ in sources."binary-extensions-2.1.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."brorand-1.1.0" @@ -51555,11 +54087,11 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."chardet-0.7.0" - sources."chokidar-3.4.0" + sources."chokidar-3.4.2" sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" @@ -51618,7 +54150,11 @@ in }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."crypto-browserify-3.12.0" sources."cyclist-1.0.1" sources."debug-2.6.9" @@ -51647,7 +54183,11 @@ in sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" @@ -51692,14 +54232,19 @@ in sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" - (sources."fork-ts-checker-webpack-plugin-5.0.4" // { + (sources."fork-ts-checker-webpack-plugin-5.1.0" // { dependencies = [ - sources."chalk-2.4.2" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."fragment-cache-0.2.1" sources."from2-2.3.0" - sources."fs-extra-9.0.0" + sources."fs-extra-9.0.1" sources."fs-monkey-1.0.1" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" @@ -51738,7 +54283,18 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-7.2.0" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."cli-width-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."rxjs-6.6.3" + sources."supports-color-7.2.0" + ]; + }) sources."interpret-1.4.0" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -51761,6 +54317,7 @@ in sources."isobject-3.0.1" sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json5-1.0.1" sources."jsonfile-6.0.1" @@ -51769,7 +54326,7 @@ in sources."loader-runner-2.4.0" sources."loader-utils-1.4.0" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" (sources."log-symbols-3.0.0" // { dependencies = [ @@ -51779,7 +54336,11 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."magic-string-0.25.7" - sources."make-dir-2.1.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" @@ -51858,8 +54419,18 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.1" - sources."ora-4.0.4" + sources."onetime-5.1.2" + (sources."ora-5.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."log-symbols-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."os-browserify-0.3.0" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -51870,8 +54441,8 @@ in sources."pako-1.0.11" sources."parallel-transform-1.2.0" sources."parent-module-1.0.1" - sources."parse-asn1-5.1.5" - sources."parse-json-5.0.1" + sources."parse-asn1-5.1.6" + sources."parse-json-5.1.0" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -51884,6 +54455,7 @@ in sources."picomatch-2.2.2" sources."pify-4.0.1" sources."pkg-dir-3.0.0" + sources."pluralize-8.0.0" sources."posix-character-classes-0.1.1" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -51921,13 +54493,13 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."schema-utils-1.0.0" - sources."semver-5.7.1" - sources."serialize-javascript-3.1.0" + sources."schema-utils-2.7.0" + sources."semver-7.3.2" + sources."serialize-javascript-4.0.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -52015,8 +54587,9 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.4" // { + (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ + sources."schema-utils-1.0.0" sources."source-map-0.6.1" ]; }) @@ -52034,7 +54607,7 @@ in sources."to-regex-range-5.0.1" sources."tree-kill-1.2.2" sources."tsconfig-paths-3.9.0" - (sources."tsconfig-paths-webpack-plugin-3.2.0" // { + (sources."tsconfig-paths-webpack-plugin-3.3.0" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -52059,7 +54632,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -52074,11 +54647,7 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - (sources."watchpack-1.7.4" // { - dependencies = [ - sources."chokidar-3.4.1" - ]; - }) + sources."watchpack-1.7.4" (sources."watchpack-chokidar2-2.0.0" // { dependencies = [ sources."anymatch-2.0.0" @@ -52099,19 +54668,20 @@ in ]; }) sources."wcwidth-1.0.1" - (sources."webpack-4.43.0" // { + (sources."webpack-4.44.1" // { dependencies = [ sources."memory-fs-0.4.1" + sources."schema-utils-1.0.0" ]; }) - sources."webpack-node-externals-1.7.2" + sources."webpack-node-externals-2.5.1" (sources."webpack-sources-1.4.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."which-1.3.1" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" sources."worker-farm-1.7.0" sources."wrappy-1.0.2" sources."xtend-4.0.2" @@ -52132,17 +54702,17 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.4.6"; + version = "4.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.6.tgz"; - sha512 = "IaLrnZ80BrBLPAkBup8bn363S1NHfNf8jfCJLWoXad598cUm6byMqntWtDFeTq0c3KohXcsIbT+nqLc5S9vz0w=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.6.tgz"; + sha512 = "S3CToCDtuqkcUyPrPTYKdic9aiOsVairCP8dEydyYjvLUIYVVK3GWJqBfThkNdaMjeB/fVPt8qlYjGqvSs55GQ=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.19.0" - (sources."@apollo/protobufjs-1.0.4" // { + sources."@apollo/federation-0.20.0" + (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.28" + sources."@types/node-10.17.35" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -52152,35 +54722,73 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.1" - sources."@babel/generator-7.11.0" + (sources."@babel/compat-data-7.11.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + (sources."@babel/core-7.11.6" // { + dependencies = [ + sources."@babel/generator-7.11.6" + sources."@babel/types-7.11.5" + sources."semver-5.7.1" + ]; + }) + (sources."@babel/generator-7.11.4" // { + dependencies = [ + sources."@babel/types-7.11.5" + ]; + }) sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.10.4" + (sources."@babel/helper-compilation-targets-7.10.4" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.10.4" + (sources."@babel/helper-define-map-7.10.5" // { + dependencies = [ + sources."@babel/types-7.11.5" + ]; + }) + sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" + (sources."@babel/helper-member-expression-to-functions-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.5" + ]; + }) sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + (sources."@babel/helper-module-transforms-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.5" + ]; + }) sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.11.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" - sources."@babel/helper-split-export-declaration-7.11.0" + (sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.5" + ]; + }) + (sources."@babel/helper-split-export-declaration-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.5" + ]; + }) sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" @@ -52242,20 +54850,31 @@ in sources."@babel/plugin-transform-typescript-7.11.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.0" + (sources."@babel/preset-env-7.11.5" // { + dependencies = [ + sources."@babel/types-7.11.5" + sources."semver-5.7.1" + ]; + }) sources."@babel/preset-flow-7.10.4" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.10.4" - (sources."@babel/register-7.10.5" // { + (sources."@babel/register-7.11.5" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" + sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.11.1" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + (sources."@babel/traverse-7.11.5" // { + dependencies = [ + sources."@babel/generator-7.11.6" + sources."@babel/types-7.11.5" + ]; + }) + sources."@babel/types-7.10.4" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -52271,7 +54890,7 @@ in (sources."chalk-3.0.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."color-convert-2.0.1" @@ -52280,15 +54899,17 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."@oclif/command-1.7.0" // { + (sources."@oclif/command-1.8.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.0" + sources."semver-7.3.2" ]; }) - (sources."@oclif/config-1.16.0" // { + (sources."@oclif/config-1.17.0" // { dependencies = [ sources."globby-11.0.1" sources."is-wsl-2.2.0" + sources."tslib-2.0.1" ]; }) (sources."@oclif/errors-1.3.3" // { @@ -52324,6 +54945,7 @@ in dependencies = [ sources."cli-ux-4.9.3" sources."indent-string-3.2.0" + sources."semver-5.7.1" sources."strip-ansi-5.2.0" ]; }) @@ -52332,10 +54954,14 @@ in sources."npm-run-path-3.1.0" sources."path-key-3.1.1" sources."semver-7.3.2" - sources."tslib-2.0.0" + sources."tslib-2.0.1" + ]; + }) + (sources."@oclif/plugin-warn-if-update-available-1.7.0" // { + dependencies = [ + sources."semver-5.7.1" ]; }) - sources."@oclif/plugin-warn-if-update-available-1.7.0" sources."@oclif/screen-1.0.4" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" @@ -52347,7 +54973,7 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@samverschueren/stream-to-observable-0.3.0" + sources."@samverschueren/stream-to-observable-0.3.1" sources."@sindresorhus/is-0.7.0" sources."@types/accepts-1.3.5" sources."@types/body-parser-1.19.0" @@ -52356,48 +54982,77 @@ in sources."@types/content-disposition-0.5.3" sources."@types/cookies-0.7.4" sources."@types/cors-2.8.7" + sources."@types/ejs-2.7.0" sources."@types/express-4.17.7" - sources."@types/express-serve-static-core-4.17.9" + sources."@types/express-serve-static-core-4.17.12" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" - sources."@types/graphql-upload-8.0.3" + (sources."@types/graphql-upload-8.0.4" // { + dependencies = [ + sources."graphql-15.3.0" + ]; + }) sources."@types/http-assert-1.5.1" + sources."@types/http-errors-1.8.0" + sources."@types/inquirer-6.5.0" + (sources."@types/jscodeshift-0.7.1" // { + dependencies = [ + sources."ast-types-0.12.1" + sources."recast-0.17.2" + sources."source-map-0.6.1" + ]; + }) sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.3" + sources."@types/koa-2.11.4" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" ]; }) sources."@types/normalize-package-data-2.4.0" - sources."@types/qs-6.9.4" + sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.5" + sources."@types/through-0.0.30" sources."@types/ws-7.2.6" - sources."@types/zen-observable-0.8.0" - (sources."@vue/cli-shared-utils-4.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@vue/cli-ui-4.5.0" // { + sources."@types/zen-observable-0.8.1" + sources."@vue/cli-shared-utils-4.5.6" + (sources."@vue/cli-ui-4.5.6" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.0" - sources."@vue/cli-ui-addon-widgets-4.5.0" + sources."@vue/cli-ui-addon-webpack-4.5.6" + sources."@vue/cli-ui-addon-widgets-4.5.6" + (sources."@vue/compiler-core-3.0.0" // { + dependencies = [ + sources."@babel/types-7.11.5" + sources."source-map-0.6.1" + ]; + }) + sources."@vue/compiler-dom-3.0.0" + (sources."@vue/compiler-sfc-3.0.0" // { + dependencies = [ + sources."@babel/types-7.11.5" + sources."source-map-0.6.1" + ]; + }) + sources."@vue/compiler-ssr-3.0.0" + sources."@vue/reactivity-3.0.0" + sources."@vue/runtime-core-3.0.0" + sources."@vue/runtime-dom-3.0.0" + sources."@vue/shared-3.0.0" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."aggregate-error-3.0.1" - sources."ajv-6.12.3" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.5" (sources."ansi-align-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -52435,9 +55090,10 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.30.2" // { + (sources."apollo-2.30.3" // { dependencies = [ - sources."graphql-tag-2.10.4" + sources."apollo-graphql-0.6.0" + sources."mkdirp-1.0.4" sources."strip-ansi-5.2.0" ]; }) @@ -52445,25 +55101,21 @@ in sources."apollo-cache-control-0.11.1" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.37.8" // { + (sources."apollo-codegen-core-0.37.9" // { dependencies = [ - sources."@babel/types-7.10.4" - sources."recast-0.19.1" + (sources."recast-0.20.3" // { + dependencies = [ + sources."ast-types-0.14.1" + ]; + }) sources."source-map-0.6.1" + sources."tslib-2.0.1" ]; }) - (sources."apollo-codegen-flow-0.35.8" // { - dependencies = [ - sources."@babel/types-7.10.4" - ]; - }) - sources."apollo-codegen-scala-0.36.8" - sources."apollo-codegen-swift-0.37.8" - (sources."apollo-codegen-typescript-0.37.8" // { - dependencies = [ - sources."@babel/types-7.10.4" - ]; - }) + sources."apollo-codegen-flow-0.35.9" + sources."apollo-codegen-scala-0.36.9" + sources."apollo-codegen-swift-0.37.9" + sources."apollo-codegen-typescript-0.37.9" sources."apollo-datasource-0.7.2" (sources."apollo-engine-reporting-2.3.0" // { dependencies = [ @@ -52473,7 +55125,11 @@ in sources."apollo-engine-reporting-protobuf-0.5.2" sources."apollo-env-0.6.5" sources."apollo-graphql-0.5.0" - sources."apollo-language-server-1.23.3" + (sources."apollo-language-server-1.23.4" // { + dependencies = [ + sources."apollo-graphql-0.6.0" + ]; + }) sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -52483,13 +55139,13 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.2" - sources."apollo-server-core-2.16.1" + sources."apollo-server-core-2.17.0" sources."apollo-server-env-2.4.5" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.16.1" + sources."apollo-server-express-2.17.0" sources."apollo-server-plugin-base-0.9.1" sources."apollo-server-types-0.5.1" - sources."apollo-tracing-0.11.1" + sources."apollo-tracing-0.11.2" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { @@ -52510,7 +55166,11 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.13.3" + (sources."ast-types-0.14.2" // { + dependencies = [ + sources."tslib-2.0.1" + ]; + }) sources."astral-regex-1.0.0" sources."async-2.6.3" sources."async-each-1.0.3" @@ -52521,7 +55181,7 @@ in sources."atob-2.1.2" sources."await-to-js-2.1.1" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" sources."backo2-1.0.2" @@ -52533,9 +55193,11 @@ in }) sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" + sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."bl-1.2.2" + sources."bl-1.2.3" + sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -52545,7 +55207,6 @@ in sources."setprototypeof-1.1.1" ]; }) - sources."boolbase-1.0.0" (sources."boxen-4.2.0" // { dependencies = [ (sources."ansi-align-3.0.0" // { @@ -52556,21 +55217,21 @@ in sources."ansi-styles-4.2.1" sources."camelcase-5.3.1" sources."chalk-3.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-7.0.3" sources."has-flag-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-5.2.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."term-size-2.2.0" sources."type-fest-0.8.1" ]; }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.13.0" + sources."browserslist-4.14.3" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -52597,7 +55258,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001133" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -52606,11 +55267,6 @@ in sources."chalk-2.4.2" sources."change-case-4.1.1" sources."chardet-0.7.0" - (sources."cheerio-1.0.0-rc.3" // { - dependencies = [ - sources."entities-1.1.2" - ]; - }) (sources."chokidar-2.1.8" // { dependencies = [ sources."braces-2.3.2" @@ -52656,11 +55312,11 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."cli-ux-5.4.9" // { + (sources."cli-ux-5.4.10" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."clean-stack-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -52669,14 +55325,23 @@ in sources."fs-extra-9.0.1" sources."has-flag-4.0.0" sources."is-wsl-2.2.0" - sources."strip-ansi-5.2.0" - sources."supports-color-7.1.0" - sources."tslib-2.0.0" + sources."semver-7.3.2" + sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.1.0" + sources."tslib-2.0.1" sources."type-fest-0.11.0" ]; }) sources."cli-width-3.0.0" sources."clipboard-2.0.6" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" + ]; + }) sources."clone-1.0.4" sources."clone-response-1.0.2" sources."cmd-shim-3.0.3" @@ -52692,7 +55357,8 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" - sources."configstore-3.1.2" + sources."configstore-3.1.5" + sources."consolidate-0.16.0" sources."constant-case-3.0.3" (sources."content-disposition-0.5.3" // { dependencies = [ @@ -52722,20 +55388,24 @@ in ]; }) sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."crypto-random-string-1.0.0" - sources."css-select-1.2.0" - sources."css-what-2.1.3" + sources."cssesc-3.0.0" sources."cssfilter-0.0.10" + sources."csstype-2.6.13" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" - sources."de-indent-1.0.2" - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; }) + sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" (sources."decompress-4.2.1" // { dependencies = [ @@ -52775,20 +55445,11 @@ in sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" sources."destroy-1.0.4" - sources."detect-indent-6.0.0" sources."dicer-0.3.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" - (sources."dom-serializer-0.1.1" // { - dependencies = [ - sources."entities-1.1.2" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" sources."dot-case-3.0.3" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."dotenv-8.2.0" (sources."download-7.1.0" // { dependencies = [ @@ -52805,22 +55466,24 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.520" + sources."electron-to-chromium-1.3.570" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" + sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.0.3" sources."env-ci-3.2.2" - sources."envinfo-7.7.2" + sources."envinfo-7.7.3" sources."error-ex-1.3.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esm-3.2.25" sources."esprima-4.0.1" + sources."estree-walker-2.0.1" sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -52889,11 +55552,12 @@ in dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" + sources."semver-5.7.1" ]; }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.130.0" + sources."flow-parser-0.134.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -52917,7 +55581,9 @@ in sources."gaze-1.1.3" sources."generate-function-1.1.0" sources."generate-object-property-1.2.0" + sources."generic-names-2.0.1" sources."gensync-1.0.0-beta.1" + sources."get-caller-file-2.0.5" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -52930,8 +55596,8 @@ in sources."graceful-fs-4.1.15" ]; }) - sources."git-up-4.0.1" - sources."git-url-parse-11.1.2" + sources."git-up-4.0.2" + sources."git-url-parse-11.1.3" sources."glob-7.1.5" sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" @@ -53015,17 +55681,11 @@ in sources."kind-of-4.0.0" ]; }) + sources."hash-sum-2.0.0" sources."hash.js-1.1.7" - sources."he-1.2.0" sources."header-case-2.0.3" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.8" - (sources."htmlparser2-3.10.1" // { - dependencies = [ - sources."entities-1.1.2" - sources."readable-stream-3.6.0" - ]; - }) sources."http-cache-semantics-3.8.1" (sources."http-call-5.3.0" // { dependencies = [ @@ -53038,6 +55698,8 @@ in sources."human-signals-1.1.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" + sources."icss-replace-symbols-1.1.0" + sources."icss-utils-4.1.1" sources."ieee754-1.1.13" sources."ignore-5.1.8" sources."ignore-by-default-1.0.1" @@ -53046,7 +55708,8 @@ in sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."inflected-2.0.4" + sources."indexes-of-1.0.1" + sources."inflected-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -53061,9 +55724,9 @@ in sources."figures-3.2.0" sources."has-flag-4.0.0" sources."mimic-fn-2.1.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."type-fest-0.11.0" ]; }) @@ -53075,7 +55738,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -53088,6 +55751,7 @@ in sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-natural-number-4.0.1" + sources."is-negative-zero-2.0.0" sources."is-npm-1.0.0" sources."is-number-7.0.0" sources."is-obj-1.0.1" @@ -53101,7 +55765,7 @@ in sources."is-redirect-1.0.0" sources."is-regex-1.1.1" sources."is-retry-allowed-1.2.0" - sources."is-ssh-1.3.1" + sources."is-ssh-1.3.2" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" @@ -53144,6 +55808,7 @@ in sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -53182,9 +55847,15 @@ in sources."type-fest-0.3.1" ]; }) + (sources."loader-utils-1.4.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" + sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" sources."lodash.get-4.4.2" @@ -53205,7 +55876,7 @@ in sources."wrap-ansi-3.0.1" ]; }) - sources."loglevel-1.6.8" + sources."loglevel-1.7.0" sources."long-4.0.0" sources."loose-envify-1.4.0" sources."lowdb-1.0.0" @@ -53216,6 +55887,7 @@ in sources."yallist-3.1.1" ]; }) + sources."magic-string-0.25.7" sources."make-dir-1.3.0" sources."make-error-1.3.6" sources."map-cache-0.2.2" @@ -53223,6 +55895,11 @@ in sources."media-typer-0.3.0" sources."merge-1.2.1" sources."merge-descriptors-1.0.1" + (sources."merge-source-map-1.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" @@ -53264,29 +55941,32 @@ in sources."nice-try-1.0.5" sources."no-case-3.0.3" sources."node-dir-0.1.17" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."node-ipc-9.1.1" sources."node-modules-regexp-1.0.0" (sources."node-notifier-6.0.0" // { dependencies = [ sources."is-wsl-2.2.0" - sources."semver-6.3.0" ]; }) - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" + sources."semver-5.7.1" ]; }) sources."nopt-1.0.10" - sources."normalize-package-data-2.5.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" - sources."nth-check-1.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -53306,9 +55986,13 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-path-0.11.4" - sources."object-treeify-1.1.26" + sources."object-treeify-1.1.28" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -53331,14 +56015,17 @@ in sources."p-map-2.1.0" sources."p-timeout-2.0.1" sources."p-try-2.2.0" - sources."package-json-4.0.1" + (sources."package-json-4.0.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."param-case-3.0.3" sources."parse-git-config-2.0.3" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."parse-passwd-1.0.0" - sources."parse-path-4.0.1" - sources."parse-url-5.0.1" - sources."parse5-3.0.3" + sources."parse-path-4.0.2" + sources."parse-url-5.0.2" sources."parseurl-1.3.3" sources."pascal-case-3.1.1" sources."pascalcase-0.1.1" @@ -53375,13 +56062,26 @@ in ]; }) sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.34" // { + dependencies = [ + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-modules-3.2.2" + sources."postcss-modules-extract-imports-2.0.0" + sources."postcss-modules-local-by-default-3.0.3" + sources."postcss-modules-scope-2.2.0" + sources."postcss-modules-values-3.0.0" + sources."postcss-selector-parser-6.0.3" + sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" - sources."prismjs-1.20.0" + sources."prismjs-1.21.0" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."protocols-1.4.7" + sources."protocols-1.4.8" sources."proxy-addr-2.0.6" sources."ps-list-4.1.0" sources."pseudomap-1.0.2" @@ -53428,6 +56128,7 @@ in }) (sources."recast-0.18.10" // { dependencies = [ + sources."ast-types-0.13.3" sources."source-map-0.6.1" ]; }) @@ -53443,7 +56144,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" @@ -53456,6 +56157,8 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.2" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" @@ -53468,7 +56171,7 @@ in sources."rss-parser-3.9.0" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -53476,8 +56179,12 @@ in sources."sec-1.0.0" sources."seek-bzip-1.0.6" sources."select-1.1.2" - sources."semver-5.7.1" - sources."semver-diff-2.1.0" + sources."semver-6.3.0" + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) (sources."send-0.17.1" // { dependencies = [ (sources."debug-2.6.9" // { @@ -53492,6 +56199,7 @@ in }) sources."sentence-case-3.0.3" sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" sources."set-value-2.0.1" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" @@ -53543,10 +56251,11 @@ in ]; }) sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -53577,6 +56286,7 @@ in sources."steno-0.4.4" sources."streamsearch-0.1.2" sources."strict-uri-encode-1.1.0" + sources."string-hash-1.1.3" sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" @@ -53596,7 +56306,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - (sources."subscriptions-transport-ws-0.9.17" // { + (sources."subscriptions-transport-ws-0.9.18" // { dependencies = [ sources."ws-5.2.2" ]; @@ -53622,11 +56332,11 @@ in dependencies = [ sources."cross-spawn-7.0.3" sources."execa-3.4.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."is-stream-2.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -53696,6 +56406,7 @@ in sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" sources."union-value-1.0.1" + sources."uniq-1.0.1" sources."unique-string-1.0.0" sources."universalify-1.0.0" sources."unpipe-1.0.0" @@ -53723,7 +56434,7 @@ in }) sources."upper-case-2.0.1" sources."upper-case-first-2.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" @@ -53741,18 +56452,18 @@ in sources."vscode-languageserver-protocol-3.14.1" sources."vscode-languageserver-types-3.14.0" sources."vscode-uri-1.0.6" - sources."vue-2.6.11" + sources."vue-2.6.12" (sources."vue-cli-plugin-apollo-0.21.3" // { dependencies = [ sources."cross-spawn-7.0.3" sources."execa-3.4.0" sources."fs-extra-8.1.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."is-stream-2.0.0" sources."jsonfile-4.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -53761,16 +56472,16 @@ in sources."which-2.0.2" ]; }) - sources."vue-jscodeshift-adapter-2.1.0" - (sources."vue-sfc-descriptor-to-string-1.0.0" // { + (sources."vue-codemod-0.0.4" // { dependencies = [ - sources."indent-string-3.2.0" + sources."globby-10.0.2" + sources."vue-3.0.0" ]; }) - sources."vue-template-compiler-2.6.11" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" + sources."which-module-2.0.0" sources."widest-line-3.1.0" (sources."wrap-ansi-4.0.0" // { dependencies = [ @@ -53788,13 +56499,27 @@ in sources."xmlbuilder-11.0.1" sources."xss-1.0.8" sources."xtend-4.0.2" + sources."y18n-4.0.0" sources."yallist-2.1.2" (sources."yaml-front-matter-3.4.1" // { dependencies = [ sources."commander-1.0.0" ]; }) - sources."yarn-1.22.4" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + ]; + }) + (sources."yargs-parser-18.1.3" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) + sources."yarn-1.22.5" sources."yauzl-2.10.0" sources."yn-3.1.1" sources."zen-observable-0.8.15" @@ -53935,12 +56660,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.11.0" + sources."@babel/generator-7.11.6" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.5" sources."@babel/template-7.10.4" - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -53965,7 +56690,7 @@ in sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."source-map-0.5.7" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" @@ -54013,19 +56738,19 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.14.6"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.14.6.tgz"; - sha512 = "M+DxWKG35yfUrJj58i6ohTrf8EaRkk9mFj/QSXxUvmqsyYrBmpQT1RnITzk7HY0QVxW1Oiw9zjxGVrQeozJL/w=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.15.2.tgz"; + sha512 = "40tSBJENAo8bC9RA+IplD/OACRBiZbTBXdt/Q7qaTdDiaMz/ITXCYuALeY6cGK6bO3Frmw2B5djwGbjxlrLa6A=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.11.1" // { + (sources."@babel/core-7.11.6" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.11.0" // { + (sources."@babel/generator-7.11.6" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -54042,10 +56767,10 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -54060,7 +56785,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ejs-2.5.7" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" @@ -54093,7 +56818,7 @@ in sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."matcher-collection-1.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -54146,7 +56871,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -54174,13 +56899,13 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.16.1.tgz"; - sha512 = "IS1Ix7qyRq7GTMXqhHUF44yY89i/1Ucn5KFLimEfDpwU1f3GvbV9VnDpqpG6kedJsl2LigEthSnoVlzaOwgt0g=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.17.0.tgz"; + sha512 = "t80ktUFL9DPaTO7yydoNYXIDKINweWbFvvUXesltmWj7UaIyepIVRAWUp4+62udJtor1VxVFEAXnsVDA640flw=="; }; dependencies = [ - sources."abab-2.0.4" + sources."abab-2.0.5" sources."acorn-5.7.4" (sources."acorn-globals-4.3.4" // { dependencies = [ @@ -54188,14 +56913,14 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -54248,7 +56973,7 @@ in sources."jsprim-1.4.1" sources."left-pad-1.3.0" sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" @@ -54281,7 +57006,7 @@ in sources."turndown-4.0.2" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urijs-1.19.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -54436,7 +57161,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -54472,7 +57197,7 @@ in sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -54485,7 +57210,7 @@ in }) sources."balanced-match-1.0.0" sources."base64-js-1.3.1" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."browser-pack-6.1.0" @@ -54588,7 +57313,7 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parents-1.0.1" - sources."parse-asn1-5.1.5" + sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -54616,6 +57341,7 @@ in sources."resolve-1.17.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shasum-object-1.0.0" @@ -54685,10 +57411,10 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.15" + sources."@types/node-13.13.21" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -54700,7 +57426,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -54731,7 +57457,7 @@ in sources."caseless-0.12.0" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."castv2-client-1.2.0" @@ -54746,7 +57472,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-6.0.0" + sources."commander-6.1.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -54822,7 +57548,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.1" + sources."ipaddr.js-2.0.0" sources."is-arrayish-0.2.1" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" @@ -55006,12 +57732,16 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" sources."stream-transcoder-0.0.5" - sources."string2compact-1.3.0" + (sources."string2compact-1.3.0" // { + dependencies = [ + sources."ipaddr.js-1.9.1" + ]; + }) sources."string_decoder-0.10.31" sources."strip-ansi-2.0.1" sources."strip-bom-2.0.0" @@ -55041,7 +57771,7 @@ in sources."ultron-1.1.1" sources."underscore-1.6.0" sources."uniq-1.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."utfx-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" @@ -55116,10 +57846,10 @@ in coc-css = nodeEnv.buildNodePackage { name = "coc-css"; packageName = "coc-css"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.4.tgz"; - sha512 = "SvYsSjLJHHESTORGLsPI/QPiA5zB2z+cC9eaJ638yhh6qTZIwFHM0p5v1ZfflK+FUdJgiDz87oyWnUKVP1wZ7Q=="; + url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.5.tgz"; + sha512 = "Khii6e43VV1JqSNd/UGMDmenBkFYcFKEr0WM6a8isOOWxSX8Vly/YAjVq7rbErD3mYOeJ+rxcH5/faUqIDj/9A=="; }; buildInputs = globalBuildInputs; meta = { @@ -55156,10 +57886,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.2.7"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.2.7.tgz"; - sha512 = "an8yOGLe0t7RT3LFSSDYP7oEqeYmQHTDU9yEeaVXy42W+4MYVsf771F2t1BMvjg3AjkpF9WA7ztM9lKck6DBMA=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.1.tgz"; + sha512 = "yiWUByuOtIHs1GnXspO59F5K0QtGYxMmpt8ZC2VvvB3DZZhEbhmBNrcoU66JaJP9y8tCZWTRh1eyobCRBL0pTA=="; }; buildInputs = globalBuildInputs; meta = { @@ -55173,10 +57903,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.8.1"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.8.1.tgz"; - sha512 = "C9un9MiSk9rZ2ATOdBeTTH/39sHzQJf5rJnuVqNNyjTECIdzsL0Hbb8/CffFrB82z4tDfru2dncjd5fnz/OTOQ=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.1.tgz"; + sha512 = "kPNmgaCx6hKshq/Vv5uugrPkQcDa7pVp+hosGADBP8qzHxudbumDA5va2vSzqjhUxAYEGTL92F0mBapg29pJhg=="; }; buildInputs = globalBuildInputs; meta = { @@ -55191,15 +57921,15 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.9.2"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.9.2.tgz"; - sha512 = "2w3kFR0SG4zBJ1mEd4eaCXB+LIdbZxkaSpivojRbiwNBc6Z6gfcqcAl841lGxr9Ry4R4jPGjnGH0N+08Ectg1Q=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.11.0.tgz"; + sha512 = "W27x1U6WlKiFKsiTRxc5neFFJKx1AXFYZ8OxELX4tubCptNa64RTBqSTk9Iv0zHFwEs1xLJ56CE7NO3wTmKVKw=="; }; dependencies = [ sources."isexe-2.0.0" - sources."node-fetch-2.6.0" - sources."tslib-2.0.0" + sources."node-fetch-2.6.1" + sources."tslib-2.0.1" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -55214,10 +57944,10 @@ in coc-highlight = nodeEnv.buildNodePackage { name = "coc-highlight"; packageName = "coc-highlight"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.5.tgz"; - sha512 = "fGWz30toD5ORdRpH7WOSbMvNOqzdorCSClTfwIdcb3vJoKPA31wOxFzEMfzR7jlXvusjBaUr1GvTQyu3eOKomw=="; + url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.6.tgz"; + sha512 = "aKzZ86GVnZgZV2EAf62SDpTXzGYHD7PTSB+HgytTvdubgFgssQitrIUvWCPnlvagPixtM1XqTlh8AKusnrtSOg=="; }; buildInputs = globalBuildInputs; meta = { @@ -55252,10 +57982,10 @@ in coc-imselect = nodeEnv.buildNodePackage { name = "coc-imselect"; packageName = "coc-imselect"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/coc-imselect/-/coc-imselect-0.0.12.tgz"; - sha512 = "X8TBe8UTwNd01HrWBXy93jQ1PShGtTa4bm2aH2bQwx9EH9FW7ufRlw7euPKkR2kzilshwb3UbJnLET2vFdZjJw=="; + url = "https://registry.npmjs.org/coc-imselect/-/coc-imselect-0.0.13.tgz"; + sha512 = "5hL7FmrLILl6PwZDUndOfHqfMjAl31pvB6YifmnZJO/ht4J3lFLCWxkiyXt5PRQbrHKLGnPT7sySTKxF8X303g=="; }; buildInputs = globalBuildInputs; meta = { @@ -55269,10 +57999,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.4.11"; + version = "1.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.11.tgz"; - sha512 = "Dh6q45+NKNqFxWXWOMD5eq74Egr0iuWq9nO6T/+L3yd4FL+b+whFFSdWiehifJQwx83lAGQ3TjdEjLnUT29+/Q=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.12.tgz"; + sha512 = "kKvT5ESFDOVPZ2iO4MQ2FkWj88kZqcczpQDqYD1tBgrLAGD0YnEzSzK6paI+kJYqk945X/k66Kcq5YbercvmqA=="; }; buildInputs = globalBuildInputs; meta = { @@ -55287,10 +58017,10 @@ in coc-jest = nodeEnv.buildNodePackage { name = "coc-jest"; packageName = "coc-jest"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.0.3.tgz"; - sha512 = "ZxgOP00URYcmIUnl1yjxonxbwb4QHEk2JJxxcYyCHo2wJPCVQWB+WYVYzHb0pzrZdDcsj5hk6wXWnLXM5EkRjA=="; + url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.0.4.tgz"; + sha512 = "cqNvWTS27HrT3+zthsb7zPokPwvrCJkGnmQkktfDDnUET5d6lbMhJaqZ8DlYxKKtoaPZ5QzwnaoowChhh8M9WA=="; }; buildInputs = globalBuildInputs; meta = { @@ -55305,10 +58035,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.2.6"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.2.6.tgz"; - sha512 = "PAytSZ30TWoEHOfi2V3Y944u5q1WHNVhjsKyNnggm8CcgYAulWJiCzxSsmKBLw+DbRLqygGUdO3cOIbQeJCm5A=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.1.tgz"; + sha512 = "VKCzzCMZYxqjU89EMh8g58ytbhXXQcMSyWx385NXiijjK3Amtuvz775lPfiUeIAeVNr2VM+yeKimUw4pbE/lug=="; }; buildInputs = globalBuildInputs; meta = { @@ -55340,99 +58070,171 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.1.tgz"; - sha512 = "BMM8RIPR7HPAqOeQ+tqf+emtuUFATz5Kam9TUN3I4g1URFrI3pthnx6N5s6h/sdtRiwdCLo8vPie58y+Bhx4EQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.4.tgz"; + sha512 = "EaDdMssH8XCpXq4rTQOkl8BhiB5eR+pAlV4mARs+jsB6wvJVd6U3Ba6nKuTB7n7HbHbn3tWZWLhclpqByi5G8g=="; }; dependencies = [ - sources."@chemzqm/neovim-5.1.9" + sources."@chemzqm/neovim-5.2.6" + sources."@tootallnate/once-1.1.2" + sources."agent-base-6.0.1" + sources."arch-2.1.2" sources."async-2.6.3" sources."await-semaphore-0.1.3" sources."balanced-match-1.0.0" + sources."big-integer-1.6.48" + sources."binary-0.3.0" + sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" sources."bser-2.1.1" - sources."chownr-1.1.4" - sources."coc.nvim-0.0.77" + sources."buffer-indexof-polyfill-1.0.2" + sources."buffers-0.1.1" + sources."bytes-3.1.0" + sources."chainsaw-0.1.0" + sources."chownr-2.0.0" + sources."clipboardy-2.3.0" + sources."coc.nvim-0.0.79" sources."concat-map-0.0.1" - sources."date-format-2.1.0" + sources."content-disposition-0.5.3" + sources."core-util-is-1.0.2" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + sources."which-1.3.1" + ]; + }) + sources."date-format-3.0.0" sources."debounce-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-extend-0.6.0" + sources."define-properties-1.1.3" + sources."duplexer2-0.1.4" + sources."end-of-stream-1.4.4" + sources."es-abstract-1.17.6" + sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" + sources."execa-1.0.0" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.12.1" - sources."fp-ts-2.8.1" + sources."follow-redirects-1.13.0" + sources."fp-ts-2.8.2" sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" + (sources."fstream-1.0.12" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + ]; + }) + sources."function-bind-1.1.1" + sources."get-stream-4.1.0" sources."glob-7.1.6" sources."graceful-fs-4.2.4" + sources."has-1.0.3" + sources."has-symbols-1.0.1" + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" sources."int64-buffer-0.1.10" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" + sources."is-docker-2.1.1" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isuri-2.0.3" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."jsonfile-4.0.0" + sources."listenercount-1.0.1" (sources."locate-java-home-1.1.2" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."lodash-4.17.19" - sources."log4js-5.3.0" - (sources."metals-languageclient-0.2.8" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."semver-7.3.2" - ]; - }) + sources."lodash-4.17.20" + sources."log4js-6.3.0" + sources."metals-languageclient-0.3.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."msgpack-lite-0.1.26" (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" + sources."mkdirp-0.5.5" sources."rimraf-2.4.5" ]; }) sources."ncp-2.0.0" - sources."node-fetch-2.6.0" + sources."nice-try-1.0.5" + sources."node-fetch-2.6.1" sources."node-int64-0.4.0" + sources."npm-run-path-2.0.2" + sources."object-inspect-1.8.0" + sources."object-keys-1.1.1" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" + sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."process-nextick-args-2.0.1" + sources."promise.prototype.finally-3.1.2" sources."promisify-child-process-4.1.1" + sources."pump-3.0.0" sources."rc-1.2.8" + sources."readable-stream-2.3.7" sources."rfc-3986-1.0.1" sources."rfdc-1.1.4" sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."semver-6.3.0" + sources."safe-buffer-5.1.2" + sources."semver-7.3.2" + sources."setimmediate-1.0.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."streamroller-2.2.4" + sources."signal-exit-3.0.3" + (sources."streamroller-2.2.4" // { + dependencies = [ + sources."date-format-2.1.0" + ]; + }) + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" + sources."string_decoder-1.1.1" + sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-4.4.13" - sources."tslib-1.13.0" - sources."tunnel-0.0.6" + sources."tar-6.0.5" + sources."traverse-0.3.9" + sources."tslib-2.0.1" sources."universalify-0.1.2" - sources."uuid-3.4.0" + sources."unzipper-0.10.11" + sources."util-deprecate-1.0.2" + sources."uuid-7.0.3" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-uri-2.1.2" - sources."which-1.3.1" + sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yallist-3.1.1" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -55477,15 +58279,15 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.5" - sources."@typescript-eslint/experimental-utils-3.8.0" - sources."@typescript-eslint/parser-3.8.0" - sources."@typescript-eslint/types-3.8.0" - sources."@typescript-eslint/typescript-estree-3.8.0" - sources."@typescript-eslint/visitor-keys-3.8.0" + sources."@types/json-schema-7.0.6" + sources."@typescript-eslint/experimental-utils-3.10.1" + sources."@typescript-eslint/parser-3.10.1" + sources."@typescript-eslint/types-3.10.1" + sources."@typescript-eslint/typescript-estree-3.10.1" + sources."@typescript-eslint/visitor-keys-3.10.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" - sources."ajv-6.12.3" + sources."acorn-jsx-5.3.1" + sources."ajv-6.12.5" sources."ajv-keywords-3.5.2" (sources."ansi-align-2.0.0" // { dependencies = [ @@ -55545,7 +58347,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001133" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -55595,9 +58397,9 @@ in sources."common-tags-1.8.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - (sources."configstore-3.1.2" // { + (sources."configstore-3.1.5" // { dependencies = [ - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."is-obj-1.0.1" ]; }) @@ -55612,7 +58414,7 @@ in }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."decode-uri-component-0.2.0" @@ -55633,16 +58435,16 @@ in sources."doctrine-3.0.0" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.520" + sources."electron-to-chromium-1.3.570" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -55654,17 +58456,21 @@ in sources."semver-6.3.0" ]; }) - sources."eslint-scope-5.1.0" + sources."eslint-scope-5.1.1" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" (sources."execa-0.7.0" // { @@ -55828,7 +58634,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."invert-kv-2.0.0" @@ -55906,10 +58712,10 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.merge-4.6.2" sources."log-symbols-2.2.0" - sources."loglevel-1.6.8" + sources."loglevel-1.7.0" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -55999,7 +58805,7 @@ in ]; }) sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."optionator-0.8.3" (sources."os-locale-3.1.0" // { dependencies = [ @@ -56074,7 +58880,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.0.5" + sources."prettier-2.1.2" (sources."prettier-eslint-10.1.1" // { dependencies = [ sources."prettier-1.19.1" @@ -56158,7 +58964,7 @@ in sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -56217,7 +59023,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -56354,7 +59160,7 @@ in }) sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" @@ -56437,11 +59243,17 @@ in coc-r-lsp = nodeEnv.buildNodePackage { name = "coc-r-lsp"; packageName = "coc-r-lsp"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.1.1.tgz"; - sha512 = "y/6SBQhGAXEHqfb/EPuRZBPpXNMwXXF7lCU6f/J0WjxwGOzip8StuiRc3Vhr3JXvP/QSO37tunkaAJX+z8rRTg=="; + url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.2.1.tgz"; + sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA=="; }; + dependencies = [ + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" + ]; buildInputs = globalBuildInputs; meta = { description = "R language server extension for coc.nvim"; @@ -56472,10 +59284,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.14"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.14.tgz"; - sha512 = "nTS7mcGTbo+5bLdhod4GOVTODb/wDdnKgVNLpU75q//kwQuf0psUPp3t/XFcYXxzbskMwAcaEXyC27cGek7+Cw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.8.0.tgz"; + sha512 = "kX/mSezjGZKy1hM3l+qrqLt4sQfS1GvtzwQQ1iqS4s+1YAwViRFLx/E1RFJRElQZ4WPvvRiu+d0OeiGbKQaMAg=="; }; buildInputs = globalBuildInputs; meta = { @@ -56508,10 +59320,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.1.28"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.28.tgz"; - sha512 = "okVbjhKbFH6iTPeTpjxhtYtBBTFy5neOQYtn1H9CrbPpjnjodWzBDq3izoXCsC4BMMyBRzOwmwmJ0eA65S6JnQ=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.0.tgz"; + sha512 = "uWY5BquBQaQ9UD8PyjhbkbyQFsoc545A/eyquPJ9G3TF8VaXCBSGiVkzGIBT4It6ldN9vc/VQEVsRpEvtO6TTw=="; }; buildInputs = globalBuildInputs; meta = { @@ -56525,10 +59337,10 @@ in coc-solargraph = nodeEnv.buildNodePackage { name = "coc-solargraph"; packageName = "coc-solargraph"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.6.tgz"; - sha512 = "Vkl4IYCgexGQ038betmYJ4Ht2OqbVJDFrQn8h+OCvVUHAEGsQTYj8sIIq3qohW/FuJJXvUdRoGEYQUZCtw96OQ=="; + url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.7.tgz"; + sha512 = "+oaGgco/4VuQIAp7MqvwrMPnKXViap/W894pFodstK1FkCUpP3qc04Kt7B/8IqRTFrd5b6tAn7Nrsf5g4RffTw=="; }; buildInputs = globalBuildInputs; meta = { @@ -56549,8 +59361,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.1" - sources."@babel/generator-7.11.0" + sources."@babel/core-7.11.6" + sources."@babel/generator-7.11.6" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.11.0" @@ -56563,19 +59375,19 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -56614,7 +59426,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.13.0" + sources."browserslist-4.14.3" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -56622,7 +59434,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001133" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -56662,7 +59474,7 @@ in sources."copy-descriptor-0.1.1" sources."cosmiconfig-5.2.1" sources."currently-unhandled-0.4.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -56674,19 +59486,19 @@ in sources."dir-glob-2.2.2" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.520" + sources."dot-prop-5.3.0" + sources."electron-to-chromium-1.3.570" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."execall-2.0.0" @@ -56832,7 +59644,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."log-symbols-3.0.0" sources."longest-streak-2.0.4" sources."loud-rejection-1.6.0" @@ -56864,7 +59676,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."nanomatch-1.2.13" - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" sources."normalize-package-data-2.5.0" sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" @@ -56903,7 +59715,7 @@ in sources."picomatch-2.2.2" sources."pify-4.0.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -56995,7 +59807,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."specificity-0.4.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -57077,7 +59889,7 @@ in sources."has-values-0.1.4" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -57227,13 +60039,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.5.3"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.3.tgz"; - sha512 = "8izLeNvlIted2ilje94KmEh/yGX4pTHajWuPBjP9GeM4JZI0RK7VS+SlkRSJB6IjJkubs7VvTnp3ahVYJecZvw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.7.tgz"; + sha512 = "VP/xLBnChBWZPrURULJsy5fi9gt+Fsvv5qWXZrLorBsh/14ppnPqfdyyKRuK+mDrxi9gcnSbAwTHOJ4yl5e9ag=="; }; dependencies = [ - sources."typescript-3.9.5" + sources."typescript-3.9.7" ]; buildInputs = globalBuildInputs; meta = { @@ -57248,16 +60060,23 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.11"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.11.tgz"; - sha512 = "a1yV0MtIe6uV0hIhIVUonFTqrykV5wmio8NRlIPYxYgmYq05t0glBK1P8AOPkHi9o4K0kJB4XGLiOJXnTOBNig=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.0.tgz"; + sha512 = "JtuTM6DHU21h6j1fEeAaOtfFveLOzeqVXh9mjd53fVHws9T89wW8yV0ZsU5gz4u4g0tw7nN779sJqOEAXnmR8w=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@emmetio/extract-abbreviation-0.1.6" + sources."@emmetio/extract-abbreviation-0.2.0" + (sources."@eslint/eslintrc-0.1.3" // { + dependencies = [ + sources."debug-4.3.0" + sources."ignore-4.0.6" + sources."strip-json-comments-3.1.1" + ]; + }) sources."@mrmlnc/readdir-enhanced-2.2.1" (sources."@nodelib/fs.scandir-2.1.3" // { dependencies = [ @@ -57266,12 +60085,21 @@ in }) sources."@nodelib/fs.stat-1.1.3" sources."@nodelib/fs.walk-1.2.4" + sources."@prettier/plugin-pug-1.6.1" sources."@sindresorhus/is-0.14.0" - sources."@sorg/log-2.1.0" + sources."@sorg/log-2.2.0" sources."@starptech/expression-parser-0.10.0" sources."@starptech/hast-util-from-webparser-0.10.0" - sources."@starptech/prettyhtml-0.10.0" - sources."@starptech/prettyhtml-formatter-0.10.0" + (sources."@starptech/prettyhtml-0.10.0" // { + dependencies = [ + sources."prettier-1.19.1" + ]; + }) + (sources."@starptech/prettyhtml-formatter-0.10.0" // { + dependencies = [ + sources."prettier-1.19.1" + ]; + }) sources."@starptech/prettyhtml-hast-to-html-0.10.0" sources."@starptech/prettyhtml-hastscript-0.10.0" sources."@starptech/prettyhtml-sort-attributes-0.10.0" @@ -57282,34 +60110,33 @@ in sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/glob-7.1.3" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - (sources."@typescript-eslint/experimental-utils-1.13.0" // { + sources."@typescript-eslint/experimental-utils-3.10.1" + sources."@typescript-eslint/parser-3.10.1" + sources."@typescript-eslint/types-3.10.1" + (sources."@typescript-eslint/typescript-estree-3.10.1" // { dependencies = [ - sources."eslint-scope-4.0.3" - ]; - }) - sources."@typescript-eslint/parser-1.13.0" - (sources."@typescript-eslint/typescript-estree-1.13.0" // { - dependencies = [ - sources."semver-5.5.0" + sources."debug-4.3.0" + sources."semver-7.3.2" ]; }) + sources."@typescript-eslint/visitor-keys-3.10.1" sources."abbrev-1.1.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" - (sources."aggregate-error-3.0.1" // { + sources."acorn-jsx-5.3.1" + (sources."aggregate-error-3.1.0" // { dependencies = [ sources."indent-string-4.0.0" ]; }) - sources."ajv-6.12.3" + sources."ajv-6.12.5" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -57317,6 +60144,7 @@ in sources."strip-ansi-5.2.0" ]; }) + sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -57362,13 +60190,12 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."buefy-helper-json-1.0.3" sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -57381,6 +60208,7 @@ in sources."character-entities-1.2.4" sources."character-entities-html4-1.1.4" sources."character-entities-legacy-1.1.4" + sources."character-parser-2.2.0" sources."character-reference-invalid-1.1.4" sources."chardet-0.7.0" (sources."chokidar-3.0.2" // { @@ -57411,7 +60239,7 @@ in ]; }) sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."cliui-4.1.0" @@ -57502,41 +60330,56 @@ in sources."dir-glob-2.0.0" sources."dlv-1.1.3" sources."doctrine-3.0.0" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."duplexer3-0.1.4" sources."editorconfig-0.15.3" sources."element-helper-json-2.0.6" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" + sources."enquirer-2.3.6" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-6.8.0" // { + (sources."eslint-7.9.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."debug-4.2.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.3" + sources."debug-4.3.0" + sources."has-flag-4.0.0" sources."ignore-4.0.6" - sources."semver-6.3.0" - sources."strip-ansi-5.2.0" + sources."path-key-3.1.1" + sources."semver-7.3.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" + sources."supports-color-7.2.0" + sources."which-2.0.2" ]; }) - sources."eslint-plugin-vue-6.2.2" - sources."eslint-scope-5.1.0" - sources."eslint-utils-1.4.3" + (sources."eslint-plugin-vue-7.0.0-beta.3" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) + sources."eslint-scope-5.1.1" + sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-6.2.1" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-0.7.0" @@ -57634,6 +60477,7 @@ in ]; }) sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -57645,7 +60489,7 @@ in sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.0.4" + sources."hast-util-is-element-1.1.0" sources."hast-util-parse-selector-2.2.4" sources."hast-util-to-string-1.0.4" sources."hast-util-whitespace-1.0.4" @@ -57678,7 +60522,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."invert-kv-2.0.0" @@ -57693,6 +60537,7 @@ in sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" sources."is-empty-1.2.0" + sources."is-expression-4.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -57713,6 +60558,7 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" + sources."is-regex-1.1.1" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -57720,7 +60566,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-beautify-1.11.0" // { + (sources."js-beautify-1.13.0" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -57729,26 +60575,26 @@ in sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.1.3" - sources."jsonc-parser-1.0.3" + sources."jsonc-parser-2.3.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."lcid-2.0.0" - sources."levn-0.3.0" + sources."levn-0.4.1" sources."lines-and-columns-1.1.6" sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.assign-4.2.0" sources."lodash.defaults-4.2.0" sources."lodash.iteratee-4.7.0" sources."lodash.merge-4.6.2" - sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.8" + sources."loglevel-1.7.0" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -57794,8 +60640,8 @@ in sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.0" - sources."nopt-4.0.3" + sources."node-fetch-2.6.1" + sources."nopt-5.0.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" @@ -57821,8 +60667,8 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.1" - sources."optionator-0.8.3" + sources."onetime-5.1.2" + sources."optionator-0.9.1" sources."os-homedir-1.0.2" (sources."os-locale-3.1.0" // { dependencies = [ @@ -57832,7 +60678,6 @@ in ]; }) sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" @@ -57873,44 +60718,32 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."prelude-ls-1.1.2" + sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" - sources."prettier-1.19.1" - (sources."prettier-eslint-9.0.2" // { + sources."prettier-2.1.2" + (sources."prettier-eslint-11.0.0" // { dependencies = [ - sources."acorn-6.4.1" - (sources."acorn-jsx-3.0.1" // { + sources."ansi-regex-4.1.0" + (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."acorn-3.3.0" + sources."semver-5.7.1" ]; }) - sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - sources."cross-spawn-6.0.5" - sources."debug-4.2.0" - sources."eslint-5.16.0" - sources."eslint-scope-4.0.3" - sources."espree-5.0.1" - sources."figures-2.0.0" - sources."globals-11.12.0" + sources."debug-4.3.0" + sources."eslint-6.8.0" + sources."eslint-utils-1.4.3" + sources."espree-6.2.1" sources."ignore-4.0.6" sources."indent-string-4.0.0" - sources."inquirer-6.5.2" - sources."mimic-fn-1.2.0" - sources."mute-stream-0.0.7" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" + sources."levn-0.3.0" + sources."optionator-0.8.3" + sources."prelude-ls-1.1.2" + sources."regexpp-2.0.1" + sources."semver-6.3.0" sources."strip-ansi-5.2.0" - (sources."vue-eslint-parser-2.0.3" // { - dependencies = [ - sources."acorn-5.7.4" - sources."debug-3.2.6" - sources."eslint-scope-3.7.3" - sources."espree-3.5.4" - ]; - }) + sources."strip-json-comments-3.1.1" + sources."type-check-0.3.2" + sources."typescript-3.9.7" ]; }) sources."prettier-tslint-0.4.2" @@ -57920,6 +60753,8 @@ in sources."property-information-5.5.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" + sources."pug-error-2.0.0" + sources."pug-lexer-5.0.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."quick-lru-1.1.0" @@ -57932,7 +60767,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -57946,7 +60781,7 @@ in sources."readdirp-3.4.0" sources."redent-2.0.0" sources."regex-not-1.0.2" - sources."regexpp-2.0.1" + sources."regexpp-3.1.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."rehype-sort-attribute-values-2.0.1" @@ -57978,12 +60813,12 @@ in sources."rimraf-2.6.3" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."s.color-0.0.13" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.13" + sources."sass-formatter-0.4.15" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -58039,7 +60874,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -58108,9 +60943,9 @@ in ]; }) sources."stylus-supremacy-2.14.5" - sources."suf-cli-0.1.1" - sources."suf-node-1.1.1" - sources."suf-regex-0.0.22" + sources."suf-cli-0.1.3" + sources."suf-node-1.2.1" + sources."suf-regex-0.0.23" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -58139,12 +60974,16 @@ in sources."trim-trailing-lines-1.1.3" sources."trough-1.0.5" sources."tslib-1.13.0" - sources."tslint-5.20.1" - sources."tsutils-2.29.0" - sources."type-check-0.3.2" + (sources."tslint-5.20.1" // { + dependencies = [ + sources."tsutils-2.29.0" + ]; + }) + sources."tsutils-3.17.1" + sources."type-check-0.4.0" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typescript-3.9.7" + sources."typescript-4.0.3" sources."unherit-1.1.3" (sources."unified-7.1.0" // { dependencies = [ @@ -58192,7 +61031,7 @@ in }) sources."untildify-2.1.0" sources."update-notifier-3.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -58215,25 +61054,21 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - sources."vls-0.2.0" - (sources."vscode-css-languageservice-4.3.1" // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0-next.2" - sources."vscode-uri-2.1.2" - ]; - }) - sources."vscode-emmet-helper-1.2.17" + sources."vls-0.5.3" + sources."vscode-css-languageservice-4.1.0" + sources."vscode-emmet-helper-2.0.0" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-nls-4.1.2" - sources."vscode-uri-1.0.8" - sources."vscode-web-custom-data-0.1.4" + sources."vscode-uri-2.1.2" + sources."vscode-web-custom-data-0.3.1" (sources."vue-eslint-parser-7.1.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" + sources."espree-6.2.1" ]; }) sources."vue-onsenui-helper-json-1.0.2" @@ -58314,10 +61149,10 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.0.4.tgz"; - sha512 = "ChwFqLSF0C/c/LIhJR6ycOc7JZreFkGeNOol/+oPw+OFvY5Zgz8vjdDzmwXZlKwQMIuZAnDUFZOJaYUyCRJzsw=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.0.5.tgz"; + sha512 = "BMtE+UB9mmChn9bD6Nd7fuWVgEPwaa48QQLyE0nxQK2PXozLsPpRx7micYNpMB/LUh786oe/Gn1NPVwzNE2iEw=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -58329,12 +61164,17 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.0" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."ms-2.0.0" - sources."prettier-1.19.1" + sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.0" + (sources."vscode-json-languageservice-3.8.4" // { + dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-nls-5.0.0" + ]; + }) sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -58351,7 +61191,7 @@ in sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" sources."yaml-ast-parser-custom-tags-0.0.43" - sources."yaml-language-server-0.7.2" + sources."yaml-language-server-0.10.1" ]; buildInputs = globalBuildInputs; meta = { @@ -58365,10 +61205,10 @@ in coc-yank = nodeEnv.buildNodePackage { name = "coc-yank"; packageName = "coc-yank"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.4.tgz"; - sha512 = "8qonhyBfipzni6Fbbdm9hOjUIdLtwPGqnVGxA5DV+Kd4ctvD+FiBRuaWnXWf4QqxC8ATHQyTyoSqrvdXdko4PA=="; + url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.5.tgz"; + sha512 = "HITJR6Cjah8xJwPBqWFQCj0vAWu29IrPWuEdZBnGo+qqasGoVSjurGnrRrmZZADuMWh/Z+2z4V7J8DoVejs40Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -58467,17 +61307,17 @@ in sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.7" sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."kuler-1.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."logform-2.2.0" sources."lynx-0.2.0" sources."mersenne-0.0.4" @@ -58532,7 +61372,7 @@ in sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-0.3.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -58551,7 +61391,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -58586,7 +61426,7 @@ in sources."chalk-3.0.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."clone-response-1.0.2" @@ -58598,7 +61438,7 @@ in sources."concat-map-0.0.1" (sources."conf-1.4.0" // { dependencies = [ - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."is-obj-1.0.1" sources."make-dir-1.3.0" sources."pify-3.0.0" @@ -58645,7 +61485,7 @@ in sources."detect-indent-6.0.0" sources."detect-newline-3.1.0" sources."dir-glob-3.0.1" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."editor-1.0.0" @@ -58684,7 +61524,7 @@ in sources."fresh-0.5.2" sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -58766,7 +61606,7 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -58779,7 +61619,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.debounce-4.0.8" sources."loud-rejection-2.2.0" sources."lowercase-keys-1.0.1" @@ -58824,8 +61664,8 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-5.1.1" - sources."open-7.1.0" + sources."onetime-5.1.2" + sources."open-7.2.1" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -58876,7 +61716,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."read-package-json-2.1.1" + sources."read-package-json-2.1.2" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -58898,7 +61738,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -58922,7 +61762,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -58940,8 +61780,8 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" - sources."systeminformation-4.26.10" + sources."supports-color-7.2.0" + sources."systeminformation-4.27.5" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.2.1" @@ -58955,12 +61795,12 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.10.2" + sources."underscore-1.11.0" sources."unique-string-2.0.0" sources."universalify-1.0.0" sources."unpipe-1.0.0" - sources."update-notifier-4.1.0" - sources."uri-js-4.2.2" + sources."update-notifier-4.1.1" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -58979,7 +61819,7 @@ in sources."strip-ansi-6.0.0" ]; }) - (sources."windows-release-3.3.1" // { + (sources."windows-release-3.3.3" // { dependencies = [ sources."cross-spawn-6.0.5" sources."execa-1.0.0" @@ -59028,9 +61868,9 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" - sources."aggregate-error-3.0.1" + sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -59083,7 +61923,7 @@ in sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" sources."cp-file-7.0.0" - sources."cpy-8.1.0" + sources."cpy-8.1.1" sources."debug-2.6.9" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -59182,7 +62022,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."js-tokens-4.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."junk-3.1.0" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" @@ -59247,7 +62087,7 @@ in sources."p-map-3.0.0" sources."p-timeout-3.2.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-4.0.0" @@ -59320,7 +62160,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -59396,7 +62236,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -59438,7 +62278,7 @@ in sources."event-emitter-0.3.5" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -59459,7 +62299,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -59521,7 +62361,7 @@ in ]; }) sources."which-1.3.1" - sources."xstream-11.12.0" + sources."xstream-11.13.0" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -59598,7 +62438,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."jsonfile-4.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -59606,7 +62446,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -59615,7 +62455,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -59633,7 +62473,7 @@ in sources."ansi-regex-4.1.0" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { dependencies = [ @@ -59672,10 +62512,10 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.0.tgz"; - sha512 = "Q/V11lyflnkhWEkMImgTvG0iRx9q2K2c1Ko/NnP7XOl63JvQ/hlvaoyxYE85vM0fIJyWXO8qTSf2Uen+8oUTTA=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.1.tgz"; + sha512 = "TeaEDgfOSJ3cVilXKeIG2590IjjnSWPvhUUE6xGl3Aqys9O2JQNDyVbC1stnqlbyUgxm8KCOP0piLOk+MXUlZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -59719,7 +62559,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -59746,7 +62586,7 @@ in sources."atob-2.1.2" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -59823,7 +62663,7 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."configstore-3.1.2" + sources."configstore-3.1.5" sources."connections-1.4.2" sources."content-types-0.1.0" sources."copy-descriptor-0.1.1" @@ -59851,7 +62691,7 @@ in sources."dat-secret-storage-4.0.1" sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-equal-0.2.2" @@ -59882,7 +62722,7 @@ in sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" sources."dom-walk-0.1.2" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" @@ -60073,7 +62913,7 @@ in sources."multicast-dns-7.2.2" sources."multistream-2.1.1" sources."mute-stream-0.0.8" - sources."mutexify-1.3.0" + sources."mutexify-1.3.1" sources."nan-2.14.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" @@ -60225,7 +63065,7 @@ in ]; }) sources."sodium-universal-2.0.0" - sources."sorted-array-functions-1.2.0" + sources."sorted-array-functions-1.3.0" sources."sorted-indexof-1.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" @@ -60321,7 +63161,7 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" sources."use-3.1.1" @@ -60367,10 +63207,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.18"; + version = "0.2.19"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.18.tgz"; - sha512 = "VqsWI0zHgX+i4rDmqXqqDv3T++z21osaOencXrMVwlF8P75tKlEnZ72WlONNE1UAxtAvlPIG2zmGMoa7guqDyw=="; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.19.tgz"; + sha512 = "RQhzFYjO955zR6YUqP2NbaE6owt9sq33ACWydyKS0v7Tec71Gf2+ewNLyE91UqCtw3wmQhTAYDsWdrqzsxVNig=="; }; dependencies = [ sources."minimist-1.2.5" @@ -60385,6 +63225,42 @@ in bypassCache = true; reconstructLock = true; }; + diagnostic-languageserver = nodeEnv.buildNodePackage { + name = "diagnostic-languageserver"; + packageName = "diagnostic-languageserver"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.7.1.tgz"; + sha512 = "iq4RE35kISxPucmRfZhpIJr9xWi2EOGraD4rX0/5Tk3dIUbsLHeUzX5eVQeVL7Kw4QiBsbMO4W2TgV18VyiUYA=="; + }; + dependencies = [ + sources."commander-5.1.0" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."lodash-4.17.20" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."rxjs-6.6.3" + sources."tslib-1.13.0" + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" + sources."vscode-uri-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "diagnostic language server"; + homepage = "https://github.com/iamcco/diagnostic-languageserver#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; @@ -60419,21 +63295,21 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.33.2"; + version = "6.33.3"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.2.tgz"; - sha512 = "zdVxNUeI3Ywj3ls8K+NcssOn4KjfJ5QdSyTsgIf9AsOlDCioGh5//qE5/c4HH0Bn14J/WETEcSW62YJKlMFN0w=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.3.tgz"; + sha512 = "m/zeWqH/JXZvR/7D2j0TjK2jyDf8SFeAi0IWW92+elx28krC66lvzhVgoNiG8PpCLuT6rZk1yLhYAjMVEB4YyA=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.726.0" + sources."aws-sdk-2.756.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" @@ -60447,7 +63323,7 @@ in sources."delay-4.4.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.7" sources."events-1.1.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -60478,14 +63354,14 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lossless-json-1.0.4" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" - sources."p-queue-6.6.0" + sources."p-queue-6.6.1" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -60524,7 +63400,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uri-js-4.2.2" // { + (sources."uri-js-4.4.0" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -60568,18 +63444,18 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-3.0.1.tgz"; - sha512 = "ZZfCT5/+XXomHI7O+frUJfKeqEnxXYq8SL45s0uR6KMRZpFlckzMlLpyBFKVUNd+VWjgVwmc9d/fe/YhU1N5Ng=="; + url = "https://registry.npmjs.org/emoj/-/emoj-3.1.0.tgz"; + sha512 = "ohjlUXM2v39rDqGIrlyxdcn9ql+4b+X1u90CXNWjYw5wX6C3wTHRfqFfeV8jajYD6Xc+ufn2X1QeZZWhRBXTlA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.1" - sources."@babel/generator-7.11.0" + sources."@babel/core-7.11.6" + sources."@babel/generator-7.11.6" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.10.5" + sources."@babel/helper-builder-react-jsx-experimental-7.11.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.11.0" @@ -60593,7 +63469,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-syntax-jsx-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -60601,20 +63477,20 @@ in sources."@babel/plugin-transform-parameters-7.10.5" sources."@babel/plugin-transform-react-jsx-7.10.4" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" - sources."@sindresorhus/is-2.1.1" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" + sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/color-name-1.1.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" - sources."ajv-6.12.3" + sources."ajv-6.12.5" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -60623,51 +63499,62 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."arch-2.1.2" - sources."arrify-2.0.1" + sources."arrify-1.0.1" sources."astral-regex-2.0.0" + sources."atomically-1.3.2" sources."auto-bind-4.0.0" - sources."cacheable-lookup-2.0.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."cacheable-lookup-5.0.3" (sources."cacheable-request-7.0.1" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" ]; }) sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."quick-lru-4.0.1" + ]; + }) sources."chalk-2.4.2" sources."ci-info-2.0.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" sources."clipboardy-2.3.0" - (sources."clone-response-1.0.2" // { - dependencies = [ - sources."mimic-response-1.0.1" - ]; - }) + sources."clone-response-1.0.2" + sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - (sources."conf-6.2.4" // { + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + (sources."conf-7.1.2" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-7.3.2" ]; }) sources."convert-source-map-1.7.0" + sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" - sources."debounce-fn-3.0.1" - sources."debug-4.2.0" + sources."debounce-fn-4.0.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ sources."map-obj-1.0.1" ]; }) - sources."decompress-response-5.0.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."defer-to-connect-2.0.0" - sources."dot-prop-5.2.0" - sources."duplexer3-0.1.4" + sources."dot-prop-5.3.0" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -60677,40 +63564,42 @@ in sources."execa-1.0.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."find-cache-dir-3.3.1" sources."find-up-3.0.0" + sources."fs.realpath-1.0.0" sources."gensync-1.0.0-beta.1" sources."get-stream-4.1.0" + sources."glob-7.1.6" sources."globals-11.12.0" - (sources."got-10.7.0" // { - dependencies = [ - sources."get-stream-5.1.0" - ]; - }) + sources."got-11.7.0" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-cache-semantics-4.1.0" - sources."import-jsx-3.1.0" - sources."imurmurhash-0.1.4" + sources."http2-wrapper-1.0.0-beta.5.2" + sources."import-jsx-4.0.0" sources."indent-string-4.0.0" - (sources."ink-2.7.1" // { + sources."inflight-1.0.6" + sources."inherits-2.0.4" + (sources."ink-3.0.6" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."ink-text-input-3.3.0" // { + (sources."ink-text-input-4.0.1" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" + sources."type-fest-0.15.1" ]; }) sources."is-arrayish-0.2.1" @@ -60720,38 +63609,21 @@ in sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."json5-2.1.3" - sources."keyv-4.0.1" + sources."keyv-4.0.3" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" - sources."lodash-4.17.19" - sources."lodash.debounce-4.0.8" + sources."lodash-4.17.20" sources."lodash.throttle-4.1.1" - (sources."log-update-3.4.0" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" - sources."cli-cursor-2.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" - ]; - }) sources."loose-envify-1.4.0" sources."lowercase-keys-2.0.0" (sources."make-dir-3.1.0" // { @@ -60761,25 +63633,18 @@ in }) sources."map-age-cleaner-0.1.3" sources."map-obj-4.1.0" - (sources."mem-6.1.0" // { - dependencies = [ - sources."mimic-fn-3.1.0" - ]; - }) - (sources."meow-6.1.1" // { + sources."mem-6.1.1" + (sources."meow-7.1.1" // { dependencies = [ sources."type-fest-0.13.1" ]; }) - sources."mimic-fn-2.1.0" - sources."mimic-response-2.1.0" + sources."mimic-fn-3.1.0" + sources."mimic-response-1.0.1" sources."min-indent-1.0.1" + sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minimist-options-4.1.0" // { - dependencies = [ - sources."arrify-1.0.1" - ]; - }) + sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" sources."normalize-package-data-2.5.0" @@ -60787,25 +63652,38 @@ in sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.1" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) sources."p-cancelable-2.0.0" sources."p-defer-1.0.0" - sources."p-event-4.2.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" - sources."p-timeout-3.2.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" + sources."patch-console-1.0.0" sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" + (sources."pkg-dir-4.2.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + ]; + }) sources."pkg-up-3.1.0" sources."prop-types-15.7.2" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."quick-lru-4.0.1" + sources."quick-lru-5.1.1" sources."react-16.13.1" + sources."react-devtools-core-4.8.2" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -60824,14 +63702,17 @@ in }) sources."redent-3.0.0" sources."resolve-1.17.0" + sources."resolve-alpn-1.0.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" + sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."scheduler-0.18.0" sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.2" sources."signal-exit-3.0.3" sources."skin-tone-1.0.0" (sources."slice-ansi-3.0.0" // { @@ -60845,7 +63726,12 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" + (sources."stack-utils-2.0.2" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -60859,12 +63745,10 @@ in sources."strip-indent-3.0.0" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" - sources."to-readable-stream-2.1.0" sources."trim-newlines-3.0.0" - sources."type-fest-0.10.0" - sources."typedarray-to-buffer-3.1.5" + sources."type-fest-0.12.0" sources."unicode-emoji-modifier-base-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."widest-line-3.1.0" @@ -60876,7 +63760,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" + sources."ws-7.3.1" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.9.6" ]; @@ -60907,6 +63791,1551 @@ in bypassCache = true; reconstructLock = true; }; + "epgstation-../../applications/video/epgstation" = nodeEnv.buildNodePackage { + name = "EPGStation"; + packageName = "EPGStation"; + version = "1.7.4"; + src = ../../applications/video/epgstation; + dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@fluentui/date-time-utilities-7.8.1" + sources."@fluentui/dom-utilities-1.1.1" + sources."@fluentui/keyboard-key-0.2.12" + sources."@fluentui/react-7.139.0" + sources."@fluentui/react-focus-7.16.5" + sources."@fluentui/react-icons-0.3.4" + sources."@fluentui/react-window-provider-0.3.3" + sources."@fluentui/theme-0.3.2" + (sources."@gulp-sourcemaps/identity-map-1.0.2" // { + dependencies = [ + sources."normalize-path-2.1.1" + sources."source-map-0.6.1" + ]; + }) + (sources."@gulp-sourcemaps/map-sources-1.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."@microsoft/load-themed-styles-1.10.97" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@npmcli/move-file-1.0.1" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/basic-auth-1.1.3" + sources."@types/body-parser-1.19.0" + sources."@types/caseless-0.12.2" + sources."@types/chart.js-2.9.23" + sources."@types/connect-3.4.33" + sources."@types/engine.io-3.1.4" + sources."@types/express-4.17.7" + sources."@types/express-serve-static-core-4.17.12" + sources."@types/fancy-log-1.3.0" + sources."@types/glob-7.1.3" + sources."@types/hls.js-0.13.0" + sources."@types/js-yaml-3.12.5" + sources."@types/json-schema-7.0.6" + sources."@types/lodash-4.14.158" + sources."@types/material-design-lite-1.1.16" + sources."@types/mime-2.0.3" + sources."@types/minimatch-3.0.3" + sources."@types/minimist-1.2.0" + sources."@types/mithril-2.0.3" + sources."@types/mkdirp-1.0.1" + sources."@types/multer-1.4.3" + sources."@types/mysql-2.15.15" + sources."@types/node-14.0.26" + sources."@types/pg-7.14.4" + sources."@types/pg-types-1.11.5" + sources."@types/qs-6.9.5" + sources."@types/range-parser-1.2.3" + sources."@types/request-2.48.5" + sources."@types/serve-static-1.13.5" + sources."@types/socket.io-2.1.10" + sources."@types/socket.io-client-1.4.33" + sources."@types/sqlite3-3.1.6" + sources."@types/tough-cookie-4.0.0" + sources."@types/url-join-4.0.0" + sources."@uifabric/foundation-7.9.5" + sources."@uifabric/icons-7.5.5" + sources."@uifabric/merge-styles-7.19.1" + sources."@uifabric/react-hooks-7.13.4" + sources."@uifabric/set-version-7.0.23" + sources."@uifabric/styling-7.16.5" + sources."@uifabric/utilities-7.32.2" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."abbrev-1.1.1" + sources."accepts-1.3.7" + sources."acorn-5.7.4" + sources."after-0.8.2" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.5" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."ansi-colors-1.1.0" + sources."ansi-cyan-0.1.1" + sources."ansi-escapes-1.4.0" + sources."ansi-gray-0.1.1" + sources."ansi-red-0.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."ansi-wrap-0.1.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."to-regex-range-2.1.1" + ]; + }) + sources."append-buffer-1.0.2" + sources."append-field-1.0.0" + sources."aproba-1.2.0" + sources."archy-1.0.0" + sources."are-we-there-yet-1.1.5" + sources."argparse-1.0.10" + sources."aribts-2.1.12" + sources."arr-diff-4.0.0" + sources."arr-filter-1.1.2" + sources."arr-flatten-1.1.0" + sources."arr-map-2.0.2" + sources."arr-union-3.1.0" + sources."array-each-1.0.1" + sources."array-flatten-1.1.1" + (sources."array-initial-1.1.0" // { + dependencies = [ + sources."is-number-4.0.0" + ]; + }) + (sources."array-last-1.3.0" // { + dependencies = [ + sources."is-number-4.0.0" + ]; + }) + sources."array-slice-1.1.0" + (sources."array-sort-1.0.0" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."array-union-2.1.0" + sources."array-unique-0.3.2" + sources."arraybuffer.slice-0.0.7" + sources."asn1-0.2.4" + (sources."asn1.js-5.4.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."async-done-1.3.2" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."async-settle-1.0.0" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.10.1" + sources."b24.js-1.0.3" + sources."babel-polyfill-6.23.0" + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."regenerator-runtime-0.11.1" + ]; + }) + sources."bach-1.2.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."base64-js-1.3.1" + sources."base64id-2.0.0" + sources."basic-auth-2.0.1" + sources."bcrypt-pbkdf-1.0.2" + sources."better-assert-1.0.2" + sources."big.js-5.2.2" + sources."bignumber.js-9.0.0" + sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" + sources."blob-0.0.5" + sources."block-stream-0.0.9" + sources."bluebird-3.7.2" + sources."bn.js-5.1.3" + sources."body-parser-1.19.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + (sources."browserify-rsa-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."browserify-sign-4.2.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) + sources."browserify-zlib-0.2.0" + sources."buffer-4.9.2" + sources."buffer-equal-1.0.0" + sources."buffer-from-1.1.1" + sources."buffer-writer-2.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.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-3.1.0" + (sources."cacache-15.0.5" // { + dependencies = [ + sources."p-map-4.0.0" + ]; + }) + sources."cache-base-1.0.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + sources."pump-3.0.0" + ]; + }) + sources."callsite-1.0.0" + sources."camelcase-3.0.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-0.4.2" + sources."chart.js-2.9.3" + sources."chartjs-color-2.4.1" + sources."chartjs-color-string-0.6.0" + (sources."chokidar-2.1.8" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."to-regex-range-2.1.1" + ]; + }) + sources."chownr-2.0.0" + sources."chrome-trace-event-1.0.2" + 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."clean-css-4.2.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."clean-stack-2.2.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.1" + sources."cliui-3.2.0" + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."clone-response-1.0.2" + sources."clone-stats-1.0.0" + sources."cloneable-readable-1.1.3" + sources."code-point-at-1.1.0" + sources."collection-map-1.0.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-support-1.1.3" + sources."colors-1.4.0" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-bind-1.0.0" + sources."component-emitter-1.3.0" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + (sources."concat-with-sourcemaps-1.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."console-browserify-1.2.0" + sources."console-control-strings-1.1.0" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."convert-source-map-1.7.0" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + (sources."copy-concurrently-1.0.5" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + ]; + }) + sources."copy-descriptor-0.1.1" + sources."copy-props-2.0.4" + sources."core-js-2.6.11" + sources."core-util-is-1.0.2" + (sources."crc-3.8.0" // { + dependencies = [ + sources."buffer-5.6.0" + ]; + }) + (sources."create-ecdh-4.0.4" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."crypto-browserify-3.12.0" + (sources."css-2.2.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-ripple-effect-1.0.5" + sources."cyclist-1.0.1" + sources."d-1.0.1" + sources."dashdash-1.14.1" + sources."date-format-3.0.0" + sources."debug-2.6.9" + (sources."debug-fabulous-1.1.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + (sources."default-compare-1.0.0" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."default-resolution-2.0.0" + sources."defer-to-connect-1.1.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."del-5.1.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."des.js-1.0.1" + sources."destroy-1.0.4" + sources."detect-file-1.0.0" + sources."detect-libc-1.0.3" + sources."detect-newline-2.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."diff-4.0.2" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."difunc-0.0.4" + sources."dir-glob-3.0.1" + sources."diskusage-1.1.3" + sources."domain-browser-1.2.0" + sources."dotenv-8.2.0" + sources."duplexer3-0.1.4" + sources."duplexify-3.7.1" + sources."each-props-1.3.2" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."emojis-list-3.0.0" + sources."encodeurl-1.0.2" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.2" + ]; + }) + sources."end-of-stream-1.4.4" + (sources."engine.io-3.4.2" // { + dependencies = [ + sources."cookie-0.3.1" + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + (sources."engine.io-client-3.4.3" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + sources."ws-6.1.4" + ]; + }) + sources."engine.io-parser-2.2.0" + sources."enhanced-resolve-4.3.0" + sources."errno-0.1.7" + sources."error-ex-1.3.2" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" + sources."es6-promise-4.2.8" + sources."es6-symbol-3.1.3" + sources."es6-weak-map-2.0.3" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-4.0.3" + sources."esprima-4.0.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."etag-1.8.1" + sources."event-emitter-0.3.5" + sources."eventemitter3-2.0.3" + sources."events-3.2.0" + sources."evp_bytestokey-1.0.3" + (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."express-4.17.1" + sources."express-normalize-query-params-middleware-0.5.1" + sources."express-openapi-7.0.0" + (sources."ext-1.4.0" // { + dependencies = [ + sources."type-2.1.0" + ]; + }) + sources."extend-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."extsprintf-1.3.0" + sources."fancy-log-1.3.3" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.4" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-1.1.4" + sources."fastq-1.8.0" + sources."figgy-pudding-3.5.2" + sources."figures-2.0.0" + sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" + sources."finalhandler-1.1.2" + sources."find-cache-dir-3.3.1" + sources."find-up-1.1.2" + (sources."findup-sync-3.0.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."fined-1.2.0" + sources."flagged-respawn-1.0.1" + sources."flatted-2.0.2" + sources."flush-write-stream-1.1.1" + sources."for-in-1.0.2" + sources."for-own-1.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.5.1" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."fs-extra-9.0.1" + sources."fs-minipass-2.1.0" + sources."fs-mkdirp-stream-1.0.0" + sources."fs-routes-7.0.1" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.13" + (sources."fstream-1.0.12" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + ]; + }) + sources."function-bind-1.1.1" + sources."gauge-2.7.4" + sources."get-caller-file-1.0.3" + (sources."get-stream-4.1.0" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + (sources."glob-stream-6.1.0" // { + dependencies = [ + sources."glob-parent-3.1.0" + sources."is-glob-3.1.0" + ]; + }) + sources."glob-watcher-5.0.5" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" + sources."globby-10.0.2" + sources."glogg-1.0.2" + sources."got-9.6.0" + sources."graceful-fs-4.2.4" + sources."gulp-4.0.2" + (sources."gulp-clean-css-4.3.0" // { + dependencies = [ + sources."through2-3.0.1" + ]; + }) + sources."gulp-cli-2.3.0" + sources."gulp-concat-2.6.1" + (sources."gulp-dart-sass-1.0.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + (sources."gulp-plumber-1.2.1" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."arr-diff-1.1.0" + sources."arr-union-2.1.0" + sources."array-slice-0.2.3" + sources."chalk-1.1.3" + sources."extend-shallow-1.1.4" + sources."kind-of-1.1.0" + sources."plugin-error-0.1.2" + sources."supports-color-2.0.0" + ]; + }) + (sources."gulp-sourcemaps-2.6.5" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."gulp-tslint-8.1.4" + (sources."gulp-typescript-5.0.1" // { + dependencies = [ + sources."ansi-colors-3.2.4" + sources."source-map-0.7.3" + sources."through2-3.0.2" + ]; + }) + sources."gulplog-1.0.0" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + (sources."has-binary2-1.0.3" // { + dependencies = [ + sources."isarray-2.0.1" + ]; + }) + sources."has-cors-1.1.0" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."has-unicode-2.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) + sources."hash.js-1.1.7" + (sources."hls-b24.js-0.12.3" // { + dependencies = [ + sources."eventemitter3-3.1.0" + ]; + }) + sources."hmac-drbg-1.0.1" + sources."homedir-polyfill-1.0.3" + sources."hosted-git-info-2.8.8" + sources."http-cache-semantics-4.1.0" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."ignore-5.1.8" + sources."ignore-walk-3.0.3" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."indexof-0.0.1" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + (sources."inquirer-3.0.6" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + sources."interpret-1.4.0" + sources."invert-kv-1.0.0" + sources."ip-1.1.5" + sources."ipaddr.js-1.9.1" + sources."is-absolute-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-descriptor-1.0.2" + sources."is-dir-1.0.0" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.1" + sources."is-negated-glob-1.0.0" + sources."is-negative-zero-2.0.0" + sources."is-number-7.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.2" + sources."is-plain-object-2.0.4" + sources."is-promise-2.2.2" + sources."is-regex-1.1.1" + sources."is-relative-1.0.0" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" + sources."is-typedarray-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."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + (sources."jest-worker-26.3.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.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.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-1.0.1" + sources."jsonfile-6.0.1" + sources."jsprim-1.4.1" + sources."just-debounce-1.0.0" + sources."keyv-3.1.0" + sources."kind-of-6.0.3" + sources."last-run-1.1.1" + sources."latest-version-5.1.0" + sources."lazystream-1.0.0" + sources."lcid-1.0.0" + sources."lead-1.0.0" + sources."liftoff-3.1.0" + sources."load-json-file-1.1.0" + sources."loader-runner-2.4.0" + sources."loader-utils-1.4.0" + sources."locate-path-5.0.0" + sources."lodash-4.17.19" + sources."lodash.clone-4.5.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.merge-4.6.2" + sources."lodash.some-4.6.0" + (sources."log4js-6.3.0" // { + dependencies = [ + sources."debug-4.3.0" + sources."ms-2.1.2" + ]; + }) + sources."loose-envify-1.4.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + sources."lru-queue-0.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."make-iterator-1.0.1" + sources."map-cache-0.2.2" + sources."map-stream-0.0.7" + sources."map-visit-1.0.0" + (sources."matchdep-2.0.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."findup-sync-2.0.0" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."material-design-icons-3.0.1" + sources."material-design-lite-1.3.0" + sources."md5.js-1.3.5" + sources."media-typer-0.3.0" + sources."memoizee-0.4.14" + sources."memory-fs-0.5.0" + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."micromatch-4.0.2" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-1.2.0" + sources."mimic-response-1.0.1" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.4" + sources."minizlib-2.1.2" + (sources."mirakurun-3.2.0" // { + dependencies = [ + sources."aribts-1.3.5" + sources."eventemitter3-4.0.7" + sources."express-openapi-6.0.0" + sources."fs-routes-2.0.0" + sources."openapi-default-setter-2.1.0" + sources."openapi-framework-0.26.0" + sources."openapi-jsonschema-parameters-1.2.0" + sources."openapi-request-coercer-2.4.0" + sources."openapi-request-validator-4.2.0" + sources."openapi-response-validator-4.0.0" + (sources."openapi-schema-validator-3.0.3" // { + dependencies = [ + sources."openapi-types-1.3.4" + ]; + }) + (sources."openapi-security-handler-2.0.4" // { + dependencies = [ + sources."openapi-types-1.3.4" + ]; + }) + sources."openapi-types-1.3.5" + sources."readable-stream-3.6.0" + sources."semver-7.3.2" + sources."stream-http-3.1.1" + ]; + }) + (sources."mississippi-3.0.0" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) + sources."mithril-2.0.4" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-1.0.4" + sources."moment-2.28.0" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + (sources."move-concurrently-1.0.1" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + ]; + }) + sources."ms-2.0.0" + (sources."multer-1.4.2" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) + sources."munin-plugin-0.0.9" + sources."mute-stdout-1.0.1" + sources."mute-stream-0.0.7" + sources."mysql-2.18.1" + sources."nan-2.14.1" + sources."nanomatch-1.2.13" + (sources."needle-2.5.2" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."negotiator-0.6.2" + sources."neo-async-2.6.2" + sources."next-tick-1.0.0" + sources."node-addon-api-2.0.0" + sources."node-fetch-1.6.3" + (sources."node-gyp-3.8.0" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."nopt-3.0.6" + sources."rimraf-2.7.1" + sources."semver-5.3.0" + sources."tar-2.2.2" + ]; + }) + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + (sources."node-pre-gyp-0.11.0" // { + dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + sources."tar-4.4.13" + sources."yallist-3.1.1" + ]; + }) + sources."nopt-4.0.3" + sources."normalize-package-data-2.5.0" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.0" + sources."now-and-later-2.0.1" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.8" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."object-component-0.0.3" + (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-inspect-1.8.0" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.1" + sources."object.defaults-1.1.0" + sources."object.map-1.0.1" + sources."object.pick-1.3.0" + sources."object.reduce-1.0.1" + sources."office-ui-fabric-react-7.139.0" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-2.0.1" + (sources."openapi-default-setter-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-framework-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-jsonschema-parameters-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-request-coercer-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-request-validator-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-response-validator-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-schema-validator-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + (sources."openapi-security-handler-7.0.1" // { + dependencies = [ + sources."openapi-types-7.0.1" + ]; + }) + sources."openapi-types-7.0.0" + (sources."opencollective-1.0.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."minimist-1.2.0" + sources."supports-color-2.0.0" + ]; + }) + sources."opencollective-postinstall-2.0.3" + sources."opn-4.0.2" + sources."ordered-read-streams-1.0.1" + sources."os-browserify-0.3.0" + sources."os-homedir-1.0.2" + sources."os-locale-1.4.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-cancelable-1.1.0" + sources."p-limit-3.0.2" + (sources."p-locate-4.1.0" // { + dependencies = [ + sources."p-limit-2.3.0" + ]; + }) + sources."p-map-3.0.0" + sources."p-try-2.2.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."packet-reader-1.0.0" + sources."pako-1.0.11" + sources."parallel-transform-1.2.0" + sources."parse-asn1-5.1.6" + sources."parse-filepath-1.0.2" + sources."parse-json-2.2.0" + sources."parse-node-version-1.0.1" + sources."parse-passwd-1.0.0" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."path-root-0.1.1" + sources."path-root-regex-0.1.2" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."pbkdf2-3.1.1" + sources."performance-now-2.1.0" + (sources."pg-8.3.0" // { + dependencies = [ + sources."semver-4.3.2" + ]; + }) + sources."pg-connection-string-2.3.0" + sources."pg-int8-1.0.1" + sources."pg-pool-3.2.1" + sources."pg-protocol-1.2.5" + sources."pg-types-2.2.0" + sources."pgpass-1.0.2" + sources."picomatch-2.2.2" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + (sources."pkg-dir-4.2.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."path-exists-4.0.0" + ]; + }) + sources."plugin-error-1.0.1" + sources."posix-character-classes-0.1.1" + sources."postgres-array-2.0.0" + sources."postgres-bytea-1.0.0" + sources."postgres-date-1.0.7" + sources."postgres-interval-1.2.0" + sources."prepend-http-2.0.0" + sources."pretty-hrtime-1.0.3" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."promise-queue-2.2.5" + sources."prop-types-15.7.2" + sources."proxy-addr-2.0.6" + sources."prr-1.0.1" + sources."psl-1.8.0" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."pump-2.0.1" + sources."pumpify-1.5.1" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."rc-1.2.8" + sources."react-16.13.1" + sources."react-dom-16.13.1" + sources."react-is-16.13.1" + (sources."read-pkg-1.1.0" // { + dependencies = [ + sources."path-type-1.1.0" + ]; + }) + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.7" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."rechoir-0.6.2" + sources."regenerator-runtime-0.10.5" + sources."regex-not-1.0.2" + sources."registry-auth-token-4.2.0" + sources."registry-url-5.1.0" + sources."remove-bom-buffer-3.0.0" + sources."remove-bom-stream-1.2.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.1" + sources."replace-homedir-1.0.0" + (sources."request-2.88.2" // { + dependencies = [ + sources."form-data-2.3.3" + sources."qs-6.5.2" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.17.0" + sources."resolve-dir-1.0.1" + sources."resolve-options-1.1.0" + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."reusify-1.0.4" + sources."rfdc-1.1.4" + sources."rimraf-3.0.2" + sources."ripemd160-2.0.2" + sources."run-async-2.4.1" + sources."run-parallel-1.1.9" + sources."run-queue-1.0.3" + sources."rx-4.1.0" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sass-1.26.11" + sources."sax-1.2.4" + sources."scheduler-0.19.1" + sources."schema-utils-2.7.1" + sources."semver-5.7.1" + sources."semver-greatest-satisfied-range-1.1.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serialize-javascript-4.0.0" + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."setprototypeof-1.1.1" + sources."sha.js-2.4.11" + sources."sift-7.0.1" + sources."signal-exit-3.0.3" + sources."slash-3.0.0" + (sources."snapdragon-0.8.2" // { + 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."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."socket.io-2.3.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."socket.io-adapter-1.1.2" + (sources."socket.io-client-2.3.0" // { + dependencies = [ + sources."component-emitter-1.2.1" + sources."debug-4.1.1" + sources."isarray-2.0.1" + sources."ms-2.1.2" + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) + ]; + }) + (sources."socket.io-parser-3.4.1" // { + dependencies = [ + sources."component-emitter-1.2.1" + sources."debug-4.1.1" + sources."isarray-2.0.1" + sources."ms-2.1.2" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.0" + sources."sparkles-1.0.1" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.6" + sources."split-1.0.1" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sqlite3-5.0.0" + sources."sqlstring-2.3.1" + sources."sshpk-1.16.1" + sources."ssri-8.0.0" + sources."stack-trace-0.0.10" + (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."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-exhaust-1.0.2" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.1" + (sources."streamroller-2.2.4" // { + dependencies = [ + sources."date-format-2.1.0" + sources."debug-4.3.0" + sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" + sources."ms-2.1.2" + sources."universalify-0.1.2" + ]; + }) + sources."streamsearch-0.1.2" + sources."string-width-1.0.2" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-bom-string-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" + sources."sver-compat-1.5.0" + sources."swagger-schema-official-2.0.0-bab6bed" + sources."swagger-ui-dist-3.30.2" + sources."tail-2.0.4" + sources."tapable-1.1.3" + sources."tar-6.0.5" + (sources."terser-4.8.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-3.0.7" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."through-2.3.8" + sources."through2-2.0.5" + sources."through2-filter-3.0.0" + sources."time-stamp-1.1.0" + sources."timers-browserify-2.0.11" + sources."timers-ext-0.1.7" + sources."tmp-0.0.33" + sources."to-absolute-glob-2.0.2" + sources."to-array-0.1.4" + sources."to-arraybuffer-1.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-readable-stream-1.0.0" + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."to-through-2.0.0" + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" + (sources."ts-loader-8.0.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."ts-log-2.1.4" + sources."tslib-1.13.0" + (sources."tslint-6.1.2" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) + sources."tsutils-2.29.0" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-1.2.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typescript-3.9.7" + sources."unc-path-regex-0.1.2" + sources."undertaker-1.3.0" + sources."undertaker-registry-1.0.1" + sources."union-value-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."unique-stream-2.3.1" + sources."universalify-1.0.0" + 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.2.0" + sources."uri-js-4.4.0" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-join-4.0.1" + sources."url-parse-lax-3.0.0" + sources."url-toolkit-2.2.0" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."v8flags-3.2.0" + sources."validate-npm-package-license-3.0.4" + sources."value-or-function-3.0.0" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."vinyl-2.2.0" + sources."vinyl-fs-3.0.3" + (sources."vinyl-sourcemap-1.1.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."vinyl-sourcemaps-apply-0.2.1" + sources."vm-browserify-1.1.2" + (sources."watchpack-1.7.4" // { + dependencies = [ + sources."anymatch-3.1.1" + sources."binary-extensions-2.1.0" + sources."chokidar-3.4.2" + sources."fsevents-2.1.3" + sources."is-binary-path-2.1.0" + sources."readdirp-3.4.0" + ]; + }) + sources."watchpack-chokidar2-2.0.0" + (sources."webpack-4.44.0" // { + dependencies = [ + sources."acorn-6.4.1" + sources."braces-2.3.2" + sources."cacache-12.0.4" + sources."chownr-1.1.4" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."locate-path-3.0.0" + sources."lru-cache-5.1.1" + sources."make-dir-2.1.0" + sources."memory-fs-0.4.1" + sources."micromatch-3.1.10" + sources."mkdirp-0.5.5" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."rimraf-2.7.1" + sources."schema-utils-1.0.0" + sources."source-map-0.6.1" + sources."ssri-6.0.1" + sources."terser-webpack-plugin-1.4.5" + sources."to-regex-range-2.1.1" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + ]; + }) + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."webpack-stream-5.2.1" // { + dependencies = [ + sources."memory-fs-0.4.1" + ]; + }) + sources."which-1.3.1" + sources."which-module-1.0.0" + sources."wide-align-1.1.3" + sources."worker-farm-1.7.0" + sources."wrap-ansi-2.1.0" + sources."wrappy-1.0.2" + sources."ws-7.3.1" + sources."xmlhttprequest-ssl-1.5.5" + sources."xtend-4.0.2" + sources."y18n-3.2.1" + sources."yallist-4.0.0" + sources."yargs-7.1.1" + sources."yargs-parser-5.0.0-security.0" + sources."yeast-0.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "DTV Software in Japan."; + homepage = "https://github.com/l3tnun/EPGStation#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; escape-string-regexp = nodeEnv.buildNodePackage { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -60928,10 +65357,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.6.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz"; - sha512 = "QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz"; + sha512 = "V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -60941,10 +65370,11 @@ in sources."chalk-2.4.2" ]; }) + sources."@eslint/eslintrc-0.1.3" sources."@types/color-name-1.1.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" - sources."ajv-6.12.3" + sources."acorn-jsx-5.3.1" + sources."ajv-6.12.5" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -60959,30 +65389,34 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-5.1.0" + sources."eslint-scope-5.1.1" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.0" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" @@ -61011,7 +65445,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -61046,7 +65480,7 @@ in sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."v8-compile-cache-2.1.1" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -61066,10 +65500,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "9.1.1"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.1.1.tgz"; - sha512 = "+y3ULQemuvoxWgfV/VGzlYJS84V9GmvyzIxZFGUA3kgUpaJkuqXn/nm21Z/nYYNmfiySXy6RU1ery0A8cztZRw=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.1.2.tgz"; + sha512 = "HJ7n92z+gSBLPP/en2pse1SLsFfwOXb8aqHn3FyXwYaE+J5wSM+raBbSmvE9Ttq20IF6Rq/dXxjhiIjuxAUjpw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -61079,10 +65513,11 @@ in sources."chalk-2.4.2" ]; }) + sources."@eslint/eslintrc-0.1.3" sources."@types/color-name-1.1.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" - sources."ajv-6.12.3" + sources."acorn-jsx-5.3.1" + sources."ajv-6.12.5" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -61097,7 +65532,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."color-convert-1.9.3" @@ -61105,24 +65540,28 @@ in sources."concat-map-0.0.1" sources."core_d-2.0.0" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.6.0" - sources."eslint-scope-5.1.0" + sources."eslint-7.9.0" + sources."eslint-scope-5.1.1" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.0" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" @@ -61151,7 +65590,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -61187,7 +65626,7 @@ in sources."text-table-0.2.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."v8-compile-cache-2.1.1" sources."which-2.0.2" sources."word-wrap-1.2.3" @@ -61213,7 +65652,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -61222,7 +65661,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" @@ -61353,7 +65792,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -61367,7 +65806,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -61410,7 +65849,7 @@ in sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."aggregate-error-3.0.1" + sources."aggregate-error-3.1.0" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -61447,7 +65886,7 @@ in sources."ps-list-7.2.0" ]; }) - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."hard-rejection-2.1.0" sources."has-flag-4.0.0" sources."hosted-git-info-2.8.8" @@ -61459,16 +65898,9 @@ in sources."chalk-4.1.0" ]; }) - (sources."inquirer-autocomplete-prompt-1.0.2" // { + (sources."inquirer-autocomplete-prompt-1.1.0" // { dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."figures-2.0.0" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" + sources."chalk-4.1.0" ]; }) sources."is-arrayish-0.2.1" @@ -61477,11 +65909,11 @@ in sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lru-cache-4.1.5" sources."map-obj-4.1.0" (sources."meow-6.1.1" // { @@ -61502,13 +65934,13 @@ in sources."npm-run-path-4.0.1" sources."num-sort-2.1.0" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" sources."p-finally-2.0.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" @@ -61545,7 +65977,7 @@ in sources."resolve-1.17.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."shebang-command-2.0.0" @@ -61555,13 +65987,13 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" (sources."taskkill-3.1.0" // { dependencies = [ sources."execa-3.4.0" @@ -61591,10 +66023,10 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-3.0.0.tgz"; - sha512 = "jA3zD1pl57cwBlhF6V6lZIOk6//77nQyQ3UGkxxYr4X9+F8nI6SGGan69hdohtmsPZCG3vMlqdtBhwlqEn4thA=="; + url = "https://registry.npmjs.org/forever/-/forever-3.0.2.tgz"; + sha512 = "GKZLVs3RQh52kF3kuCrlR1e5npaOqomQzTQryZOFJZ9GKNqLya75LSn1rdjFQ8XixwX3jT76pIJmtGN4XXv1aw=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -61631,7 +66063,6 @@ in sources."async-0.2.9" sources."cliff-0.1.9" sources."nconf-0.6.9" - sources."optimist-0.6.0" sources."utile-0.2.1" sources."winston-0.8.0" ]; @@ -61680,7 +66111,7 @@ in sources."define-property-2.0.2" sources."defined-0.0.0" sources."director-1.2.7" - sources."duplexer-0.1.1" + sources."duplexer-0.1.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" @@ -61720,11 +66151,7 @@ in sources."is-extendable-0.1.1" ]; }) - (sources."flatiron-0.4.3" // { - dependencies = [ - sources."optimist-0.6.0" - ]; - }) + sources."flatiron-0.4.3" sources."for-in-1.0.2" sources."forever-monitor-3.0.1" sources."fragment-cache-0.2.1" @@ -61757,7 +66184,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -61765,6 +66192,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -61820,10 +66248,14 @@ in sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.pick-1.3.0" sources."once-1.4.0" - sources."optimist-0.6.1" + sources."optimist-0.6.0" sources."os-locale-1.4.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -62006,7 +66438,7 @@ in sources."has-flag-3.0.0" sources."iterall-1.3.0" sources."minimist-1.2.5" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."supports-color-5.5.0" ]; buildInputs = globalBuildInputs; @@ -62029,8 +66461,8 @@ in }; dependencies = [ sources."async-2.6.3" - sources."debug-4.2.0" - sources."lodash-4.17.19" + sources."debug-4.3.0" + sources."lodash-4.17.20" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" @@ -62058,10 +66490,10 @@ in }; dependencies = [ sources."asyncmemo-1.0.0" - sources."chloride-2.2.14" + sources."chloride-2.3.0" sources."chloride-test-1.2.4" sources."commander-2.20.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" @@ -62084,7 +66516,7 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" sources."is-property-1.0.2" - sources."is-valid-domain-0.0.14" + sources."is-valid-domain-0.0.15" sources."json-buffer-2.0.11" sources."jsonpointer-4.1.0" sources."kvgraph-0.1.0" @@ -62098,7 +66530,7 @@ in sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" @@ -62106,8 +66538,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" - sources."nan-2.14.1" - sources."nearley-2.19.5" + sources."nearley-2.19.7" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -62174,7 +66605,7 @@ in sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.1" + sources."socks-2.4.4" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -62183,13 +66614,13 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.4.9" + sources."sodium-native-3.2.0" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-caps-1.1.0" (sources."ssb-client-4.9.0" // { dependencies = [ - sources."ssb-config-3.4.4" + sources."ssb-config-3.4.5" ]; }) sources."ssb-config-2.3.9" @@ -62210,7 +66641,7 @@ in }) sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" - sources."ssb-ref-2.14.0" + sources."ssb-ref-2.14.2" (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" @@ -62255,10 +66686,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.6"; + version = "3.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.6.tgz"; - sha512 = "Mzb3SGlcrFSwVu4R8Y2sGxK+d7VP6CRC6rw3S4mOPbxfW3qNrOLYEPDJM7h1GNUjOL22JQHx1qsn8sRODqAygQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.12.tgz"; + sha512 = "ZL27e8s3lkkrKrGCCQDlwIGnLOihrrehDI1jriWaU+UaVME1IYCtOiYbLp59iITK2s8Ak7e0LSSCyO08bRLAvQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -62278,7 +66709,7 @@ in sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."ajv-6.12.3" + sources."ajv-6.12.5" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -62292,6 +66723,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."arrify-1.0.1" + sources."atomically-1.3.2" (sources."boxen-4.2.0" // { dependencies = [ sources."chalk-3.0.0" @@ -62308,7 +66740,7 @@ in sources."chalk-4.1.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-spinners-2.4.0" sources."cli-width-3.0.0" @@ -62316,11 +66748,11 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-6.2.4" + sources."conf-7.1.2" sources."configstore-5.0.1" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" - sources."debounce-fn-3.0.1" + sources."debounce-fn-4.0.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -62331,7 +66763,7 @@ in sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -62345,8 +66777,8 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."find-up-3.0.0" - sources."fuse.js-3.6.1" - sources."get-stream-5.1.0" + sources."fuse.js-6.4.1" + sources."get-stream-5.2.0" sources."global-dirs-2.0.1" (sources."got-9.6.0" // { dependencies = [ @@ -62366,18 +66798,7 @@ in sources."indent-string-4.0.0" sources."ini-1.3.5" sources."inquirer-7.3.3" - (sources."inquirer-autocomplete-prompt-1.0.2" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."figures-2.0.0" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."inquirer-autocomplete-prompt-1.1.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -62393,41 +66814,40 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."lines-and-columns-1.1.6" - sources."locate-path-3.0.0" - sources."lodash-4.17.19" - (sources."log-symbols-3.0.0" // { + (sources."locate-path-3.0.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" + sources."path-exists-3.0.0" ]; }) + sources."lodash-4.17.20" + sources."log-symbols-4.0.0" sources."lowercase-keys-1.0.1" - sources."make-dir-3.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."map-obj-4.1.0" - (sources."meow-6.1.1" // { + (sources."meow-7.1.1" // { dependencies = [ sources."type-fest-0.13.1" ]; }) sources."merge-stream-2.0.0" - sources."mimic-fn-2.1.0" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -62436,20 +66856,24 @@ in sources."normalize-url-4.5.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" - sources."onetime-5.1.1" - (sources."ora-4.0.5" // { + (sources."onetime-5.1.2" // { dependencies = [ - sources."chalk-3.0.0" + sources."mimic-fn-2.1.0" ]; }) + sources."ora-5.1.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."package-json-6.5.0" - sources."parse-json-5.0.1" - sources."path-exists-3.0.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."parse-json-5.1.0" + sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."pkg-up-3.1.0" @@ -62469,7 +66893,6 @@ in sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."p-locate-4.1.0" - sources."path-exists-4.0.0" sources."type-fest-0.8.1" ]; }) @@ -62480,23 +66903,27 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" - sources."semver-diff-3.1.1" + sources."semver-7.3.2" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -62506,12 +66933,12 @@ in sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - (sources."update-notifier-4.1.0" // { + (sources."update-notifier-4.1.1" // { dependencies = [ sources."chalk-3.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" @@ -62541,7 +66968,7 @@ in sha512 = "O3UHyNJ3nYBNfgC+R5hvJPADiZztZHgWoYfdX0vAtXf0yWyqNgtJQzkcY3RufW1Yi+Bq2Yo8ptyYr2i573GPTQ=="; }; dependencies = [ - sources."@ardatan/aggregate-error-0.0.1" + sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" (sources."@babel/highlight-7.10.4" // { @@ -62554,35 +66981,37 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.11.1" + sources."@babel/runtime-7.11.2" + sources."@exodus/schemasafe-1.0.0-rc.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.0.16" - (sources."@graphql-tools/graphql-file-loader-6.0.16" // { + sources."@graphql-tools/delegate-6.2.3" + (sources."@graphql-tools/graphql-file-loader-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.0.16" // { + (sources."@graphql-tools/import-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.0.16" // { + (sources."@graphql-tools/json-file-loader-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.0.16" - sources."@graphql-tools/merge-6.0.16" - sources."@graphql-tools/schema-6.0.16" - (sources."@graphql-tools/url-loader-6.0.16" // { + sources."@graphql-tools/load-6.2.3" + sources."@graphql-tools/merge-6.2.3" + sources."@graphql-tools/schema-6.2.3" + (sources."@graphql-tools/url-loader-6.2.3" // { dependencies = [ - sources."cross-fetch-3.0.5" + sources."cross-fetch-3.0.6" + sources."node-fetch-2.6.1" ]; }) - sources."@graphql-tools/utils-6.0.16" - sources."@graphql-tools/wrap-6.0.16" + sources."@graphql-tools/utils-6.2.3" + sources."@graphql-tools/wrap-6.2.3" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -62590,10 +67019,10 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" - sources."aggregate-error-3.0.1" + sources."aggregate-error-3.1.0" sources."ajv-5.5.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -62612,7 +67041,7 @@ in sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -62628,9 +67057,10 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."bufferutil-4.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -62673,7 +67103,8 @@ in sources."cross-spawn-6.0.5" sources."d-1.0.1" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."dataloader-2.0.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-equal-2.0.3" @@ -62701,7 +67132,7 @@ in sources."execa-1.0.0" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -62748,7 +67179,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-0.4.1" ]; @@ -62781,7 +67212,7 @@ in sources."is-arrayish-0.2.1" sources."is-bigint-1.0.0" sources."is-boolean-object-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" @@ -62789,8 +67220,10 @@ in sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-map-2.0.1" + sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" sources."is-number-object-1.0.4" + sources."is-promise-4.0.0" sources."is-regex-1.1.1" sources."is-set-2.0.1" sources."is-stream-1.1.0" @@ -62809,7 +67242,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" @@ -62824,7 +67257,7 @@ in sources."leven-3.1.0" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."log-symbols-3.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -62853,7 +67286,6 @@ in sources."minimist-1.2.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nan-2.14.1" sources."next-tick-1.0.0" sources."nice-try-1.0.5" (sources."no-case-3.0.3" // { @@ -62863,23 +67295,28 @@ in }) sources."node-fetch-2.6.0" sources."node-fetch-h2-2.3.0" + sources."node-gyp-build-3.7.0" sources."node-readfiles-0.2.0" sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.1.3" - sources."oas-resolver-2.4.2" + sources."oas-linter-3.2.0" + sources."oas-resolver-2.5.0" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."open-7.0.4" sources."openapi-to-graphql-2.1.0" (sources."ora-4.0.4" // { @@ -62912,7 +67349,7 @@ in ]; }) sources."parent-module-1.0.1" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" (sources."pascal-case-3.1.1" // { dependencies = [ sources."tslib-1.13.0" @@ -62932,7 +67369,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."reftools-1.1.4" + sources."reftools-1.1.6" sources."regenerator-runtime-0.13.7" sources."regexp.prototype.flags-1.3.0" sources."registry-auth-token-4.2.0" @@ -62948,7 +67385,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - (sources."rxjs-6.6.2" // { + (sources."rxjs-6.6.3" // { dependencies = [ sources."tslib-1.13.0" ]; @@ -62965,7 +67402,11 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."side-channel-1.0.2" + (sources."side-channel-1.0.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."signal-exit-3.0.3" sources."simple-git-2.5.0" sources."slash-3.0.0" @@ -62978,8 +67419,8 @@ in sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."subscriptions-transport-ws-0.9.17" - sources."supports-color-7.1.0" + sources."subscriptions-transport-ws-0.9.18" + sources."supports-color-7.2.0" (sources."swagger2openapi-5.4.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -62995,7 +67436,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.0.0" + sources."tslib-2.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" @@ -63003,13 +67444,14 @@ in sources."typedarray-to-buffer-3.1.5" sources."universalify-1.0.0" sources."unixify-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" + sources."utf-8-validate-5.0.2" sources."uuid-3.4.0" sources."valid-url-1.0.9" sources."verror-1.10.0" sources."wcwidth-1.0.1" - (sources."websocket-1.0.31" // { + (sources."websocket-1.0.32" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -63369,7 +67811,7 @@ in sources."here-0.0.2" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-0.7.0" @@ -63377,7 +67819,7 @@ in dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."memory-streams-0.1.3" @@ -63396,10 +67838,10 @@ in sources."supports-color-2.0.0" (sources."supports-hyperlinks-2.1.0" // { dependencies = [ - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.26.10" + sources."systeminformation-4.27.5" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -63535,6 +67977,8 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" @@ -63560,7 +68004,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -63576,6 +68020,7 @@ in ]; }) sources."fancy-log-1.3.3" + sources."fast-levenshtein-1.1.4" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -63610,6 +68055,7 @@ in sources."graceful-fs-4.2.4" sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -63629,20 +68075,25 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-negated-glob-1.0.0" + sources."is-negative-zero-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-regex-1.1.1" sources."is-relative-1.0.0" + sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -63697,9 +68148,10 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."object.defaults-1.1.0" sources."object.map-1.0.1" sources."object.pick-1.3.0" @@ -63792,7 +68244,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -63815,6 +68267,16 @@ in sources."stream-exhaust-1.0.2" sources."stream-shift-1.0.1" sources."string-width-1.0.2" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -63834,7 +68296,7 @@ in sources."type-1.2.0" sources."typedarray-0.0.6" sources."unc-path-regex-0.1.2" - sources."undertaker-1.2.1" + sources."undertaker-1.3.0" sources."undertaker-registry-1.0.1" sources."union-value-1.0.1" sources."unique-stream-2.3.1" @@ -63945,6 +68407,8 @@ in sources."detect-file-1.0.0" sources."each-props-1.3.2" sources."error-ex-1.3.2" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" @@ -63961,7 +68425,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -63997,6 +68461,7 @@ in sources."glogg-1.0.2" sources."graceful-fs-4.2.4" sources."gulplog-1.0.0" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -64018,11 +68483,13 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" ]; }) + sources."is-date-object-1.0.2" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.3" @@ -64032,13 +68499,16 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" + sources."is-negative-zero-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-regex-1.1.1" sources."is-relative-1.0.0" + sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -64095,9 +68565,10 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."object.defaults-1.1.0" sources."object.map-1.0.1" sources."object.pick-1.3.0" @@ -64170,7 +68641,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -64183,6 +68654,16 @@ in ]; }) sources."string-width-1.0.2" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -64267,7 +68748,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.4" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -64290,14 +68771,14 @@ in }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-3.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -64355,11 +68836,11 @@ in sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" sources."strip-json-comments-3.1.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."wrappy-1.0.2" @@ -64390,16 +68871,16 @@ in sources."corser-2.0.1" sources."debug-3.2.6" sources."ecstatic-3.3.2" - sources."eventemitter3-4.0.4" - sources."follow-redirects-1.12.1" + sources."eventemitter3-4.0.7" + sources."follow-redirects-1.13.0" sources."he-1.2.0" sources."http-proxy-1.18.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."mime-1.6.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."opener-1.5.1" + sources."opener-1.5.2" sources."portfinder-1.0.28" sources."qs-6.9.4" sources."requires-port-1.0.0" @@ -64505,7 +68986,7 @@ in sources."minimist-1.2.5" ]; }) - sources."moment-2.27.0" + sources."moment-2.28.0" sources."mv-2.1.1" sources."nan-2.14.1" sources."ncp-2.0.0" @@ -64548,7 +69029,7 @@ in sources."async-limiter-1.0.1" sources."chrome-remote-interface-0.27.2" sources."commander-2.11.0" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."semver-5.7.1" sources."source-map-0.7.3" sources."ws-6.2.1" @@ -64591,7 +69072,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.5.1" - sources."jquery.terminal-2.17.6" + sources."jquery.terminal-2.18.3" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -64599,7 +69080,7 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."path-is-absolute-1.0.1" - sources."prismjs-1.20.0" + sources."prismjs-1.21.0" sources."rimraf-2.7.1" sources."select-1.1.2" sources."tiny-emitter-2.1.0" @@ -64642,7 +69123,11 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" - sources."ast-types-0.13.3" + (sources."ast-types-0.14.2" // { + dependencies = [ + sources."tslib-2.0.1" + ]; + }) sources."astral-regex-2.0.0" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" @@ -64669,7 +69154,7 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" @@ -64761,7 +69246,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."mimic-fn-2.1.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."restore-cursor-3.1.0" ]; }) @@ -64781,7 +69266,7 @@ in ]; }) sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -64823,7 +69308,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.1.0" + sources."open-7.2.1" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -64844,7 +69329,7 @@ in sources."rimraf-3.0.2" sources."rsvp-3.6.2" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -64869,7 +69354,7 @@ in ]; }) sources."source-map-0.6.1" - sources."split2-3.1.1" + sources."split2-3.2.2" sources."ssh-config-1.1.6" sources."statuses-1.5.0" (sources."stream-combiner2-1.1.1" // { @@ -64898,7 +69383,7 @@ in sources."debug-3.2.6" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-4.4.13" sources."through-2.3.8" sources."through2-3.0.2" @@ -64916,7 +69401,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."which-2.0.2" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ @@ -64952,7 +69437,7 @@ in sources."@types/color-name-1.1.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -64966,7 +69451,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.5.0" @@ -65006,7 +69491,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.2" - sources."ejs-3.1.3" + sources."ejs-3.1.5" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" @@ -65127,7 +69612,7 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-locale-1.4.0" @@ -65169,7 +69654,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" - sources."prettier-2.0.5" + sources."prettier-2.1.2" sources."process-nextick-args-2.0.1" sources."promise-polyfill-6.1.0" sources."pseudomap-1.0.2" @@ -65206,7 +69691,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."spiro-2.0.0" sources."split-1.0.1" sources."sprintf-js-1.0.3" @@ -65248,19 +69733,20 @@ in sources."unicoderegexp-0.4.1" sources."universalify-1.0.0" sources."unorm-1.6.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - (sources."verda-1.1.0" // { + (sources."verda-1.1.1" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" + sources."tslib-2.0.1" ]; }) sources."verror-1.10.0" @@ -65368,8 +69854,8 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."iterare-1.2.1" - sources."jaeger-client-3.18.0" - sources."lodash-4.17.19" + sources."jaeger-client-3.18.1" + sources."lodash-4.17.20" sources."long-2.4.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -65420,15 +69906,15 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.166"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.166.tgz"; - sha512 = "+wZT9vcD+fIFL3E4kkSKHhaphKq6sDrrFbVoiCyZRoY9+3sGvBedzYOPEoZpiF83YbbPR+WUSM54naB5q8xOYw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.1.8.tgz"; + sha512 = "oBMVeCZP/gQ66imuK65rQIXDl5NrpyMPoPGqzcBxsIyTKHV3w5nAYvB+TQUO1fHNw61EsaRhGVMCrO139kkdQw=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" sources."@yarnpkg/lockfile-1.1.0" - sources."abab-2.0.4" + sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.0" (sources."acorn-globals-4.3.4" // { @@ -65437,7 +69923,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.5" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -65472,7 +69958,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.726.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -65480,7 +69966,7 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -65491,7 +69977,7 @@ in sources."base64-js-1.3.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" - (sources."bl-4.0.2" // { + (sources."bl-4.0.3" // { dependencies = [ sources."buffer-5.6.0" ]; @@ -65588,7 +70074,7 @@ in sources."diff-match-patch-1.0.5" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) @@ -65669,7 +70155,7 @@ in sources."fs-extra-4.0.3" ]; }) - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -65712,9 +70198,10 @@ in sources."html-minifier-3.5.21" (sources."htmlparser2-4.1.0" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."dom-serializer-1.1.0" + sources."domelementtype-2.0.2" sources."domhandler-3.0.0" - sources."domutils-2.1.0" + sources."domutils-2.3.0" sources."entities-2.0.3" ]; }) @@ -65768,6 +70255,7 @@ in sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-1.0.0" (sources."is-number-3.0.0" // { @@ -65781,6 +70269,7 @@ in sources."is-typedarray-1.0.0" sources."is-unc-path-0.1.2" sources."is-windows-0.2.0" + sources."is-wsl-2.2.0" (sources."is2-0.0.9" // { dependencies = [ sources."deep-is-0.1.2" @@ -65793,7 +70282,7 @@ in sources."jmespath-0.15.0" sources."joplin-turndown-4.0.29" sources."joplin-turndown-plugin-gfm-1.0.12" - sources."jpeg-js-0.4.1" + sources."jpeg-js-0.4.2" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" sources."jsdom-15.2.1" @@ -65817,7 +70306,7 @@ in sources."levn-0.3.0" sources."linkify-it-2.2.0" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash-es-4.17.15" sources."lodash.padend-4.6.1" sources."lodash.repeat-4.1.0" @@ -65840,7 +70329,7 @@ in }) sources."markdown-it-abbr-1.0.4" sources."markdown-it-anchor-5.3.0" - sources."markdown-it-deflist-2.0.3" + sources."markdown-it-deflist-2.1.0" sources."markdown-it-emoji-1.4.0" sources."markdown-it-expand-tabs-1.0.13" sources."markdown-it-footnote-3.0.2" @@ -65850,7 +70339,7 @@ in dependencies = [ sources."entities-2.0.3" sources."linkify-it-3.0.2" - sources."markdown-it-11.0.0" + sources."markdown-it-11.0.1" ]; }) sources."markdown-it-sub-1.0.0" @@ -65868,7 +70357,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -65876,7 +70365,7 @@ in }) sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."multiparty-4.2.2" sources."nan-2.14.1" @@ -65888,7 +70377,7 @@ in sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - (sources."needle-2.5.0" // { + (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -65897,7 +70386,7 @@ in sources."nextgen-events-1.3.0" sources."nice-try-1.0.5" sources."no-case-2.3.2" - sources."node-abi-2.18.0" + sources."node-abi-2.19.1" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" @@ -65936,6 +70425,7 @@ in sources."object.pick-1.3.0" sources."omggif-1.0.10" sources."once-1.4.0" + sources."open-7.2.1" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -65972,7 +70462,7 @@ in sources."qs-6.5.2" sources."query-string-4.3.4" sources."querystring-0.2.0" - sources."querystringify-2.1.1" + sources."querystringify-2.2.0" sources."random-bytes-1.0.0" sources."rc-1.2.8" sources."read-chunk-2.1.0" @@ -66138,14 +70628,14 @@ in ]; }) sources."tar-fs-2.1.0" - sources."tar-stream-2.1.3" + sources."tar-stream-2.1.4" (sources."tcp-port-used-0.1.2" // { dependencies = [ sources."debug-0.7.4" sources."q-0.9.7" ]; }) - sources."terminal-kit-1.42.0" + sources."terminal-kit-1.43.0" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -66201,7 +70691,7 @@ in ]; }) sources."upper-case-1.1.3" - (sources."uri-js-4.2.2" // { + (sources."uri-js-4.4.0" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -66258,10 +70748,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.11.0.tgz"; - sha512 = "a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz"; + sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -66279,11 +70769,8 @@ in sources."lru-cache-4.1.5" sources."minimatch-3.0.4" sources."mkdirp-1.0.4" - sources."nopt-4.0.3" + sources."nopt-5.0.0" sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" @@ -66328,13 +70815,13 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.5.tgz"; - sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz"; + sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.5" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -66344,7 +70831,7 @@ in sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."markdown-it-10.0.0" sources."markdown-it-anchor-5.3.0" sources."marked-0.8.2" @@ -66386,7 +70873,7 @@ in sources."date-now-0.1.4" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) @@ -66401,7 +70888,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -66424,10 +70911,10 @@ in json = nodeEnv.buildNodePackage { name = "json"; packageName = "json"; - version = "9.0.6"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json/-/json-9.0.6.tgz"; - sha1 = "7972c2a5a48a42678db2730c7c2c4ee6e4e24585"; + url = "https://registry.npmjs.org/json/-/json-10.0.0.tgz"; + sha512 = "iK7tAZtpoghibjdB1ncCWykeBMmke3JThUe+rnkD4qkZaglOIQ70Pw7r5UJ4lyUT+7gnw7ehmmLUHDuhqzQD+g=="; }; buildInputs = globalBuildInputs; meta = { @@ -66489,7 +70976,7 @@ in sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.44.0" @@ -66506,7 +70993,7 @@ in sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -66532,7 +71019,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.5" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -66545,7 +71032,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -66553,7 +71040,7 @@ in sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -66561,7 +71048,7 @@ in sources."caseless-0.12.0" sources."chalk-3.0.0" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -66596,7 +71083,7 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -66664,7 +71151,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" @@ -66756,7 +71243,7 @@ in }) sources."strip-ansi-5.2.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."term-size-2.2.0" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" @@ -66768,8 +71255,8 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."unpipe-1.0.0" - sources."update-notifier-4.1.0" - sources."uri-js-4.2.2" + sources."update-notifier-4.1.1" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -66829,10 +71316,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.1.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.1.1.tgz"; - sha512 = "xAlOr5PMqUbiKXSv5PCniHWV3aiwj6wIZ0gUVcwpTCPVQm/qH2WAMFWxtnpM6KJqhkRWrIpovR4Rb0rn8GtJzQ=="; + url = "https://registry.npmjs.org/karma/-/karma-5.2.2.tgz"; + sha512 = "rB3Ua5yDxmIupTj67r3Q8itz7TxJzRE6DmVcOfV20D509Uu9AoBKlVwbZhND4kcm6BqLfbHtv4DZC9QJfrUY+w=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -66856,7 +71343,7 @@ in sources."bytes-3.1.0" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -66895,13 +71382,13 @@ in sources."engine.io-parser-2.2.0" sources."ent-2.2.0" sources."escape-html-1.0.3" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.7" sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -66926,10 +71413,10 @@ in sources."isbinaryfile-4.0.6" sources."jsonfile-4.0.0" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -66996,7 +71483,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -67055,6 +71542,8 @@ in sources."define-properties-1.1.3" sources."duplexify-3.7.1" sources."end-of-stream-1.4.4" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."extend-3.0.2" sources."flush-write-stream-1.1.1" sources."fs-mkdirp-stream-1.0.0" @@ -67064,15 +71553,21 @@ in sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.2.4" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" sources."is-relative-1.0.0" + sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -67084,8 +71579,9 @@ in sources."minimatch-3.0.4" sources."normalize-path-2.1.1" sources."now-and-later-2.0.1" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."once-1.4.0" sources."ordered-read-streams-1.0.1" sources."path-dirname-1.0.2" @@ -67101,6 +71597,16 @@ in sources."resolve-options-1.1.0" sources."safe-buffer-5.1.2" sources."stream-shift-1.0.1" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."string_decoder-1.1.1" sources."through2-2.0.5" sources."through2-filter-3.0.0" @@ -67138,7 +71644,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -67146,7 +71652,7 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" @@ -67235,7 +71741,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" (sources."mem-4.3.0" // { @@ -67249,7 +71755,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."mute-stream-0.0.8" (sources."nconf-0.10.0" // { dependencies = [ @@ -67328,7 +71834,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."underscore-1.9.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" (sources."utile-0.3.0" // { dependencies = [ sources."async-0.9.2" @@ -67490,9 +71996,9 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@octokit/auth-token-2.4.2" - (sources."@octokit/endpoint-6.0.5" // { + (sources."@octokit/endpoint-6.0.6" // { dependencies = [ - sources."is-plain-object-4.1.1" + sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) @@ -67508,10 +72014,10 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.7" // { + (sources."@octokit/request-5.4.9" // { dependencies = [ sources."@octokit/request-error-2.0.2" - sources."is-plain-object-4.1.1" + sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) @@ -67521,18 +72027,18 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.2.1" + sources."@octokit/types-5.5.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -67558,7 +72064,7 @@ in sources."atob-2.1.2" sources."atob-lite-2.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -67628,7 +72134,7 @@ in sources."combined-stream-1.0.8" (sources."compare-func-2.0.0" // { dependencies = [ - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."is-obj-2.0.0" ]; }) @@ -67708,15 +72214,15 @@ in sources."detect-indent-5.0.0" sources."dezalgo-1.0.3" sources."dir-glob-2.2.2" - sources."dot-prop-4.2.0" - sources."duplexer-0.1.1" + sources."dot-prop-4.2.1" + sources."duplexer-0.1.2" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" - sources."envinfo-7.7.2" + sources."envinfo-7.7.3" sources."err-code-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.6" @@ -67862,8 +72368,8 @@ in sources."trim-newlines-2.0.0" ]; }) - sources."git-up-4.0.1" - sources."git-url-parse-11.1.2" + sources."git-up-4.0.2" + sources."git-url-parse-11.2.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -67929,7 +72435,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -67940,6 +72446,7 @@ in sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -67949,7 +72456,7 @@ in sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-regex-1.1.1" - sources."is-ssh-1.3.1" + sources."is-ssh-1.3.2" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-text-path-1.0.1" @@ -67964,6 +72471,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -67978,7 +72486,7 @@ in ]; }) sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" sources."lodash.get-4.4.2" @@ -67996,14 +72504,12 @@ in sources."map-cache-0.2.2" sources."map-obj-4.1.0" sources."map-visit-1.0.0" - (sources."meow-7.0.1" // { + (sources."meow-7.1.1" // { dependencies = [ - sources."arrify-2.0.1" - sources."camelcase-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."p-locate-4.1.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -68016,11 +72522,7 @@ in ]; }) sources."type-fest-0.13.1" - (sources."yargs-parser-18.1.3" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."yargs-parser-18.1.3" ]; }) sources."merge2-1.4.1" @@ -68051,7 +72553,7 @@ in sources."nanomatch-1.2.13" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."node-fetch-npm-2.0.4" (sources."node-gyp-5.1.1" // { dependencies = [ @@ -68100,7 +72602,11 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" @@ -68123,8 +72629,8 @@ in sources."parallel-transform-1.2.0" sources."parse-github-repo-url-1.4.1" sources."parse-json-4.0.0" - sources."parse-path-4.0.1" - sources."parse-url-5.0.1" + sources."parse-path-4.0.2" + sources."parse-url-5.0.2" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" @@ -68143,7 +72649,7 @@ in sources."promise-retry-1.1.1" sources."promzard-0.3.0" sources."proto-list-1.2.4" - sources."protocols-1.4.7" + sources."protocols-1.4.8" sources."protoduck-5.0.1" sources."psl-1.8.0" sources."pump-3.0.0" @@ -68158,7 +72664,7 @@ in sources."quick-lru-4.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.5" - sources."read-package-json-2.1.1" + sources."read-package-json-2.1.2" sources."read-package-tree-5.3.1" (sources."read-pkg-3.0.0" // { dependencies = [ @@ -68202,7 +72708,7 @@ in sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -68263,7 +72769,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-1.0.1" sources."split-string-3.1.0" sources."split2-2.2.0" @@ -68333,7 +72839,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.4" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -68352,7 +72858,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -68367,7 +72873,7 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" sources."wordwrap-1.0.0" (sources."wrap-ansi-5.1.0" // { dependencies = [ @@ -68538,7 +73044,7 @@ in sources."define-property-2.0.2" sources."depd-2.0.0" sources."destroy-1.0.4" - sources."duplexer-0.1.1" + sources."duplexer-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."escape-html-1.0.3" @@ -68809,7 +73315,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -68826,7 +73332,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."backo2-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -69286,7 +73792,7 @@ in sources."isobject-3.0.1" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -69316,15 +73822,15 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.1" - sources."@babel/generator-7.11.0" + sources."@babel/core-7.11.6" + sources."@babel/generator-7.11.6" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.10.4" + sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" @@ -69334,7 +73840,7 @@ in sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.11.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" @@ -69347,7 +73853,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" @@ -69401,7 +73907,7 @@ in sources."@babel/plugin-transform-property-literals-7.10.4" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-runtime-7.11.0" + sources."@babel/plugin-transform-runtime-7.11.5" sources."@babel/plugin-transform-shorthand-properties-7.10.4" sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" @@ -69409,13 +73915,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.0" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-env-7.11.5" + sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.11.1" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -69429,15 +73935,15 @@ in sources."@types/babel__core-7.1.9" sources."@types/babel__generator-7.6.1" sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.13" + sources."@types/babel__traverse-7.0.14" sources."@types/color-name-1.1.1" sources."@types/estree-0.0.45" sources."@types/graceful-fs-4.1.3" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.5" - sources."@types/node-14.0.27" + sources."@types/json-schema-7.0.6" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -69467,7 +73973,7 @@ in sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."amdefine-1.0.1" @@ -69481,7 +73987,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."asn1-0.2.4" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -69500,7 +74006,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-core-7.0.0-bridge.0" sources."babel-eslint-10.0.3" sources."babel-helper-evaluate-path-0.5.0" @@ -69562,14 +74068,14 @@ in sources."big.js-5.2.2" sources."binary-extensions-2.1.0" sources."bindings-1.5.0" - (sources."bl-4.0.2" // { + (sources."bl-4.0.3" // { dependencies = [ sources."buffer-5.6.0" sources."readable-stream-3.6.0" ]; }) sources."bluebird-3.7.2" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -69599,7 +74105,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.13.0" + sources."browserslist-4.14.3" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -69614,7 +74120,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001133" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -69623,10 +74129,10 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."chokidar-3.4.1" // { + (sources."chokidar-3.4.2" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -69716,7 +74222,7 @@ in sources."dash-ast-1.0.0" sources."dashdash-1.14.1" sources."death-1.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."define-properties-1.1.3" @@ -69736,7 +74242,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.520" + sources."electron-to-chromium-1.3.570" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -69752,12 +74258,18 @@ in }) sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."escalade-3.0.2" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" + sources."escalade-3.1.0" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" sources."eslint-visitor-keys-1.3.0" sources."esprima-4.0.1" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."estree-walker-0.6.1" sources."esutils-2.0.3" @@ -69902,8 +74414,10 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -69912,6 +74426,7 @@ in sources."is-glob-4.0.1" sources."is-gzip-1.0.0" sources."is-module-1.0.0" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -69919,7 +74434,9 @@ in }) sources."is-plain-object-2.0.4" sources."is-reference-1.2.1" + sources."is-regex-1.1.1" sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -69940,7 +74457,7 @@ in (sources."jest-worker-25.5.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."js-tokens-4.0.0" @@ -69948,6 +74465,7 @@ in sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" @@ -69969,7 +74487,7 @@ in ]; }) sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.memoize-3.0.4" sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" @@ -70024,7 +74542,7 @@ in sources."ncp-2.0.0" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."node-int64-0.4.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ @@ -70039,7 +74557,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -70058,9 +74576,10 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" @@ -70072,8 +74591,8 @@ in sources."parallel-transform-1.2.0" sources."paredit.js-0.3.6" sources."parents-1.0.1" - sources."parse-asn1-5.1.5" - sources."parse-json-5.0.1" + sources."parse-asn1-5.1.6" + sources."parse-json-5.1.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" @@ -70139,7 +74658,7 @@ in sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ @@ -70189,9 +74708,9 @@ in sources."normalize-path-2.1.1" ]; }) - sources."schema-utils-2.7.0" + sources."schema-utils-2.7.1" sources."semver-5.7.1" - sources."serialize-javascript-3.1.0" + sources."serialize-javascript-4.0.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -70251,7 +74770,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -70284,6 +74803,16 @@ in sources."stream-shift-1.0.1" sources."stream-splicer-2.0.1" sources."string-width-3.1.0" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -70295,7 +74824,7 @@ in sources."supports-color-5.5.0" sources."syntax-error-1.4.0" sources."tapable-1.1.3" - (sources."tar-stream-2.1.3" // { + (sources."tar-stream-2.1.4" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -70305,7 +74834,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.4" // { + (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ sources."schema-utils-1.0.0" sources."source-map-0.6.1" @@ -70353,7 +74882,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -70389,7 +74918,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."webpack-4.44.1" // { + (sources."webpack-4.44.2" // { dependencies = [ sources."acorn-6.4.1" sources."micromatch-3.1.10" @@ -70487,28 +75016,28 @@ in markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; - version = "3.8.1"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.1.tgz"; - sha512 = "R6k8ytdJZePDAdb8NT0NvrNvu6n25IwLPIoJ4guHWC5yqyTlnUpRT7j3XE4ioBXwqOhG/LlUcuckD621kZkl4w=="; + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.8.3.tgz"; + sha512 = "Q9LTCwBjWcQR9dd6LNMXg9GFewkRiVEaU/+Y2ZcCbOb0lVqIfeJworWYGakG7bFj8HJQILBTRnAnEK9DDKfdPA=="; }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-3.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-5.1.0" + sources."commander-6.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -70534,10 +75063,10 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."link-check-4.5.0" - sources."lodash-4.17.19" - sources."markdown-link-extractor-1.2.3" - sources."marked-0.8.2" + sources."link-check-4.5.1" + sources."lodash-4.17.20" + sources."markdown-link-extractor-1.2.6" + sources."marked-1.1.1" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."ms-2.1.2" @@ -70551,11 +75080,11 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" ]; @@ -70598,7 +75127,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -70658,17 +75187,21 @@ in sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."exit-hook-1.1.1" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -70700,7 +75233,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.5" ]; }) sources."has-ansi-2.0.0" @@ -70731,7 +75264,7 @@ in sources."jsonpointer-4.1.0" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._basecopy-3.0.1" sources."lodash._basetostring-3.0.1" sources."lodash._basevalues-3.0.0" @@ -70833,7 +75366,7 @@ in sources."type-1.2.0" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -70859,14 +75392,14 @@ in mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "3.0.5"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-3.0.5.tgz"; - sha512 = "9M7VulhltkD8sIebWutK/VfAD+m+6BIFqfpjDh9Pz/etoKUtjO6UMnOhUcDmNl6iApE8C9xrUmaMyNZkZAlrMw=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-3.1.2.tgz"; + sha512 = "BojKspBv4nNWzO1wC6VEI+g9gHDOhkaGHGgLxXkasdU4pwjdO5AXD5M/wcLPkXYPjZ/N+6sU8rjQTlyvN2cWiQ=="; }; buildInputs = globalBuildInputs; meta = { - description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source code)."; + description = "Beautiful and accessible math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source "; homepage = "https://github.com/mathjax/MathJax#readme"; license = "Apache-2.0"; }; @@ -70911,750 +75444,35 @@ in bypassCache = true; reconstructLock = true; }; - meguca = nodeEnv.buildNodePackage { - name = "meguca"; - packageName = "meguca"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/meguca/-/meguca-1.1.8.tgz"; - sha512 = "BrbjYMq6FeZYMKx9mw7aHGUtLCyGPX4kSoCqZiRBFw5ESTgJcmmr+DbLCC29k8hRpBVRqdq3OapSEbAGXZ6z/g=="; - }; - dependencies = [ - (sources."@gulp-sourcemaps/identity-map-1.0.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."source-map-0.6.1" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."@gulp-sourcemaps/map-sources-1.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."accord-0.28.0" // { - dependencies = [ - sources."glob-7.1.6" - sources."minimatch-3.0.4" - sources."semver-5.7.1" - sources."uglify-js-2.8.29" - ]; - }) - sources."acorn-5.7.4" - sources."ajv-4.11.8" - (sources."align-text-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."almond-0.3.3" - sources."ansi-colors-1.1.0" - sources."ansi-cyan-0.1.1" - sources."ansi-gray-0.1.1" - sources."ansi-red-0.1.1" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."ansi-wrap-0.1.0" - sources."append-buffer-1.0.2" - sources."archy-1.0.0" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-differ-1.0.0" - sources."array-each-1.0.1" - sources."array-slice-1.1.0" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."asap-2.0.6" - sources."asn1-0.2.4" - sources."assert-plus-0.2.0" - sources."assign-symbols-1.0.0" - sources."asynckit-0.4.0" - sources."atob-2.1.2" - sources."aws-sign2-0.6.0" - sources."aws4-1.10.0" - sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - 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."extend-shallow-2.0.1" - ]; - }) - sources."buffer-equal-1.0.0" - sources."cache-base-1.0.1" - sources."camelcase-1.2.1" - 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.2.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."cliui-2.1.0" - sources."clone-1.0.4" - sources."clone-buffer-1.0.0" - sources."clone-stats-0.0.1" - (sources."cloneable-readable-1.1.3" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."co-4.6.0" - sources."collection-visit-1.0.0" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."convert-source-map-1.7.0" - sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" - (sources."css-2.2.4" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."d-1.0.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" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.2" - ]; - }) - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" - sources."defaults-1.0.3" - sources."define-properties-1.1.3" - sources."define-property-2.0.2" - sources."delayed-stream-1.0.0" - sources."deprecated-0.0.1" - sources."detect-file-1.0.0" - sources."detect-newline-2.1.0" - (sources."duplexer2-0.0.2" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - ]; - }) - (sources."duplexify-3.7.1" // { - dependencies = [ - sources."end-of-stream-1.4.4" - sources."once-1.4.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."ecc-jsbn-0.1.2" - sources."end-of-stream-0.1.5" - sources."errno-0.1.7" - (sources."es5-ext-0.10.53" // { - dependencies = [ - sources."next-tick-1.0.0" - ]; - }) - sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.3" - sources."es6-weak-map-2.0.3" - sources."escape-string-regexp-1.0.5" - sources."event-emitter-0.3.5" - (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."ext-1.4.0" // { - dependencies = [ - sources."type-2.0.0" - ]; - }) - sources."extend-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."extsprintf-1.3.0" - sources."fancy-log-1.3.3" - (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.2.0" - sources."first-chunk-stream-1.0.0" - sources."flagged-respawn-1.0.1" - (sources."flush-write-stream-1.1.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."for-in-1.0.2" - sources."for-own-1.0.0" - 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" // { - dependencies = [ - sources."graceful-fs-4.2.4" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - 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" // { - dependencies = [ - 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."globule-0.1.0" // { - dependencies = [ - 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.2" - sources."graceful-fs-3.0.12" - sources."gulp-3.9.1" - (sources."gulp-clean-css-3.10.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.3" - ]; - }) - (sources."gulp-less-3.5.0" // { - dependencies = [ - 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."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."gulp-sourcemaps-2.6.5" // { - dependencies = [ - sources."graceful-fs-4.2.4" - sources."readable-stream-2.3.7" - sources."source-map-0.6.1" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."gulp-typescript-4.0.2" // { - dependencies = [ - sources."arr-diff-1.1.0" - sources."arr-union-2.1.0" - sources."array-slice-0.2.3" - sources."clone-2.1.2" - sources."clone-stats-1.0.0" - sources."extend-shallow-1.1.4" - sources."glob-7.1.6" - sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.4" - sources."kind-of-1.1.0" - sources."minimatch-3.0.4" - sources."ordered-read-streams-1.0.1" - sources."plugin-error-0.1.2" - sources."readable-stream-2.3.7" - sources."source-map-0.6.1" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - sources."unique-stream-2.3.1" - sources."vinyl-2.2.0" - sources."vinyl-fs-3.0.3" - ]; - }) - (sources."gulp-uglify-3.0.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."gulp-util-3.0.8" // { - dependencies = [ - sources."object-assign-3.0.0" - sources."readable-stream-2.3.7" - sources."replace-ext-0.0.1" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - sources."vinyl-0.5.3" - ]; - }) - sources."gulplog-1.0.0" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" - sources."has-ansi-2.0.0" - sources."has-gulplog-0.1.0" - sources."has-symbols-1.0.1" - 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."hoek-2.16.3" - sources."homedir-polyfill-1.0.3" - sources."http-signature-1.1.1" - sources."image-size-0.5.5" - sources."indx-0.2.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.5" - sources."interpret-1.4.0" - sources."is-absolute-1.0.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-glob-3.1.0" - sources."is-negated-glob-1.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.2.2" - sources."is-relative-1.0.0" - sources."is-typedarray-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."isexe-2.0.0" - sources."isobject-3.0.1" - 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-stable-stringify-without-jsonify-1.0.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."kind-of-6.0.3" - sources."lazy-cache-1.0.4" - (sources."lazystream-1.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."lead-1.0.0" - (sources."less-2.7.3" // { - dependencies = [ - sources."graceful-fs-4.2.4" - ]; - }) - 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" - sources."lodash._getnative-3.9.1" - sources."lodash._isiterateecall-3.0.9" - sources."lodash._reescape-3.0.0" - sources."lodash._reevaluate-3.0.0" - sources."lodash._reinterpolate-3.0.0" - sources."lodash._root-3.0.1" - sources."lodash.clone-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.escape-3.2.0" - sources."lodash.flatten-4.4.0" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - sources."lodash.keys-3.1.2" - sources."lodash.merge-4.6.2" - sources."lodash.partialright-4.2.1" - sources."lodash.pick-4.4.0" - sources."lodash.restparam-3.6.1" - sources."lodash.template-3.6.2" - sources."lodash.templatesettings-3.1.1" - sources."lodash.uniq-4.5.0" - sources."longest-1.0.1" - sources."lru-cache-2.7.3" - sources."lru-queue-0.1.0" - sources."make-error-1.3.6" - sources."make-error-cause-1.2.2" - sources."make-iterator-1.0.1" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."memoizee-0.4.14" - sources."micromatch-3.1.10" - sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" - sources."minimatch-2.0.10" - sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" - sources."ms-2.0.0" - sources."multipipe-0.1.2" - sources."nanomatch-1.2.13" - sources."natives-1.1.6" - sources."next-tick-1.1.0" - sources."normalize-path-2.1.1" - sources."now-and-later-2.0.1" - sources."oauth-sign-0.8.2" - sources."object-assign-4.1.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-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.defaults-1.1.0" - sources."object.map-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.3.3" - sources."orchestrator-0.3.8" - sources."ordered-read-streams-0.1.0" - sources."os-homedir-1.0.2" - sources."parse-filepath-1.0.2" - sources."parse-node-version-1.0.1" - sources."parse-passwd-1.0.0" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" - sources."path-root-0.1.1" - sources."path-root-regex-0.1.2" - sources."performance-now-0.2.0" - sources."plugin-error-1.0.1" - sources."posix-character-classes-0.1.1" - sources."pretty-hrtime-1.0.3" - sources."process-nextick-args-2.0.1" - sources."promise-7.3.1" - sources."prr-1.0.1" - (sources."pump-2.0.1" // { - dependencies = [ - (sources."end-of-stream-1.4.4" // { - 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" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - sources."rechoir-0.6.2" - sources."regex-not-1.0.2" - sources."remove-bom-buffer-3.0.0" - (sources."remove-bom-stream-1.2.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" - sources."replace-ext-1.0.1" - sources."request-2.81.0" - sources."resolve-1.17.0" - sources."resolve-dir-1.0.1" - sources."resolve-options-1.1.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."right-align-0.1.3" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."semver-4.3.6" - sources."sequencify-0.0.7" - (sources."set-value-2.0.1" // { - 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."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."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."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" - sources."sparkles-1.0.1" - sources."split-string-3.1.0" - (sources."sshpk-1.16.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (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."stream-consume-0.1.1" - sources."stream-shift-1.0.1" - sources."string_decoder-0.10.31" - sources."stringstream-0.0.6" - sources."strip-ansi-3.0.1" - sources."strip-bom-1.0.0" - sources."strip-bom-string-1.0.0" - sources."supports-color-2.0.0" - sources."through2-0.6.5" - (sources."through2-filter-3.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - sources."tildify-1.2.0" - sources."time-stamp-1.1.0" - sources."timers-ext-0.1.7" - sources."to-absolute-glob-2.0.2" - (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" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-1.2.0" - sources."typescript-3.9.7" - sources."uglify-js-3.10.1" - sources."uglify-to-browserify-1.0.2" - sources."unc-path-regex-0.1.2" - sources."union-value-1.0.1" - sources."unique-stream-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."urix-0.1.0" - sources."use-3.1.1" - sources."user-home-1.1.1" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."v8flags-2.1.1" - sources."value-or-function-3.0.0" - (sources."verror-1.10.0" // { - dependencies = [ - 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.2.4" - sources."vinyl-2.2.0" - ]; - }) - sources."vinyl-sourcemaps-apply-0.2.1" - sources."when-3.7.8" - sources."which-1.3.1" - sources."window-size-0.1.0" - sources."wordwrap-0.0.2" - sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."yargs-3.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "[![GoDoc](https://godoc.org/github.com/bakape/meguca?status.svg)](https://godoc.org/github.com/bakape/meguca) [![Build Status](https://travis-ci.org/bakape/meguca.svg?branch=master)](https://travis-ci.org/bakape/meguca)"; - homepage = "https://github.com/bakape/meguca#readme"; - license = "AGPL-3.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.0.tgz"; - sha512 = "FL0S+TpQLy1qfaX3BISUp3AC4D8o392WpTWXqOAku6QDnPrB/NYK30dTxGXt3p6+SB9j8jnHEhRX12AuTREsdg=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.1.tgz"; + sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.3.1" - sources."@fluentui/keyboard-key-0.2.8" - sources."@fluentui/react-7.124.2" - sources."@fluentui/react-focus-7.12.27" - sources."@fluentui/react-icons-0.1.42" - sources."@microsoft/load-themed-styles-1.10.65" + sources."@fluentui/date-time-utilities-7.8.1" + sources."@fluentui/dom-utilities-1.1.1" + sources."@fluentui/keyboard-key-0.2.12" + sources."@fluentui/react-7.139.0" + sources."@fluentui/react-focus-7.16.5" + sources."@fluentui/react-icons-0.3.4" + sources."@fluentui/react-window-provider-0.3.3" + sources."@fluentui/theme-0.3.2" + sources."@microsoft/load-themed-styles-1.10.97" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.7.41" - sources."@uifabric/icons-7.3.67" - sources."@uifabric/merge-styles-7.16.4" - sources."@uifabric/react-hooks-7.7.0" - sources."@uifabric/set-version-7.0.19" - sources."@uifabric/styling-7.14.7" - sources."@uifabric/utilities-7.25.0" + sources."@uifabric/foundation-7.9.5" + sources."@uifabric/icons-7.5.5" + sources."@uifabric/merge-styles-7.19.1" + sources."@uifabric/react-hooks-7.13.4" + sources."@uifabric/set-version-7.0.23" + sources."@uifabric/styling-7.16.5" + sources."@uifabric/utilities-7.32.2" sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -71678,7 +75496,7 @@ in sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -71716,7 +75534,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.7" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" sources."express-openapi-6.0.0" @@ -71752,7 +75570,7 @@ in sources."json-schema-traverse-0.4.1" sources."keyv-3.1.0" sources."latest-version-5.1.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.merge-4.6.2" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" @@ -71778,7 +75596,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.124.2" + sources."office-ui-fabric-react-7.139.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -71877,7 +75695,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.31.1" + sources."swagger-ui-dist-3.34.0" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -71887,7 +75705,7 @@ in sources."tslib-1.13.0" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -71908,15 +75726,16 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.1.1"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.1.tgz"; - sha512 = "p7FuGlYH8t7gaiodlFreseLxEmxTgvyG9RgPHODFPySNhwUehu8NIb0vdSt3WFckSneswZ0Un5typYcWElk7HQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; + sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; }; dependencies = [ + sources."@types/color-name-1.1.1" sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" sources."array.prototype.map-1.0.2" @@ -71926,12 +75745,8 @@ in sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."camelcase-5.3.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."chokidar-3.3.1" + sources."chalk-4.1.0" + sources."chokidar-3.4.2" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -71939,10 +75754,10 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."debug-3.2.6" + sources."debug-4.1.1" sources."decamelize-1.2.0" sources."define-properties-1.1.3" sources."diff-4.0.2" @@ -71951,10 +75766,10 @@ in sources."es-array-method-boxes-properly-1.0.0" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."fill-range-7.0.1" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."flat-4.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -71964,7 +75779,7 @@ in sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."has-1.0.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.1" sources."he-1.2.0" sources."inflight-1.0.6" @@ -71972,7 +75787,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -71988,9 +75803,9 @@ in sources."isexe-2.0.0" sources."iterate-iterator-1.0.1" sources."iterate-value-1.0.2" - sources."js-yaml-3.13.1" - sources."locate-path-5.0.0" - sources."log-symbols-3.0.0" + sources."js-yaml-3.14.0" + sources."locate-path-6.0.0" + sources."log-symbols-4.0.0" sources."minimatch-3.0.4" sources."ms-2.1.2" sources."normalize-path-3.0.0" @@ -71998,15 +75813,15 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.0.2" + sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" sources."promise.allsettled-1.0.2" sources."randombytes-2.1.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."safe-buffer-5.2.1" @@ -72018,11 +75833,7 @@ in sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-3.0.1" - (sources."supports-color-7.1.0" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) + sources."supports-color-7.1.0" sources."to-regex-range-5.0.1" sources."which-2.0.2" sources."which-module-2.0.0" @@ -72031,6 +75842,9 @@ in (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -72042,6 +75856,7 @@ in sources."ansi-regex-4.1.0" sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" sources."string-width-3.1.0" @@ -72054,6 +75869,7 @@ in sources."ansi-regex-4.1.0" sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" sources."string-width-3.1.0" @@ -72104,7 +75920,7 @@ in sources."commander-4.1.1" ]; }) - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.44.0" @@ -72121,7 +75937,7 @@ in sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -72162,7 +75978,7 @@ in sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."kuler-1.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.defaults-4.2.0" sources."lodash.omit-4.5.0" sources."logform-2.2.0" @@ -72197,6 +76013,1689 @@ in bypassCache = true; reconstructLock = true; }; + netlify-cli = nodeEnv.buildNodePackage { + name = "netlify-cli"; + packageName = "netlify-cli"; + version = "2.63.3"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.3.tgz"; + sha512 = "XHokxG0dgSYbewUj9ifRI/EiM8PYAwWaA31+WFCbGHi0kKHrVwFLx1FsQH3Yo35dQk7MM0dnHjT8xTir0slgZw=="; + }; + dependencies = [ + sources."@analytics/cookie-utils-0.2.3" + sources."@analytics/core-0.6.2" + sources."@analytics/storage-utils-0.2.4" + sources."@babel/code-frame-7.10.4" + (sources."@babel/compat-data-7.11.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + (sources."@babel/core-7.11.6" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."@babel/generator-7.11.6" + sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" + (sources."@babel/helper-compilation-targets-7.10.4" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.10.5" + sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-define-map-7.10.5" + sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-hoist-variables-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.11.0" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-regex-7.10.5" + sources."@babel/helper-remap-async-to-generator-7.11.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helpers-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.11.5" + sources."@babel/plugin-proposal-async-generator-functions-7.10.5" + sources."@babel/plugin-proposal-class-properties-7.10.4" + sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.10.4" + sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" + sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.11.0" + sources."@babel/plugin-proposal-private-methods-7.10.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-top-level-await-7.10.4" + sources."@babel/plugin-transform-arrow-functions-7.10.4" + sources."@babel/plugin-transform-async-to-generator-7.10.4" + sources."@babel/plugin-transform-block-scoped-functions-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.11.1" + sources."@babel/plugin-transform-classes-7.10.4" + sources."@babel/plugin-transform-computed-properties-7.10.4" + sources."@babel/plugin-transform-destructuring-7.10.4" + sources."@babel/plugin-transform-dotall-regex-7.10.4" + sources."@babel/plugin-transform-duplicate-keys-7.10.4" + sources."@babel/plugin-transform-exponentiation-operator-7.10.4" + sources."@babel/plugin-transform-for-of-7.10.4" + sources."@babel/plugin-transform-function-name-7.10.4" + sources."@babel/plugin-transform-literals-7.10.4" + sources."@babel/plugin-transform-member-expression-literals-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.5" + sources."@babel/plugin-transform-modules-commonjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.10.5" + sources."@babel/plugin-transform-modules-umd-7.10.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" + sources."@babel/plugin-transform-new-target-7.10.4" + sources."@babel/plugin-transform-object-super-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.5" + sources."@babel/plugin-transform-property-literals-7.10.4" + sources."@babel/plugin-transform-regenerator-7.10.4" + sources."@babel/plugin-transform-reserved-words-7.10.4" + sources."@babel/plugin-transform-shorthand-properties-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" + sources."@babel/plugin-transform-sticky-regex-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.5" + sources."@babel/plugin-transform-typeof-symbol-7.10.4" + sources."@babel/plugin-transform-unicode-escapes-7.10.4" + sources."@babel/plugin-transform-unicode-regex-7.10.4" + (sources."@babel/preset-env-7.11.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."@babel/preset-modules-0.1.4" + sources."@babel/runtime-7.11.2" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" + sources."@bugsnag/browser-7.3.5" + sources."@bugsnag/core-7.3.5" + sources."@bugsnag/cuid-3.0.0" + sources."@bugsnag/js-7.3.5" + sources."@bugsnag/node-7.3.5" + sources."@bugsnag/safe-json-stringify-6.0.0" + sources."@dabh/diagnostics-2.0.2" + sources."@jest/types-24.9.0" + sources."@mrmlnc/readdir-enhanced-2.2.1" + (sources."@netlify/build-4.0.4" // { + dependencies = [ + sources."chalk-3.0.0" + sources."resolve-2.0.0-next.1" + ]; + }) + sources."@netlify/cache-utils-1.0.3" + (sources."@netlify/config-2.1.5" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."@netlify/functions-utils-1.2.9" + (sources."@netlify/git-utils-1.0.2" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."to-regex-range-5.0.1" + ]; + }) + sources."@netlify/open-api-0.16.0" + sources."@netlify/plugin-edge-handlers-1.1.0" + sources."@netlify/run-utils-1.0.1" + (sources."@netlify/zip-it-and-ship-it-1.3.12" // { + dependencies = [ + sources."resolve-2.0.0-next.1" + ]; + }) + (sources."@nodelib/fs.scandir-2.1.3" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + ]; + }) + sources."@nodelib/fs.stat-1.1.3" + sources."@nodelib/fs.walk-1.2.4" + (sources."@oclif/color-0.1.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."supports-color-7.2.0" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-3.0.0" + sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" + ]; + }) + (sources."@oclif/command-1.8.0" // { + dependencies = [ + sources."@oclif/plugin-help-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."wrap-ansi-4.0.0" + ]; + }) + (sources."@oclif/config-1.17.0" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.4" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."globby-11.0.1" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + sources."tslib-2.0.1" + ]; + }) + (sources."@oclif/errors-1.3.3" // { + dependencies = [ + sources."clean-stack-3.0.0" + sources."fs-extra-9.0.1" + sources."wrap-ansi-7.0.0" + ]; + }) + sources."@oclif/linewrap-1.0.0" + sources."@oclif/parser-3.8.5" + (sources."@oclif/plugin-help-2.2.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + (sources."widest-line-2.0.1" // { + dependencies = [ + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + ]; + }) + (sources."@oclif/plugin-not-found-1.2.4" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."cli-ux-4.9.3" + sources."fs-extra-7.0.1" + sources."has-flag-3.0.0" + sources."indent-string-3.2.0" + sources."is-wsl-1.1.0" + sources."jsonfile-4.0.0" + sources."semver-5.7.1" + sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" + sources."universalify-0.1.2" + ]; + }) + (sources."@oclif/plugin-plugins-1.9.0" // { + dependencies = [ + sources."fs-extra-7.0.1" + sources."jsonfile-4.0.0" + sources."npm-run-path-3.1.0" + sources."path-key-3.1.1" + sources."tslib-2.0.1" + sources."universalify-0.1.2" + ]; + }) + sources."@oclif/screen-1.0.4" + sources."@octokit/auth-token-2.4.2" + (sources."@octokit/endpoint-6.0.6" // { + dependencies = [ + sources."is-plain-object-5.0.0" + sources."universal-user-agent-6.0.0" + ]; + }) + (sources."@octokit/plugin-paginate-rest-1.1.2" // { + dependencies = [ + sources."@octokit/types-2.16.2" + ]; + }) + sources."@octokit/plugin-request-log-1.0.0" + (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { + dependencies = [ + sources."@octokit/types-2.16.2" + ]; + }) + (sources."@octokit/request-5.4.9" // { + dependencies = [ + sources."@octokit/request-error-2.0.2" + sources."is-plain-object-5.0.0" + sources."universal-user-agent-6.0.0" + ]; + }) + (sources."@octokit/request-error-1.2.1" // { + dependencies = [ + sources."@octokit/types-2.16.2" + ]; + }) + sources."@octokit/rest-16.43.2" + sources."@octokit/types-5.5.0" + sources."@rollup/plugin-babel-5.2.1" + (sources."@rollup/plugin-commonjs-15.1.0" // { + dependencies = [ + sources."estree-walker-2.0.1" + ]; + }) + sources."@rollup/plugin-json-4.1.0" + sources."@rollup/plugin-node-resolve-9.0.0" + sources."@rollup/pluginutils-3.1.0" + sources."@sindresorhus/is-0.14.0" + sources."@sindresorhus/slugify-1.1.0" + (sources."@sindresorhus/transliterate-0.1.1" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) + sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" + sources."@types/decompress-4.2.3" + sources."@types/download-6.2.4" + sources."@types/estree-0.0.39" + sources."@types/glob-7.1.3" + sources."@types/got-8.3.5" + sources."@types/http-proxy-1.17.4" + sources."@types/istanbul-lib-coverage-2.0.3" + sources."@types/istanbul-lib-report-3.0.0" + sources."@types/istanbul-reports-1.1.2" + sources."@types/minimatch-3.0.3" + sources."@types/mkdirp-0.5.2" + sources."@types/node-14.11.1" + sources."@types/node-fetch-2.5.7" + sources."@types/normalize-package-data-2.4.0" + sources."@types/resolve-1.17.1" + sources."@types/semver-5.5.0" + sources."@types/yargs-13.0.10" + sources."@types/yargs-parser-15.0.0" + sources."@typescript-eslint/typescript-estree-2.34.0" + sources."accepts-1.3.7" + sources."agent-base-6.0.1" + sources."aggregate-error-3.1.0" + sources."analytics-0.5.5" + sources."analytics-utils-0.2.2" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" + (sources."ansi-styles-4.2.1" // { + dependencies = [ + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."ansicolors-0.3.2" + sources."anymatch-3.1.1" + (sources."archive-type-4.0.0" // { + dependencies = [ + sources."file-type-4.4.0" + ]; + }) + sources."archiver-4.0.2" + (sources."archiver-utils-2.1.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flat-polyfill-1.0.1" + sources."array-flatten-1.1.1" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."arrify-2.0.1" + sources."ascii-table-0.0.9" + sources."assign-symbols-1.0.0" + sources."ast-module-types-2.6.0" + sources."async-3.2.0" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + sources."atob-lite-2.0.0" + (sources."aws-sdk-2.756.0" // { + dependencies = [ + sources."buffer-4.9.2" + sources."uuid-3.3.2" + ]; + }) + sources."babel-plugin-dynamic-import-node-2.3.3" + sources."backoff-2.5.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."before-after-hook-2.1.0" + sources."binary-extensions-2.1.0" + sources."bl-4.0.3" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."raw-body-2.4.0" + ]; + }) + (sources."boxen-4.2.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."browserslist-4.14.3" + sources."btoa-lite-1.0.0" + sources."buffer-5.6.0" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-crc32-0.2.13" + sources."buffer-fill-1.0.0" + sources."builtin-modules-3.1.0" + sources."builtins-1.0.3" + sources."byline-5.0.0" + sources."bytes-3.1.0" + sources."cache-base-1.0.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."lowercase-keys-2.0.0" + ]; + }) + sources."cachedir-2.3.0" + sources."call-me-maybe-1.0.1" + sources."camelcase-5.3.1" + sources."caniuse-lite-1.0.30001133" + sources."cardinal-2.1.1" + sources."caw-2.0.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."chardet-0.7.0" + (sources."chokidar-3.4.2" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."is-number-7.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."ci-info-2.0.0" + (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-deep-3.4.0" + sources."clean-stack-2.2.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-2.1.0" + sources."cli-progress-3.8.2" + sources."cli-spinners-2.4.0" + (sources."cli-ux-5.5.0" // { + dependencies = [ + sources."ansi-escapes-4.3.1" + sources."chalk-4.1.0" + sources."clean-stack-3.0.0" + sources."extract-stack-2.0.0" + sources."fs-extra-9.0.1" + sources."supports-hyperlinks-2.1.0" + sources."tslib-2.0.1" + sources."type-fest-0.11.0" + ]; + }) + sources."cli-width-2.2.1" + sources."cliui-6.0.0" + sources."clone-1.0.4" + sources."clone-response-1.0.2" + sources."collection-visit-1.0.0" + sources."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.5.3" + sources."colors-1.4.0" + sources."colorspace-1.1.2" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."common-path-prefix-2.0.0" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + (sources."compress-commons-3.0.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + (sources."concordance-4.0.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."config-chain-1.1.12" + sources."configstore-5.0.1" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" + (sources."convert-source-map-1.7.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."cookie-0.4.1" + sources."cookie-signature-1.0.6" + sources."copy-descriptor-0.1.1" + (sources."copy-template-dir-1.4.0" // { + dependencies = [ + sources."pump-1.0.3" + sources."readable-stream-2.3.7" + sources."readdirp-2.2.1" + sources."safe-buffer-5.1.2" + ]; + }) + (sources."core-js-compat-3.6.5" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."cp-file-7.0.0" + (sources."cpy-8.1.1" // { + dependencies = [ + sources."globby-9.2.0" + ]; + }) + sources."crc-3.8.0" + sources."crc32-stream-3.0.1" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + sources."which-1.3.1" + ]; + }) + sources."crypto-random-string-2.0.0" + sources."cyclist-1.0.1" + sources."date-time-2.1.0" + (sources."debug-4.3.0" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + (sources."decompress-4.2.1" // { + dependencies = [ + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-2.3.0" + ]; + }) + sources."decompress-response-3.3.0" + (sources."decompress-tar-4.1.1" // { + dependencies = [ + sources."bl-1.2.3" + sources."file-type-5.2.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."tar-stream-1.6.2" + ]; + }) + (sources."decompress-tarbz2-4.1.1" // { + dependencies = [ + sources."file-type-6.2.0" + ]; + }) + (sources."decompress-targz-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."decompress-unzip-4.0.1" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + sources."pify-2.3.0" + ]; + }) + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."deepmerge-4.2.2" + sources."defaults-1.0.3" + sources."defer-to-connect-1.1.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + (sources."del-5.1.0" // { + dependencies = [ + sources."slash-3.0.0" + ]; + }) + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."deprecation-2.3.1" + sources."destroy-1.0.4" + sources."detective-amd-3.0.0" + sources."detective-cjs-3.1.1" + sources."detective-es6-2.2.0" + sources."detective-less-1.0.2" + sources."detective-postcss-3.0.1" + sources."detective-sass-3.0.1" + sources."detective-scss-2.0.1" + sources."detective-stylus-1.0.0" + sources."detective-typescript-5.8.0" + (sources."dir-glob-2.2.2" // { + dependencies = [ + sources."path-type-3.0.0" + sources."pify-3.0.0" + ]; + }) + sources."dlv-1.1.3" + sources."dot-prop-5.3.0" + sources."dotenv-8.2.0" + (sources."download-7.1.0" // { + dependencies = [ + sources."@sindresorhus/is-0.7.0" + sources."cacheable-request-2.1.4" + sources."get-stream-3.0.0" + sources."got-8.3.2" + sources."http-cache-semantics-3.8.1" + sources."is-plain-obj-1.1.0" + sources."keyv-3.0.0" + sources."lowercase-keys-1.0.0" + sources."make-dir-1.3.0" + sources."normalize-url-2.0.1" + sources."p-cancelable-0.4.1" + sources."p-event-2.3.1" + sources."p-timeout-2.0.1" + sources."pify-3.0.0" + sources."sort-keys-2.0.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."ee-first-1.1.1" + sources."electron-to-chromium-1.3.570" + sources."elf-tools-1.1.2" + sources."emoji-regex-8.0.0" + sources."enabled-2.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."envinfo-7.7.3" + sources."error-ex-1.3.2" + sources."error-stack-parser-2.0.6" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" + sources."escalade-3.1.0" + sources."escape-goat-2.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-4.0.0" + (sources."escodegen-1.14.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."eslint-visitor-keys-1.3.0" + sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."estree-walker-1.0.1" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."eventemitter3-4.0.7" + sources."events-1.1.1" + (sources."execa-3.4.0" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."is-stream-2.0.0" + sources."npm-run-path-4.0.1" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.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."kind-of-5.1.0" + ]; + }) + (sources."express-4.17.1" // { + dependencies = [ + sources."cookie-0.4.0" + sources."debug-2.6.9" + sources."safe-buffer-5.1.2" + ]; + }) + sources."express-logging-1.1.1" + sources."ext-list-2.2.2" + sources."ext-name-5.0.0" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extract-stack-1.0.0" + sources."fast-diff-1.2.0" + sources."fast-equals-1.6.3" + sources."fast-glob-2.2.7" + sources."fast-levenshtein-2.0.6" + sources."fast-safe-stringify-2.0.7" + sources."fast-stringify-1.1.2" + sources."fastq-1.8.0" + sources."fd-slicer-1.1.0" + sources."fecha-4.2.0" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."file-size-0.0.5" + sources."file-type-8.1.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.1.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."filter-obj-2.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."find-up-4.1.0" + sources."flatten-1.0.3" + sources."flush-write-stream-2.0.0" + sources."fn.name-1.1.0" + sources."folder-walker-3.2.0" + sources."follow-redirects-1.13.0" + sources."for-in-1.0.2" + sources."form-data-3.0.0" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + (sources."from2-2.3.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."from2-array-0.0.4" + sources."fs-constants-1.0.0" + (sources."fs-extra-8.1.0" // { + dependencies = [ + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."function-bind-1.1.1" + sources."fuzzy-0.1.3" + sources."gensync-1.0.0-beta.1" + sources."get-amd-module-type-3.0.0" + sources."get-caller-file-2.0.5" + sources."get-port-5.1.1" + sources."get-proxy-2.1.0" + sources."get-stream-5.2.0" + sources."get-value-2.0.6" + (sources."gh-release-fetch-1.0.4" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."git-repo-info-2.1.1" + sources."gitconfiglocal-2.1.0" + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."glob-to-regexp-0.3.0" + sources."global-cache-dir-1.0.1" + sources."global-dirs-2.0.1" + sources."globals-11.12.0" + (sources."globby-10.0.2" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.4" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."gonzales-pe-4.3.0" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + sources."to-readable-stream-1.0.0" + ]; + }) + sources."graceful-fs-4.2.4" + sources."has-1.0.3" + (sources."has-ansi-0.1.0" // { + dependencies = [ + sources."ansi-regex-0.2.1" + ]; + }) + sources."has-flag-4.0.0" + (sources."has-glob-1.0.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.1" + sources."has-to-string-tag-x-1.4.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."has-yarn-2.1.0" + (sources."hasha-5.2.0" // { + dependencies = [ + sources."is-stream-2.0.0" + ]; + }) + sources."hosted-git-info-2.8.8" + sources."http-cache-semantics-4.1.0" + (sources."http-call-5.3.0" // { + dependencies = [ + sources."is-stream-2.0.0" + sources."parse-json-4.0.0" + ]; + }) + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-proxy-1.18.1" + (sources."http-proxy-middleware-1.0.5" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."to-regex-range-5.0.1" + ]; + }) + sources."https-proxy-agent-5.0.0" + sources."human-signals-1.1.1" + sources."hyperlinker-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."ignore-4.0.6" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."indexes-of-1.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + (sources."inquirer-6.5.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."escape-string-regexp-1.0.5" + sources."figures-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + ]; + }) + (sources."inquirer-autocomplete-prompt-1.1.0" // { + dependencies = [ + sources."ansi-escapes-4.3.1" + sources."chalk-4.1.0" + sources."type-fest-0.11.0" + ]; + }) + sources."into-stream-3.1.0" + sources."invariant-2.2.4" + sources."ipaddr.js-1.9.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-buffer-1.1.6" + sources."is-callable-1.2.1" + sources."is-ci-2.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-descriptor-1.0.2" + sources."is-docker-2.1.1" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-installed-globally-0.3.2" + sources."is-interactive-1.0.0" + sources."is-module-1.0.0" + sources."is-natural-number-4.0.1" + sources."is-negative-zero-2.0.0" + sources."is-npm-4.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-obj-2.0.0" + sources."is-object-1.0.1" + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.2" + sources."is-plain-obj-2.1.0" + sources."is-plain-object-2.0.4" + sources."is-reference-1.2.1" + sources."is-regex-1.1.1" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" + sources."is-typedarray-1.0.0" + sources."is-url-1.2.4" + sources."is-windows-1.0.2" + sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" + sources."isarray-1.0.0" + sources."iserror-0.0.2" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isurl-1.0.0" + sources."jest-get-type-24.9.0" + sources."jest-validate-24.9.0" + sources."jmespath-0.15.0" + sources."js-string-escape-1.0.1" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.0" + sources."jsesc-2.5.2" + sources."json-buffer-3.0.0" + sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json5-2.1.3" + sources."jsonfile-6.0.1" + sources."junk-3.1.0" + sources."jwt-decode-2.2.0" + sources."keep-func-props-3.0.1" + sources."keyv-3.1.0" + sources."kind-of-6.0.3" + sources."kuler-2.0.0" + (sources."lambda-local-1.7.3" // { + dependencies = [ + sources."commander-5.1.0" + ]; + }) + sources."latest-version-5.1.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."leven-3.1.0" + sources."levenary-1.1.1" + sources."levn-0.3.0" + sources."lines-and-columns-1.1.6" + (sources."load-json-file-5.3.0" // { + dependencies = [ + sources."parse-json-4.0.0" + sources."type-fest-0.3.1" + ]; + }) + sources."locate-path-5.0.0" + sources."lodash-4.17.20" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.camelcase-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.debounce-4.0.8" + sources."lodash.deburr-4.1.0" + sources."lodash.defaults-4.2.0" + sources."lodash.difference-4.5.0" + sources."lodash.flatten-4.4.0" + sources."lodash.flattendeep-4.4.0" + sources."lodash.get-4.4.2" + sources."lodash.isempty-4.4.0" + sources."lodash.isequal-4.5.0" + sources."lodash.islength-4.0.1" + sources."lodash.isobject-3.0.2" + sources."lodash.isplainobject-4.0.6" + sources."lodash.merge-4.6.2" + sources."lodash.pick-4.4.0" + sources."lodash.sample-4.2.1" + sources."lodash.set-4.3.2" + sources."lodash.snakecase-4.1.1" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" + sources."lodash.transform-4.6.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + (sources."log-process-errors-5.1.2" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."log-symbols-3.0.0" + (sources."logform-2.2.0" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."loose-envify-1.4.0" + sources."lowercase-keys-1.0.1" + sources."macos-release-2.4.1" + sources."magic-string-0.25.7" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."map-cache-0.2.2" + sources."map-obj-4.1.0" + sources."map-visit-1.0.0" + sources."maxstache-1.0.7" + (sources."maxstache-stream-1.0.4" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."md5-hex-2.0.0" + sources."md5-o-matic-0.1.1" + sources."media-typer-0.3.0" + sources."memoize-one-5.1.1" + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."micro-api-client-3.3.0" + sources."micro-memoize-2.1.2" + sources."micromatch-3.1.10" + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-3.1.0" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."module-definition-3.3.0" + sources."moize-5.4.7" + (sources."move-file-1.2.0" // { + dependencies = [ + (sources."cp-file-6.2.0" // { + dependencies = [ + sources."make-dir-2.1.0" + ]; + }) + sources."path-exists-3.0.0" + sources."semver-5.7.1" + ]; + }) + sources."ms-2.0.0" + (sources."multiparty-4.2.2" // { + dependencies = [ + sources."http-errors-1.8.0" + sources."setprototypeof-1.2.0" + ]; + }) + sources."mute-stream-0.0.7" + sources."nanomatch-1.2.13" + sources."natural-orderby-2.0.3" + sources."negotiator-0.6.2" + sources."nested-error-stacks-2.1.0" + (sources."netlify-4.5.1" // { + dependencies = [ + sources."qs-6.9.4" + ]; + }) + (sources."netlify-redirect-parser-2.5.0" // { + dependencies = [ + sources."@netlify/config-0.11.11" + sources."chalk-3.0.0" + ]; + }) + sources."netlify-redirector-0.2.0" + sources."nice-try-1.0.5" + sources."node-fetch-2.6.1" + sources."node-releases-1.1.61" + sources."node-source-walk-4.2.0" + sources."noop2-2.0.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.0" + (sources."npm-conf-1.1.3" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."npm-run-path-2.0.2" + sources."object-assign-4.1.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-inspect-1.8.0" + sources."object-keys-1.1.1" + sources."object-treeify-1.1.28" + sources."object-visit-1.0.1" + sources."object.assign-4.1.1" + (sources."object.getownpropertydescriptors-2.1.0" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + sources."object.pick-1.3.0" + sources."octokit-pagination-methods-1.1.0" + sources."omit.js-2.0.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."one-time-1.0.0" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) + (sources."open-6.4.0" // { + dependencies = [ + sources."is-wsl-1.1.0" + ]; + }) + (sources."opn-5.5.0" // { + dependencies = [ + sources."is-wsl-1.1.0" + ]; + }) + sources."optionator-0.8.3" + (sources."ora-4.1.1" // { + dependencies = [ + sources."chalk-3.0.0" + sources."cli-cursor-3.1.0" + sources."mute-stream-0.0.8" + sources."restore-cursor-3.1.0" + ]; + }) + sources."os-name-3.1.0" + sources."os-tmpdir-1.0.2" + (sources."p-all-2.1.0" // { + dependencies = [ + sources."p-map-2.1.0" + ]; + }) + sources."p-cancelable-1.1.0" + sources."p-event-4.2.0" + (sources."p-filter-2.1.0" // { + dependencies = [ + sources."p-map-2.1.0" + ]; + }) + sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-map-3.0.0" + sources."p-reduce-2.1.0" + sources."p-timeout-3.2.0" + sources."p-try-2.2.0" + sources."p-wait-for-3.1.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."parallel-transform-1.2.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."parse-github-url-1.0.2" + sources."parse-gitignore-1.0.1" + sources."parse-json-5.1.0" + sources."parse-ms-2.1.0" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."password-prompt-1.1.2" + sources."path-dirname-1.0.2" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."pend-1.2.0" + sources."picomatch-2.2.2" + sources."pify-4.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-dir-4.2.0" + sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.34" // { + dependencies = [ + sources."has-flag-3.0.0" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-values-parser-1.5.0" + sources."precinct-6.3.1" + sources."precond-0.2.3" + sources."prelude-ls-1.1.2" + sources."prepend-http-2.0.0" + (sources."pretty-format-24.9.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + ]; + }) + sources."pretty-ms-5.1.0" + sources."prettyjson-1.2.1" + sources."process-nextick-args-2.0.1" + sources."proto-list-1.2.4" + sources."proxy-addr-2.0.6" + sources."pump-3.0.0" + sources."punycode-1.3.2" + sources."pupa-2.0.1" + sources."qs-6.7.0" + sources."query-string-5.1.1" + sources."querystring-0.2.0" + sources."random-bytes-1.0.0" + sources."random-item-3.0.0" + sources."range-parser-1.2.1" + (sources."raw-body-2.4.1" // { + dependencies = [ + sources."http-errors-1.7.3" + ]; + }) + sources."rc-1.2.8" + sources."react-is-16.13.1" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + sources."read-pkg-up-7.0.1" + sources."readable-stream-3.6.0" + sources."readdirp-3.4.0" + sources."redeyed-2.1.1" + sources."regenerate-1.4.1" + sources."regenerate-unicode-properties-8.2.0" + sources."regenerator-runtime-0.13.7" + sources."regenerator-transform-0.14.5" + sources."regex-not-1.0.2" + sources."regexpu-core-4.7.1" + sources."registry-auth-token-4.2.0" + sources."registry-url-5.1.0" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."require-package-name-2.0.1" + sources."requires-port-1.0.0" + sources."resolve-1.17.0" + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + (sources."restore-cursor-2.0.0" // { + dependencies = [ + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" + ]; + }) + sources."ret-0.1.15" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."rollup-2.28.1" + sources."run-async-2.4.1" + sources."run-parallel-1.1.9" + sources."rxjs-6.6.3" + sources."safe-buffer-5.2.1" + sources."safe-join-0.1.3" + sources."safe-json-stringify-1.2.0" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.1" + sources."seek-bzip-1.0.6" + sources."semver-7.3.2" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.3" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-2.0.0" + (sources."snapdragon-0.8.2" // { + 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."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."sort-keys-1.1.2" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) + sources."sort-keys-length-1.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.8" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.6" + sources."split-string-3.1.0" + sources."split2-1.1.1" + sources."sprintf-js-1.0.3" + sources."stack-generator-2.0.5" + sources."stack-trace-0.0.10" + sources."stackframe-1.2.0" + (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."static-server-2.2.1" // { + dependencies = [ + sources."ansi-regex-0.2.1" + sources."ansi-styles-1.1.0" + sources."chalk-0.5.1" + sources."escape-string-regexp-1.0.5" + sources."strip-ansi-0.3.0" + sources."supports-color-0.2.0" + ]; + }) + sources."statsd-client-0.4.5" + sources."statuses-1.5.0" + sources."strict-uri-encode-1.1.0" + sources."string-width-4.2.0" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."strip-ansi-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + ]; + }) + sources."strip-ansi-control-characters-2.0.0" + sources."strip-bom-3.0.0" + sources."strip-dirs-2.1.0" + sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-json-comments-2.0.1" + (sources."strip-outer-1.0.1" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."supports-color-7.2.0" + (sources."supports-hyperlinks-1.0.1" // { + dependencies = [ + sources."has-flag-2.0.0" + (sources."supports-color-5.5.0" // { + dependencies = [ + sources."has-flag-3.0.0" + ]; + }) + ]; + }) + sources."tar-stream-2.1.4" + sources."temp-dir-1.0.0" + (sources."tempy-0.3.0" // { + dependencies = [ + sources."crypto-random-string-1.0.0" + sources."type-fest-0.3.1" + sources."unique-string-1.0.0" + ]; + }) + sources."term-size-2.2.0" + sources."text-hex-1.0.0" + sources."through-2.3.8" + (sources."through2-2.0.5" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."through2-filter-3.0.0" + sources."through2-map-3.0.0" + sources."time-zone-1.0.0" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."to-buffer-1.1.1" + sources."to-fast-properties-2.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-readable-stream-2.1.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" + sources."toml-3.0.0" + sources."tomlify-j0.4-3.0.0" + sources."treeify-1.1.0" + (sources."trim-repeated-1.0.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."triple-beam-1.3.0" + sources."tslib-1.13.0" + sources."tsutils-3.17.1" + sources."tunnel-agent-0.6.0" + sources."type-check-0.3.2" + sources."type-fest-0.8.1" + sources."type-is-1.6.18" + sources."typedarray-to-buffer-3.1.5" + sources."typescript-3.9.7" + sources."uid-safe-2.1.5" + sources."unbzip2-stream-1.4.3" + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" + sources."union-value-1.0.1" + sources."uniq-1.0.1" + sources."unique-string-2.0.0" + sources."universal-user-agent-4.0.1" + sources."universalify-1.0.0" + (sources."unixify-1.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + 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."update-notifier-4.1.1" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."urix-0.1.0" + sources."url-0.10.3" + sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + sources."utils-merge-1.0.1" + sources."uuid-8.3.0" + sources."validate-npm-package-license-3.0.4" + sources."validate-npm-package-name-3.0.0" + sources."vary-1.1.2" + (sources."wait-port-0.2.9" // { + dependencies = [ + sources."commander-3.0.2" + ]; + }) + sources."wcwidth-1.0.1" + sources."well-known-symbols-2.0.0" + sources."which-2.0.2" + sources."which-module-2.0.0" + sources."widest-line-3.1.0" + (sources."windows-release-3.3.3" // { + dependencies = [ + sources."execa-1.0.0" + sources."get-stream-4.1.0" + ]; + }) + (sources."winston-3.3.3" // { + dependencies = [ + sources."is-stream-2.0.0" + ]; + }) + (sources."winston-transport-4.4.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."word-wrap-1.2.3" + sources."wrap-ansi-6.2.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" + sources."yarn-1.22.5" + sources."yauzl-2.10.0" + sources."zip-stream-3.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Netlify command line tool"; + homepage = https://github.com/netlify/cli; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; nijs = nodeEnv.buildNodePackage { name = "nijs"; packageName = "nijs"; @@ -72222,14 +77721,14 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.0.0.tgz"; - sha512 = "ZW34qA3CJSPKDz2SJBHKRvyNQN0yWO5EGKKksJc+jElu9VA468gwJTyTArC1iOXU7rN3Wtfg/CMt/dBAOFIjvg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.0.tgz"; + sha512 = "rjlHQlnl1dqiDZxZYiKqQdrjias7V+81OVR5PTzZioCBtWkNdrKy06M05HLKxy/pcKikKRCabeDRoZaEc6nIjw=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -72237,7 +77736,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -72285,7 +77784,7 @@ in sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minipass-3.1.3" - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."nopt-4.0.3" sources."npmlog-4.1.2" @@ -72314,11 +77813,11 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.0.2" + sources."tar-6.0.5" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -72378,7 +77877,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" @@ -72573,7 +78072,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -72692,7 +78191,7 @@ in sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."needle-2.5.0" + sources."needle-2.5.2" sources."nopt-4.0.3" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -72738,16 +78237,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.1.2.tgz"; - sha512 = "In2GzDLER2Bm5SkuEQVrekrSFtPljpkMaEYcZxNkbTomYixI63PrCm1IJEZjEBjSkFaK5zY1t3sfEHKdAla+MQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.1.3.tgz"; + sha512 = "U+bxzyjB66dwIm0DZwvCqy34A6CJICro8xNNbMqA8GWnNrY6/ZGuUrmNuApsH3n8stkOPB4CozdR9JpEXTqbtw=="; }; dependencies = [ - sources."@babel/runtime-7.11.1" - sources."@node-red/editor-api-1.1.2" - sources."@node-red/editor-client-1.1.2" - (sources."@node-red/nodes-1.1.2" // { + sources."@babel/runtime-7.11.2" + sources."@node-red/editor-api-1.1.3" + sources."@node-red/editor-client-1.1.3" + (sources."@node-red/nodes-1.1.3" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -72761,14 +78260,14 @@ in }) ]; }) - sources."@node-red/registry-1.1.2" - sources."@node-red/runtime-1.1.2" - sources."@node-red/util-1.1.2" + sources."@node-red/registry-1.1.3" + sources."@node-red/runtime-1.1.3" + sources."@node-red/util-1.1.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -72791,7 +78290,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."axios-0.19.2" sources."balanced-match-1.0.0" (sources."basic-auth-2.0.1" // { @@ -72808,7 +78307,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - (sources."bl-1.2.2" // { + (sources."bl-1.2.3" // { dependencies = [ (sources."readable-stream-2.3.7" // { dependencies = [ @@ -72931,7 +78430,7 @@ in }) (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -72974,7 +78473,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -73041,7 +78540,7 @@ in }) sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."moment-timezone-0.5.31" (sources."mqtt-2.18.8" // { dependencies = [ @@ -73056,7 +78555,7 @@ in sources."mustache-4.0.1" sources."mute-stream-0.0.8" sources."nan-2.14.0" - (sources."needle-2.5.0" // { + (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -73195,7 +78694,7 @@ in sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -73249,7 +78748,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -73257,7 +78756,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -73325,7 +78824,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" sources."mkdirp-0.5.5" sources."ncp-0.4.2" sources."nijs-0.0.25" @@ -73387,7 +78886,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -73397,7 +78896,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.0.2" // { + (sources."tar-6.0.5" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -73408,7 +78907,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uid-number-0.0.5" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -73457,7 +78956,7 @@ in sources."braces-3.0.2" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -73465,12 +78964,12 @@ in (sources."chalk-3.0.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -73481,7 +78980,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" @@ -73576,7 +79075,7 @@ in ]; }) sources."unique-string-2.0.0" - sources."update-notifier-4.1.0" + sources."update-notifier-4.1.1" sources."url-parse-lax-3.0.0" sources."widest-line-3.1.0" sources."wrappy-1.0.2" @@ -73596,10 +79095,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.7"; + version = "6.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.7.tgz"; - sha512 = "swhsdpNpyXg4GbM6LpOQ6qaloQuIKizZ+Zh6JPXJQc59ka49100Js0WvZx594iaKSoFgkFq2s8uXFHS3/Xy2WQ=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.8.tgz"; + sha512 = "HBZVBMYs5blsj94GTeQZel7s9odVuuSUHy1+AlZh7rPVux1os2ashvEGLy/STNK7vUjbrCg5Kq9/GXisJgdf6A=="; }; buildInputs = globalBuildInputs; meta = { @@ -73614,18 +79113,18 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "7.0.2"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-7.0.2.tgz"; - sha512 = "MyH17fUCFbYShuIyxZj6yqB6YZ47+AjPCgXQiH1oqNe3vElBoJ0toY7nwy88qJbfXnFqjTFigzs9lsoKSK0iUw=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.0.1.tgz"; + sha512 = "xSMyNEIvsrNPDh5r1N/VxDGE+5ZkiEx8BxBvoEBWc/rsaHHfwKCvsY3qJjAn064pULH4uTrT7+kJwroHYsY/Yw=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.3" + sources."@npmcli/git-2.0.4" sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/move-file-1.0.1" sources."@npmcli/promise-spawn-1.2.0" - sources."@npmcli/run-script-1.4.0" + sources."@npmcli/run-script-1.5.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -73633,8 +79132,8 @@ in sources."abbrev-1.1.1" sources."agent-base-6.0.1" sources."agentkeepalive-4.1.3" - sources."aggregate-error-3.0.1" - sources."ajv-6.12.3" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.5" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -73653,7 +79152,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" (sources."boxen-4.2.0" // { @@ -73671,7 +79170,7 @@ in sources."cacache-15.0.5" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -73682,7 +79181,7 @@ in sources."ci-info-2.0.0" sources."cint-8.2.1" sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-table-0.3.1" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -73690,14 +79189,14 @@ in sources."color-name-1.1.4" sources."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commander-5.1.0" + sources."commander-6.1.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" @@ -73706,7 +79205,7 @@ in sources."delegates-1.0.0" sources."depd-1.1.2" sources."dezalgo-1.0.3" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" @@ -73721,7 +79220,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.2" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-minipass-2.1.0" @@ -73771,12 +79270,13 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.2.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-parse-helpfulerror-1.0.3" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-2.1.3" + sources."jsonlines-0.1.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."keyv-3.1.0" @@ -73786,12 +79286,13 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" ]; }) - sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."locate-path-6.0.0" + sources."lodash-4.17.20" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { @@ -73807,9 +79308,9 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - (sources."minipass-fetch-1.3.0" // { + (sources."minipass-fetch-1.3.1" // { dependencies = [ - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" ]; }) sources."minipass-flush-1.0.5" @@ -73824,7 +79325,6 @@ in }) sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nested-error-stacks-2.0.1" (sources."node-gyp-6.1.0" // { dependencies = [ sources."chownr-1.1.4" @@ -73846,9 +79346,9 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-2.1.2" sources."npm-pick-manifest-6.1.0" - (sources."npm-registry-fetch-8.1.3" // { + (sources."npm-registry-fetch-8.1.4" // { dependencies = [ - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" ]; }) sources."npmlog-4.1.2" @@ -73860,8 +79360,8 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.0.2" + sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -73870,9 +79370,9 @@ in ]; }) sources."pacote-11.1.11" + sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" sources."performance-now-2.1.0" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" @@ -73887,15 +79387,14 @@ in sources."qs-6.5.2" sources."rc-1.2.8" sources."rc-config-loader-3.0.0" - sources."read-package-json-fast-1.1.3" + sources."read-package-json-fast-1.2.1" sources."readable-stream-2.3.7" sources."readdir-scoped-modules-1.1.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" + sources."remote-git-tags-3.0.0" sources."request-2.88.2" sources."require-from-string-2.0.2" - sources."requireg-0.2.2" - sources."resolve-1.7.1" sources."responselike-1.0.2" sources."retry-0.10.1" sources."rimraf-3.0.2" @@ -73912,9 +79411,9 @@ in sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.1" + sources."socks-2.4.4" sources."socks-proxy-agent-5.0.0" - sources."spawn-please-0.3.0" + sources."spawn-please-0.4.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."ssri-8.0.0" @@ -73922,10 +79421,10 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" - (sources."tar-6.0.2" // { + sources."supports-color-7.2.0" + (sources."tar-6.0.5" // { dependencies = [ - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" ]; }) sources."term-size-2.2.0" @@ -73938,12 +79437,12 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" - (sources."update-notifier-4.1.0" // { + (sources."update-notifier-4.1.1" // { dependencies = [ sources."chalk-3.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -73986,7 +79485,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -73995,7 +79494,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" @@ -74131,7 +79630,7 @@ in sources."tweetnacl-0.14.5" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -74201,13 +79700,13 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - (sources."@babel/core-7.11.1" // { + (sources."@babel/core-7.11.6" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.11.0" // { + (sources."@babel/generator-7.11.6" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -74215,12 +79714,12 @@ in sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.10.5" + sources."@babel/helper-builder-react-jsx-experimental-7.11.5" sources."@babel/helper-compilation-targets-7.10.4" sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.10.4" + sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" @@ -74230,7 +79729,7 @@ in sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.11.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" @@ -74239,7 +79738,7 @@ in sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" @@ -74301,12 +79800,12 @@ in sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.0" - sources."@babel/preset-modules-0.1.3" - sources."@babel/runtime-7.11.1" + sources."@babel/preset-env-7.11.5" + sources."@babel/preset-modules-0.1.4" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -74316,7 +79815,7 @@ in sources."@parcel/watcher-1.12.1" sources."@parcel/workers-1.11.0" sources."@types/q-1.5.4" - sources."abab-2.0.4" + sources."abab-2.0.5" sources."acorn-7.4.0" (sources."acorn-globals-4.3.4" // { dependencies = [ @@ -74324,7 +79823,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -74341,7 +79840,7 @@ in sources."array-equal-1.0.0" sources."array-unique-0.3.2" sources."asn1-0.2.4" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -74359,7 +79858,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -74382,7 +79881,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" @@ -74408,7 +79907,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.13.0" + sources."browserslist-4.14.3" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -74424,7 +79923,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001133" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -74507,7 +80006,7 @@ in sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."deasync-0.1.20" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" (sources."defaults-1.0.3" // { @@ -74543,7 +80042,7 @@ in }) (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" sources."entities-2.0.3" ]; }) @@ -74552,13 +80051,13 @@ in sources."domexception-1.0.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."dotenv-5.0.1" sources."dotenv-expand-5.1.0" sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.520" + sources."electron-to-chromium-1.3.570" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -74566,15 +80065,11 @@ in }) sources."encodeurl-1.0.2" sources."entities-1.1.2" - sources."envinfo-7.7.2" + sources."envinfo-7.7.3" sources."error-ex-1.3.2" - (sources."es-abstract-1.17.6" // { - dependencies = [ - sources."object-inspect-1.8.0" - ]; - }) + sources."es-abstract-1.18.0-next.0" sources."es-to-primitive-1.2.1" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-1.9.1" @@ -74662,7 +80157,8 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.6" // { dependencies = [ - sources."posthtml-0.13.1" + sources."posthtml-0.13.3" + sources."posthtml-parser-0.5.0" sources."terser-4.8.0" ]; }) @@ -74691,7 +80187,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-color-stop-1.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ @@ -74709,6 +80205,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-html-1.1.0" + sources."is-negative-zero-2.0.0" sources."is-number-3.0.0" sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" @@ -74750,7 +80247,7 @@ in sources."leven-3.1.0" sources."levenary-1.1.1" sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.clone-4.5.0" sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" @@ -74813,7 +80310,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -74822,13 +80319,21 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-copy-0.1.0" - sources."object-inspect-1.4.1" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.assign-4.1.1" + (sources."object.getownpropertydescriptors-2.1.0" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."object.pick-1.3.0" - sources."object.values-1.1.1" + (sources."object.values-1.1.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -74837,7 +80342,7 @@ in sources."ora-2.1.0" sources."os-browserify-0.3.0" sources."pako-0.2.9" - sources."parse-asn1-5.1.5" + sources."parse-asn1-5.1.6" sources."parse-json-4.0.0" sources."parse5-5.1.0" sources."parseurl-1.3.3" @@ -74852,12 +80357,12 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."supports-color-6.1.0" ]; }) - (sources."postcss-calc-7.0.2" // { + (sources."postcss-calc-7.0.4" // { dependencies = [ sources."postcss-value-parser-4.1.0" ]; @@ -74914,7 +80419,7 @@ in sources."postcss-ordered-values-4.1.2" sources."postcss-reduce-initial-4.0.3" sources."postcss-reduce-transforms-4.0.2" - sources."postcss-selector-parser-6.0.2" + sources."postcss-selector-parser-6.0.3" sources."postcss-svgo-4.0.2" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" @@ -74934,6 +80439,8 @@ in (sources."purgecss-2.3.0" // { dependencies = [ sources."commander-5.1.0" + sources."postcss-7.0.32" + sources."supports-color-6.1.0" ]; }) sources."q-1.5.1" @@ -74960,7 +80467,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ @@ -75046,13 +80553,25 @@ in ]; }) sources."static-extend-0.1.2" - sources."static-module-2.2.5" + (sources."static-module-2.2.5" // { + dependencies = [ + sources."object-inspect-1.4.1" + ]; + }) sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { @@ -75090,6 +80609,7 @@ in (sources."uncss-0.17.3" // { dependencies = [ sources."is-absolute-url-3.0.3" + sources."postcss-selector-parser-6.0.2" ]; }) sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -75113,7 +80633,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -75127,7 +80647,11 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."uuid-3.4.0" sources."v8-compile-cache-2.1.1" sources."vendors-1.0.4" @@ -75173,7 +80697,7 @@ in sources."negotiator-0.6.2" ]; }) - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -75184,12 +80708,12 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babybird-0.0.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.5.0" - sources."bl-1.2.2" + sources."bl-1.2.3" sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ @@ -75238,6 +80762,8 @@ in sources."encodeurl-1.0.2" sources."entities-1.1.2" sources."errno-0.1.7" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" @@ -75270,6 +80796,7 @@ in sources."handlebars-4.7.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-symbols-1.0.1" sources."hat-0.0.3" sources."heapdump-0.3.15" @@ -75281,7 +80808,12 @@ in sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-arguments-1.0.4" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" sources."is-fullwidth-code-point-2.0.0" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -75301,7 +80833,7 @@ in sources."kad-memstore-0.0.1" sources."limitation-0.2.1" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.clone-4.5.0" sources."media-typer-0.3.0" sources."mediawiki-title-0.6.5" @@ -75314,7 +80846,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" @@ -75323,8 +80855,9 @@ in sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" sources."oauth-sign-0.9.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -75395,6 +80928,16 @@ in sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-3.1.0" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."string_decoder-1.1.1" sources."strip-ansi-5.2.0" sources."toidentifier-1.0.0" @@ -75402,10 +80945,10 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.4" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -75436,6 +80979,274 @@ in bypassCache = true; reconstructLock = true; }; + patch-package = nodeEnv.buildNodePackage { + name = "patch-package"; + packageName = "patch-package"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz"; + sha512 = "YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg=="; + }; + dependencies = [ + sources."@yarnpkg/lockfile-1.1.0" + sources."ansi-styles-3.2.1" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."cache-base-1.0.1" + sources."chalk-2.4.2" + sources."ci-info-2.0.0" + (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."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."copy-descriptor-0.1.1" + sources."cross-spawn-6.0.5" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" + sources."escape-string-regexp-1.0.5" + (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-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."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."find-yarn-workspace-root-1.2.1" // { + dependencies = [ + sources."fs-extra-4.0.3" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."fs-extra-7.0.1" + sources."fs.realpath-1.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.6" + sources."graceful-fs-4.2.4" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-ci-2.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."is-plain-object-2.0.4" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."jsonfile-4.0.0" + sources."kind-of-6.0.3" + sources."klaw-sync-6.0.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."micromatch-3.1.10" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."ms-2.0.0" + sources."nanomatch-1.2.13" + sources."nice-try-1.0.5" + (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-tmpdir-1.0.2" + sources."pascalcase-0.1.1" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."posix-character-classes-0.1.1" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.7.1" + sources."safe-regex-1.1.0" + sources."semver-5.7.1" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."slash-2.0.0" + (sources."snapdragon-0.8.2" // { + 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."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."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + (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."supports-color-5.5.0" + sources."tmp-0.0.33" + (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."union-value-1.0.1" + sources."universalify-0.1.2" + (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."urix-0.1.0" + sources."use-3.1.1" + sources."which-1.3.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Fix broken node modules with no fuss"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; @@ -75557,7 +81368,7 @@ in sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -75566,13 +81377,14 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.1" + sources."ipaddr.js-2.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" @@ -75612,7 +81424,11 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" @@ -75694,13 +81510,17 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" - sources."string2compact-1.3.0" + (sources."string2compact-1.3.0" // { + dependencies = [ + sources."ipaddr.js-1.9.1" + ]; + }) sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -75764,7 +81584,7 @@ in sources."accepts-1.3.7" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -75779,7 +81599,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -75798,7 +81618,7 @@ in sources."ws-1.1.5" ]; }) - sources."bl-4.0.2" + sources."bl-4.0.3" sources."blob-0.0.5" sources."bn.js-4.11.9" sources."bncode-0.5.3" @@ -75939,7 +81759,7 @@ in sources."readable-stream-2.3.7" ]; }) - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" @@ -76081,7 +81901,7 @@ in sources."statuses-1.5.0" sources."string2compact-1.3.0" sources."string_decoder-1.1.1" - sources."tar-stream-2.1.3" + sources."tar-stream-2.1.4" sources."thirty-two-0.0.2" sources."thunky-1.1.0" sources."to-array-0.1.4" @@ -76103,7 +81923,7 @@ in sources."ultron-1.1.1" sources."uniq-1.0.1" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."utp-0.0.7" @@ -76131,10 +81951,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.4.12"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.4.12.tgz"; - sha512 = "//Oru9g26OvTCe6bID3AJNiJ8B5SRd0vQBRH1gpoWxDh5kdPPpV4pge4B6ncWJUIl0yAVB9sSmDqDDheJP5+xQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.7.0.tgz"; + sha512 = "5+ZKJUKhh6indenG8egpELjgAEQKO6fx5LHlepDr3zymkX6EupySjPh/E/20ue920bUbMdvC0Hi2S71S45IJ7A=="; }; buildInputs = globalBuildInputs; meta = { @@ -76149,10 +81969,10 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.1.tgz"; - sha512 = "bYQy5ydAQJKCMSpvaMg0ThPBeGYqhQXumjbFOmWnL4u65CYXQ16RfS6afGQpit0dGv/fNzxbdDtx8dkqOhhIbg=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.2.tgz"; + sha512 = "3mlEmN1v2NVuosMWZM2tP8bgZn7rO5PYxRRrXtdSyL5KipcgBDjJ9ct8/LKxImMCJJi3x5nYhCGFJOkGyEqXBQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -76172,7 +81992,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."chalk-4.1.0" - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -76191,7 +82011,7 @@ in sources."fs-extra-9.0.1" sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" - sources."get-stdin-7.0.0" + sources."get-stdin-8.0.0" sources."glob-parent-5.1.1" sources."globby-11.0.1" sources."graceful-fs-4.2.4" @@ -76211,7 +82031,7 @@ in sources."json-parse-better-errors-1.0.2" sources."jsonfile-6.0.1" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."log-symbols-2.2.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -76233,7 +82053,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -76247,7 +82067,7 @@ in sources."supports-color-6.1.0" ]; }) - sources."postcss-load-config-2.1.0" + sources."postcss-load-config-2.1.1" (sources."postcss-reporter-6.0.1" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -76272,7 +82092,7 @@ in sources."sprintf-js-1.0.3" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."universalify-1.0.0" sources."which-module-2.0.0" @@ -76294,10 +82114,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.0.5"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; - sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz"; + sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="; }; buildInputs = globalBuildInputs; meta = { @@ -76329,7 +82149,7 @@ in sources."inherits-2.0.4" sources."isexe-2.0.0" sources."keypress-0.2.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -76359,7 +82179,7 @@ in sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -76373,7 +82193,7 @@ in sources."async-1.5.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."browser-pack-6.1.0" @@ -76485,7 +82305,7 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { @@ -76523,7 +82343,7 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parents-1.0.1" - sources."parse-asn1-5.1.5" + sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -76553,6 +82373,7 @@ in sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."sander-0.5.1" sources."sha.js-2.4.11" sources."shasum-1.0.2" @@ -76616,13 +82437,15 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.13.6"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.13.6.tgz"; - sha512 = "0e7oA1gveyd8XLkBYcPWRC27PAFGTxpf6aVJWUfA79Q3lCCOP9BQBkr9a42FutP3q6GMc9TVW4mQ+xSEfhwOzA=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.2.tgz"; + sha512 = "4dLL/PvePCi4GvI88OjcT1lERIj4jpspXeUvivkYvGxI2NypkmrADuxa32Y3kIZ0D+bAM2ZR6MyOqAyztmRKcg=="; }; dependencies = [ sources."isexe-2.0.0" + sources."shell-quote-1.7.2" + sources."uuid-3.4.0" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.15.3" @@ -76680,10 +82503,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.59"; + version = "1.1.73"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.59.tgz"; - sha512 = "34PysYgl5bDdV7H4y5dv4fonKsJvI2H/YSDY6jvVtt0XI7Ld0k6lHzBZcVDO4kNLdJt0ekhwqC8w42oJyPYnWg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.73.tgz"; + sha512 = "IWW7ZCp/Mk0WOVX9o1/L/Usq+vQODEDOaxlLSCDCClBAdjQsxCCo4FYZPMs4Ec3GKRwEmXHwzW8ZIit3J/cHKw=="; }; buildInputs = globalBuildInputs; meta = { @@ -76735,9 +82558,10 @@ in sources."is-arguments-1.0.4" sources."is-bigint-1.0.0" sources."is-boolean-object-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-map-2.0.1" + sources."is-negative-zero-2.0.0" sources."is-number-object-1.0.4" sources."is-regex-1.1.1" sources."is-set-2.0.1" @@ -76756,7 +82580,11 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."pkginfo-0.4.1" @@ -76766,7 +82594,11 @@ in sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."semver-5.7.1" - sources."side-channel-1.0.2" + (sources."side-channel-1.0.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."stack-trace-0.0.10" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" @@ -76850,14 +82682,14 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.9.10"; + version = "0.9.12"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.10.tgz"; - sha512 = "2rfbQp8uNpQEw/4hRYes3fVrOAYfgK7jYw3t/A9R4EpMSF6jtzJLA/sl1SQh2zWaF5z1ckXEvUW9B8c+NDc//g=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.12.tgz"; + sha512 = "9Ap7WfEsYtAoVZNyA8lryWAsU2Wq0lHXaNiFgdVZb4zltHNTYEqKmRi06WhileeuqVTNkd1CF2S5CCS5Xg9+aQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/generator-7.11.0" // { + (sources."@babel/generator-7.11.6" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -76869,37 +82701,23 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" - sources."@babel/runtime-7.11.1" + sources."@babel/parser-7.11.5" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" - (sources."@emotion/babel-utils-0.6.10" // { - dependencies = [ - sources."source-map-0.7.3" - ]; - }) - sources."@emotion/hash-0.6.6" - (sources."@emotion/is-prop-valid-0.8.8" // { - dependencies = [ - sources."@emotion/memoize-0.7.4" - ]; - }) - sources."@emotion/memoize-0.6.6" - sources."@emotion/serialize-0.9.1" - sources."@emotion/stylis-0.7.1" - sources."@emotion/unitless-0.6.7" - sources."@emotion/utils-0.8.2" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" + sources."@emotion/is-prop-valid-0.8.8" + sources."@emotion/memoize-0.7.4" + sources."@emotion/stylis-0.8.5" + sources."@emotion/unitless-0.7.5" + sources."@exodus/schemasafe-1.0.0-rc.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.13.15" - sources."@types/parse-json-4.0.0" - sources."abbrev-1.1.1" sources."ajv-5.5.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -76909,19 +82727,13 @@ in sources."util-0.10.3" ]; }) - (sources."babel-plugin-emotion-9.2.11" // { - dependencies = [ - sources."mkdirp-0.5.5" - sources."source-map-0.5.7" - ]; - }) - sources."babel-plugin-macros-2.8.0" sources."babel-plugin-styled-components-1.11.1" sources."babel-plugin-syntax-jsx-6.18.0" sources."base64-js-1.3.1" sources."better-ajv-errors-0.6.7" + sources."big.js-5.2.2" sources."binary-extensions-2.1.0" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."braces-3.0.2" sources."brorand-1.1.0" sources."browserify-aes-1.2.0" @@ -76947,43 +82759,36 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."call-me-maybe-1.0.1" - sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelize-1.0.0" sources."chalk-2.4.2" - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."cipher-base-1.0.4" sources."classnames-2.2.6" sources."clipboard-2.0.6" - sources."cliui-6.0.0" + sources."cliui-4.1.0" sources."clsx-1.1.1" sources."co-4.6.0" sources."code-error-fragment-0.0.230" + sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - (sources."convert-source-map-1.7.0" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) sources."core-js-3.6.5" sources."core-util-is-1.0.2" - sources."cosmiconfig-6.0.0" (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; }) - sources."create-emotion-9.2.12" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" - sources."csstype-2.6.13" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decko-1.2.0" sources."delegate-3.2.0" @@ -76993,33 +82798,37 @@ in sources."bn.js-4.11.9" ]; }) + sources."dom-walk-0.1.2" sources."domain-browser-1.2.0" - sources."dompurify-2.0.12" + sources."dompurify-1.0.11" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" ]; }) sources."emoji-regex-8.0.0" - sources."emotion-9.2.12" - sources."error-ex-1.3.2" + sources."emojis-list-3.0.0" + sources."end-of-stream-1.4.4" sources."es6-promise-3.3.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."eventemitter3-4.0.4" + sources."eventemitter3-3.1.2" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" sources."fill-range-7.0.1" - sources."find-root-1.1.0" - sources."find-up-4.1.0" + sources."find-up-3.0.0" sources."foreach-2.0.5" sources."format-util-1.0.5" sources."fsevents-2.1.3" - sources."get-caller-file-2.0.5" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" sources."glob-parent-5.1.1" + sources."global-4.4.0" sources."globals-11.12.0" sources."good-listener-1.2.2" sources."grapheme-splitter-1.0.4" @@ -77041,79 +82850,88 @@ in sources."http2-client-1.3.3" sources."https-browserify-1.0.0" sources."ieee754-1.1.13" - sources."import-fresh-3.2.1" sources."inherits-2.0.1" - sources."is-arrayish-0.2.1" + sources."invert-kv-2.0.0" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" + sources."is-stream-1.1.0" sources."isarray-2.0.5" + sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsesc-2.5.2" - sources."json-parse-better-errors-1.0.2" sources."json-pointer-0.6.0" sources."json-schema-ref-parser-6.1.0" sources."json-schema-traverse-0.3.1" sources."json-to-ast-2.1.0" + sources."json5-1.0.1" sources."jsonpointer-4.1.0" + sources."lcid-2.0.0" sources."leven-3.1.0" - sources."lines-and-columns-1.1.6" - sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."loader-utils-1.4.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.20" sources."loose-envify-1.4.0" - sources."lunr-2.3.8" + sources."lunr-2.3.6" + sources."map-age-cleaner-0.1.3" sources."mark.js-8.11.1" - sources."marked-0.7.0" + sources."marked-0.6.3" sources."md5.js-1.3.5" + sources."mem-4.3.0" sources."memoize-one-5.1.1" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.11.9" ]; }) + sources."mimic-fn-2.1.0" + sources."min-document-2.19.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-4.15.4" - sources."mobx-react-6.2.5" - sources."mobx-react-lite-2.0.7" + sources."mobx-4.15.7" + sources."mobx-react-5.4.4" sources."ms-2.1.2" sources."neo-async-2.6.2" + sources."nice-try-1.0.5" sources."node-fetch-h2-2.3.0" sources."node-libs-browser-2.2.1" sources."node-readfiles-0.2.0" - sources."nopt-1.0.10" sources."normalize-path-3.0.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.1.3" - sources."oas-resolver-2.4.2" + sources."oas-linter-3.2.0" + sources."oas-resolver-2.5.0" sources."oas-schema-walker-1.1.5" - sources."oas-validator-4.0.7" + sources."oas-validator-3.4.0" sources."object-assign-4.1.1" + sources."once-1.4.0" sources."ono-4.0.11" - sources."openapi-sampler-1.0.0-beta.16" + sources."openapi-sampler-1.0.0-beta.14" sources."os-browserify-0.3.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."pako-1.0.11" - sources."parent-module-1.0.1" - sources."parse-asn1-5.1.5" - sources."parse-json-5.0.1" + sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" - sources."path-exists-4.0.0" - sources."path-parse-1.0.6" - sources."path-type-4.0.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" - sources."polished-3.6.5" + sources."polished-3.6.7" sources."postcss-value-parser-4.1.0" - sources."prismjs-1.20.0" + sources."prismjs-1.21.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" @@ -77122,6 +82940,7 @@ in sources."bn.js-4.11.9" ]; }) + sources."pump-3.0.0" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -77129,8 +82948,14 @@ in sources."randomfill-1.0.4" sources."react-16.13.1" sources."react-dom-16.13.1" - sources."react-dropdown-aria-2.0.7" + sources."react-dropdown-1.8.0" + (sources."react-hot-loader-4.12.21" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) sources."react-is-16.13.1" + sources."react-lifecycles-compat-3.0.4" sources."react-tabs-3.1.1" (sources."readable-stream-2.3.7" // { dependencies = [ @@ -77141,61 +82966,68 @@ in ]; }) sources."readdirp-3.4.0" - sources."redoc-2.0.0-rc.36" - sources."reftools-1.1.4" + (sources."redoc-2.0.0-rc.8-1" // { + dependencies = [ + sources."tslib-1.13.0" + ]; + }) + sources."reftools-1.1.6" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" - sources."resolve-from-4.0.0" + sources."require-main-filename-1.0.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."scheduler-0.19.1" sources."select-1.1.2" + sources."semver-5.7.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" sources."shallowequal-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."should-13.2.3" sources."should-equal-2.0.0" sources."should-format-3.0.3" sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" + sources."signal-exit-3.0.3" sources."slugify-1.4.5" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."string-width-4.2.0" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" - (sources."styled-components-5.1.1" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."@emotion/stylis-0.8.5" - sources."@emotion/unitless-0.7.5" + sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."stylis-3.5.4" - sources."stylis-rule-sheet-0.0.10" + sources."string_decoder-1.3.0" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."styled-components-5.2.0" sources."supports-color-5.5.0" - sources."swagger2openapi-6.2.2" + (sources."swagger2openapi-5.4.0" // { + dependencies = [ + sources."yargs-12.0.5" + ]; + }) sources."timers-browserify-2.0.11" sources."tiny-emitter-2.1.0" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."touch-2.0.2" - sources."tslib-2.0.0" + sources."tslib-2.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.4" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) - sources."url-template-2.0.8" (sources."util-0.11.1" // { dependencies = [ sources."inherits-2.0.3" @@ -77203,20 +83035,41 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" + sources."which-1.3.1" sources."which-module-2.0.0" sources."wordwrap-1.0.0" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-2.1.0" // { dependencies = [ - sources."ansi-styles-4.2.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."ansi-regex-2.1.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" ]; }) + sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yaml-1.10.0" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."find-up-4.1.0" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-3.0.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."require-main-filename-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."wrap-ansi-6.2.0" + sources."yargs-parser-18.1.3" + ]; + }) + sources."yargs-parser-11.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -77249,10 +83102,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.23.0"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.23.0.tgz"; - sha512 = "vLNmZFUGVwrnqNAJ/BvuLk1MtWzu4IuoqsH9UWK5AIdO3rt8/CSiJNvPvCIvfzrbNsqKbNzPAG1V2O4eTe2XZg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; + sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -77280,6 +83133,7 @@ in sources."chalk-2.4.2" ]; }) + sources."@eslint/eslintrc-0.1.3" sources."@rollup/plugin-commonjs-13.0.2" sources."@rollup/plugin-node-resolve-8.4.0" sources."@rollup/pluginutils-3.1.0" @@ -77287,31 +83141,31 @@ in sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" - sources."@types/json-schema-7.0.5" + sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/mocha-7.0.2" sources."@types/node-12.7.12" sources."@types/node-fetch-2.5.7" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.47.0" - (sources."@typescript-eslint/eslint-plugin-3.8.0" // { + sources."@types/vscode-1.49.0" + (sources."@typescript-eslint/eslint-plugin-3.10.1" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.8.0" - sources."@typescript-eslint/parser-3.8.0" - sources."@typescript-eslint/types-3.8.0" - (sources."@typescript-eslint/typescript-estree-3.8.0" // { + sources."@typescript-eslint/experimental-utils-3.10.1" + sources."@typescript-eslint/parser-3.10.1" + sources."@typescript-eslint/types-3.10.1" + (sources."@typescript-eslint/typescript-estree-3.10.1" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-3.8.0" + sources."@typescript-eslint/visitor-keys-3.10.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."agent-base-4.3.0" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -77337,11 +83191,11 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."cheerio-1.0.0-rc.3" - sources."chokidar-3.3.1" + sources."chokidar-3.4.2" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -77358,7 +83212,7 @@ in sources."cross-spawn-7.0.3" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" @@ -77387,22 +83241,26 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.6.0" // { + (sources."eslint-7.9.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."eslint-scope-5.1.0" + sources."eslint-scope-5.1.1" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.0" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."estree-walker-1.0.1" sources."esutils-2.0.3" @@ -77412,7 +83270,7 @@ in sources."fd-slicer-1.1.0" sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."flat-4.1.0" sources."flat-cache-2.0.1" sources."flatted-2.0.2" @@ -77450,7 +83308,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -77475,13 +83333,9 @@ in sources."leven-3.1.0" sources."levn-0.4.1" sources."linkify-it-2.2.0" - sources."locate-path-5.0.0" - sources."lodash-4.17.19" - (sources."log-symbols-3.0.0" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) + sources."locate-path-6.0.0" + sources."lodash-4.17.20" + sources."log-symbols-4.0.0" sources."lru-cache-4.1.5" sources."magic-string-0.25.7" (sources."markdown-it-10.0.0" // { @@ -77496,11 +83350,11 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.1.1" // { + (sources."mocha-8.1.3" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-4.1.1" + sources."escape-string-regexp-4.0.0" sources."has-flag-4.0.0" - sources."js-yaml-3.13.1" sources."strip-json-comments-3.0.1" sources."supports-color-7.1.0" ]; @@ -77508,7 +83362,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-compare-1.4.0" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."nth-check-1.0.2" sources."object-inspect-1.8.0" @@ -77520,8 +83374,8 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.0.2" + sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { @@ -77544,14 +83398,14 @@ in sources."randombytes-2.1.0" sources."read-1.0.7" sources."readable-stream-3.6.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."regexpp-3.1.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.23.0" + sources."rollup-2.28.1" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -77578,7 +83432,7 @@ in sources."text-table-0.2.0" sources."tmp-0.0.29" sources."to-regex-range-5.0.1" - sources."tslib-2.0.0" + sources."tslib-2.0.1" (sources."tsutils-3.17.1" // { dependencies = [ sources."tslib-1.13.0" @@ -77592,20 +83446,20 @@ in sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" - (sources."vsce-1.77.0" // { + (sources."vsce-1.79.5" // { dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" ]; }) - sources."vscode-jsonrpc-5.1.0-next.1" - sources."vscode-languageclient-7.0.0-next.1" - sources."vscode-languageserver-protocol-3.16.0-next.2" - sources."vscode-languageserver-types-3.16.0-next.1" + sources."vscode-jsonrpc-6.0.0-next.5" + sources."vscode-languageclient-7.0.0-next.9" + sources."vscode-languageserver-protocol-3.16.0-next.7" + sources."vscode-languageserver-types-3.16.0-next.3" sources."vscode-test-1.4.0" sources."which-2.0.2" sources."which-module-2.0.0" @@ -77632,6 +83486,7 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" ]; @@ -77641,6 +83496,7 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" sources."yargs-14.2.3" @@ -77666,13 +83522,13 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sdk-1.18.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" @@ -77691,7 +83547,7 @@ in sources."crc-0.2.0" sources."crypto-0.0.3" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" @@ -77748,7 +83604,7 @@ in sources."node-wsfederation-0.1.1" sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" sources."oauth-sign-0.9.0" - (sources."openid-2.0.6" // { + (sources."openid-2.0.7" // { dependencies = [ sources."qs-6.5.2" sources."request-2.88.2" @@ -77775,7 +83631,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uid2-0.0.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."util-0.4.9" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -77897,7 +83753,7 @@ in sources."supports-color-5.5.0" sources."term-size-1.2.0" sources."update-check-1.5.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."vary-1.1.2" sources."which-1.3.1" sources."widest-line-2.0.1" @@ -77916,14 +83772,20 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.78.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.78.1.tgz"; - sha512 = "Dw3x2+fnZ+Tgb3nGTYfGe78AIT/AOda8gttwKAoCUPScNDoF8Hjy8YvLuqLQg/o7daWouFUCHQ9Mv0ehN/Qazg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.1.1.tgz"; + sha512 = "e9NoM93/1hWm2+5YsfNbZPZuqjD62B2k16j85hTuLoOtkDPjp80vma9he4kMwbJoEoU4cT332vBWg8+EQmdkFA=="; }; dependencies = [ sources."2-thenable-1.0.0" - sources."@mrmlnc/readdir-enhanced-2.2.1" + (sources."@kwsites/file-exists-1.1.1" // { + dependencies = [ + sources."debug-4.3.0" + sources."ms-2.1.2" + ]; + }) + sources."@kwsites/promise-deferred-1.1.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -77937,51 +83799,76 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@serverless/cli-1.5.2" - sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.34.1" // { + (sources."@serverless/cli-1.5.2" // { dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@serverless/component-metrics-1.0.8" + (sources."@serverless/components-3.1.3" // { + dependencies = [ + sources."chalk-2.4.2" + sources."fs-extra-8.1.0" sources."globby-10.0.2" - sources."semver-7.3.2" + sources."uuid-3.4.0" ]; }) (sources."@serverless/core-1.1.2" // { dependencies = [ sources."fs-extra-7.0.1" + sources."semver-6.3.0" + ]; + }) + (sources."@serverless/enterprise-plugin-4.0.4" // { + dependencies = [ + sources."@serverless/platform-client-2.0.2" ]; }) - sources."@serverless/enterprise-plugin-3.7.0" sources."@serverless/event-mocks-1.1.1" - sources."@serverless/inquirer-1.1.2" - sources."@serverless/platform-client-1.1.1" - (sources."@serverless/platform-client-china-1.0.32" // { + (sources."@serverless/inquirer-1.1.2" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@serverless/platform-client-1.1.10" + (sources."@serverless/platform-client-china-1.1.0" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" + sources."fs-extra-8.1.0" ]; }) - (sources."@serverless/platform-sdk-2.3.1" // { + (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ - sources."debug-4.2.0" + sources."chalk-2.4.2" + sources."debug-4.3.0" sources."https-proxy-agent-4.0.0" + sources."is-docker-1.1.0" sources."ms-2.1.2" sources."ramda-0.25.0" + sources."uuid-3.4.0" sources."ws-6.2.1" ]; }) sources."@serverless/template-1.1.3" - sources."@serverless/utils-1.2.0" - sources."@serverless/utils-china-0.1.22" + (sources."@serverless/utils-1.2.0" // { + dependencies = [ + sources."chalk-2.4.2" + sources."uuid-3.4.0" + ]; + }) + sources."@serverless/utils-china-0.1.28" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-0.2.17" sources."@types/caseless-0.12.2" sources."@types/chalk-2.2.0" + sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" - sources."@types/lodash-4.14.158" + sources."@types/lodash-4.14.161" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -77989,7 +83876,8 @@ in sources."adm-zip-0.4.16" sources."after-0.8.2" sources."agent-base-5.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" + sources."ajv-keywords-3.5.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -78004,18 +83892,12 @@ in sources."file-type-4.4.0" ]; }) - (sources."archiver-3.1.1" // { + (sources."archiver-5.0.2" // { dependencies = [ - sources."async-2.6.3" - (sources."compress-commons-2.1.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - ]; - }) - sources."isarray-1.0.0" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - sources."zip-stream-2.1.3" + sources."async-3.2.0" + sources."compress-commons-4.0.1" + sources."crc32-stream-4.0.0" + sources."zip-stream-4.0.2" ]; }) (sources."archiver-utils-2.1.0" // { @@ -78027,21 +83909,15 @@ in ]; }) sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" sources."array-union-2.1.0" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" - sources."async-1.5.2" + sources."async-2.6.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - sources."atob-2.1.2" - (sources."aws-sdk-2.726.0" // { + sources."at-least-node-1.0.0" + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -78049,27 +83925,32 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."axios-0.19.2" 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."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-2.1.0" - sources."bl-4.0.2" + sources."bl-4.0.3" sources."blob-0.0.5" sources."bluebird-3.7.2" - (sources."boxen-3.2.0" // { + (sources."boxen-4.2.0" // { dependencies = [ - sources."string-width-3.1.0" - sources."type-fest-0.3.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."type-fest-0.8.1" ]; }) sources."brace-expansion-1.1.11" @@ -78081,49 +83962,29 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."builtin-modules-3.1.0" - sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) sources."cachedir-2.3.0" - sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" - sources."caw-2.0.1" - sources."chalk-2.4.2" + (sources."chalk-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."chardet-0.7.0" - (sources."child-process-ext-2.1.1" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."semver-5.7.1" - ]; - }) - sources."chokidar-3.4.1" - sources."ci-info-1.6.0" - (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-buffer-1.1.6" - (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-2.2.0" + sources."child-process-ext-2.1.1" + sources."chokidar-3.4.2" + sources."cli-boxes-2.2.1" (sources."cli-color-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -78132,7 +83993,6 @@ in sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."clone-response-1.0.2" - sources."collection-visit-1.0.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -78154,30 +84014,28 @@ in ]; }) sources."concat-map-0.0.1" - sources."config-chain-1.1.12" - sources."configstore-3.1.2" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) sources."cookiejar-2.1.2" - sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."crc-3.8.0" sources."crc32-stream-3.0.1" - sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) (sources."d-1.0.1" // { dependencies = [ sources."type-1.2.0" ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.32" + sources."dayjs-1.8.36" sources."debug-3.1.0" - sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" (sources."decompress-4.2.1" // { dependencies = [ @@ -78187,7 +84045,7 @@ in sources."decompress-response-3.3.0" (sources."decompress-tar-4.1.1" // { dependencies = [ - sources."bl-1.2.2" + sources."bl-1.2.3" sources."isarray-1.0.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -78212,27 +84070,35 @@ in sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" sources."define-properties-1.1.3" - sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."diagnostics-1.1.1" sources."dijkstrajs-1.0.1" sources."dir-glob-3.0.1" - sources."dot-prop-4.2.0" sources."dot-qs-0.2.0" sources."dotenv-8.2.0" - (sources."download-7.1.0" // { + (sources."download-8.0.0" // { dependencies = [ sources."@sindresorhus/is-0.7.0" - sources."cacheable-request-2.1.4" - sources."file-type-8.1.0" - sources."get-stream-3.0.0" - sources."got-8.3.2" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) + sources."file-type-11.1.0" + (sources."got-8.3.2" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."pify-3.0.0" + ]; + }) sources."http-cache-semantics-3.8.1" sources."keyv-3.0.0" sources."lowercase-keys-1.0.0" + sources."make-dir-2.1.0" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" - sources."pify-3.0.0" + sources."pify-4.0.1" + sources."semver-5.7.1" sources."sort-keys-2.0.0" ]; }) @@ -78242,11 +84108,6 @@ in sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."enabled-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.2" - ]; - }) sources."end-of-stream-1.4.4" (sources."engine.io-client-3.4.3" // { dependencies = [ @@ -78274,75 +84135,38 @@ in sources."essentials-1.1.1" sources."event-emitter-0.3.5" sources."events-1.1.1" - (sources."execa-0.7.0" // { - dependencies = [ - sources."get-stream-3.0.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-buffer-1.1.6" - (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."ext-1.4.0" sources."ext-list-2.2.2" sources."ext-name-5.0.0" sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."external-editor-3.1.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-3.1.3" sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" + sources."fastest-levenshtein-1.0.12" sources."fastq-1.8.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" sources."figures-3.2.0" sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."filesize-3.6.1" + sources."filenamify-3.0.0" + sources."filesize-6.1.0" sources."fill-range-7.0.1" (sources."find-process-1.4.3" // { dependencies = [ + sources."chalk-2.4.2" sources."debug-2.6.9" ]; }) sources."find-requires-1.0.0" - sources."flat-5.0.0" + sources."flat-5.0.2" sources."follow-redirects-1.5.10" - sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.2" - sources."fragment-cache-0.2.1" (sources."from2-2.3.0" // { dependencies = [ sources."isarray-1.0.0" @@ -78352,56 +84176,22 @@ in ]; }) sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" + (sources."fs-extra-9.0.1" // { + dependencies = [ + sources."jsonfile-6.0.1" + sources."universalify-1.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."fs2-0.3.8" sources."fsevents-2.1.3" sources."function-bind-1.1.1" - sources."get-proxy-2.1.0" - sources."get-stdin-6.0.0" + sources."get-stdin-8.0.0" sources."get-stream-4.1.0" - sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."glob-to-regexp-0.3.0" - sources."global-dirs-0.1.1" - (sources."globby-9.2.0" // { - dependencies = [ - sources."@nodelib/fs.stat-1.1.3" - sources."array-union-1.0.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."dir-glob-2.2.2" - sources."fast-glob-2.2.7" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."glob-parent-3.1.0" - sources."ignore-4.0.6" - sources."is-buffer-1.1.6" - sources."is-glob-3.1.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."slash-2.0.0" - sources."to-regex-range-2.1.1" - ]; - }) + sources."globby-11.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."graphlib-2.1.8" @@ -78412,24 +84202,12 @@ in 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-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."agent-base-6.0.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -78437,7 +84215,6 @@ in sources."ieee754-1.1.13" sources."ignore-5.1.8" sources."immediate-3.0.6" - sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indexof-0.0.1" sources."inflight-1.0.6" @@ -78446,57 +84223,29 @@ in (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-escapes-3.2.0" + sources."chalk-2.4.2" sources."figures-2.0.0" ]; }) - (sources."inquirer-autocomplete-prompt-1.0.2" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."figures-2.0.0" - ]; - }) + sources."inquirer-autocomplete-prompt-1.1.0" sources."into-stream-3.1.0" - sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" - sources."is-ci-1.2.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-docker-1.1.0" - sources."is-extendable-0.1.1" + sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.1.0" sources."is-natural-number-4.0.1" - sources."is-npm-1.0.0" sources."is-number-7.0.0" - sources."is-obj-1.0.1" sources."is-object-1.0.1" - sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" - sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-windows-1.0.2" - (sources."is-wsl-2.2.0" // { - dependencies = [ - sources."is-docker-2.1.1" - ]; - }) + sources."is-wsl-2.2.0" sources."isarray-2.0.1" sources."isexe-2.0.0" - sources."iso8601-duration-1.2.0" - sources."isobject-3.0.1" - (sources."isomorphic-fetch-2.2.1" // { - dependencies = [ - sources."node-fetch-1.7.3" - ]; - }) sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" sources."isurl-1.0.0" @@ -78513,7 +84262,6 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" (sources."jszip-3.5.0" // { @@ -78526,20 +84274,7 @@ in }) sources."jwt-decode-2.2.0" sources."keyv-3.1.0" - sources."kind-of-6.0.3" sources."kuler-1.0.1" - (sources."latest-version-3.1.0" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."got-6.7.1" - sources."package-json-4.0.1" - sources."prepend-http-1.0.4" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" - sources."semver-5.7.1" - sources."url-parse-lax-1.0.0" - ]; - }) (sources."lazystream-1.0.0" // { dependencies = [ sources."isarray-1.0.0" @@ -78549,7 +84284,7 @@ in ]; }) sources."lie-3.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" @@ -78567,15 +84302,12 @@ in }) sources."long-4.0.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" sources."lru-queue-0.1.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."memoizee-0.4.14" sources."merge2-1.4.1" sources."methods-1.1.2" @@ -78587,60 +84319,28 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nanoid-2.1.11" - sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."ncjsm-4.1.0" sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-dir-0.1.17" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" - (sources."npm-conf-1.1.3" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-component-0.0.3" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-buffer-1.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-hash-2.0.3" sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-2.0.1" - (sources."open-7.1.0" // { - dependencies = [ - sources."is-docker-2.1.1" - ]; - }) + sources."open-7.2.1" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -78651,17 +84351,18 @@ in sources."p-event-2.3.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" + sources."p-limit-3.0.2" sources."p-timeout-2.0.1" sources."p-try-2.2.0" - sources."package-json-6.5.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."pako-1.0.11" sources."parseqs-0.0.5" sources."parseuri-0.0.5" - sources."pascalcase-0.1.1" - sources."path-dirname-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-loader-1.0.10" sources."path-type-4.0.0" @@ -78671,18 +84372,15 @@ in sources."pify-5.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" sources."prettyoutput-1.2.0" sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" - sources."proto-list-1.2.4" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.15" + sources."@types/node-13.13.21" ]; }) - sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -78692,91 +84390,44 @@ in sources."ramda-0.26.1" sources."rc-1.2.8" sources."readable-stream-3.6.0" + sources."readdir-glob-1.0.0" sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.7" - sources."regex-not-1.0.2" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" sources."replaceall-0.1.6" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" + sources."uuid-3.4.0" ]; }) sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" - sources."ret-0.1.15" sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" - sources."semver-6.3.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."semver-regex-2.0.0" + sources."semver-7.3.2" sources."set-immediate-shim-1.0.1" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shortid-2.2.15" sources."signal-exit-3.0.3" - (sources."simple-git-1.132.0" // { + (sources."simple-git-2.20.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."simple-swizzle-0.2.2" sources."slash-3.0.0" - (sources."snapdragon-0.8.2" // { - 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-buffer-1.1.6" - (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."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."is-buffer-1.1.6" - sources."kind-of-3.2.2" - ]; - }) (sources."socket.io-client-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -78787,33 +84438,12 @@ in sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.19" - sources."source-map-url-0.4.0" - sources."split-string-3.1.0" - sources."split2-3.1.1" + sources."split2-3.2.2" sources."sprintf-js-1.0.3" sources."sprintf-kit-2.0.0" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" - (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-buffer-1.1.6" - (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."stealthy-require-1.1.1" sources."stream-promise-3.2.0" sources."stream-shift-1.0.1" @@ -78829,7 +84459,6 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-5.2.0" sources."strip-dirs-2.1.0" - sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" (sources."superagent-3.8.3" // { @@ -78843,12 +84472,13 @@ in sources."supports-color-5.5.0" (sources."tabtab-3.0.2" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" + sources."untildify-3.0.3" ]; }) - sources."tar-stream-2.1.3" - sources."term-size-1.2.0" + sources."tar-stream-2.1.4" + sources."term-size-2.2.0" sources."text-hex-1.0.0" sources."through-2.3.8" sources."timed-out-4.0.1" @@ -78856,14 +84486,7 @@ in sources."tmp-0.0.33" sources."to-array-0.1.4" sources."to-buffer-1.1.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - ]; - }) sources."to-readable-stream-1.0.0" - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" @@ -78872,35 +84495,12 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-2.0.0" + sources."type-2.1.0" sources."type-fest-0.11.0" sources."unbzip2-stream-1.4.3" - sources."union-value-1.0.1" - sources."unique-string-1.0.0" sources."universalify-0.1.2" - (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."isarray-1.0.0" - ]; - }) - sources."untildify-3.0.3" - sources."unzip-response-2.0.1" - (sources."update-notifier-2.5.0" // { - dependencies = [ - sources."ansi-align-2.0.0" - sources."boxen-1.3.0" - sources."camelcase-4.1.0" - sources."cli-boxes-1.0.0" - ]; - }) - sources."uri-js-4.2.2" - sources."urix-0.1.0" + sources."untildify-4.0.0" + sources."uri-js-4.4.0" (sources."url-0.10.3" // { dependencies = [ sources."punycode-1.3.2" @@ -78909,18 +84509,20 @@ in sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."urlencode-1.1.0" - sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" + sources."uuid-8.3.0" sources."verror-1.10.0" - sources."whatwg-fetch-3.3.1" sources."which-1.3.1" - sources."widest-line-2.0.1" - (sources."winston-3.2.1" // { + (sources."widest-line-3.1.0" // { dependencies = [ - sources."async-2.6.3" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) + sources."winston-3.2.1" (sources."winston-transport-4.4.0" // { dependencies = [ sources."isarray-1.0.0" @@ -78932,15 +84534,13 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."ws-7.3.1" - sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" - sources."yallist-2.1.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.0" sources."yauzl-2.10.0" sources."yeast-0.1.2" sources."zip-stream-3.0.1" @@ -78968,14 +84568,14 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" @@ -79010,7 +84610,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.2.1" sources."domutils-1.4.3" - sources."duplexer-0.1.1" + sources."duplexer-0.1.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" @@ -79164,7 +84764,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."utf8-2.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -79302,7 +84902,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.3" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."micromatch-3.1.10" @@ -79582,54 +85182,24 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.369.3"; + version = "1.399.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.369.3.tgz"; - sha512 = "I54pQeG7i/fLQfBQYK+hL/Yr3g9FPuSnVWKroRFdEaB6vfNSRBA2nd3cKPz9iTVm8v72dSZvixsvR6s+7iDi6g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.399.0.tgz"; + sha512 = "o1okhJvmRpETbMHCyJvXaVOLIVtlbledhztTZKsnMRs0wgim/GyNNWTboqM5a0aR23OpQzW8qlV3BQRsAvEisw=="; }; dependencies = [ - sources."@arcanis/slice-ansi-1.0.2" - sources."@nodelib/fs.scandir-2.1.3" - sources."@nodelib/fs.stat-2.0.3" - sources."@nodelib/fs.walk-1.2.4" - sources."@sindresorhus/is-3.1.0" - (sources."@snyk/cli-interface-2.8.1" // { - dependencies = [ - (sources."@snyk/dep-graph-1.19.0" // { - dependencies = [ - sources."tslib-2.0.0" - ]; - }) - ]; - }) - (sources."@snyk/cocoapods-lockfile-parser-3.4.0" // { - dependencies = [ - sources."@snyk/dep-graph-1.18.4" - sources."semver-7.3.2" - ]; - }) - sources."@snyk/composer-lockfile-parser-1.4.0" - (sources."@snyk/dep-graph-1.18.3" // { - dependencies = [ - sources."semver-7.3.2" - ]; - }) + sources."@sindresorhus/is-2.1.1" + sources."@snyk/cli-interface-2.9.2" + sources."@snyk/cocoapods-lockfile-parser-3.5.2" + sources."@snyk/composer-lockfile-parser-1.4.1" + sources."@snyk/dep-graph-1.19.4" sources."@snyk/docker-registry-v2-client-1.13.5" sources."@snyk/gemfile-1.2.0" - sources."@snyk/graphlib-2.1.9-patch" - sources."@snyk/inquirer-6.2.2-patch" - sources."@snyk/java-call-graph-builder-1.12.3" - sources."@snyk/lodash-4.17.15-patch" + sources."@snyk/java-call-graph-builder-1.13.2" sources."@snyk/rpm-parser-2.0.0" - sources."@snyk/ruby-semver-2.2.0" - (sources."@snyk/snyk-cocoapods-plugin-2.3.0" // { + (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // { dependencies = [ - (sources."@snyk/cli-interface-1.5.0" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) - sources."tslib-2.0.0" + sources."tslib-2.0.1" ]; }) (sources."@snyk/snyk-docker-pull-3.2.0" // { @@ -79641,73 +85211,42 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/color-name-1.1.1" sources."@types/debug-4.1.5" - sources."@types/emscripten-1.39.4" - sources."@types/glob-7.1.3" + sources."@types/graphlib-2.1.7" sources."@types/hosted-git-info-2.7.0" sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.15" + sources."@types/node-14.11.1" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" - sources."@types/xml2js-0.4.5" - (sources."@yarnpkg/core-2.1.1" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."camelcase-5.3.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.3" - sources."has-flag-4.0.0" - sources."mkdirp-0.5.5" - sources."path-key-3.1.1" - sources."semver-7.3.2" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."supports-color-7.1.0" - sources."which-2.0.2" - ]; - }) - sources."@yarnpkg/fslib-2.1.0" - sources."@yarnpkg/json-proxy-2.1.0" - sources."@yarnpkg/libzip-2.1.0" sources."@yarnpkg/lockfile-1.1.0" - sources."@yarnpkg/parsers-2.1.0" - sources."@yarnpkg/pnp-2.1.0" - (sources."@yarnpkg/shell-2.1.0" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) sources."abbrev-1.1.1" sources."agent-base-4.3.0" (sources."ansi-align-3.0.0" // { dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" - sources."any-promise-1.3.0" sources."archy-1.0.0" sources."argparse-1.0.10" - sources."array-union-2.1.0" sources."asap-2.0.6" sources."asn1-0.2.4" - sources."ast-types-0.13.3" + (sources."ast-types-0.14.2" // { + dependencies = [ + sources."tslib-2.0.1" + ]; + }) sources."async-1.5.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - (sources."bl-4.0.2" // { + (sources."bl-4.0.3" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -79716,22 +85255,17 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."camelcase-5.3.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" + sources."type-fest-0.8.1" ]; }) sources."brace-expansion-1.1.11" - sources."braces-3.0.2" sources."browserify-zlib-0.1.4" sources."buffer-5.6.0" sources."buffer-from-1.1.1" @@ -79739,20 +85273,18 @@ in sources."cacheable-lookup-5.0.3" (sources."cacheable-request-7.0.1" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" ]; }) sources."camelcase-2.1.1" sources."chalk-2.4.2" sources."chardet-0.7.0" sources."child-process-1.0.2" - sources."chownr-1.1.4" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" - sources."cli-cursor-2.1.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" sources."cli-spinner-0.2.10" - sources."cli-width-2.2.1" - sources."clipanion-2.4.4" + sources."cli-width-3.0.0" (sources."cliui-3.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -79777,7 +85309,7 @@ in }) sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -79787,7 +85319,6 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."defer-to-connect-2.0.0" - sources."define-properties-1.1.3" (sources."degenerator-1.0.4" // { dependencies = [ sources."esprima-3.1.3" @@ -79795,7 +85326,6 @@ in }) sources."depd-1.1.2" sources."diff-4.0.2" - sources."dir-glob-3.0.1" (sources."docker-modem-2.1.3" // { dependencies = [ sources."readable-stream-3.6.0" @@ -79803,13 +85333,13 @@ in sources."string_decoder-1.3.0" ]; }) - sources."dockerfile-ast-0.0.19" - sources."dot-prop-5.2.0" - sources."dotnet-deps-parser-4.10.0" + sources."dockerfile-ast-0.0.30" + sources."dot-prop-5.3.0" + sources."dotnet-deps-parser-5.0.0" sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."email-validator-2.0.4" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -79823,21 +85353,16 @@ in sources."execa-1.0.0" sources."extend-3.0.2" sources."external-editor-3.1.0" - sources."fast-glob-3.2.4" sources."fast-levenshtein-2.0.6" - sources."fastq-1.8.0" - sources."figures-2.0.0" + sources."figures-3.2.0" sources."file-uri-to-path-1.0.0" - sources."fill-range-7.0.1" sources."fs-constants-1.0.0" - sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { dependencies = [ sources."readable-stream-1.1.14" ]; }) - sources."function-bind-1.1.1" sources."get-stream-4.1.0" (sources."get-uri-2.0.4" // { dependencies = [ @@ -79846,16 +85371,12 @@ in ]; }) sources."glob-7.1.6" - sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" - sources."globby-10.0.2" - sources."got-11.5.1" + sources."got-11.4.0" sources."graceful-fs-4.2.4" - sources."grapheme-splitter-1.0.4" + sources."graphlib-2.1.8" sources."gunzip-maybe-1.4.2" - sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" sources."has-yarn-2.1.0" (sources."hosted-git-info-3.0.5" // { dependencies = [ @@ -79879,27 +85400,33 @@ in }) sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" - sources."ignore-5.1.8" sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-escapes-4.3.1" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."invert-kv-1.0.0" sources."ip-1.1.5" - sources."is-3.3.0" - sources."is-callable-1.2.0" sources."is-ci-2.0.0" sources."is-deflate-1.0.0" sources."is-docker-2.1.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.1" + sources."is-fullwidth-code-point-3.0.0" sources."is-gzip-1.0.0" sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" - sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-stream-1.1.0" @@ -79910,58 +85437,43 @@ in sources."isexe-2.0.0" sources."js-yaml-3.14.0" sources."json-buffer-3.0.1" - sources."json-file-plus-3.3.1" (sources."jszip-3.5.0" // { dependencies = [ sources."pako-1.0.11" ]; }) - sources."keyv-4.0.1" + sources."keyv-4.0.3" sources."latest-version-5.1.0" sources."lcid-1.0.0" sources."levn-0.3.0" sources."lie-3.3.0" + sources."lodash-4.17.20" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" - sources."lodash.constant-3.0.0" - sources."lodash.filter-4.6.0" + sources."lodash.findkey-4.6.0" sources."lodash.flatmap-4.5.0" sources."lodash.flatten-4.4.0" - sources."lodash.foreach-4.5.0" sources."lodash.get-4.4.2" - sources."lodash.has-4.5.2" - sources."lodash.isarray-4.0.0" + sources."lodash.invert-4.3.0" sources."lodash.isempty-4.4.0" sources."lodash.isequal-4.5.0" - sources."lodash.isfunction-3.0.9" - sources."lodash.isundefined-3.0.1" - sources."lodash.keys-4.2.0" - sources."lodash.map-4.6.0" - sources."lodash.reduce-4.6.0" + sources."lodash.merge-4.6.2" sources."lodash.set-4.3.2" - sources."lodash.size-4.2.0" sources."lodash.topairs-4.3.0" - sources."lodash.transform-4.6.0" - sources."lodash.union-4.6.0" - sources."lodash.values-4.3.0" - sources."logic-solver-2.0.1" + sources."lodash.uniq-4.5.0" sources."lowercase-keys-2.0.0" sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."make-dir-3.1.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.2" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" sources."nconf-0.10.0" (sources."needle-2.5.0" // { dependencies = [ @@ -79970,25 +85482,20 @@ in }) sources."netmask-1.0.6" sources."nice-try-1.0.5" - sources."node.extend-2.0.2" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-hash-2.0.3" - sources."object-keys-1.1.1" - sources."object.assign-4.1.0" sources."once-1.4.0" - sources."onetime-2.0.1" - sources."open-7.1.0" + sources."onetime-5.1.2" + sources."open-7.2.1" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.0.0" sources."p-finally-1.0.0" - sources."p-limit-2.3.0" sources."p-map-2.1.0" - sources."p-try-2.2.0" sources."pac-proxy-agent-3.0.1" sources."pac-resolver-3.0.0" (sources."package-json-6.5.0" // { @@ -80002,7 +85509,7 @@ in }) sources."decompress-response-3.3.0" sources."defer-to-connect-1.1.3" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."got-9.6.0" sources."json-buffer-3.0.0" sources."keyv-3.1.0" @@ -80015,18 +85522,12 @@ in sources."parse-link-header-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-type-4.0.0" sources."peek-stream-1.1.3" - sources."picomatch-2.2.2" - sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.3.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" - sources."promise-deferred-2.0.3" - sources."promiseback-2.0.3" sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" @@ -80050,12 +85551,10 @@ in sources."registry-url-5.1.0" sources."resolve-alpn-1.0.0" sources."responselike-2.0.0" - sources."restore-cursor-2.0.0" - sources."reusify-1.0.4" + sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -80067,43 +85566,37 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" - sources."slash-3.0.0" sources."smart-buffer-4.1.0" - sources."snyk-config-3.1.0" - (sources."snyk-docker-plugin-3.16.0" // { + sources."snyk-config-3.1.1" + (sources."snyk-cpp-plugin-1.5.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + sources."tslib-2.0.1" + ]; + }) + (sources."snyk-docker-plugin-3.21.0" // { dependencies = [ sources."rimraf-3.0.2" - (sources."snyk-nodejs-lockfile-parser-1.22.0" // { - dependencies = [ - sources."event-loop-spinner-1.1.0" - sources."uuid-3.4.0" - ]; - }) sources."tmp-0.2.1" sources."uuid-8.3.0" ]; }) sources."snyk-go-parser-1.4.1" - (sources."snyk-go-plugin-1.16.0" // { + (sources."snyk-go-plugin-1.16.2" // { dependencies = [ - (sources."@snyk/dep-graph-1.19.3" // { - dependencies = [ - sources."@snyk/graphlib-2.1.9-patch.2" - ]; - }) sources."rimraf-3.0.2" - sources."tmp-0.2.0" + sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.5.1" // { + (sources."snyk-gradle-plugin-3.6.3" // { dependencies = [ - (sources."@snyk/cli-interface-2.8.0" // { + (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ - (sources."@snyk/dep-graph-1.19.0" // { - dependencies = [ - sources."tslib-2.0.0" - ]; - }) sources."tslib-1.13.0" ]; }) @@ -80113,35 +85606,35 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."rimraf-3.0.2" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tmp-0.2.1" - sources."tslib-2.0.0" + sources."tslib-2.0.1" ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.18.2" // { + (sources."snyk-mvn-plugin-2.19.4" // { dependencies = [ + sources."@snyk/cli-interface-2.9.1" sources."tmp-0.1.0" sources."tslib-1.11.1" ]; }) - sources."snyk-nodejs-lockfile-parser-1.26.3" - (sources."snyk-nuget-plugin-1.18.1" // { + sources."snyk-nodejs-lockfile-parser-1.28.1" + (sources."snyk-nuget-plugin-1.19.3" // { dependencies = [ - sources."jszip-3.3.0" + sources."jszip-3.4.0" sources."pako-1.0.11" ]; }) sources."snyk-paket-parser-1.6.0" - (sources."snyk-php-plugin-1.9.0" // { + (sources."snyk-php-plugin-1.9.2" // { dependencies = [ - sources."@snyk/cli-interface-2.3.2" sources."tslib-1.11.1" ]; }) (sources."snyk-policy-1.14.1" // { dependencies = [ - sources."@types/node-6.14.10" + sources."@types/node-6.14.12" sources."hosted-git-info-2.8.8" (sources."snyk-module-2.1.0" // { dependencies = [ @@ -80158,7 +85651,7 @@ in }) (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ - sources."@types/node-6.14.10" + sources."@types/node-6.14.12" sources."debug-3.2.6" sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" @@ -80193,19 +85686,11 @@ in sources."ssh2-0.8.9" sources."ssh2-streams-0.4.10" sources."statuses-1.5.0" - sources."stream-buffers-3.0.2" sources."stream-shift-1.0.1" - sources."stream-to-array-2.3.0" - (sources."stream-to-promise-2.2.0" // { - dependencies = [ - sources."end-of-stream-1.1.0" - sources."once-1.3.3" - ]; - }) sources."streamsearch-0.1.2" - (sources."string-width-2.1.1" // { + (sources."string-width-4.2.0" // { dependencies = [ - sources."strip-ansi-4.0.0" + sources."strip-ansi-6.0.0" ]; }) sources."string_decoder-0.10.31" @@ -80217,12 +85702,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - (sources."tar-4.4.13" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) - (sources."tar-stream-2.1.3" // { + (sources."tar-stream-2.1.4" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -80242,27 +85722,24 @@ in sources."thunkify-2.1.2" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" - sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."toml-3.0.0" sources."tree-kill-1.2.2" sources."tslib-1.13.0" - sources."tunnel-0.0.6" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."type-fest-0.8.1" + sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.10.2" sources."unique-string-2.0.0" sources."unpipe-1.0.0" - (sources."update-notifier-4.1.0" // { + (sources."update-notifier-4.1.1" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."url-parse-lax-3.0.0" @@ -80270,20 +85747,14 @@ in sources."uuid-3.4.0" sources."vscode-languageserver-types-3.15.1" sources."which-1.3.1" - (sources."widest-line-3.1.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."widest-line-3.1.0" sources."window-size-0.1.4" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" sources."word-wrap-1.2.3" (sources."wrap-ansi-5.1.0" // { dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" ]; }) @@ -80414,7 +85885,7 @@ in sources."clone-1.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."configstore-3.1.2" + sources."configstore-3.1.5" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -80428,7 +85899,7 @@ in }) sources."deep-extend-0.6.0" sources."defaults-1.0.3" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."draftlog-1.0.12" sources."duplexer3-0.1.4" sources."error-ex-1.3.2" @@ -80520,7 +85991,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -80586,7 +86057,7 @@ in sources."async-each-1.0.3" sources."async-single-1.0.5" sources."atob-2.1.2" - (sources."atomic-file-2.0.1" // { + (sources."atomic-file-2.1.1" // { dependencies = [ sources."flumecodec-0.0.1" sources."level-codec-6.2.0" @@ -80608,21 +86079,12 @@ in sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" sources."bindings-1.5.0" - (sources."bl-0.8.2" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.0.34" - sources."string_decoder-0.10.31" - ]; - }) sources."blake2s-1.1.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."broadcast-stream-0.2.2" sources."buffer-5.6.0" sources."buffer-from-1.1.1" - sources."bytewise-1.1.0" - sources."bytewise-core-1.2.3" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -80636,7 +86098,7 @@ in sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."charwise-3.0.1" - sources."chloride-2.2.14" + sources."chloride-2.3.0" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" (sources."class-utils-0.3.6" // { @@ -80684,7 +86146,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" @@ -80814,7 +86276,7 @@ in sources."he-0.5.0" sources."heap-0.2.6" sources."hoox-0.0.1" - sources."idb-kv-store-4.4.0" + sources."idb-kv-store-4.5.0" sources."ieee754-1.1.13" sources."immediate-3.2.3" sources."increment-buffer-1.0.1" @@ -80836,7 +86298,7 @@ in sources."is-binary-path-1.0.1" sources."is-boolean-object-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-canonical-base64-1.1.1" (sources."is-data-descriptor-1.0.0" // { dependencies = [ @@ -80859,6 +86321,7 @@ in sources."is-glob-2.0.1" sources."is-hexadecimal-1.0.4" sources."is-map-2.0.1" + sources."is-negative-zero-2.0.0" sources."is-number-2.1.0" sources."is-number-object-1.0.4" (sources."is-plain-object-2.0.4" // { @@ -80874,7 +86337,7 @@ in sources."is-symbol-1.0.3" sources."is-typed-array-1.1.3" sources."is-typedarray-1.0.0" - sources."is-valid-domain-0.0.14" + sources."is-valid-domain-0.0.15" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -80896,27 +86359,6 @@ in sources."level-js-4.0.2" sources."level-packager-5.1.1" sources."level-post-1.0.7" - (sources."level-sublevel-6.6.5" // { - dependencies = [ - (sources."abstract-leveldown-0.12.4" // { - dependencies = [ - sources."xtend-3.0.0" - ]; - }) - sources."deferred-leveldown-0.2.0" - sources."isarray-0.0.1" - (sources."levelup-0.19.1" // { - dependencies = [ - sources."xtend-3.0.0" - ]; - }) - sources."ltgt-2.1.3" - sources."prr-0.0.0" - sources."readable-stream-1.0.34" - sources."semver-5.1.1" - sources."string_decoder-0.10.31" - ]; - }) sources."level-supports-1.0.1" (sources."leveldown-5.6.0" // { dependencies = [ @@ -80961,6 +86403,7 @@ in sources."multiserver-3.6.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" + sources."mutexify-1.3.1" sources."muxrpc-6.5.0" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" @@ -80980,7 +86423,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.5" + sources."nearley-2.19.7" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" @@ -81009,7 +86452,11 @@ in sources."isobject-3.0.1" ]; }) - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.omit-2.0.1" (sources."object.pick-1.3.0" // { dependencies = [ @@ -81208,7 +86655,11 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - sources."side-channel-1.0.2" + (sources."side-channel-1.0.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -81237,7 +86688,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.4.1" + sources."socks-2.4.4" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -81246,7 +86697,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.4.9" + sources."sodium-native-3.2.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" @@ -81255,7 +86706,7 @@ in sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" - sources."ssb-config-3.4.4" + sources."ssb-config-3.4.5" (sources."ssb-db-20.3.0" // { dependencies = [ sources."glob-7.1.6" @@ -81264,13 +86715,13 @@ in ]; }) sources."ssb-ebt-5.6.7" - sources."ssb-friends-4.2.0" + sources."ssb-friends-4.2.1" (sources."ssb-gossip-1.1.1" // { dependencies = [ sources."atomic-file-1.1.5" ]; }) - (sources."ssb-invite-2.1.5" // { + (sources."ssb-invite-2.1.6" // { dependencies = [ sources."abstract-leveldown-6.2.3" sources."level-6.0.1" @@ -81294,10 +86745,10 @@ in sources."ssb-plugins-1.0.4" sources."ssb-private1-1.0.1" sources."ssb-query-2.4.5" - sources."ssb-ref-2.14.0" + sources."ssb-ref-2.14.2" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" - sources."ssb-validate-4.1.1" + sources."ssb-validate-4.1.3" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -81324,7 +86775,11 @@ in ]; }) sources."string-width-1.0.2" - sources."string.prototype.trim-1.2.1" + (sources."string.prototype.trim-1.2.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" @@ -81359,8 +86814,6 @@ in sources."tweetnacl-auth-0.3.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."typewise-1.0.3" - sources."typewise-core-1.2.0" sources."typewiselite-1.0.0" sources."uint48be-2.0.1" sources."ultron-1.0.2" @@ -81449,7 +86902,7 @@ in sources."ws-1.1.5" ]; }) - sources."@types/babel-types-7.0.8" + sources."@types/babel-types-7.0.9" sources."@types/babylon-6.16.5" sources."accepts-1.3.7" sources."acorn-3.3.0" @@ -81482,7 +86935,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -81499,13 +86952,13 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.726.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."uuid-3.3.2" ]; }) sources."aws-sign2-0.6.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" @@ -81684,7 +87137,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -81734,7 +87187,7 @@ in }) (sources."http-proxy-1.18.1" // { dependencies = [ - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.7" ]; }) sources."http-signature-1.1.1" @@ -81812,7 +87265,7 @@ in }) sources."load-json-file-1.1.0" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.get-4.4.2" sources."lodash.isequal-4.5.0" sources."long-2.4.0" @@ -81860,7 +87313,7 @@ in sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.1.2" sources."multer-1.4.2" sources."mustache-2.3.2" @@ -81885,7 +87338,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."openid-2.0.6" + sources."openid-2.0.7" sources."options-0.0.6" sources."optjs-3.2.2" sources."os-locale-3.1.0" @@ -82053,7 +87506,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -82153,7 +87606,7 @@ in sources."uid2-0.0.3" sources."ultron-1.0.2" sources."unpipe-1.0.0" - (sources."uri-js-4.2.2" // { + (sources."uri-js-4.4.0" // { dependencies = [ sources."punycode-2.1.1" ]; @@ -82295,7 +87748,7 @@ in sources."define-properties-1.1.3" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" + sources."domelementtype-2.0.2" ]; }) sources."domelementtype-1.3.1" @@ -82309,8 +87762,9 @@ in sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."js-yaml-3.14.0" @@ -82320,7 +87774,11 @@ in sources."nth-check-1.0.2" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.getownpropertydescriptors-2.1.0" sources."object.values-1.1.1" sources."q-1.5.1" @@ -82453,7 +87911,7 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."configstore-3.1.2" + sources."configstore-3.1.5" sources."connect-3.7.0" sources."content-type-1.0.4" sources."cookiejar-2.1.2" @@ -82484,7 +87942,7 @@ in ]; }) sources."diff-1.4.0" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -82552,7 +88010,7 @@ in sources."graceful-fs-4.2.4" (sources."graphlib-2.1.8" // { dependencies = [ - sources."lodash-4.17.19" + sources."lodash-4.17.20" ]; }) sources."growl-1.9.2" @@ -82624,7 +88082,7 @@ in sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.6.0" // { dependencies = [ - sources."lodash-4.17.19" + sources."lodash-4.17.20" ]; }) sources."jsonfile-2.4.0" @@ -82891,7 +88349,7 @@ in sources."swagger-editor-2.10.5" (sources."swagger-test-templates-1.6.0" // { dependencies = [ - sources."lodash-4.17.19" + sources."lodash-4.17.20" ]; }) (sources."swagger-tools-0.9.16" // { @@ -82916,7 +88374,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.4" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -82983,7 +88441,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -82992,7 +88450,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" (sources."bcrypt-pbkdf-1.0.2" // { dependencies = [ sources."tweetnacl-0.14.5" @@ -83006,7 +88464,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."discord.js-11.6.4" @@ -83041,9 +88499,9 @@ in sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."module-alias-2.2.2" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.1.2" - sources."node-fetch-2.6.0" + sources."node-fetch-2.6.1" sources."oauth-sign-0.9.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" @@ -83077,7 +88535,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-module-2.0.0" @@ -83196,7 +88654,7 @@ in sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."crypt-0.0.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-equal-1.1.1" sources."deep-is-0.1.3" sources."define-properties-1.1.3" @@ -83230,12 +88688,13 @@ in sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.4" + sources."is-negative-zero-2.0.0" sources."is-plain-obj-1.1.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" @@ -83251,7 +88710,7 @@ in sources."levn-0.3.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."log-symbols-1.0.2" sources."map-like-2.0.0" sources."markdown-escapes-1.0.4" @@ -83265,7 +88724,11 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" sources."optionator-0.8.3" sources."p-limit-1.3.0" @@ -83311,7 +88774,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" (sources."string-width-1.0.2" // { @@ -83413,14 +88876,19 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."match-index-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."regexp.prototype.flags-1.3.0" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" @@ -83438,10 +88906,10 @@ in textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; packageName = "textlint-rule-alex"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-2.1.0.tgz"; - sha512 = "+ctxNHWJNfO7IXMj+D4XOBHL1Gj7/vnroCjw8wByPxpCngfr/fmMYyaJ5H5v9dIQjY+WuPmpAp3xM4zkZqjHJQ=="; + url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-3.0.0.tgz"; + sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -83451,23 +88919,34 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.3.4" sources."@textlint/types-1.4.5" + sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" + sources."@types/parse5-5.0.3" sources."@types/unist-2.0.3" - sources."alex-8.2.0" - sources."ansi-align-3.0.0" + sources."alex-9.0.1" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."string-width-3.1.0" + ]; + }) sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-iterate-1.1.4" - sources."arrify-2.0.1" + sources."arrify-1.0.1" sources."bail-1.0.5" sources."balanced-match-1.0.0" sources."boundary-1.0.1" - (sources."boxen-3.2.0" // { + (sources."boxen-4.2.0" // { dependencies = [ - sources."camelcase-5.3.1" - sources."type-fest-0.3.1" + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + sources."type-fest-0.8.1" ]; }) sources."brace-expansion-1.1.11" @@ -83475,24 +88954,21 @@ in sources."buffer-from-1.1.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" sources."pump-3.0.0" ]; }) - sources."camelcase-6.0.0" - (sources."camelcase-keys-6.2.2" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" + sources."character-entities-html4-1.1.4" sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."ci-info-2.0.0" - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."clone-response-1.0.2" sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" @@ -83505,12 +88981,11 @@ in sources."string_decoder-1.3.0" ]; }) - sources."configstore-4.0.0" + sources."configstore-5.0.1" sources."core-util-is-1.0.2" - sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" - sources."cuss-1.20.0" - sources."debug-4.2.0" + sources."crypto-random-string-2.0.0" + sources."cuss-1.21.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -83520,44 +88995,43 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."dot-prop-4.2.0" - sources."duplexer-0.1.1" + sources."dot-prop-5.3.0" + sources."duplexer-0.1.2" sources."duplexer3-0.1.4" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" + sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."event-stream-3.1.7" - sources."execa-0.7.0" sources."extend-3.0.2" sources."fault-1.0.4" + sources."figgy-pudding-3.5.2" sources."figures-3.2.0" sources."find-up-4.1.0" - sources."fn-name-2.0.1" sources."format-0.2.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" - sources."get-stream-3.0.0" - sources."git-diff-tree-1.1.0" - sources."git-spawned-stream-1.0.1" - sources."glob-7.1.6" - sources."global-dirs-0.1.1" - (sources."got-9.6.0" // { + (sources."get-stream-4.1.0" // { dependencies = [ - sources."get-stream-4.1.0" sources."pump-3.0.0" ]; }) + sources."git-diff-tree-1.1.0" + sources."git-spawned-stream-1.0.1" + sources."glob-7.1.6" + sources."global-dirs-2.0.1" + sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" - sources."hast-util-from-parse5-5.0.3" + sources."hast-util-from-parse5-6.0.0" sources."hast-util-has-property-1.0.4" sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.0.4" + sources."hast-util-is-element-1.1.0" sources."hast-util-parse-selector-2.2.4" sources."hast-util-phrasing-1.0.5" sources."hast-util-to-nlcst-1.2.7" @@ -83574,6 +89048,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."is-alphabetical-1.0.4" + sources."is-alphanumeric-1.0.0" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.4" @@ -83582,64 +89057,71 @@ in sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-hexadecimal-1.0.4" - sources."is-hidden-1.1.3" - sources."is-installed-globally-0.1.0" - sources."is-npm-3.0.0" - sources."is-obj-1.0.1" - sources."is-object-1.0.1" - sources."is-path-inside-1.0.1" + sources."is-installed-globally-0.3.2" + sources."is-npm-4.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.2" sources."is-plain-obj-1.1.0" - sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" sources."is-whitespace-character-1.0.4" sources."is-word-character-1.0.4" sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" - sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" + (sources."libnpmconfig-1.2.1" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + ]; + }) sources."limit-spawn-0.0.3" sources."lines-and-columns-1.1.6" - sources."load-plugin-2.3.1" + sources."load-plugin-3.0.0" sources."locate-path-5.0.0" sources."lodash.difference-4.5.0" sources."lodash.intersection-4.4.0" + sources."longest-streak-2.0.4" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."make-dir-1.3.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."map-obj-4.1.0" sources."map-stream-0.1.0" sources."markdown-escapes-1.0.4" + sources."markdown-table-2.0.0" sources."mdast-comment-marker-1.1.2" - sources."mdast-util-to-nlcst-3.2.3" - sources."meow-7.0.1" + sources."mdast-util-compact-2.0.1" + (sources."mdast-util-to-nlcst-4.0.0" // { + dependencies = [ + sources."vfile-location-3.1.0" + ]; + }) + sources."meow-7.1.1" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minimist-options-4.1.0" // { - dependencies = [ - sources."arrify-1.0.1" - ]; - }) + sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nlcst-is-literal-1.2.1" sources."nlcst-normalize-2.1.4" - sources."nlcst-search-1.5.1" + sources."nlcst-search-2.0.0" sources."nlcst-to-string-2.0.4" sources."normalize-package-data-2.5.0" sources."normalize-url-4.5.0" - sources."npm-prefix-1.2.0" - sources."npm-run-path-2.0.2" sources."object-keys-1.1.1" sources."once-1.4.0" - sources."os-homedir-1.0.2" sources."p-cancelable-1.1.0" - sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -83649,24 +89131,21 @@ in ]; }) sources."parse-english-4.1.3" - sources."parse-entities-1.2.2" - sources."parse-json-5.0.1" + sources."parse-entities-2.0.0" + sources."parse-json-5.1.0" sources."parse-latin-4.2.1" - sources."parse5-5.1.1" + sources."parse5-6.0.1" sources."path-exists-4.0.0" 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.6" sources."pause-stream-0.0.11" - sources."pify-3.0.0" sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."process-nextick-args-1.0.7" sources."property-information-5.5.0" - sources."pseudomap-1.0.2" sources."pump-1.0.3" sources."pump-chain-1.0.0" + sources."pupa-2.0.1" sources."quick-lru-4.0.1" sources."quotation-1.1.3" sources."rc-1.2.8" @@ -83684,32 +89163,33 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" - sources."rehype-parse-6.0.2" + sources."rehype-parse-7.0.1" sources."rehype-retext-2.0.4" - sources."remark-frontmatter-1.3.3" - sources."remark-message-control-5.0.0" - sources."remark-parse-7.0.2" - sources."remark-retext-3.1.3" + sources."remark-frontmatter-2.0.0" + sources."remark-mdx-2.0.0-next.8" + sources."remark-message-control-6.0.0" + (sources."remark-parse-8.0.3" // { + dependencies = [ + sources."vfile-location-3.1.0" + ]; + }) + sources."remark-retext-4.0.0" + sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."retext-english-3.0.4" - (sources."retext-equality-4.3.0" // { - dependencies = [ - sources."unist-util-is-4.0.2" - sources."unist-util-visit-2.0.3" - sources."unist-util-visit-parents-3.1.0" - ]; - }) - sources."retext-profanities-5.0.0" + sources."retext-equality-5.2.0" + sources."retext-profanities-6.1.0" sources."safe-buffer-5.2.1" sources."semver-5.7.1" - sources."semver-diff-2.1.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shellsubstitute-1.2.0" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."signal-exit-3.0.3" sources."sliced-1.0.1" sources."space-separated-tokens-1.1.5" @@ -83723,7 +89203,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -83736,16 +89216,29 @@ in sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" sources."stream-combiner-0.0.4" - sources."string-width-3.1.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."string_decoder-0.10.31" + sources."stringify-entities-3.0.1" sources."strip-ansi-5.2.0" - sources."strip-eof-1.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-5.5.0" - sources."term-size-1.2.0" - sources."textlint-rule-helper-2.1.1" + sources."term-size-2.2.0" + (sources."textlint-rule-helper-2.1.1" // { + dependencies = [ + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" + ]; + }) sources."through-2.3.8" (sources."through2-2.0.0" // { dependencies = [ @@ -83761,31 +89254,44 @@ in sources."trough-1.0.5" sources."type-fest-0.13.1" sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" sources."unherit-1.1.3" - (sources."unified-8.4.2" // { + (sources."unified-9.2.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; }) sources."unified-diff-3.0.1" - (sources."unified-engine-7.0.0" // { + (sources."unified-engine-8.0.0" // { dependencies = [ - sources."parse-json-4.0.0" + sources."is-plain-obj-2.1.0" ]; }) - sources."unified-message-control-2.0.0" - sources."unique-string-1.0.0" - sources."unist-util-inspect-4.1.4" - sources."unist-util-is-3.0.0" + (sources."unified-message-control-3.0.1" // { + dependencies = [ + sources."vfile-location-3.1.0" + ]; + }) + sources."unique-string-2.0.0" + sources."unist-util-inspect-5.0.1" + sources."unist-util-is-4.0.2" sources."unist-util-modify-children-1.1.6" sources."unist-util-position-3.1.0" - sources."unist-util-remove-position-1.1.4" + sources."unist-util-remove-position-2.0.1" sources."unist-util-stringify-position-2.0.3" - sources."unist-util-visit-1.4.1" + sources."unist-util-visit-2.0.3" sources."unist-util-visit-children-1.1.4" - sources."unist-util-visit-parents-2.1.2" - sources."untildify-2.1.0" - sources."update-notifier-3.0.1" + sources."unist-util-visit-parents-3.1.0" + (sources."update-notifier-4.1.1" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -83795,36 +89301,18 @@ in sources."vfile-message-2.0.4" (sources."vfile-reporter-6.0.1" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" sources."supports-color-6.1.0" ]; }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" sources."web-namespaces-1.1.4" - sources."which-1.3.1" - (sources."widest-line-2.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."widest-line-3.1.0" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."x-is-string-0.1.0" - sources."xdg-basedir-3.0.0" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."yallist-2.1.2" - (sources."yargs-parser-18.1.3" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -83978,14 +89466,19 @@ in sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inherits-2.0.4" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."object-assign-4.1.1" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.values-1.1.1" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -84030,13 +89523,18 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" ]; @@ -84062,7 +89560,7 @@ in sources."@textlint/ast-node-types-4.3.4" sources."@textlint/types-1.4.5" sources."boundary-1.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."split-lines-2.0.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -84092,7 +89590,7 @@ in sources."@textlint/ast-node-types-4.3.4" sources."@textlint/types-1.4.5" sources."boundary-1.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."strip-json-comments-3.1.1" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -84126,15 +89624,20 @@ in sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-capitalized-1.0.0" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" ]; @@ -84163,12 +89666,31 @@ in sources."boundary-1.0.1" sources."define-properties-1.1.3" sources."e-prime-0.10.4" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" + sources."has-1.0.3" sources."has-symbols-1.0.1" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" + sources."is-symbol-1.0.3" sources."no-cliches-0.1.1" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."passive-voice-0.1.0" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" sources."too-wordy-0.1.6" @@ -84191,13 +89713,13 @@ in thelounge = nodeEnv.buildNodePackage { name = "thelounge"; packageName = "thelounge"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge/-/thelounge-4.1.0.tgz"; - sha512 = "ozjuU9/DaxT5r7ivckvdrzTLRoMCOiUlNbEAxldoHD3jzbbCEm561rHkEw0Caek31tOL4y0yqHiFuRBRoGbmiQ=="; + url = "https://registry.npmjs.org/thelounge/-/thelounge-4.2.0.tgz"; + sha512 = "5hijX1V/4CrgrkqCqtwP32LSbLPSF/10nneI+2doPHKx7AdCgR52HqWZo0AQEPv4fvOqEOMLJ0c9pL6t/jUDwg=="; }; dependencies = [ - sources."@sindresorhus/is-2.1.1" + sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" @@ -84205,14 +89727,19 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" - sources."abstract-logging-1.0.0" + sources."abstract-logging-2.0.0" sources."accepts-1.3.7" sources."after-0.8.2" - sources."agent-base-4.3.0" - sources."ajv-6.12.3" + (sources."agent-base-6.0.1" // { + dependencies = [ + sources."debug-4.3.0" + sources."ms-2.1.2" + ]; + }) + sources."ajv-6.12.5" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."aproba-1.2.0" @@ -84232,7 +89759,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."backo2-1.0.2" sources."backoff-2.5.0" sources."balanced-match-1.0.0" @@ -84242,6 +89769,7 @@ in sources."bcryptjs-2.4.3" sources."better-assert-1.0.2" sources."blob-0.0.5" + sources."block-stream-0.0.9" sources."bn.js-4.11.9" sources."body-parser-1.19.0" sources."boolbase-1.0.0" @@ -84249,23 +89777,19 @@ in sources."buffer-equal-constant-time-1.0.1" sources."busboy-0.3.1" sources."bytes-3.1.0" - sources."cacheable-lookup-2.0.1" + sources."cacheable-lookup-5.0.3" sources."cacheable-request-7.0.1" sources."callsite-1.0.0" sources."caseless-0.12.0" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" sources."chownr-1.1.4" - (sources."clone-response-1.0.2" // { - dependencies = [ - sources."mimic-response-1.0.1" - ]; - }) + sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-4.1.0" + sources."commander-6.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -84285,7 +89809,11 @@ in sources."css-what-2.1.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decompress-response-5.0.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.0" sources."delayed-stream-1.0.0" @@ -84321,12 +89849,10 @@ in }) sources."engine.io-parser-2.2.0" sources."entities-1.1.2" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."eventemitter3-2.0.3" + sources."eventemitter3-4.0.7" (sources."express-4.17.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -84337,7 +89863,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-text-encoding-1.0.3" - sources."file-type-14.1.3" + sources."file-type-14.7.1" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.1.0" sources."finalhandler-1.1.2" @@ -84345,14 +89871,14 @@ in sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" + sources."fstream-1.0.12" sources."gauge-2.7.4" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."got-10.6.0" + sources."got-11.5.2" sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" @@ -84369,10 +89895,11 @@ in ]; }) sources."http-signature-1.2.0" + sources."http2-wrapper-1.0.0-beta.5.2" sources."http_ece-1.1.0" - (sources."https-proxy-agent-3.0.1" // { + (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -84384,11 +89911,16 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."ipaddr.js-1.9.1" - sources."irc-framework-4.7.0" + (sources."irc-framework-4.9.0" // { + dependencies = [ + sources."iconv-lite-0.6.2" + ]; + }) sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-2.0.1" + sources."isexe-2.0.0" sources."isomorphic-textencoder-1.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" @@ -84396,28 +89928,27 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" (sources."jsprim-1.4.1" // { dependencies = [ sources."extsprintf-1.3.0" ]; }) - sources."jwa-1.4.1" - sources."jws-3.2.2" - sources."keyv-4.0.1" + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."keyv-4.0.3" sources."ldap-filter-0.3.3" - sources."ldapjs-2.0.0-pre.5" - sources."linkify-it-2.2.0" - sources."lodash-4.17.15" + sources."ldapjs-2.1.1" + sources."linkify-it-3.0.2" + sources."lodash-4.17.20" sources."lowercase-keys-2.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" - sources."mimic-response-2.1.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -84426,14 +89957,22 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.1" - (sources."needle-2.5.0" // { + (sources."needle-2.5.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" ]; }) sources."negotiator-0.6.2" + sources."node-addon-api-2.0.0" + sources."node-forge-0.9.1" + (sources."node-gyp-3.8.0" // { + dependencies = [ + sources."nopt-3.0.6" + sources."semver-5.3.0" + sources."tar-2.2.2" + ]; + }) (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" @@ -84456,9 +89995,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-2.0.0" - sources."p-event-4.2.0" sources."p-finally-1.0.0" - sources."p-timeout-3.2.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ @@ -84466,7 +90003,7 @@ in sources."@szmarczak/http-timer-1.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -84477,11 +90014,9 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" - sources."mimic-response-1.0.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" sources."semver-6.3.0" - sources."to-readable-stream-1.0.0" ]; }) sources."parse5-3.0.3" @@ -84501,6 +90036,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" + sources."quick-lru-5.1.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" @@ -84517,12 +90053,13 @@ in sources."uuid-3.4.0" ]; }) + sources."resolve-alpn-1.0.0" sources."responselike-2.0.0" sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.1.3" + sources."semver-7.3.2" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -84562,7 +90099,7 @@ in sources."ipaddr.js-0.1.3" ]; }) - sources."sqlite3-4.1.1" + sources."sqlite3-5.0.0" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."streamsearch-0.1.2" @@ -84572,41 +90109,40 @@ in sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" sources."strtok3-6.0.4" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tar-4.4.13" - sources."tlds-1.207.0" + sources."tlds-1.208.0" sources."to-array-0.1.4" - sources."to-readable-stream-2.1.0" + sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."token-types-2.0.0" sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.10.0" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" - sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."urlsafe-base64-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-7.0.1" + sources."uuid-8.3.0" sources."vary-1.1.2" sources."vasync-2.2.0" sources."verror-1.10.0" - sources."web-push-3.4.3" + sources."web-push-3.4.4" + sources."which-1.3.1" sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" - sources."yarn-1.22.0" + sources."yarn-1.22.4" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -84622,10 +90158,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.119.1"; + version = "0.120.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.119.1.tgz"; - sha512 = "GHyh/RiUfQ5VTiWIVRRTANYoXc1PFB1y+jDVRTb649nif1uX1F06PT1TKU3k2+F/MN4UJ3PWvQB53fY2OqKqKw=="; + url = "https://registry.npmjs.org/three/-/three-0.120.1.tgz"; + sha512 = "ktaCRFUR7JUZcKec+cBRz+oBex5pOVaJhrtxvFF2T7on53o9UkEux+/Nh1g/4zeb4t/pbxIFcADbn/ACu3LC1g=="; }; buildInputs = globalBuildInputs; meta = { @@ -84658,39 +90194,40 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.2.2"; + version = "5.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.2.2.tgz"; - sha512 = "PvlmqvMRwgPReA3tPfExeS1mweQY/KpCIY5+zLP/lp0UEi93wLvSMzqp/5vV5pjK7cwkzhPtc68TszBNM+zv9Q=="; + url = "https://registry.npmjs.org/titanium/-/titanium-5.2.5.tgz"; + sha512 = "P2+0coxeYre+1Lf/k2t61W1UwcNhupQy5s5UcpDkbGiRg7EDoYVnkix1H08yg+mfKh14Jm9+6QDDKpEWM+arZQ=="; }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" + sources."buffer-crc32-0.2.13" sources."caseless-0.12.0" sources."colors-1.3.3" sources."combined-stream-1.0.8" - sources."commander-2.19.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."diff-3.5.0" sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."fd-slicer-1.1.0" (sources."fields-0.1.24" // { dependencies = [ sources."colors-0.6.2" @@ -84698,7 +90235,7 @@ in }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-7.0.1" + sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -84715,35 +90252,38 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" + sources."jsonfile-6.0.1" sources."jsprim-1.4.1" sources."keypress-0.2.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimatch-3.0.4" - sources."minimist-0.0.10" - sources."moment-2.27.0" - (sources."node-appc-0.2.49" // { + sources."moment-2.28.0" + (sources."node-appc-1.1.1" // { dependencies = [ - sources."temp-0.8.4" + sources."async-3.2.0" + sources."colors-1.4.0" ]; }) sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."optimist-0.6.1" sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" sources."performance-now-2.1.0" sources."pkginfo-0.3.1" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.88.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" - sources."source-map-0.6.1" + sources."semver-7.3.2" sources."sprintf-0.1.5" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -84755,10 +90295,9 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.4.10" - sources."universalify-0.1.2" - sources."uri-js-4.2.2" - sources."uuid-3.3.3" + sources."universalify-1.0.0" + sources."uri-js-4.4.0" + sources."uuid-8.3.0" sources."verror-1.10.0" (sources."winston-1.1.2" // { dependencies = [ @@ -84766,9 +90305,9 @@ in sources."colors-1.0.3" ]; }) - sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."xmldom-0.1.31" + sources."xmldom-0.3.0" + sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -84783,10 +90322,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.10.0.tgz"; - sha512 = "IcnXbISVdJtwhTDpbO+LAfOF37G4uflrZMSnf4VPX1aMygOutXvFQcLz3ST0/1EmaZuPOHHyUxnaDuPGSU93pA=="; + url = "https://registry.npmjs.org/triton/-/triton-7.11.0.tgz"; + sha512 = "NycwGp9drvi9uJUo7PCmET470f+ZWzvzJ7d06hcI+Y0LZSLtZN+gxFz+YjLpt14Zifqs/751IcEhp7cCGThBxA=="; }; dependencies = [ sources."asn1-0.2.4" @@ -84842,7 +90381,7 @@ in ]; }) sources."keep-alive-agent-0.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."lomstream-1.1.0" // { dependencies = [ sources."assert-plus-0.1.5" @@ -84855,7 +90394,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" @@ -84987,7 +90526,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.10" + sources."@types/node-6.14.12" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -85053,10 +90592,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.9.7"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz"; - sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; + sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; }; buildInputs = globalBuildInputs; meta = { @@ -85107,10 +90646,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.1"; + version = "3.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz"; - sha512 = "RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; + sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; }; buildInputs = globalBuildInputs; meta = { @@ -85125,18 +90664,18 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.9.tgz"; - sha512 = "H+CLr9LrO0xZ0UbDz8K3KK//oBc3XDuj4he86Xnw/zjIPJlknOuiHdmPRYTlgo7/0zGEmvVgxZ+m3aqUMIpIhQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.10.tgz"; + sha512 = "WLrNg3hngoQJc3Ka1NxbWQMYjFJx013Xd9hNiRvHU1NUFMy8H5/5dT83Wh64gr2CJz5zNQlrqTkrfaWbwS/jEQ=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."@primer/octicons-10.0.0" + sources."@primer/octicons-10.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -85157,13 +90696,14 @@ in sources."base64id-2.0.0" sources."better-assert-1.0.2" sources."blob-0.0.5" - sources."blueimp-md5-2.16.0" + sources."blueimp-md5-2.17.0" sources."body-parser-1.19.0" + sources."bootstrap-3.4.1" sources."brace-expansion-1.1.11" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -85197,7 +90737,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-4.0.2" - sources."diff2html-3.1.11" + sources."diff2html-3.1.13" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -85241,7 +90781,7 @@ in sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" - sources."getmac-5.11.0" + sources."getmac-5.15.0" sources."glob-7.1.6" sources."got-9.6.0" sources."has-binary2-1.0.3" @@ -85277,7 +90817,7 @@ in sources."latest-version-5.1.0" sources."locate-path-5.0.0" sources."locks-0.2.2" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."logform-2.2.0" // { dependencies = [ sources."ms-2.1.2" @@ -85313,7 +90853,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-7.0.4" + sources."open-7.2.1" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -85432,7 +90972,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-15.3.1" + sources."yargs-15.4.1" sources."yargs-parser-18.1.3" sources."yeast-0.1.2" ]; @@ -85446,6 +90986,253 @@ in bypassCache = true; reconstructLock = true; }; + vega-cli = nodeEnv.buildNodePackage { + name = "vega-cli"; + packageName = "vega-cli"; + version = "5.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.15.0.tgz"; + sha512 = "1Mv7+T84L6EIPIsC3fslhywNDfguy135EN4uAcFCWhErQXG3yzel2gNyvlsA0ixTAi5oG7mFL6ftkTB6r2CzIw=="; + }; + dependencies = [ + sources."@types/color-name-1.1.1" + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-4.2.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."camelcase-5.3.1" + sources."canvas-2.6.1" + sources."chownr-1.1.4" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."d3-array-2.7.1" + sources."d3-color-2.0.0" + sources."d3-delaunay-5.3.0" + sources."d3-dispatch-2.0.0" + sources."d3-dsv-2.0.0" + sources."d3-force-2.1.1" + sources."d3-format-2.0.0" + sources."d3-geo-2.0.1" + sources."d3-geo-projection-3.0.0" + sources."d3-hierarchy-2.0.0" + sources."d3-interpolate-2.0.1" + sources."d3-path-2.0.0" + sources."d3-quadtree-2.0.0" + sources."d3-scale-3.2.2" + sources."d3-shape-2.0.0" + sources."d3-time-2.0.0" + sources."d3-time-format-3.0.0" + sources."d3-timer-2.0.0" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" + sources."delaunator-4.0.1" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."emoji-regex-8.0.0" + sources."find-up-4.1.0" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-caller-file-2.0.5" + sources."glob-7.1.6" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."locate-path-5.0.0" + sources."mimic-response-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."nan-2.14.1" + sources."needle-2.5.2" + sources."node-fetch-2.6.1" + sources."node-pre-gyp-0.11.0" + sources."nopt-4.0.3" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.8" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."process-nextick-args-2.0.1" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-1.17.0" + sources."rimraf-2.7.1" + sources."rw-1.3.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.13" + sources."topojson-client-3.1.0" + sources."util-deprecate-1.0.2" + sources."vega-5.15.0" + sources."vega-canvas-1.2.4" + sources."vega-crossfilter-4.0.4" + sources."vega-dataflow-5.7.2" + sources."vega-encode-4.8.2" + sources."vega-event-selector-2.0.5" + sources."vega-expression-2.7.0" + sources."vega-force-4.0.6" + sources."vega-format-1.0.3" + sources."vega-functions-5.7.3" + sources."vega-geo-4.3.6" + sources."vega-hierarchy-4.0.8" + sources."vega-loader-4.3.2" + sources."vega-parser-6.0.4" + sources."vega-projection-1.4.4" + sources."vega-regression-1.0.8" + sources."vega-runtime-6.1.2" + sources."vega-scale-7.1.0" + sources."vega-scenegraph-4.9.1" + sources."vega-selections-5.1.3" + sources."vega-statistics-1.7.8" + sources."vega-time-2.0.3" + sources."vega-transforms-4.9.2" + sources."vega-typings-0.18.2" + sources."vega-util-1.15.1" + sources."vega-view-5.8.2" + sources."vega-view-transforms-4.5.7" + sources."vega-voronoi-4.1.4" + sources."vega-wordcloud-4.1.2" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Command line utilities for server-side Vega."; + homepage = "https://github.com/vega/vega#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + vega-lite = nodeEnv.buildNodePackage { + name = "vega-lite"; + packageName = "vega-lite"; + version = "4.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-4.15.0.tgz"; + sha512 = "381Kszxei5Rhg8WkcUE7yPHafLndBbdR8nBSJi4zFsn8iAfCVjn7h7QL9DphNix5V7Ko1nhOadxqNaxGsiD71w=="; + }; + dependencies = [ + sources."@types/clone-2.1.0" + sources."@types/color-name-1.1.1" + sources."@types/fast-json-stable-stringify-2.0.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."array-flat-polyfill-1.0.1" + sources."camelcase-5.3.1" + sources."cliui-6.0.0" + sources."clone-2.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."decamelize-1.2.0" + sources."emoji-regex-8.0.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."find-up-4.1.0" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-3.0.0" + sources."json-stringify-pretty-compact-2.0.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."set-blocking-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."tslib-2.0.1" + sources."vega-event-selector-2.0.5" + sources."vega-expression-2.7.0" + sources."vega-util-1.15.1" + sources."which-module-2.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Vega-Lite is a concise high-level language for interactive visualization."; + homepage = https://vega.github.io/vega-lite/; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; @@ -85530,6 +91317,867 @@ in bypassCache = true; reconstructLock = true; }; + vscode-json-languageserver-bin = nodeEnv.buildNodePackage { + name = "vscode-json-languageserver-bin"; + packageName = "vscode-json-languageserver-bin"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-json-languageserver-bin/-/vscode-json-languageserver-bin-1.0.1.tgz"; + sha512 = "WU+Ks0OEo1c4pgFUA4gIockhzlRqWqSRL2NXHOCtYhJnuIqfrNgSyECZC+nCMyn/CnzpPuQQjzC74GWlIRXnZQ=="; + }; + dependencies = [ + sources."agent-base-4.3.0" + sources."debug-3.1.0" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."http-proxy-agent-2.1.0" + sources."https-proxy-agent-2.2.4" + sources."jsonc-parser-1.0.3" + sources."ms-2.0.0" + (sources."request-light-0.2.5" // { + dependencies = [ + sources."vscode-nls-4.1.2" + ]; + }) + (sources."vscode-json-languageservice-3.8.4" // { + dependencies = [ + sources."jsonc-parser-2.3.1" + sources."vscode-nls-5.0.0" + sources."vscode-uri-2.1.2" + ]; + }) + sources."vscode-jsonrpc-3.5.0" + sources."vscode-languageserver-3.5.1" + (sources."vscode-languageserver-protocol-3.5.1" // { + dependencies = [ + sources."vscode-languageserver-types-3.5.0" + ]; + }) + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-nls-2.0.2" + sources."vscode-uri-1.0.8" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JSON language server"; + homepage = "https://github.com/vscode-langservers/vscode-json-languageserver-bin#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { + name = "vscode-lldb"; + packageName = "vscode-lldb"; + version = "1.5.3"; + src = ../../misc/vscode-extensions/vscode-lldb/build-deps; + dependencies = [ + sources."@types/json5-0.0.30" + sources."@types/mocha-7.0.2" + sources."@types/node-8.10.64" + sources."@types/vscode-1.49.0" + sources."@types/yauzl-2.9.1" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."acorn-6.4.1" + sources."ajv-6.12.5" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."ansi-colors-3.2.3" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" + sources."aproba-1.2.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + (sources."asn1.js-5.4.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assign-symbols-1.0.0" + sources."async-each-1.0.3" + sources."atob-2.1.2" + sources."azure-devops-node-api-7.2.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."big.js-5.2.2" + sources."binary-extensions-2.1.0" + sources."bindings-1.5.0" + sources."bluebird-3.7.2" + sources."bn.js-5.1.3" + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browser-stdout-1.3.1" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + (sources."browserify-rsa-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."browserify-sign-4.2.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."browserify-zlib-0.2.0" + (sources."buffer-4.9.2" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."buffer-crc32-0.2.13" + sources."buffer-from-1.1.1" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + (sources."cacache-12.0.4" // { + dependencies = [ + sources."glob-7.1.6" + ]; + }) + sources."cache-base-1.0.1" + sources."camelcase-5.3.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."cheerio-1.0.0-rc.3" + sources."chokidar-3.3.0" + sources."chownr-1.1.4" + sources."chrome-trace-event-1.0.2" + 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-buffer-1.1.6" + (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."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + (sources."concat-stream-1.6.2" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."console-browserify-1.2.0" + sources."constants-browserify-1.0.0" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + (sources."create-ecdh-4.0.4" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" + sources."crypto-browserify-3.12.0" + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."cyclist-1.0.1" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."denodeify-1.2.1" + sources."des.js-1.0.1" + sources."detect-file-1.0.0" + sources."diff-3.5.0" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."dom-serializer-0.1.1" + sources."domain-browser-1.2.0" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" + (sources."duplexify-3.7.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."emoji-regex-7.0.3" + sources."emojis-list-3.0.0" + sources."end-of-stream-1.4.4" + sources."enhanced-resolve-4.3.0" + sources."entities-1.1.2" + sources."errno-0.1.7" + sources."es-abstract-1.17.6" + sources."es-to-primitive-1.2.1" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-4.0.3" + sources."esprima-4.0.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."events-3.2.0" + 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-buffer-1.1.6" + (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."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.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."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fd-slicer-1.1.0" + sources."figgy-pudding-3.5.2" + sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + (sources."findup-sync-3.0.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-buffer-1.1.6" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."flat-4.1.0" + (sources."flush-write-stream-1.1.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + (sources."from2-2.3.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."get-value-2.0.6" + sources."glob-7.1.3" + sources."glob-parent-5.1.1" + (sources."global-modules-2.0.0" // { + dependencies = [ + sources."global-prefix-3.0.0" + ]; + }) + sources."global-prefix-1.0.2" + sources."graceful-fs-4.2.4" + sources."growl-1.10.5" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."hash.js-1.1.7" + sources."he-1.2.0" + sources."hmac-drbg-1.0.1" + sources."homedir-polyfill-1.0.3" + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."https-browserify-1.0.0" + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."import-local-2.0.0" + sources."imurmurhash-0.1.4" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."interpret-1.4.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-2.1.0" + sources."is-buffer-2.0.4" + sources."is-callable-1.2.1" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.1" + sources."is-symbol-1.0.3" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-yaml-3.13.1" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-traverse-0.4.1" + sources."json5-2.1.3" + sources."kind-of-6.0.3" + sources."leven-3.1.0" + sources."linkify-it-2.2.0" + sources."loader-runner-2.4.0" + (sources."loader-utils-1.4.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."locate-path-3.0.0" + sources."lodash-4.17.20" + sources."log-symbols-3.0.0" + sources."lru-cache-5.1.1" + sources."make-dir-2.1.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + (sources."markdown-it-10.0.0" // { + dependencies = [ + sources."entities-2.0.3" + ]; + }) + sources."md5.js-1.3.5" + sources."mdurl-1.0.1" + (sources."memory-fs-0.5.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."memory-streams-0.1.3" + sources."micromatch-4.0.2" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."mime-1.6.0" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."mocha-7.2.0" + sources."move-concurrently-1.0.1" + sources."ms-2.1.1" + sources."mute-stream-0.0.8" + sources."nan-2.14.1" + sources."nanomatch-1.2.13" + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."node-environment-flags-1.0.6" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."punycode-1.4.1" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."string_decoder-1.1.1" + ]; + }) + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."normalize-path-3.0.0" + sources."nth-check-1.0.2" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-buffer-1.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-inspect-1.8.0" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.0" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."os-0.1.1" + sources."os-browserify-0.3.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pako-1.0.11" + (sources."parallel-transform-1.2.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."parse-asn1-5.1.6" + sources."parse-passwd-1.0.0" + sources."parse-semver-1.1.1" + sources."parse5-3.0.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + 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."pbkdf2-3.1.1" + sources."pend-1.2.0" + sources."picomatch-2.2.2" + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."posix-character-classes-0.1.1" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."prr-1.0.1" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."read-1.0.7" + sources."readable-stream-1.0.34" + sources."readdirp-3.2.0" + sources."regex-not-1.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-cwd-2.0.0" + (sources."resolve-dir-1.0.1" // { + dependencies = [ + sources."global-modules-1.0.0" + ]; + }) + sources."resolve-from-3.0.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."run-queue-1.0.3" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."schema-utils-1.0.0" + sources."semver-5.7.1" + sources."serialize-javascript-4.0.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + (sources."snapdragon-0.8.2" // { + 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-buffer-1.1.6" + (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."ms-2.0.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."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.6.1" + sources."source-map-resolve-0.5.3" + sources."source-map-support-0.5.19" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."ssri-6.0.1" + (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-buffer-1.1.6" + (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."stream-browserify-2.0.2" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."stream-each-1.2.3" + (sources."stream-http-2.8.3" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."stream-shift-1.0.1" + sources."string-argv-0.3.1" + sources."string-width-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" + sources."string_decoder-0.10.31" + sources."strip-ansi-4.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-6.0.0" + sources."tapable-1.1.3" + sources."terser-4.8.0" + sources."terser-webpack-plugin-1.4.5" + (sources."through2-2.0.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."timers-browserify-2.0.11" + sources."tmp-0.0.29" + sources."to-arraybuffer-1.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + (sources."ts-loader-6.2.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."tslib-1.13.0" + sources."tty-browserify-0.0.0" + sources."tunnel-0.0.4" + sources."typed-rest-client-1.2.0" + sources."typedarray-0.0.6" + sources."typescript-3.9.7" + sources."uc.micro-1.0.6" + sources."underscore-1.8.3" + sources."union-value-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + (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."isarray-1.0.0" + ]; + }) + sources."upath-1.2.0" + sources."uri-js-4.4.0" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-join-1.1.0" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."v8-compile-cache-2.1.1" + sources."vm-browserify-1.1.2" + sources."vsce-1.79.5" + sources."vscode-debugadapter-testsupport-1.41.0" + sources."vscode-debugprotocol-1.41.0" + (sources."watchpack-1.7.4" // { + dependencies = [ + sources."chokidar-3.4.2" + sources."readdirp-3.4.0" + ]; + }) + (sources."watchpack-chokidar2-2.0.0" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."isarray-1.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readable-stream-2.3.7" + sources."readdirp-2.2.1" + sources."string_decoder-1.1.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-4.44.2" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isarray-1.0.0" + sources."memory-fs-0.4.1" + sources."micromatch-3.1.10" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-cli-3.3.12" // { + dependencies = [ + sources."supports-color-6.1.0" + ]; + }) + sources."webpack-sources-1.4.3" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + sources."worker-farm-1.7.0" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."wrappy-1.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + (sources."yargs-13.3.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."yargs-parser-13.1.2" + sources."yargs-unparser-1.6.0" + sources."yauzl-2.10.0" + sources."yazl-2.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; packageName = "vue-cli"; @@ -85540,7 +92188,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -85556,11 +92204,11 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - sources."bl-1.2.2" + sources."bl-1.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."buffer-5.6.0" @@ -85680,7 +92328,7 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."klaw-1.3.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."log-symbols-2.2.0" sources."lowercase-keys-1.0.1" (sources."make-dir-1.3.0" // { @@ -85741,7 +92389,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.6" @@ -85783,12 +92431,12 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.4" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" sources."unzip-response-2.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" sources."user-home-2.0.0" @@ -85842,14 +92490,14 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.1" - sources."acorn-jsx-5.2.0" - sources."ajv-6.12.3" + sources."acorn-jsx-5.3.1" + sources."ajv-6.12.5" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -85916,7 +92564,7 @@ in sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -85965,7 +92613,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."cliui-4.1.0" @@ -86021,7 +92669,7 @@ in sources."dir-glob-2.0.0" sources."dlv-1.1.3" sources."doctrine-3.0.0" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."duplexer3-0.1.4" sources."editorconfig-0.15.3" sources."element-helper-json-2.0.6" @@ -86032,15 +92680,15 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."cross-spawn-6.0.5" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ignore-4.0.6" ]; }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ sources."acorn-7.4.0" - sources."debug-4.2.0" - sources."eslint-scope-5.1.0" + sources."debug-4.3.0" + sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."vue-eslint-parser-7.1.0" ]; @@ -86052,10 +92700,14 @@ in sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-0.7.0" @@ -86154,7 +92806,7 @@ in sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.0.4" + sources."hast-util-is-element-1.1.0" sources."hast-util-parse-selector-2.2.4" sources."hast-util-to-string-1.0.4" sources."hast-util-whitespace-1.0.4" @@ -86220,7 +92872,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-beautify-1.11.0" // { + (sources."js-beautify-1.13.0" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -86241,13 +92893,13 @@ in sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.assign-4.2.0" sources."lodash.defaults-4.2.0" sources."lodash.iteratee-4.7.0" sources."lodash.merge-4.6.2" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.8" + sources."loglevel-1.7.0" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -86296,7 +92948,7 @@ in sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" - sources."nopt-4.0.3" + sources."nopt-5.0.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" @@ -86333,7 +92985,6 @@ in ]; }) sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" @@ -86468,7 +93119,7 @@ in sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -86527,7 +93178,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -86682,7 +93333,7 @@ in }) sources."untildify-2.1.0" sources."update-notifier-3.0.1" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -86704,7 +93355,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.3.1" // { + (sources."vscode-css-languageservice-4.3.4" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" @@ -86716,12 +93367,12 @@ in sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.2" + sources."vscode-nls-5.0.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."vue-onsenui-helper-json-1.0.2" @@ -86768,10 +93419,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-5.0.0.tgz"; - sha512 = "K5rzVijxNbOjxv+au1Sj7J82s1/CCyBQ9bhJE9TWdOD3OLELhC3bWJHyNJ1u2sT+kf8guaJjFvPnd6WG67PHtw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-5.1.0.tgz"; + sha512 = "Eupjwvif/9P4uGdZIddJziLLLD/RuzW8r8HEANGCW8e3dlPV4GJu5z815k9DLVshG0v+q/stUPR968Q2p7hhMQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -86786,24 +93437,30 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/polyfill-7.10.4" - sources."@babel/runtime-7.10.5" + sources."@babel/polyfill-7.11.5" + sources."@babel/runtime-7.11.2" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" + (sources."@eslint/eslintrc-0.1.3" // { + dependencies = [ + sources."debug-4.3.0" + sources."ms-2.1.2" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - sources."addons-linter-2.1.0" + sources."addons-linter-2.5.0" sources."adm-zip-0.4.16" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ajv-merge-patch-4.1.0" sources."ansi-align-3.0.0" sources."ansi-colors-4.1.1" @@ -86852,7 +93509,7 @@ in sources."atob-2.1.2" sources."atomic-sleep-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -86863,7 +93520,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.1.0" sources."bindings-1.5.0" - (sources."bl-1.2.2" // { + (sources."bl-1.2.3" // { dependencies = [ (sources."readable-stream-2.3.7" // { dependencies = [ @@ -86911,7 +93568,7 @@ in sources."caseless-0.12.0" sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" - (sources."chokidar-3.4.1" // { + (sources."chokidar-3.4.2" // { dependencies = [ sources."normalize-path-3.0.0" ]; @@ -86940,7 +93597,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-2.2.0" + sources."cli-boxes-2.2.1" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -87001,14 +93658,14 @@ in sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" - sources."deepcopy-2.0.0" + sources."deepcopy-2.1.0" sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.52.0" // { + (sources."dispensary-0.55.0" // { dependencies = [ sources."async-3.2.0" ]; @@ -87018,7 +93675,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" - sources."dot-prop-5.2.0" + sources."dot-prop-5.3.0" sources."dtrace-provider-0.8.8" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" @@ -87035,26 +93692,39 @@ in sources."es6-promisify-6.1.1" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.5.0" // { + (sources."eslint-7.9.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" + sources."eslint-visitor-keys-1.3.0" sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; }) sources."eslint-plugin-no-unsanitized-3.1.2" - sources."eslint-scope-5.1.0" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.0" + sources."eslint-scope-5.1.1" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."event-to-promise-0.8.0" @@ -87139,7 +93809,7 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -87190,7 +93860,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -87202,6 +93872,7 @@ in sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" + sources."is-negative-zero-2.0.0" sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" @@ -87260,7 +93931,7 @@ in sources."lighthouse-logger-1.2.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" sources."lodash.isinteger-4.0.4" @@ -87279,7 +93950,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.31" + sources."mdn-browser-compat-data-1.0.35" sources."mem-5.1.1" sources."merge-stream-2.0.0" (sources."micromatch-3.1.10" // { @@ -87314,7 +93985,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" sources."multimatch-4.0.0" (sources."mv-2.1.1" // { @@ -87333,7 +94004,7 @@ in sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."node-forge-0.7.6" - (sources."node-notifier-7.0.2" // { + (sources."node-notifier-8.0.0" // { dependencies = [ sources."uuid-8.3.0" ]; @@ -87361,10 +94032,14 @@ in sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."open-7.1.0" sources."optionator-0.9.1" sources."os-locale-5.0.0" @@ -87392,8 +94067,8 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."pino-6.4.0" - sources."pino-std-serializers-2.4.2" + sources."pino-6.6.1" + sources."pino-std-serializers-2.5.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { dependencies = [ @@ -87476,7 +94151,7 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."shellwords-0.1.1" - (sources."sign-addon-2.0.6" // { + (sources."sign-addon-3.1.0" // { dependencies = [ sources."core-js-3.6.5" ]; @@ -87518,7 +94193,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."sonic-boom-1.0.2" + sources."sonic-boom-1.1.0" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.19" @@ -87567,7 +94242,7 @@ in }) sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."table-5.4.6" (sources."tar-stream-1.6.2" // { dependencies = [ @@ -87620,12 +94295,12 @@ in ]; }) sources."upath-1.2.0" - (sources."update-notifier-4.1.0" // { + (sources."update-notifier-4.1.1" // { dependencies = [ sources."chalk-3.0.0" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" @@ -87661,8 +94336,8 @@ in ]; }) sources."wcwidth-1.0.1" - sources."webidl-conversions-5.0.0" - sources."whatwg-url-8.1.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-url-8.2.2" sources."when-3.7.7" sources."which-2.0.2" sources."which-module-2.0.0" @@ -87742,10 +94417,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.44.1"; + version = "4.44.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz"; - sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; + sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; dependencies = [ sources."@webassemblyjs/ast-1.9.0" @@ -87769,7 +94444,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."anymatch-3.1.1" @@ -87778,7 +94453,7 @@ in sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-unique-0.3.2" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -87803,7 +94478,7 @@ in sources."binary-extensions-2.1.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -87832,7 +94507,7 @@ in sources."builtin-status-codes-3.0.0" sources."cacache-12.0.4" sources."cache-base-1.0.1" - (sources."chokidar-3.4.1" // { + (sources."chokidar-3.4.2" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -87905,7 +94580,11 @@ in }) sources."errno-0.1.7" sources."eslint-scope-4.0.3" - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" @@ -88063,7 +94742,7 @@ in sources."p-try-2.2.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" - sources."parse-asn1-5.1.5" + sources."parse-asn1-5.1.6" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -88107,9 +94786,10 @@ in sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" sources."schema-utils-1.0.0" sources."semver-5.7.1" - sources."serialize-javascript-3.1.0" + sources."serialize-javascript-4.0.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -88184,7 +94864,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.4" // { + (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -88216,7 +94896,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -88587,9 +95267,9 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."ansi-colors-3.2.4" @@ -88692,7 +95372,7 @@ in sources."semver-5.7.1" ]; }) - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -88719,7 +95399,7 @@ in sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.7" sources."eventsource-1.0.7" sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { @@ -88773,7 +95453,7 @@ in ]; }) sources."find-up-3.0.0" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -88829,7 +95509,7 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.0" + sources."is-callable-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -88837,6 +95517,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -88859,8 +95540,8 @@ in sources."killable-1.0.1" sources."kind-of-6.0.3" sources."locate-path-3.0.0" - sources."lodash-4.17.19" - sources."loglevel-1.6.8" + sources."lodash-4.17.20" + sources."loglevel-1.7.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" @@ -88883,7 +95564,7 @@ in sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" - sources."node-forge-0.9.0" + sources."node-forge-0.10.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -88904,7 +95585,11 @@ in sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."object.pick-1.3.0" sources."obuf-1.1.2" sources."on-finished-2.3.0" @@ -88944,7 +95629,7 @@ in sources."punycode-2.1.1" sources."qs-6.7.0" sources."querystring-0.2.0" - sources."querystringify-2.1.1" + sources."querystringify-2.2.0" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -88976,7 +95661,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-1.0.0" sources."select-hose-2.0.0" - sources."selfsigned-1.10.7" + sources."selfsigned-1.10.8" sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ @@ -89117,7 +95802,7 @@ in ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -89166,19 +95851,19 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.0.3"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz"; - sha512 = "q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.1.1.tgz"; + sha512 = "4TlkHFYkrZ3WppLA5XkPmBLI5lnEpFsXvpeqxCf5PzkratZiVklNXsvoQkLhUU43q7ZL3AOXtaHAd9jLNJoU0w=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@npmcli/move-file-1.0.1" - sources."@types/json-schema-7.0.5" - sources."aggregate-error-3.0.1" - sources."ajv-6.12.3" + sources."@types/json-schema-7.0.6" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.5" sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" sources."balanced-match-1.0.0" @@ -89227,7 +95912,7 @@ in sources."minipass-collect-1.0.2" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."normalize-path-3.0.0" sources."once-1.4.0" @@ -89251,18 +95936,18 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.1.9" sources."safe-buffer-5.2.1" - sources."schema-utils-2.7.0" + sources."schema-utils-2.7.1" sources."semver-6.3.0" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" sources."slash-3.0.0" sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."ssri-8.0.0" - sources."tar-6.0.2" + sources."tar-6.0.5" sources."to-regex-range-5.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."webpack-sources-1.4.3" sources."wrappy-1.0.2" sources."yallist-4.0.0" @@ -89297,7 +95982,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.15" + sources."@types/node-13.13.21" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -89306,20 +95991,20 @@ in sources."bitfield-3.0.0" (sources."bittorrent-dht-10.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."bittorrent-peerid-1.3.3" (sources."bittorrent-protocol-3.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) (sources."bittorrent-tracker-9.15.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" @@ -89328,7 +96013,7 @@ in }) sources."blob-to-buffer-1.2.8" sources."block-stream2-2.0.0" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" sources."buffer-alloc-1.2.0" @@ -89339,7 +96024,7 @@ in sources."bufferutil-4.0.1" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -89401,7 +96086,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.1" + sources."ipaddr.js-2.0.0" sources."is-ascii-1.0.0" sources."is-docker-2.1.1" sources."is-file-1.0.0" @@ -89432,7 +96117,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.0" sources."ms-2.0.0" @@ -89450,7 +96135,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.1.0" + sources."open-7.2.1" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-1.2.0" (sources."parse-torrent-7.1.3" // { @@ -89484,7 +96169,7 @@ in sources."record-cache-1.1.0" (sources."render-media-3.4.3" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -89500,14 +96185,14 @@ in sources."simple-get-2.8.1" (sources."simple-peer-9.7.2" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.0.1" (sources."simple-websocket-8.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -89516,7 +96201,11 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."string2compact-1.3.0" + (sources."string2compact-1.3.0" // { + dependencies = [ + sources."ipaddr.js-1.9.1" + ]; + }) sources."string_decoder-1.3.0" sources."thirty-two-1.0.2" sources."through-2.3.8" @@ -89524,7 +96213,7 @@ in sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -89538,7 +96227,7 @@ in sources."url-join-4.0.1" (sources."ut_metadata-3.5.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -89549,7 +96238,7 @@ in sources."vlc-command-1.2.0" (sources."webtorrent-0.108.6" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decompress-response-4.2.1" sources."mimic-response-2.1.0" sources."ms-2.1.2" @@ -89594,10 +96283,10 @@ in write-good = nodeEnv.buildNodePackage { name = "write-good"; packageName = "write-good"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-1.0.2.tgz"; - sha512 = "1gm9Ouz7mBROF7aC8vvSm/3JtPfTiZ+fegPGCKdxsYhf6VYeStHfVFx2Hnj2kJviHPx5zZkiQ8DytzZMP0Zqwg=="; + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.3.tgz"; + sha512 = "8n5k4h00o91iYlzudpO8VqmeEjJ2qfMtVA+rhYUVYmibEOEoOXN+YGxB7CY7BZbN2Pv8aDK4oiLSN0a3pAwwOQ=="; }; dependencies = [ sources."adverb-where-0.2.1" @@ -89621,10 +96310,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.9.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.9.0.tgz"; - sha512 = "nRExM5NfJXzxTKlFmHKr/ZtoxZCddH1kuuWNfHRvTLCEHzexIn/YvI/DBZHxKLh/ym9f4Q4j4zW76vB6J18lUQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.0.tgz"; + sha512 = "tAEVZvlNLhmF2NLzhOm6UnejjPUp/iiEdxDLdP1Cm3M2YOJ7QLwrYtr0lzoNLLxQkzJwXmuBX01idECTWln82g=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -89636,12 +96325,17 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.0" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."ms-2.0.0" - sources."prettier-1.19.1" + sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.0" + (sources."vscode-json-languageservice-3.8.4" // { + dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-nls-5.0.0" + ]; + }) sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -89672,15 +96366,14 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.22.4"; + version = "1.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.4.tgz"; - sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.5.tgz"; + sha512 = "5uzKXwdMc++mYktXqkfpNYT9tY8ViWegU58Hgbo+KXzrzzhEyP1Ip+BTtXloLrXNcNlxFJbLiFKGaS9vK9ym6Q=="; }; buildInputs = globalBuildInputs; meta = { description = "📦🐈 Fast, reliable, and secure dependency management."; - homepage = "https://github.com/yarnpkg/yarn#readme"; license = "BSD-2-Clause"; }; production = true; @@ -89699,18 +96392,18 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/runtime-7.11.1" + sources."@babel/runtime-7.11.2" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" - sources."aggregate-error-3.0.1" - sources."ajv-6.12.3" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.5" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -89734,7 +96427,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" (sources."axios-0.18.1" // { dependencies = [ sources."is-buffer-2.0.4" @@ -89824,7 +96517,7 @@ in sources."concat-stream-1.6.2" sources."conf-1.4.0" sources."config-chain-1.1.12" - sources."configstore-3.1.2" + sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" sources."core-js-3.6.5" sources."core-util-is-1.0.2" @@ -89853,7 +96546,7 @@ in sources."path-type-3.0.0" ]; }) - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."downgrade-root-1.2.2" sources."download-stats-0.3.4" sources."duplexer3-0.1.4" @@ -90064,6 +96757,7 @@ in sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -90088,8 +96782,8 @@ in ]; }) sources."locate-path-2.0.0" - sources."locutus-2.0.11" - sources."lodash-4.17.19" + sources."locutus-2.0.12" + sources."lodash-4.17.20" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" @@ -90147,7 +96841,7 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.28.0" sources."ms-2.0.0" (sources."multimatch-4.0.0" // { dependencies = [ @@ -90239,7 +96933,7 @@ in sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.3.0" + sources."pretty-bytes-5.4.1" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" @@ -90300,11 +96994,11 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.7.1" - sources."roarr-2.15.3" + sources."roarr-2.15.4" sources."root-check-1.0.0" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-6.6.2" + sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -90368,7 +97062,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" @@ -90476,7 +97170,7 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.15.1" + sources."twig-1.15.2" sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."union-value-1.0.1" @@ -90494,7 +97188,7 @@ in sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" @@ -90513,7 +97207,7 @@ in sources."walk-2.3.14" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" (sources."with-open-file-0.1.7" // { dependencies = [ sources."p-try-2.2.0" @@ -90552,7 +97246,7 @@ in sources."debug-3.2.6" sources."execa-4.0.3" sources."figures-3.2.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."has-flag-4.0.0" (sources."inquirer-7.3.3" // { dependencies = [ @@ -90565,7 +97259,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."npm-run-path-4.0.1" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" sources."semver-7.3.2" @@ -90581,17 +97275,17 @@ in sources."ansi-regex-3.0.0" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."type-fest-0.11.0" sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.11.0" // { + (sources."yeoman-generator-4.12.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."diff-4.0.2" sources."dir-glob-2.2.2" - sources."ejs-3.1.3" + sources."ejs-3.1.5" sources."find-up-3.0.0" sources."globby-9.2.0" sources."ignore-4.0.6" @@ -90611,7 +97305,7 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -90648,4 +97342,4 @@ in bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix index 7dc87194d6..0da1ab74e1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-apron-${version}"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "antoinemine"; repo = "apron"; rev = "v${version}"; - sha256 = "0bciv4wz52p57q0aggmvixvqrsd1slflfyrm1z6fy5c44f4fmjjn"; + sha256 = "14ymjahqdxj26da8wik9d5dzlxn81b3z1iggdl7rn2nn06jy7lvy"; }; buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index 3032df7b8f..43fc0696e2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,26 +1,28 @@ { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "3.0.0"; in +let version = "3.1.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; src = fetchurl { url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; - sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi"; + sha256 = "0bq1np3ai3r559s3vivn45yid25fwz76rvbmsg30j57j7cyr3jqm"; }; - # Fixes tests with OCaml 4.10 + # Fix a test case patches = [(fetchpatch { - url = "https://github.com/ocaml-batteries-team/batteries-included/commit/6d8d67f9fb48181be3d527b32df15899b00cd5dd.patch"; - sha256 = "0msk8c5bjm6gm011i75b1rza332i1r4adj58qzli6gyjlvfj1hx4"; + url = "https://github.com/ocaml-batteries-team/batteries-included/commit/7cbd9617d4efa5b3d647b1cc99d9a25fa01ac6dd.patch"; + sha256 = "0q4kq10psr7n1xdv4rspk959n1a5mk9524pzm5v68ab2gkcgm8sk"; + })]; - buildInputs = [ ocaml findlib ocamlbuild qtest ]; + buildInputs = [ ocaml findlib ocamlbuild ]; + checkInputs = [ qtest ]; propagatedBuildInputs = [ num ]; - doCheck = stdenv.lib.versions.majorMinor ocaml.version != "4.07" && !stdenv.isAarch64; - checkTarget = "test test"; + doCheck = stdenv.lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; + checkTarget = "test"; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix index fa5ffabeda..7e231001f2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ stdenv, fetchFromGitHub, which, ocaml, findlib }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.3"; + version = "2.3.1"; name = "ocaml${ocaml.version}-camlpdf-${version}"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - sha256 = "1z8h6bjzmlscr6h6kdvzj8kspifb4n9dg7zi54z1cv2qi03kr8dk"; + sha256 = "1q69hhk63z836jbkv4wsng27w35w0qpz01c7ax0mqm8d8kmnr0v4"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ which ocaml findlib ]; # Version number in META file is wrong patchPhase = '' @@ -26,7 +26,9 @@ stdenv.mkDerivation rec { EOF ''; - createFindlibDestdir = true; + preInstall = '' + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs + ''; meta = with stdenv.lib; { description = "An OCaml library for reading, writing and modifying PDF files"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix new file mode 100644 index 0000000000..246397b608 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix @@ -0,0 +1,22 @@ +{ stdenv, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv +, logs, magic-mime }: + +if !stdenv.lib.versionAtLeast cohttp.version "0.99" then + cohttp +else if !stdenv.lib.versionAtLeast async.version "0.13" then + throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" +else + + buildDunePackage { + pname = "cohttp-async"; + useDune2 = true; + inherit (cohttp) version src; + + buildInputs = [ ppx_sexp_conv ]; + + propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ]; + + meta = cohttp.meta // { + description = "CoHTTP implementation for the Async concurrency library"; + }; + } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix new file mode 100644 index 0000000000..f16819ed8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/async.nix @@ -0,0 +1,19 @@ +{ stdenv, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: + +if !stdenv.lib.versionAtLeast conduit.version "1.0" +then conduit +else + +buildDunePackage { + pname = "conduit-async"; + useDune2 = true; + inherit (conduit) version src; + + buildInputs = [ ppx_sexp_conv ]; + + propagatedBuildInputs = [ async async_ssl conduit ]; + + meta = conduit.meta // { + description = "A network connection establishment library for Async"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix index 7fbeefb392..27b2a329b2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ]; meta = { - description = "Network connection library for TCP and SSL"; + description = "A network connection establishment library"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; homepage = "https://github.com/mirage/ocaml-conduit"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix new file mode 100644 index 0000000000..7d15d7d3c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix @@ -0,0 +1,18 @@ +{ buildDunePackage, containers +, gen, iter, mdx, ounit, qcheck +}: + +buildDunePackage { + pname = "containers-data"; + + inherit (containers) src version; + + doCheck = true; + checkInputs = [ gen iter mdx.bin ounit qcheck ]; + + propagatedBuildInputs = [ containers ]; + + meta = containers.meta // { + description = "A set of advanced datatypes for containers"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix index 16bad5a5ec..970122dd79 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix @@ -1,24 +1,22 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml -, iter, result, uchar -, gen, mdx, ounit, qcheck, uutf +, seq +, gen, iter, ounit, qcheck, uutf }: buildDunePackage rec { - version = "2.7"; + version = "3.0"; pname = "containers"; src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - sha256 = "1nsxfgn1g1vpqihb9gd6gsab0bcm70nf9z84cp441c8wsc57hi6a"; + sha256 = "0c75d5csgc68qqbsdz4279nlin111zrjbg4d47k32ska28myvpqn"; }; - buildInputs = [ iter ]; + propagatedBuildInputs = [ seq ]; - checkInputs = lib.optionals doCheck [ gen mdx.bin ounit qcheck uutf ]; - - propagatedBuildInputs = [ result uchar ]; + checkInputs = [ gen iter ounit qcheck uutf ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix index 3b68acaee7..e40f6531e1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }: -let version = "2.3"; in +let version = "2.3.1"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-cpdf-${version}"; @@ -9,9 +9,13 @@ stdenv.mkDerivation { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - sha256 = "0i976y1v0l7x7k2n8k6v0h4bw9zlxsv04y4fdxss6dzpsfz49w23"; + sha256 = "1gwz0iy28f67kbqap2q10nf98dalwbi03vv5j893z2an7pb4w68z"; }; + prePatch = '' + substituteInPlace META --replace 'version="1.7"' 'version="${version}"' + ''; + buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix new file mode 100644 index 0000000000..610de2cb8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "csexp"; + version = "1.3.2"; + + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz"; + sha256 = "0jhwrxfjb0x31xj4g4b89fzw34sq19j0rq2hs2zyh1vz4xxl47zj"; + }; + + postPatch = '' + substituteInPlace src/csexp.ml --replace Result.result Result.t + ''; + + meta = with lib; { + homepage = "https://github.com/ocaml-dune/csexp"; + description = "Minimal support for Canonical S-expressions"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-action-plugin/default.nix new file mode 100644 index 0000000000..65c55da6e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, dune_2, dune-glob, dune-private-libs }: + +buildDunePackage rec { + pname = "dune-action-plugin"; + inherit (dune_2) src version patches; + + useDune2 = true; + + dontAddPrefix = true; + + propagatedBuildInputs = [ dune-glob dune-private-libs ]; + + meta = with lib; { + inherit (dune_2.meta) homepage; + description = "API for writing dynamic Dune actions"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-build-info/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-build-info/default.nix index 3c828ebdcd..5d9f105782 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-build-info/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-build-info/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dune-build-info"; - inherit (dune_2) src version; + inherit (dune_2) src version patches; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix index aa12ebc8d7..16e365dd4f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -1,15 +1,15 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_2, csexp, result }: buildDunePackage rec { pname = "dune-configurator"; useDune2 = true; - inherit (dune_2) src version; + inherit (dune_2) src version patches; dontAddPrefix = true; - propagatedBuildInputs = [ dune-private-libs ]; + propagatedBuildInputs = [ csexp result ]; meta = with lib; { description = "Helper library for gathering system configuration"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix new file mode 100644 index 0000000000..c7c6f9be4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, dune_2, dune-private-libs }: + +buildDunePackage rec { + pname = "dune-glob"; + inherit (dune_2) src version patches; + + useDune2 = true; + + dontAddPrefix = true; + + propagatedBuildInputs = [ dune-private-libs ]; + + meta = with lib; { + inherit (dune_2.meta) homepage; + description = "Glob string matching language supported by dune"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 6161bd1fe8..8a635efa3a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -5,9 +5,9 @@ buildDunePackage rec { useDune2 = true; - inherit (dune_2) src version; + inherit (dune_2) src version patches; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; dontAddPrefix = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index 4ce502af19..4734d83d55 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -14,11 +14,11 @@ else stdenv.mkDerivation rec { pname = "eliom"; - version = "6.12.0"; + version = "6.12.1"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "015jh72v6ch9h9czd8sn5kjz3pv6lsnvvnhdjgrplwj443dn1xp8"; + sha256 = "04c1sz113015gyhj3w7flw7l4bv0v50q6n04kk8dybcravzy2xgx"; }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index 93e29d3d34..865c5448c5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,19 +1,19 @@ { lib, fetchzip, buildDunePackage, camlp5 -, ppx_tools_versioned, ppx_deriving, re +, ppxlib, ppx_deriving, re, perl, ncurses }: buildDunePackage rec { pname = "elpi"; - version = "1.11.2"; + version = "1.11.4"; src = fetchzip { url = "https://github.com/LPCIC/elpi/releases/download/v${version}/elpi-v${version}.tbz"; - sha256 = "15hamy9ifr05kczadwh3yj2gmr12a9z1jwppmp5yrns0vykjbj76"; + sha256 = "1hmjp2z52j17vwhhdkj45n9jx11jxkdg2dwa0n04yyw0qqy4m7c1"; }; minimumOCamlVersion = "4.04"; - buildInputs = [ ppx_tools_versioned ]; + buildInputs = [ perl ncurses ppxlib ]; propagatedBuildInputs = [ camlp5 ppx_deriving re ]; @@ -24,5 +24,9 @@ buildDunePackage rec { homepage = "https://github.com/LPCIC/elpi"; }; + postPatch = '' + substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols" + ''; + useDune2 = true; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix new file mode 100644 index 0000000000..d3915b6593 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, buildDunePackage, dune-configurator +, fdk_aac +}: + +buildDunePackage rec { + pname = "fdkaac"; + version = "0.3.2"; + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-fdkaac"; + rev = version; + sha256 = "10i6hsjkrpw7zgx99zvvka3sapd7zy53k7z4b6khj9rdrbrgznv8"; + }; + + useDune2 = true; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ fdk_aac ]; + + meta = { + description = "OCaml binding for the fdk-aac library"; + inherit (src.meta) homepage; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/genspio/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/genspio/default.nix new file mode 100644 index 0000000000..7e7b3a0b9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/genspio/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, buildDunePackage +, nonstd, sosa +}: + +buildDunePackage rec { + pname = "genspio"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "hammerlab"; + repo = pname; + rev = "${pname}.${version}"; + sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x"; + }; + + minimumOCamlVersion = "4.03"; + + propagatedBuildInputs = [ nonstd sosa ]; + + configurePhase = '' + ocaml please.mlt configure + ''; + + doCheck = true; + + meta = with lib; { + homepage = https://smondet.gitlab.io/genspio-doc/; + description = "Typed EDSL to generate POSIX Shell scripts"; + license = licenses.asl20; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix index 59e832291f..f75465e99a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix @@ -1,26 +1,28 @@ { lib, buildDunePackage, fetchFromGitHub, alcotest, cppo -, ocaml-migrate-parsetree, ppx_tools_versioned, reason, result, yojson }: +, ocaml-migrate-parsetree, ppx_tools_versioned, reason, yojson }: buildDunePackage rec { pname = "graphql_ppx"; - version = "0.7.1"; + version = "1.0.1"; minimumOCamlVersion = "4.06"; src = fetchFromGitHub { owner = "reasonml-community"; - repo = "graphql_ppx"; + repo = "graphql-ppx"; rev = "v${version}"; - sha256 = "0gpzwcnss9c82whncyxfm6gwlkgh9hy90329hrazny32ybb470zh"; + sha256 = "0lvmv1sb0ca9mja6di1dbmsgjqgj3w9var4amv1iz9nhwjjx4cpi"; }; propagatedBuildInputs = - [ cppo ocaml-migrate-parsetree ppx_tools_versioned reason result yojson ]; + [ cppo ocaml-migrate-parsetree ppx_tools_versioned reason yojson ]; checkInputs = lib.optional doCheck alcotest; doCheck = false; + useDune2 = true; + meta = { homepage = "https://github.com/reasonml-community/graphql_ppx"; description = "GraphQL PPX rewriter for Bucklescript/ReasonML"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix new file mode 100644 index 0000000000..cd95b34fa2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchurl, buildDunePackage, pkg-config +, bigstring, +}: + +buildDunePackage rec { + pname = "hidapi"; + version = "1.1.1"; + + src = fetchurl { + url = "https://github.com/vbmithr/ocaml-hidapi/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; + }; + + minimumOCamlVersion = "4.03"; + + buildInputs = [ pkgs.hidapi pkg-config ]; + propagatedBuildInputs = [ bigstring ]; + + doCheck = true; + + meta = with lib; { + homepage = https://github.com/vbmithr/ocaml-hidapi; + description = "Bindings to Signal11's hidapi library"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/1.4.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/1.4.nix deleted file mode 100644 index c1d170f78e..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/1.4.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchurl, buildDunePackage, ocaml -, astring, cstruct, fmt, hex, jsonm, logs, ocaml_lwt, ocamlgraph, uri -}: - -buildDunePackage rec { - pname = "irmin"; - version = "1.4.0"; - - minimumOCamlVersion = "4.03"; - - src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "019di4cz0z65knl232rnwj26npnc1mqh8j71xbf0mav6x350g1w5"; - }; - - propagatedBuildInputs = [ astring cstruct fmt hex jsonm logs ocaml_lwt ocamlgraph uri ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/mirage/irmin"; - description = "Irmin, a distributed database that follows the same design principles as Git"; - license = licenses.isc; - maintainers = [ maintainers.alexfmpe ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix index d16ceefd04..b92027a65a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix @@ -1,5 +1,6 @@ { janePackage , ctypes +, dune-configurator , num , octavius , ppxlib @@ -417,6 +418,15 @@ rec { propagatedBuildInputs = [ async shell ]; }; + async_ssl = janePackage { + pname = "async_ssl"; + useDune2 = true; + hash = "0z5dbiam5k7ipx9ph4r8nqv0a1ldx1ymxw3xjxgrdjda90lmwf2k"; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ async ctypes openssl ]; + }; + core_bench = janePackage { pname = "core_bench"; hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix new file mode 100644 index 0000000000..a4cf0aae69 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix @@ -0,0 +1,30 @@ +{ lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson +, base64, re, ppx_deriving }: + +buildDunePackage rec { + pname = "jwto"; + version = "0.3.0"; + + minimumOCamlVersion = "4.05"; + + src = fetchFromGitHub { + owner = "sporto"; + repo = "jwto"; + rev = version; + sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s"; + }; + + propagatedBuildInputs = + [ cryptokit fmt yojson base64 re ppx_deriving ]; + + checkInputs = [ alcotest ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/sporto/jwto"; + description = "JSON Web Tokens (JWT) for OCaml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Zimmi48 jtcoolen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix index 8a45e61767..767e087a7f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -12,8 +12,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 ]; - propagatedBuildInputs = [ cairo2 ]; + propagatedBuildInputs = [ gtk3 cairo2 ]; meta = { description = "OCaml interface to GTK 3"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index e7b68b9071..1c8edea66f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -52,6 +52,10 @@ let param = version = "8.06.8"; sha256 = "0lfjc7lscq81ibqb3fcybdzs2r1i2xl7rsgi7linq46a0pcpkinw"; }; + "4.11" = mkNewParam { + version = "8.06.9"; + sha256 = "1k42k3bjkf22gk39lwwzqzfhgjyhxnclslldrzpg5qy1829pbnc0"; + }; }.${builtins.substring 0 4 ocaml.version}; in diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index e85fa5bef2..e178e066a3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.3"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "08rmhjrk046nnhbdk16vg7w7ink4bj6yq9dsjcky5psn982aqiwi"; + sha256 = "0l6q0z5ghhy0djfscb2i2xg4dpmxs4xkwh16kc473cmb4hsxsmyk"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix index 6416871639..528ea68d98 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "mirage-stack"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; - sha256 = "1xdy59bxnki1r0jwm3s8fwarhhbxr0lsqqiag5b1j41hciiqp9jq"; + sha256 = "1y110i4kjr03b0ji3q5h0bi3n3q8mdkfflb3fyq5rvpi5l45vvdb"; }; propagatedBuildInputs = [ mirage-protocols ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix new file mode 100644 index 0000000000..150edb3174 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromBitbucket, buildDunePackage }: + +buildDunePackage rec { + pname = "nonstd"; + version = "0.0.3"; + + minimumOCamlVersion = "4.02"; + + src = fetchFromBitbucket { + owner = "smondet"; + repo = pname; + rev = "${pname}.${version}"; + sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46"; + }; + + doCheck = true; + + meta = with lib; { + homepage = https://bitbucket.org/smondet/nonstd; + description = "Non-standard mini-library"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix index d2a94112eb..df684f166e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchurl, ocaml, findlib, lablgtk ? null}: +{ stdenv, fetchurl, ocaml, findlib +, gtkSupport ? true +, lablgtk +}: stdenv.mkDerivation rec { pname = "ocamlgraph"; @@ -9,22 +12,19 @@ stdenv.mkDerivation rec { sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; }; - buildInputs = [ ocaml findlib lablgtk ]; - - patches = ./destdir.patch; - - postPatch = '' - sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in - sed -i 's@OCAMLFINDDEST := -destdir $(DESTDIR)@@' Makefile.in - ${stdenv.lib.optionalString (lablgtk != null) - "sed -i 's@+lablgtk2@${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile"} - ''; + buildInputs = [ ocaml findlib ] + ++ stdenv.lib.optional gtkSupport lablgtk + ; createFindlibDestdir = true; - buildPhase = '' - make all - make install-findlib + buildFlags = [ "all" ]; + installTargets = [ "install-findlib" ]; + + postInstall = stdenv.lib.optionalString gtkSupport '' + mkdir -p $out/bin + cp dgraph/dgraph.opt $out/bin/graph-viewer + cp editor/editor.opt $out/bin/graph-editor ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch deleted file mode 100644 index 38fca1c491..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur -x '*~' ocamlgraph-1.8.1/Makefile.in ocamlgraph-1.8.1-new//Makefile.in ---- ocamlgraph-1.8.1/Makefile.in 2011-10-17 09:57:03.000000000 -0430 -+++ ocamlgraph-1.8.1-new//Makefile.in 2011-11-24 13:01:22.626004819 -0430 -@@ -16,8 +16,8 @@ - ########################################################################## - - # Where to install the binaries --DESTDIR = - prefix =@prefix@ -+DESTDIR=$(prefix) - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ - BINDIR =$(DESTDIR)@bindir@ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix index 7d9a0573db..5b6e0dde8b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -8,11 +8,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocamlnet-${version}"; - version = "4.1.7"; + version = "4.1.8"; src = fetchurl { url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "0r9gl0lsgxk2achixxqzm8bm5l9jwc4vwihf0rvxxa9v9q9vfdhi"; + sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 731a5303ff..39201d0570 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, piqi, camlp4 }: +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }: stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.7.7"; pname = "piqi-ocaml"; + name = "ocaml${ocaml.version}-${pname}-${version}"; - src = fetchurl { - url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz"; - sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv"; + src = fetchFromGitHub { + owner = "alavrik"; + repo = pname; + rev = "v${version}"; + sha256 = "1913jpsb8mvqi8609j4g4sm5jhg50dq0xqxgy8nmvknfryyc89nm"; }; - patches = [ (fetchpatch { - url = "https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch"; - sha256 = "071s4xjyr6xx95v6az2lbl2igc87n7z5jqnnbhfq2pidrxakd0la"; - })]; - - buildInputs = [ ocaml findlib piqi camlp4 ]; + buildInputs = [ ocaml findlib piqi stdlib-shims ]; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/posix/base.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/posix/base.nix new file mode 100644 index 0000000000..a6fe690ebc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/posix/base.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub +, ctypes, integers +}: + +buildDunePackage rec { + pname = "posix-base"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-posix"; + rev = "v${version}"; + sha256 = "18px8hfqcfy2lk8105ki3hrxxigs44gs046ba0fqda6wzd0hr82b"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ ctypes integers ]; + + meta = { + homepage = "https://www.liquidsoap.info/ocaml-posix/"; + description = "Base module for the posix bindings"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/posix/socket.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/posix/socket.nix new file mode 100644 index 0000000000..69a469bbec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/posix/socket.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, posix-base }: + +buildDunePackage { + pname = "posix-socket"; + + inherit (posix-base) version src useDune2; + + propagatedBuildInputs = [ posix-base ]; + + doCheck = true; + + meta = posix-base.meta // { + description = "Bindings for posix sockets"; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/posix/types.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/posix/types.nix new file mode 100644 index 0000000000..2512fe892c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/posix/types.nix @@ -0,0 +1,15 @@ +{ lib, buildDunePackage, posix-base }: + +buildDunePackage { + pname = "posix-types"; + + inherit (posix-base) version src useDune2; + + minimumOCamlVersion = "4.03"; + + propagatedBuildInputs = [ posix-base ]; + + meta = posix-base.meta // { + description = "Bindings for the types defined in "; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix index f635fadd6d..018f1e3edf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix @@ -1,43 +1,29 @@ -{ stdenv, fetchzip, ocaml, findlib, obuild }: +{ lib, buildDunePackage, fetchurl +, seq +, stdlib-shims +}: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.07" - then { - version = "2.0.4"; - sha256 = "05a391m1l04zigi6ghywj7f5kxy2w6186221k7711wmg56m94yjw"; - } else { - version = "2.0.3"; - sha256 = "19xykhqk7q25r1pj8rpfj53j2r9ls8mxi1w5m2wqshrf20gf078h"; - } -; in +buildDunePackage rec { + pname = "ptmap"; + version = "2.0.5"; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ptmap-${param.version}"; + useDune2 = true; - src = fetchzip { - url = "https://github.com/backtracking/ptmap/archive/v${param.version}.tar.gz"; - inherit (param) sha256; + src = fetchurl { + url = "https://github.com/backtracking/ptmap/releases/download/${version}/ptmap-${version}.tbz"; + sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb"; }; - buildInputs = [ ocaml findlib obuild ]; + propagatedBuildInputs = [ seq ]; - createFindlibDestdir = true; + doCheck = true; - buildPhase = '' - substituteInPlace ptmap.obuild --replace 'build-deps: qcheck' "" - obuild configure - obuild build lib-ptmap - ''; - - installPhase = '' - obuild install --destdir $out/lib/ocaml/${ocaml.version}/site-lib - ''; + checkInputs = [ stdlib-shims ]; meta = { homepage = "https://www.lri.fr/~filliatr/software.en.html"; - platforms = ocaml.meta.platforms or []; description = "Maps over integers implemented as Patricia trees"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ volth ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ volth ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptset/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptset/default.nix new file mode 100644 index 0000000000..b9c534e763 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptset/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage +, stdlib-shims +}: + +buildDunePackage rec { + pname = "ptset"; + version = "1.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/backtracking/ptset/releases/download/${version}/ptset-${version}.tbz"; + sha256 = "1pr80mgk12l93mdq1wfsv2b6ccraxs334d5h92qzjh7bw2g13424"; + }; + + doCheck = true; + + propagatedBuildInputs = [ stdlib-shims ]; + + meta = { + description = "Integer set implementation using Patricia trees"; + homepage = "https://github.com/backtracking/ptset"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix new file mode 100644 index 0000000000..4f1baec1e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, qcheck-core, alcotest }: + +buildDunePackage { + pname = "qcheck-alcotest"; + + inherit (qcheck-core) version src; + + propagatedBuildInputs = [ qcheck-core alcotest ]; + + meta = qcheck-core.meta // { + description = "Alcotest backend for qcheck"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix new file mode 100644 index 0000000000..fa72a211ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchFromGitHub }: + +buildDunePackage rec { + pname = "qcheck-core"; + version = "0.15"; + + minimumOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "qcheck"; + rev = version; + sha256 = "1ywaklqm1agvxvzv7pwl8v4zlwc3ykw6l251w43f0gy9cfwqmh3j"; + }; + + meta = { + description = "Core qcheck library"; + homepage = "https://c-cube.github.io/qcheck/"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix index be625f4d8d..2a0e6c0ae4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix @@ -1,29 +1,14 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: +{ buildDunePackage, qcheck-ounit }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; +buildDunePackage { + pname = "qcheck"; -stdenv.mkDerivation { + inherit (qcheck-ounit) version src; - name = "ocaml${ocaml.version}-qcheck-0.7"; - src = fetchzip { - url = "https://github.com/c-cube/qcheck/archive/0.7.tar.gz"; - sha256 = "1afy7li74r3ivpvq670gvsj1rmglh5rnvb17p6w8gy5rh30aljah"; + propagatedBuildInputs = [ qcheck-ounit ]; + + meta = qcheck-ounit.meta // { + description = "Compatibility package for qcheck"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ]; - - configureFlags = [ "--enable-tests" ]; - - doCheck = true; - checkPhase = "ocaml setup.ml -test"; - - createFindlibDestdir = true; - - meta = { - description = "QuickCheck inspired property-based testing for OCaml"; - homepage = "https://github.com/c-cube/qcheck/"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms or []; - }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix new file mode 100644 index 0000000000..06897987a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, qcheck-core, ounit }: + +buildDunePackage { + pname = "qcheck-ounit"; + + inherit (qcheck-core) version src; + + propagatedBuildInputs = [ qcheck-core ounit ]; + + meta = qcheck-core.meta // { + description = "OUnit backend for qcheck"; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix index 51a8e08983..3bbb542bcb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,28 +1,22 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qcheck, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, qcheck }: -if !stdenv.lib.versionAtLeast ocaml.version "4" -then throw "qtest is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "qtest"; + version = "2.11"; -let version = "2.7"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-qtest-${version}"; - src = fetchzip { - url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "0z72m2drp67qchvsxx4sg2qjrrq8hp6p9kzdx16ibx58pvpw1sh2"; + src = fetchFromGitHub { + owner = "vincent-hugot"; + repo = pname; + rev = "v${version}"; + sha256 = "10fi2093ny8pp3jsi1gdqsllp3lr4r5mfcs2hrm7qvbnhrdbb0g3"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ qcheck ounit ]; - - installFlags = [ "BIN=$(out)/bin" ]; - preInstall = "mkdir -p $out/bin"; + propagatedBuildInputs = [ qcheck ]; meta = { - description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; - homepage = "https://github.com/vincent-hugot/iTeML"; - platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + description = "Inline (Unit) Tests for OCaml"; + inherit (src.meta) homepage; + maintainers = with lib.maintainers; [ vbgl ]; + license = lib.licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/re/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/re/default.nix index 2031c469b2..8881821490 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/re/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildDunePackage, ounit, seq }: +{ lib, fetchzip, buildDunePackage, ocaml, ounit, seq }: buildDunePackage rec { pname = "re"; @@ -11,14 +11,14 @@ buildDunePackage rec { sha256 = "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss"; }; - buildInputs = [ ounit ]; + buildInputs = lib.optional doCheck ounit; propagatedBuildInputs = [ seq ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = { homepage = "https://github.com/ocaml/ocaml-re"; description = "Pure OCaml regular expressions, with support for Perl and POSIX-style strings"; - license = stdenv.lib.licenses.lgpl2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix new file mode 100644 index 0000000000..4278989341 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, stdenv +, findlib, nonstd, ocaml, ocamlbuild +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-sosa-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "hammerlab"; + repo = "sosa"; + rev = "sosa.${version}"; + sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; + }; + + buildInputs = [ nonstd ocaml ocamlbuild findlib ]; + + buildPhase = "make build"; + + createFindlibDestdir = true; + + doCheck = true; + + meta = with lib; { + homepage = http://www.hammerlab.org/docs/sosa/master/index.html; + description = "Sane OCaml String API"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/srt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/srt/default.nix new file mode 100644 index 0000000000..7f0897ae66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/srt/default.nix @@ -0,0 +1,30 @@ +{ lib, buildDunePackage, fetchFromGitHub +, dune-configurator +, posix-socket +, srt +}: + +buildDunePackage rec { + pname = "srt"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-srt"; + rev = "v${version}"; + sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f"; + }; + + useDune2 = true; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ posix-socket srt ]; + + meta = { + description = "OCaml bindings for the libsrt library"; + license = lib.licenses.gpl2Only; + inherit (src.meta) homepage; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix index aa25174262..1d0e5b2bcd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,21 +1,50 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }: +{ stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }: let pname = "uunf"; webpage = "https://erratique.ch/software/${pname}"; + version = "13.0.0"; + ucdxml = fetchurl { + url = "http://www.unicode.org/Public/${version}/ucdxml/ucd.all.grouped.zip"; + sha256 = "04gpl09ggb6fb0kmk6298rd8184dv6vcscn28l1gpdv1yjlw1a8q"; + }; + gen = fetchurl { + url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen.ml"; + sha256 = "08j2mpi7j6q3rqc6bcdwspqn1s7pkkphznxfdycqjv4h9yaqsymj"; + }; + gen_norm = fetchurl { + url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_norm.ml"; + sha256 = "11vx5l5bag6bja7qj8jv4s2x9fknj3557n0mj87k2apq5gs5f4m5"; + }; + gen_props = fetchurl { + url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_props.ml"; + sha256 = "0a6lhja498kp9lxql0pbfvkgvajs10wx88wkqc7y5m3lrvw46268"; + }; in assert stdenv.lib.versionAtLeast ocaml.version "4.03"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; - version = "13.0.0"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; + postConfigure = '' + rm -f src/uunf_data.ml + mkdir -p support/ + cp ${gen} support/gen.ml + cp ${gen_norm} support/gen_norm.ml + cp ${gen_props} support/gen_props.ml + funzip ${ucdxml} > support/ucd.xml + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/build_support.ml + ''; + + nativeBuildInputs = [ unzip ]; + + buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner uucd ]; propagatedBuildInputs = [ uchar ]; @@ -27,6 +56,5 @@ stdenv.mkDerivation rec { platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - broken = stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix new file mode 100644 index 0000000000..463bfbc79f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +, astring, bos, cmdliner, rresult +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-webbrowser-${version}"; + version = "0.6.1"; + src = fetchurl { + url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; + sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3"; + }; + + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = []; + propagatedBuildInputs = [ astring bos cmdliner rresult ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Open and reload URIs in browsers from OCaml"; + homepage = "https://erratique.ch/software/webbrowser"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix index 1123cc0d2b..f9996eb6af 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix @@ -6,9 +6,9 @@ let source = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.9"; - url = "https://github.com/ocaml/Zarith/archive/release-1.9.tar.gz"; - sha256 = "1xrqcaj5gp52xp4ybpnblw8ciwlgrr0zi7rg7hnk8x83isjkpmwx"; + version = "1.10"; + url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz"; + sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb"; } else { version = "1.3"; url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix index 66054b3340..847951783e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix @@ -3,8 +3,8 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "2.0.3"; - sha256 = "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55"; + version = "3.1.0"; + sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; buildInputs = [ dune ]; propagatedBuildInputs = [ charInfo_width ]; extra = { diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix index 79c7919a35..c7b57eae90 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/generic/default.nix @@ -42,7 +42,7 @@ toPerlModule(stdenv.mkDerivation ( version = lib.getVersion attrs; # TODO: phase-out `attrs.name` builder = ./builder.sh; buildInputs = buildInputs ++ [ perl ]; - nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; + nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ]; fullperl = buildPerl; } )) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix index c6fb898e07..1025ed6a05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix @@ -19,9 +19,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ invoke paramiko cryptography ]; checkInputs = [ pytest mock pytest-relaxed ]; + # requires pytest_relaxed, which doesnt have official support for pytest>=5 + # https://github.com/bitprophet/pytest-relaxed/issues/12 + doCheck = false; checkPhase = '' pytest tests ''; + pythonImportsCheck = [ "fabric" ]; meta = with lib; { description = "Pythonic remote execution"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix index ca30631a68..68afbb525c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "JPype1"; - version = "0.7.5"; + version = "1.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7bbd25453dc04704d77d854c80acb5537ecb18b9de8a5572e5f22649a2160aaf"; + sha256 = "c751436350c105f403e382574d34a6ad73e4a677cb0ff5bc9a87581cc07094e1"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix index 3191538327..06a85a2203 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.0.4"; + version = "8.1.1"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2e5c8305ec4423b56af2223336c3309e5c9b8c96df0d6fde46d26cff4c5d6f1a"; + sha256 = "cee35b011667a965eca01b7d36b54649c9434ab004d8556d6563b7d899df61ed"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix index f587d186bf..c1c6395ab2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix @@ -1,7 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, pbr, six, simplegeneric, netaddr, pytz, webob -, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx -, flask, flask-restful, suds-jurko, glibcLocales }: +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, six +, simplegeneric +, netaddr +, pytz +, webob +# Test inputs +, cherrypy +, flask +, flask-restful +, glibcLocales +, nose +, pecan +, sphinx +, transaction +, webtest +}: buildPythonPackage rec { pname = "WSME"; @@ -12,38 +28,37 @@ buildPythonPackage rec { sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304"; }; - postPatch = '' - # remove turbogears tests as we don't have it packaged - rm tests/test_tg* - # WSME seems incompatible with recent SQLAlchemy version - rm wsmeext/tests/test_sqlalchemy* - # https://bugs.launchpad.net/wsme/+bug/1510823 - ${if isPy3k then "rm tests/test_cornice.py" else ""} - ''; - - checkPhae = '' - nosetests --exclude test_buildhtml \ - --exlcude test_custom_clientside_error \ - --exclude test_custom_non_http_clientside_error - ''; - - # UnicodeEncodeError, ImportError, ... - doCheck = !isPy3k; - nativeBuildInputs = [ pbr ]; propagatedBuildInputs = [ - six simplegeneric netaddr pytz webob + netaddr + pytz + simplegeneric + six + webob ]; checkInputs = [ - cornice nose webtest pecan transaction cherrypy sphinx - flask flask-restful suds-jurko glibcLocales + nose + cherrypy + flask + flask-restful + glibcLocales + pecan + sphinx + transaction + webtest ]; + # from tox.ini, tests don't work with pytest + checkPhase = '' + nosetests wsme/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose + ''; + meta = with lib; { description = "Simplify the writing of REST APIs, and extend them with additional protocols"; - homepage = "http://git.openstack.org/cgit/openstack/wsme"; + homepage = "https://pythonhosted.org/WSME/"; + changelog = "https://pythonhosted.org/WSME/changes.html"; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acebinf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acebinf/default.nix new file mode 100644 index 0000000000..78810de174 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/acebinf/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyvcf +}: + +buildPythonPackage rec { + pname = "ACEBinf"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1168pny671l6zfm2vv1pwspnflmzi7f4v8yldjl7zlz0b9cm5zlz"; + }; + + buildInputs = [ pyvcf ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "acebinf" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ACEnglish/acebinf"; + description = "Collection of simple utilities used when building bioinformatics tools"; + license = licenses.unlicense; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix new file mode 100644 index 0000000000..a887b65a8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -0,0 +1,56 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python +, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens +, brotli, fontmath, mutatormath, booleanoperations +, ufoprocessor, ufonormalizer, psautohint, tqdm +, setuptools_scm +, pytest +}: + +buildPythonPackage rec { + pname = "afdko"; + version = "3.5.1"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + booleanoperations + fonttools + lxml # fonttools[lxml], defcon[lxml] extra + fs # fonttools[ufo] extra + unicodedata2 # fonttools[unicode] extra + brotlipy # fonttools[woff] extra + zopfli # fonttools[woff] extra + fontpens + brotli + defcon + fontmath + mutatormath + ufoprocessor + ufonormalizer + psautohint + tqdm + ]; + + # tests are broken on non x86_64 + # https://github.com/adobe-type-tools/afdko/issues/1163 + # https://github.com/adobe-type-tools/afdko/issues/1216 + doCheck = stdenv.isx86_64; + checkInputs = [ pytest ]; + checkPhase = '' + PATH="$PATH:$out/bin" py.test + ''; + + meta = with stdenv.lib; { + description = "Adobe Font Development Kit for OpenType"; + homepage = "https://adobe-type-tools.github.io/afdko/"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index cd7a9cd526..08516d05f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }: +{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { pname = "agate-sql"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; }; - propagatedBuildInputs = [ agate sqlalchemy ]; + propagatedBuildInputs = [ agate sqlalchemy crate ]; meta = with stdenv.lib; { description = "Adds SQL read/write support to agate."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index dee8511740..6a128eb523 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,14 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, attrs, protobuf, zeroconf }: buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.6.1"; + version = "2.6.3"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "139d1d348fcfe2f34926a210a32dff069935d17167c4e1cb66e8b039cbb4d6c1"; + src = fetchFromGitHub { + owner = "esphome"; + repo = pname; + rev = "v${version}"; + sha256 = "1lbjxqdx63fc7qxx7xwq4b9dafmdafj7p1ggs48hyhbqfwkrv9p7"; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; @@ -16,14 +18,12 @@ buildPythonPackage rec { # no tests implemented doCheck = false; + pythonImportsCheck = [ "aioesphomeapi" ]; + meta = with lib; { description = "Python Client for ESPHome native API"; homepage = "https://github.com/esphome/aioesphomeapi"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; - - # Home Assistant should pin protobuf to the correct version. Can be tested using - # nix-build -E "with import ./. {}; home-assistant.override { extraPackages = ps: [ ps.aioesphomeapi ]; }" - broken = !lib.hasPrefix "3.6.1" protobuf.version; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index 522d6c2ed3..181c0be370 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.16.1"; + version = "0.17.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0rqzg4w86zch0cjslkndv02gmpi0r27lsy1qi1irpa8hqfhh23ja"; + sha256 = "8433ff21317e71ef1f4d8cb8f7fe58365c04b5174142d9643e22343cfb35da1b"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 9dcd34c1d1..2e5191909b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -54,6 +54,8 @@ buildPythonPackage rec { "proxy_https_bad_response" "partially_applied_handler" "middleware" + # no longer compatible with pytest>=6 + "aiohttp_plugin_async_fixture" ] ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] ++ lib.optionals isPy38 [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix index 68354cee0b..b495bf4df4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "bdd08ad65505057b9dc8fc1b5558250bd13aeba681a493080f710ffffc4260a3"; + sha256 = "35696d04d6eb0328b7031ea3c0a3cfe5d83dfcf62f920522e4767d165c6bc529"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 589ebc08ef..3b05d2c381 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "22"; + version = "23"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ad2625c8a62e28781d50644f4a4df5a97a32174b965cd3b329820ae85e2dfcc3"; + sha256 = "0628058b644776132f2f893f1a2201a0142a38b6acf089c6b11a63ad5a752ba7"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix index b9fb265f25..571b1fea2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta-server"; - version = "7.5.6"; + version = "8.0.3"; src = fetchPypi { inherit pname version; - sha256 = "507abdb64c8b83c8ff0c21e39b03a21ccd7884ca3ce31afacea2d97e4d39f2e8"; + sha256 = "894d240c51428225264867a80094b9743d71272635a18ddfefa5832b61fed2c6"; }; propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix index cdfea1f4c3..a024592b4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta"; - version = "7.5.7"; + version = "8.0.0"; src = fetchPypi { inherit pname version; - sha256 = "849966c05e9899ac72af23991e9f17271c42bba89035c49d257a9dd96b54695b"; + sha256 = "49e0862c756d644e9349f5040dd59d135cd871ffeaea5fc288eb3a2e818cf61a"; }; propagatedBuildInputs = [ six click requests pytz tabulate ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix new file mode 100644 index 0000000000..e0e9100f79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, setuptools_scm +, docutils +, pyparsing +}: + +buildPythonPackage rec { + pname = "amply"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1j2dqdz1y1nbyw33qq89v0f5rkmqfbga72d9hax909vpcapm6pbf"; + }; + + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + docutils + pyparsing + ]; + + checkPhase = '' + python tests/test_amply.py + ''; + pythonImportsCheck = [ "amply" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/willu47/amply"; + description = '' + Allows you to load and manipulate AMPL/GLPK data as Python data structures + ''; + maintainers = with maintainers; [ ris ]; + license = licenses.epl10; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix index f9b1e62caa..5fa41412a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "24dbaff8ce4f30566bb88976b398e8c4e77637171af3af6f1b9650f48890e60b"; + sha256 = "70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21"; }; propagatedBuildInputs = [ vine ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix index 7ad683b8c3..d2de4837e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4"; - }; + }; checkInputs = [ pytest ]; @@ -21,4 +21,3 @@ buildPythonPackage rec { }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 313383f426..1c140266b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.8.6"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - sha256 = "695f9b98b7eb273901d9d28a026a69a028a57ab7d666bdf146ecc215c80b5041"; + sha256 = "18a65c5917bf7f2d48bb557bf0879e49c5293b4c0e9809328387ae09338ae37b"; }; nativeBuildInputs = [ Babel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix index 48aa68f305..1f314dc740 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.32.2-r1"; + version = "3.33.0-r1"; disabled = isPyPy; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "0gwhcvklrgng8gg6in42h0aj2bsq522bhhs2pp3cqdrmypkjdm59"; + sha256 = "05mxcw1382xx22285fnv92xblqby3adfrvvalaw4dc6rzsn6kcan"; }; buildInputs = [ sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix index c790f48041..56093192d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix @@ -6,12 +6,15 @@ # buildInputs , pytest , pytest-asyncio +, isPy3k }: buildPythonPackage rec { pname = "aresponses"; version = "2.0.0"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "58693a6b715edfa830a20903ee1d1b2a791251923f311b3bebf113e8ff07bb35"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix index 51b523c010..9126969c22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { rev = "v${version}"; sha256 = "1inak3y2win58zbzykfzy6xp00f276sqsz69h2nfsd93mpr74wf6"; }; - + nativeBuildInputs = [ poetry ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix index f3c3615d92..474329ed0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.6.0"; + version = "2.7.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1ym9mmxjpnnlinly1rxfqj9rlyl2fv7dxc81f30n1b8n9pwc6jb5"; + sha256 = "4ba2e31cb24b974a10dfae3edee23db2e6bea2d00608604d062366aa3af6e81a"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix new file mode 100644 index 0000000000..12c94aee15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart +, pytest, starlette, httpx, pytest-asyncio }: + +buildPythonPackage rec { + version = "0.7"; + pname = "asgi-csrf"; + disabled = isPy27; + + # PyPI tarball doesn't include tests directory + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = version; + sha256 = "1vf4lh007790836cp3hd6wf8wsgj045dcg0w1cm335p08zz6j4k7"; + }; + + propagatedBuildInputs = [ itsdangerous python-multipart ]; + + checkInputs = [ pytest starlette httpx pytest-asyncio ]; + checkPhase = '' + pytest test_asgi_csrf.py + ''; + pythonImportsCheck = [ "asgi_csrf" ]; + + meta = with stdenv.lib; { + description = "ASGI middleware for protecting against CSRF attacks"; + license = licenses.asl20; + homepage = "https://github.com/simonw/asgi-csrf"; + maintainers = [ maintainers.ris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix index 156f77b4c9..989b974c64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0bf4xxaig0b9dv6njynaqk2j7vlpagh3y49s9qj95y0jvjw5q8as"; + sha256 = "f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c"; }; # No tests included diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astor/default.nix index 02610d042c..0d7aa38771 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astor/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook, fetchpatch }: buildPythonPackage rec { pname = "astor"; @@ -10,15 +10,15 @@ buildPythonPackage rec { }; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 - checkInputs = [ pytest ]; - checkPhase = '' - py.test -k 'not check_expressions \ - and not check_astunparse \ - and not test_convert_stdlib \ - and not test_codegen_as_submodule \ - and not test_positional_only_arguments \ - and not test_codegen_from_root' - ''; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + "check_expressions" + "check_astunparse" + "convert_stdlib" + "codegen_as_submodule" + "positional_only_arguments" + "codegen_from_root" + ]; meta = with lib; { description = "Library for reading, writing and rewriting python AST"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index 794e0fa524..826ee6103f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0gw665737pr9b0lmmxlnwgmw1sbwv00xp8jdxws1xxi6nc72mjsk"; + sha256 = "53cb2a0eb326f61e34ef4da2db01d87ce9c0ebe396f65a295829df334e31863f"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index ad7612259d..e85de90b1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.2.1"; + version = "2.3.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "baf9f1aa397a104a0c3923bae927796ca57063ce62330767131b418cd833338e"; + sha256 = "44bda34c7123f00c3df95d24e2dc8d43c4d17b456fbb8c434ef4f4a7ebb5265e"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index 57e54d24ae..077a855896 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,17 +16,17 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.16.0"; - + version = "1.16.1"; + src = fetchPypi { inherit pname version; - sha256 = "1sp036192vdl5nqifcswg2j838vf8i9k8bfd0w4qh1vz4f0pjz7y"; + sha256 = "b672131be7cc5e239c465909454542623c0aeb0a4d3b05e6a25ee9459959c11d"; }; - + checkInputs = [ pytestrunner pytest ]; - + propagatedBuildInputs = [ oauthlib requests requests_oauthlib six ]; - + meta = with lib; { description = "Python Atlassian REST API Wrapper"; homepage = "https://github.com/atlassian-api/atlassian-python-api"; @@ -34,4 +34,3 @@ buildPythonPackage rec { maintainers = [ maintainers.arnoldfarkas ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix index e2c3e8af6b..021d8e8b30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix @@ -1,18 +1,26 @@ -{ lib, isPy3k, fetchPypi, buildPythonPackage -, pytest }: +{ lib, isPy3k, pythonOlder, fetchPypi, buildPythonPackage +, pytest +, pytestcov +, sybil +, typing-extensions +}: buildPythonPackage rec { pname = "atpublic"; - version = "1.0"; + version = "2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0i3sbxkdlbb4560rrlmwwd5y4ps7k73lp4d8wnmd7ag9k426gjkx"; + sha256 = "ebeb62b71a5c683a84c1b16bbf415708af5a46841b142b85ac3a22ec2d7613b0"; }; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + checkInputs = [ - pytest + pytest pytestcov sybil ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix index ee029726d1..1ad2160827 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "http://audiotools.sourceforge.net/"; license = lib.licenses.gpl2Plus; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix index fed673453d..1b50e70aae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.10.0"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "e02525fd60d4b1e7e08bdc539b536db635da28ee25cc882412be4296802d0281"; + sha256 = "fbc54a231ca787ae0917223028269582abbd963cfa9d53ba822a601dd9cd2215"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index 4ad97ebc93..909fb65996 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "20.4.3"; + version = "20.7.1"; src = fetchPypi { inherit pname version; - sha256 = "c6fe745d52ba9f9eecf791cd31f558df42aebfc4f9ee558a8f1d18c707e1ae1f"; + sha256 = "86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix index 1ec3d29622..e6bd5acbbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro-python3"; - version = "1.9.2.1"; + version = "1.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ca1e77a3da5ac98e8833588f71fb2e170b38e34787ee0e04920de0e9470b7d32"; + sha256 = "a455c215540b1fceb1823e2a918e94959b54cb363307c97869aa46b5b55bde05"; }; doCheck = false; # No such file or directory: './run_tests.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix index 58c3b46cdb..d9f5768684 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix @@ -1,20 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: buildPythonPackage rec { pname = "avro"; - version = "1.9.2"; - disabled = isPy3k; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "4487f0e91d0d44142bd08b3c6da57073b720c3effb02eeb4e2e822804964c56b"; + sha256 = "bbf9f89fd20b4cf3156f10ec9fbce83579ece3e0403546c305957f9dac0d2f03"; }; + patchPhase = '' + # this test requires network access + sed -i 's/test_server_with_path/noop/' avro/test/test_ipc.py + '' + (stdenv.lib.optionalString isPy3k '' + # these files require twisted, which is not python3 compatible + rm avro/txipc.py + rm avro/test/txsample* + ''); + nativeBuildInputs = [ pycodestyle ]; propagatedBuildInputs = [ isort ]; meta = with stdenv.lib; { description = "A serialization and RPC framework"; homepage = "https://pypi.python.org/pypi/avro/"; + license = licenses.asl20; + maintainers = [ maintainers.zimbatm ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index bff57f554d..65dfd46285 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.12.22"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "185d93588c4cc150b2426b2764cdf2370f1807c607c1b4b057c66b2a08720c43"; + sha256 = "1a461ee084ea5e98333dacf2506e9b2619ee89cece14b9b99830b546b35c5922"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward1/default.nix index 635ffac263..927d620948 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.2.27"; + version = "0.2.35"; src = fetchPypi { inherit pname version; - sha256 = "c868437aabb2e95efbc522c43d47cac42e1c61904c7ddbebf2f41c6b63bb9c6f"; + sha256 = "563868f0f2d0cb398ce3616ee3f9734cc68cee9a612d35cab830ec5c728f1474"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index a9b8834be2..5245801bb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.24.0"; + version = "1.26.0"; src = fetchPypi { inherit pname version; - sha256 = "f6b67545a87ec1e276bd5bf06abcc84332c4eb9dfa2fd415113e07a908fe55bb"; + sha256 = "1a3fd8e48a745967e8457b9cefdc3ad0f139ac4a25af4db9c13a9e1c19ea6910"; }; # Tests are not included in the PyPI package diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix index 607118564c..313dd4241d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8dfa785305fc8dc720d8d4c2ec6a58e85e467ddc3a53b1506a2ed8b5801c8fc7"; + sha256 = "abf5b90f740e1f402e23414c9670e59cb9772e235e271fef2bce62b9100cbc77"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index e5879bd4e8..3c019cdf31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "211527511d7616a383cc196956eaf2b7ee016f2367d367924b3715f2a41106da"; + sha256 = "fe6e216ce7293219b7d8d1cbcca7cf2f4511f134c2bf0b3455078bf086436c5f"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 8e186da6d8..603bd81ad1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "9.2.0"; + version = "9.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e7904b60c42a153b64b1604f3c698602686b38787bebdaed6e808cd43b6e5967"; + sha256 = "04ca071d1d6af854b6a5947c5aed803924ccbd2ea0d240285b6fa68dc4ab75a9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index ecffc5b2a2..38b580df25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.16.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "308aeabdff61bf35ceb7a3d6dd19f1ab69a041bd92c85ee24d98a624968697f3"; + sha256 = "e08b37aea8e6b62596f55f9beb924e1759b2dc424c180ab2e752153a2b01b723"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index ded4531b48..b6f0dadf22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.7.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b1d06279307c41da5e0a5c9722aa6b36ce3b2c212534a54767210639451b9800"; + sha256 = "9d1120bd9760687d87594ec5ce9257b7335504afbe55b3cda79462c1e07a095b"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index fd6cd26c7c..a4b1679b25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -7,6 +7,7 @@ , msrestazure , azure-common , azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { @@ -23,6 +24,7 @@ buildPythonPackage rec { msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 3873f08e3c..d5e4226b5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f65c1985a47e0ac55e7d5d9cc1bd5e95335a111566edc289d460aa2bc8f80991"; + sha256 = "b12318392e6f5100246c60de88879e24b15db104d00f9704a4ff51e7344594f1"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 8e101ef051..b6cd9ca5c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "11.1.0"; + version = "11.2.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ef23587c1b6dc0866ebf0e91e83ba05d7f7e4fea7951b704781b9cd9f5f27f1c"; + sha256 = "fc8e3cbf3c58cab98d9b2218c774dae2cc90b693f5ab5a24a7a959febe6c0528"; }; propagatedBuildInputs = [ azure-mgmt-common ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix new file mode 100644 index 0000000000..ffdb6eb537 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, azure-common +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-mgmt-synapse"; + version = "0.3.0"; + disabled = pythonOlder "3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + msrest + msrestazure + ]; + + pythonImportsCheck = [ "azure.mgmt.synapse" ]; + + meta = with lib; { + description = "Azure python SDK"; + homepage = "https://github.com/Azure/azure-sdk-for-python/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 2d1ff4c291..18e4a12d3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.3.5"; + version = "0.4.1"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "71c238c785786a159b3ffd587a5e7fa1d9a517b66b592ae277fed73a9fbfa2b0"; + sha256 = "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix new file mode 100644 index 0000000000..d9d0941abd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-synapse-accesscontrol"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + pythonImportsCheck = [ "azure.synapse.accesscontrol" ]; + + meta = with lib; { + description = "Azure python SDK"; + homepage = "https://github.com/Azure/azure-sdk-for-python/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix new file mode 100644 index 0000000000..bf75e987bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-synapse-spark"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qijqp6llshqas422lnqvpv45iv99n7f13v86znql40y3jp5n3ir"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + pythonImportsCheck = [ "azure.synapse.spark" ]; + + meta = with lib; { + description = "Azure python SDK"; + homepage = "https://github.com/Azure/azure-sdk-for-python/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix new file mode 100644 index 0000000000..7dfce0d75c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook +, requests, arrow, logfury, tqdm }: + +buildPythonPackage rec { + pname = "b2sdk"; + version = "1.1.4"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0g527qdda105r5g9yjh4lxzlmz34m2bdz8dydqqy09igdsmiyi9j"; + }; + + pythonImportsCheck = [ "b2sdk" ]; + + nativebuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ requests arrow logfury tqdm ]; + + # requires unpackaged dependencies like liccheck + doCheck = false; + + meta = with stdenv.lib; { + description = "Client library and utilities for access to B2 Cloud Storage (backblaze)."; + homepage = "https://github.com/Backblaze/b2-sdk-python"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backcall/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backcall/default.nix index f1951a13d7..b5a53b6213 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backcall/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backcall/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "backcall"; - version = "0.1.0"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4"; + sha256 = "5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix index bfc52c99ef..b0f3cdb6e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf"; - + }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix index 990d471bc6..69494a4fa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { scikitlearn scipy ]; - + checkInputs = [ pytest ]; checkPhase = '' pytest tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3_1.nix b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3_1.nix new file mode 100644 index 0000000000..c70161cf28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3_1.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi +, isPyPy, cffi, pytest, six }: + +buildPythonPackage rec { + version = "3.1.7"; + pname = "bcrypt"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi; + + meta = with lib; { + description = "Modern password hashing for your software and your servers"; + homepage = "https://github.com/pyca/bcrypt/"; + license = licenses.asl20; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix index 2468eaccec..dc50c56018 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix @@ -1,15 +1,16 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi +{ stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder , cffi, pycparser, mock, pytest, py, six }: with stdenv.lib; buildPythonPackage rec { - version = "3.1.7"; + version = "3.2.0"; pname = "bcrypt"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42"; + sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"; }; buildInputs = [ pycparser mock pytest py ]; propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix index fbe108e2a0..26cd6441ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix @@ -1,43 +1,37 @@ -{ stdenv, fetchPypi, fetchpatch -, buildPythonApplication, python, pythonOlder -, mock, nose, pathpy, pyhamcrest, pytest_4 -, glibcLocales, parse, parse-type, six -, traceback2 +{ stdenv, fetchFromGitHub +, buildPythonApplication, python +, pytestCheckHook, mock, pathpy, pyhamcrest, pytest-html +, glibcLocales +, colorama, cucumber-tag-expressions, parse, parse-type, six }: buildPythonApplication rec { pname = "behave"; - version = "1.2.6"; + version = "1.2.7.dev1"; - src = fetchPypi { - inherit pname version; - sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr"; + src = fetchFromGitHub { + owner = "behave"; + repo = pname; + rev = "v${version}"; + sha256 = "1ssgixmqlg8sxsyalr83a1970njc2wg3zl8idsmxnsljwacv7qwv"; }; - patches = [ - # Fix tests on Python 2.7 - (fetchpatch { - url = "https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch"; - sha256 = "1nrh9ii6ik6gw2kjh8a6jk4mg5yqw3jfjfllbyxardclsab62ydy"; - }) - ]; - - checkInputs = [ mock nose pathpy pyhamcrest pytest_4 ]; + checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2; + propagatedBuildInputs = [ colorama cucumber-tag-expressions parse parse-type six ]; postPatch = '' patchShebangs bin ''; - doCheck = true; + # timing-based test flaky on Darwin + # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; - checkPhase = '' + postCheck = '' export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" - pytest test tests - ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' issue.features/ @@ -47,6 +41,6 @@ buildPythonApplication rec { homepage = "https://github.com/behave/behave"; description = "behaviour-driven development, Python style"; license = licenses.bsd2; - maintainers = with maintainers; [ alunduil ]; + maintainers = with maintainers; [ alunduil maxxk ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 32ac3e8bd1..4b5cabbbde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -5,14 +5,14 @@ let pname = "bellows"; - version = "0.17.0"; + version = "0.18.1"; in buildPythonPackage rec { inherit pname version; src = fetchPypi { inherit pname version; - sha256 = "03gckhrxji8lgjsi6xr8yql405kfanii5hjrmakk1328bmq9g5f6"; + sha256 = "6a2e323c2be6f10a8e99fffccb5670bc77bbddb7b5bd9253b69021120f2ab9d7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix index cb6dbcf0d9..51e29e55d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix @@ -4,18 +4,18 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.5.0"; pname = "BespON"; src = fetchPypi { inherit pname version; - sha256 = "4acfa3f918d416654beccd4db69290f498edb78bf39941287dcbc068b9a7ce2f"; + sha256 = "a75cd7e62746fb0fef9b98aa157a44f9ed2ef63e952f7ae4ec5b3c2892669187"; }; propagatedBuildInputs = [ ]; # upstream doesn't contain tests doCheck = false; - + pythonImportsCheck = [ "bespon" ]; meta = with stdenv.lib; { description = "Encodes and decodes data in the BespON format."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix index ec0440b9e4..8c7acc0a8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.19.0"; + version = "0.20.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11wiis62kcw6g3n4gdj39fx1yrlq5vz3zx3kmb6g79mliyhn2x7g"; + sha256 = "c1b1ce1c0f1e3457489672bc3a4db375a06f61ae7797a9eedf71ea788cea3870"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix index ff4fae389c..490df40e93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix @@ -8,12 +8,13 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "1.0.5"; + version = "1.4.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e8397a315c2f656ccf37ff1c43f5e0d496a10ea692c614fdf9bae1a3d5de3558"; + sha256 = "582022ab5c1ff35d0179a22a39c90b7e4e71e4641d59b2a3e81d60df741d1e3c"; }; propagatedBuildInputs = [ ecdsa pysha3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index c6a82d8ec4..1e995af392 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.5.1"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "45bba08bc142781ec7e18a847735219390808f9b6279c356252edddaee1f5fcd"; + sha256 = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix new file mode 100644 index 0000000000..130d07d61f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix @@ -0,0 +1,35 @@ +{ stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + black +}: + +buildPythonPackage rec { + pname = "black-macchiato"; + version = "1.3.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "wbolster"; + repo = pname; + rev = version; + sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl"; + }; + + propagatedBuildInputs = [ black ]; + + checkInputs = [ pytestCheckHook black ]; + + pythonImportsCheck = [ "black" ]; + + meta = with stdenv.lib; { + description = "This is a small utility built on top of the black Python code formatter to enable formatting of partial files"; + homepage = "https://github.com/wbolster/black-macchiato"; + license = licenses.bsd3; + maintainers = with maintainers; [ jperras ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix index 63f1319f56..63371fc6ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.6.4"; + version = "0.7.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1dc32899d0700c5b5ed9abf642dfee28ac62b1fb5d7be5fa5a6db104dec9a03c"; + sha256 = "25f630cf558efda5cbf620d921b85a80ae963c537feaa18cc934f7fa38dc482d"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix index 596579f814..5d4b9bcb5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -20,11 +20,13 @@ buildPythonPackage rec { cython ]; + propagatedBuildInputs = [ + numpy + ]; + checkInputs = [ - cython hypothesis - numpy pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/block-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/block-io/default.nix index 270e161744..ec1229965e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/block-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "1.1.14"; + version = "1.1.15"; src = fetchPypi { inherit pname version; - sha256 = "b87b753fe8d2812c3534be025f85ed97d1a00e8fe49c03fe9ad09d71860d672d"; + sha256 = "97ea037a67af72037cb08cec7e0a9f7866ecdfaa1a8c8ebcc0f4b9359a1516d7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix index 850070b1c0..55a01c65f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "2.1.1"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "2dfabf228f55676b88acc464f416e2b13ee06470a8ad1dd3e609bb789425fbad"; + sha256 = "qC6e69eh4uu3+PwerYAv79EKhNrvjsS/yYYSEyOUhVU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix index e1b9bc1652..48fc3bf699 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "20.2.1"; + version = "20.7.1"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1cbf17c5479eec82efd1e8a26202c3320b1986597a08706cafa46bfb80cc3001"; + sha256 = "41caa32e5778323471d87033f23537f6178a7aea64fba894c7f2b2579b51f7ed"; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix new file mode 100644 index 0000000000..c747df90f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi +, fonttools, fs, pyclipper, defcon, fontpens +, setuptools_scm, pytest +}: + +buildPythonPackage rec { + pname = "booleanOperations"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc"; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + fonttools + fs + pyclipper + defcon + fontpens + ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "Boolean operations on paths"; + homepage = "https://github.com/typemytype/booleanOperations"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 59fc878b2c..b7d599f581 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.14.32"; # N.B: if you change this, change botocore too + version = "1.14.60"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "d494a23295b2db9920e85391dc8106dc08d91dd40eeba5c05002771fe10f8853"; + sha256 = "05s2ysp90mwz5aydzfs9xm3hk9pz7s95zzpjg6g1msyy2gp2gjnq"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index e8f0684456..2593e3909e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.17.32"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.17.60"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "52a80cb721160b687179bd7077e63d775130455a678bf4280fb37c524c2bd67d"; + sha256 = "0n3a0mhx00i2i99mcwdkk7nbqdpd50zdfkg14mki0ydccqx1jgqr"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix index d6fd70031a..5afb3bfffc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.19.2"; + version = "4.20.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1mzcggfr61lqkn6sghg842ah9slfjr0ikc776vbx60iqqw9l1gvn"; + sha256 = "d7e1e1ee9b0615423b7e9abc64f0afe12e7bcf32c817a8fd1d9c8c3c4b3d71c9"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix index b560c9ec08..e79ee03241 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "brother"; - version = "0.1.14"; - disabled = pythonOlder "3.6"; + version = "0.1.17"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "11pkr30bxrzgbz6bi42dyhav6qhr7rz9fb6a13297g7wa77jn4r4"; + sha256 = "03gjcpbq8rwnjzplgwhwr8wb7a1zh940dr6iwnq9srklqzzj691m"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix index 1dd2a07048..f914d2d6c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/brotlipy/"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix index 612ab13c19..adae7ff1c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "3.6.1"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "8878437aa44ec485cecb255742035b3b98a6c7e7d167a943b5fbe597b2f8f7f9"; + sha256 = "32966bfe625ec6fc0dbc9d86d79a18f31b22b2fdec3ca070eeb3495304f7e18d"; }; propagatedBuildInputs = [ six webob ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix index baf583c45e..97a7f9a201 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -43,4 +43,4 @@ buildPythonPackage rec { description = "A simple, correct PEP517 package builder"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index c5a12c997d..595f97bcb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.8.2"; + version = "2.8.4"; src = fetchPypi { inherit pname version; - sha256 = "0rdrz2zkd6xaf9kb5l41xmbfzq618sz498w23irshih4c802pdv5"; + sha256 = "0i2sbxhsqyk2yr234il0zsyp1rf2v1l5hmzvw0yrgds6jpr19cqv"; }; propagatedBuildInputs = [ @@ -73,6 +73,13 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch + + # fix compatibility with the latest SQLAlchemy + (fetchpatch { + url = "https://github.com/buildbot/buildbot/commit/96f3cd1c5f5c82b733baecb133576366ecf544fc.patch"; + sha256 = "0n1jm13h08j7ksbs8ixayn3wziq5hzyp3kscz9fpgxd8gl885y5n"; + stripLen = 1; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index 4bb8613afe..ff61f98810 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1yz3k6dg15q4911x8kjy396dccfgrs50mjz278l09p6zmm71llax"; + sha256 = "1p9qnrqx72y4jrhawgbpwisgily7zg4rh39hpky4x56d5afvjgqc"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index 4c5aa37456..9a39cc90b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "19qwr0h6qavznx8rfjq6zjccyd2y7x4nc8asldvay3b44xfsr385"; + sha256 = "1hi44jbnafp7iqncad01hwr087aqmdszvc2if0d9gw6bm159zf4s"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1wfhwmb1d32k8isk7k8525pmkfih8hlvy53zsj19l3gvjm0da9gw"; + sha256 = "1vkh4kdlnm9z5r62b4vxx6qxc90g65gm1m4qxfc6xjk1265i1w6h"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0g62v0maz3b9bmjvvjcin6ayg0f5k0n8m93zk75lagyr69g5vaka"; + sha256 = "0v94p1m9fb6m6ik5xyi7bs4jrsgvnyf3sl7f4w1qmb24xc47k2gj"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0dlq8pchgccc66gfdlssydacisia5fbwc8b4gd8f9gcbish8jmf7"; + sha256 = "13bg289al6dmyrin3l6ih3sk7hm660m69kls3kpagg6j6nmpa5wz"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "193nni55py6yzw730yyp5va2n4313sjf6a7jmi0xs9bivvvzg5w9"; + sha256 = "11cr7m7m8ah8qqjcqj7qvjjak62cx1sq41cazd4i3r07dyhc3ypn"; }; buildInputs = [ buildbot-pkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index 05938e43ad..f0eaa7e81a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "0p1w6ailp6xpa6ckl5prj413ilxx5s3lga5mzqxj9nn00vni8ik2"; + sha256 = "1v1bcc2m4pz90rsh5pjb9m9agkvhqdk1viyf64gi1h85h191vkib"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bwapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bwapy/default.nix new file mode 100644 index 0000000000..31884074de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bwapy/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, bwa +, cffi +, zlib +}: + +buildPythonPackage rec { + pname = "bwapy"; + version = "0.1.4"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "090qwx3vl729zn3a7sksbviyg04kc71gpbm3nd8dalqp673x1npw"; + }; + postPatch = '' + # replace bundled bwa + rm -r bwa/* + cp ${bwa}/lib/*.a ${bwa}/include/*.h bwa/ + + substituteInPlace setup.py \ + --replace 'setuptools>=49.2.0' 'setuptools' + ''; + + buildInputs = [ zlib bwa ]; + + propagatedBuildInputs = [ cffi ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "bwapy" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ACEnglish/acebinf"; + description = "Python bindings to bwa mem aligner"; + license = licenses.mpl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix index 0d96372abf..57dffe89fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix @@ -4,6 +4,7 @@ , pythonOlder , icalendar , lxml +, mock , nose , pytz , requests @@ -23,6 +24,7 @@ buildPythonPackage rec { sha256 = "0m64maiqp3k8fsgkkvdx1dlfhkc70pqig4dclq6w8ajz82czrq83"; }; + nativeBuildInputs = lib.optionals (pythonOlder "3.5") [ mock ]; propagatedBuildInputs = [ six requests vobject lxml ] ++ lib.optionals (pythonOlder "3.6") [ pytz tzlocal ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix index 34d75d77a9..8edd8d0550 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0v2b72n28fi763xxv9vrf4qc61anl2ys9njy7hlm719fdaq3sxml"; + sha256 = "b4763db06a2e8553293c5edaa4bda05605c3307179a7ddfb30273a24ac384b6c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix index c01f27608f..f41aa6985d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2"; + sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz"; }; checkInputs = [ filelock mock pytest_4 pep8 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix index 7829afa83f..ecb1edf595 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.23.0"; + version = "3.24.0"; src = fetchPypi { inherit pname version; - sha256 = "a3b075bfd36677024b1dcf55a561fac161fc4f4065f01557b21a0b02ebad05c2"; + sha256 = "83ec8d9a5827ee44bb1c0601a63696a8a9086beaf0151c8255556299246081bd"; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix index eb1aec37c6..1624cbcf36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix @@ -3,25 +3,29 @@ , fetchPypi , pythonOlder , importlib-metadata +, pytestCheckHook }: buildPythonPackage rec { pname = "catalogue"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "34f8416ec5e7ed08e55c10414416e67c3f4d66edf83bc67320c3290775293816"; + sha256 = "0d01077dbfca7aa53f3ef4adecccce636bce4f82e5b52237703ab2f56478e56e"; }; propagatedBuildInputs = [ importlib-metadata ]; + checkInputs = [ pytestCheckHook ]; + meta = with stdenv.lib; { description = "Tiny library for adding function or object registries"; homepage = "https://github.com/explosion/catalogue"; + changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; - }; + }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix index 83ecf49436..3fd1b51a46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "celery"; - version = "4.4.6"; + version = "4.4.7"; src = fetchPypi { inherit pname version; - sha256 = "1ni5c3qgbhb7871b3i55wc306m3g2n0qxp92g5gszdxiicjf8xzx"; + sha256 = "d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index 79e5c3288b..07ceea731b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1y0m5qm853i6pcpb2mrf8kjkr9wr80mdrx1qmck38ayvr2v2p5lc"; + sha256 = "1fx29gsa3glwh0ik5k2gynwdz6i3ckq9aakf6ip92n3qyh6l08a8"; }; sourceRoot = "source/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix index 9e2bbc5c88..e5733e2e51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2020.4.5.2"; + version = "2020.6.20"; src = fetchPypi { inherit pname version; - sha256 = "5ad7e9a056d25ffa5082862e36f119f7f7cec6457fa07ee2f8c339814b80c9b1"; + sha256 = "5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"; }; pythonImportsCheck = [ "certifi" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certipy/default.nix index 12706ab3d8..5d34eede31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certipy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pyopenssl ]; - + doCheck = false; #no tests were included meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix index a8862010c4..c4e14c0e7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.14.1"; + version = "1.14.2"; src = fetchPypi { inherit pname version; - sha256 = "b2a2b0d276a136146e012154baefaea2758ef1f56ae9f4e01c612b0831e0bd2f"; + sha256 = "ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix index 1b940fa2c4..b79bf76131 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix @@ -1,49 +1,76 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder -, pyyaml -, six -, requests , aws-sam-translator , importlib-metadata , importlib-resources , jsonpatch , jsonschema -, pathlib2 -, setuptools , junit-xml , networkx +, pathlib2 +, pyyaml +, requests +, setuptools +, six +# Test inputs +, pytestCheckHook +, mock +, pydot }: buildPythonPackage rec { pname = "cfn-lint"; - version = "0.33.0"; + version = "0.35.1"; - src = fetchPypi { - inherit pname version; - sha256 = "b74bb89a3d0da4a744179b07bc186b9fbc4800f929bf635bb6246e80fb91a953"; + src = fetchFromGitHub { + owner = "aws-cloudformation"; + repo = "cfn-python-lint"; + rev = "v${version}"; + sha256 = "1ajb0412hw9fg9m4b3xbpfbp8cixmnpjxrkaks6k749xinzsv7qk"; }; + postPatch = '' + substituteInPlace setup.py --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"' + ''; + propagatedBuildInputs = [ - pyyaml - six - requests aws-sam-translator jsonpatch jsonschema - pathlib2 - setuptools junit-xml networkx + pathlib2 + pyyaml + requests + setuptools + six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; - # No tests included in archive - doCheck = false; + pythonImportsCheck = [ + "cfnlint" + "cfnlint.conditions" + "cfnlint.core" + "cfnlint.decode.node" + "cfnlint.decode.cfn_yaml" + "cfnlint.decode.cfn_json" + "cfnlint.decorators.refactored" + "cfnlint.graph" + "cfnlint.helpers" + "cfnlint.rules" + "cfnlint.runner" + "cfnlint.template" + "cfnlint.transform" + ]; + + checkInputs = [ pytestCheckHook mock pydot ]; + preCheck = "export PATH=$out/bin:$PATH"; meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; homepage = "https://github.com/aws-cloudformation/cfn-python-lint"; + changelog = "https://github.com/aws-cloudformation/cfn-python-lint/blob/master/CHANGELOG.md"; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix index 7638695ff2..1a29e51b35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.1.3"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1w2iakkzxfhyrqrspn40am8x7bzdp5qqdqbm1asbj7fa3mivi17x"; + sha256 = "ab5d5076f7d3e699758a244ada7c66da96bae36e22b9e351ce0ececc36f0a57f"; }; checkInputs = [ pytest coveralls pytestcov ]; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Time-handling functionality from netcdf4-python"; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix index cb5fab4614..fb2af329ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -1,29 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , attrs , botocore , click , enum-compat +, hypothesis , jmespath +, mock +, mypy-extensions , pip +, pytest +, pyyaml , setuptools , six , typing -, wheel , watchdog -, pytest -, hypothesis -, mock +, wheel }: buildPythonPackage rec { pname = "chalice"; - version = "1.14.1"; + version = "1.18.1"; src = fetchPypi { inherit pname version; - sha256 = "457e71fd84951574ccbe72d1389d9c89aaf5e69a552b01d1f1585faa63459c26"; + sha256 = "0zb4xk9b553pnfzh8s909cixfdplqnc3nda0fjwjrryi2nxjxd6a"; }; checkInputs = [ watchdog pytest hypothesis mock ]; @@ -33,10 +36,13 @@ buildPythonPackage rec { click enum-compat jmespath + mypy-extensions pip + pyyaml setuptools six wheel + ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chameleon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chameleon/default.nix index 96bd1aa8aa..d522764c79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chameleon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "3.7.4"; + version = "3.8.1"; src = fetchPypi { inherit pname version; - sha256 = "37c01c9af720bc80a0097ebc07eb41e802917ad0006c9a77dc158479c087664b"; + sha256 = "adf9609a2fa4ad20deb390605495f9a5d617b737bfbd86e51a49bbac2acaf316"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix index b8a9538757..fb0774478a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { # pytest # pytest-asyncio # ]; - # + # # # Fails with : ConnectionRefusedError: [Errno 111] Connect call failed ('127.0.0.1', 6379) # # (even with a local redis instance running) # checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index 6ea7c8dd8c..5795b55d91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.3.1"; + version = "8.4.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7076d5845f64d729e4155ec2650ad24ee70209340d11b9e619a82e9210a579b8"; + sha256 = "b6c18caf5f79cdae668c35fc8309fc88ea4a964cce9e2ca8504fab13bcf57301"; }; nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index 99d21c130d..f23d060019 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -32,10 +32,13 @@ buildPythonPackage rec { objgraph pytest pytestcov pathpy requests_toolbelt pytest-services ]; + # Keyboard interrupt ends test suite run + # daemonize and autoreload tests have issue with sockets within sandbox # Disable doctest plugin because times out checkPhase = '' substituteInPlace pytest.ini --replace "--doctest-modules" "" pytest \ + -k 'not KeyboardInterrupt and not daemonize and not Autoreload' \ --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \ --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \ ${stdenv.lib.optionalString stdenv.isDarwin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix index 83fc0d371c..21f9c5446c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix @@ -48,6 +48,15 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "freezegun~=0.3.15" "freezegun" \ + --replace "matplotlib~=3.0" "matplotlib" \ + --replace "networkx~=2.4" "networkx" \ + --replace "numpy~=1.16, < 1.19" "numpy" \ + --replace "protobuf~=3.12.0" "protobuf" + ''; + propagatedBuildInputs = [ freezegun google_api_core @@ -64,7 +73,7 @@ buildPythonPackage rec { ]; doCheck = true; - # pythonImportsCheck = [ "cirq" "cirq.Ciruit" ]; # cirq's importlib hook doesn't work here + # pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here dontUseSetuptoolsCheck = true; checkInputs = [ pytestCheckHook @@ -78,16 +87,10 @@ buildPythonPackage rec { pytestFlagsArray = [ "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope + "--benchmark-disable" # Don't need to run benchmarks when packaging. ]; disabledTests = [ - "test_serialize_sympy_constants" # fails due to small error in pi (~10e-7) - "test_convert_to_ion_gates" # fails due to rounding error, 0.75 != 0.750...2 - - # Newly disabled tests on cirq 0.8 - # TODO: test & figure out why failing - "engine_job_test" - "test_health" - "test_run_delegation" + "test_convert_to_ion_gates" # fails on some systems due to rounding error, 0.75 != 0.750...2 ] ++ lib.optionals stdenv.isAarch64 [ # Seem to fail due to math issues on aarch64? "expectation_from_wavefunction" @@ -97,6 +100,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; homepage = "https://github.com/quantumlib/cirq"; + changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix index 00da74929a..220ff790e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.1.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0j9q6725226hdhdyy9b0qfjngdj35d3y7fxbmfxpr36ksbh0x6sj"; + sha256 = "49be854582ec4a74240cb72f287846f823cd8cbd2e25f924541d12f27104bda3"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix index b7ed70f846..99a2126ee9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix @@ -3,6 +3,7 @@ , fetchPypi , numpy , scipy +, sparse , numba , future , h5py @@ -23,6 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy + sparse numba future h5py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix new file mode 100644 index 0000000000..69813e6a2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, attrs +, colorlog +, csvw +, dateutil +, tabulate +, mock +, postgresql +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "clldutils"; + version = "3.5.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "clld"; + repo = pname; + rev = "v${version}"; + sha256 = "0qlqp9yq4lbi9ik2psgw0svxlb7raadqaxdh2dgkn85d7h20y4nd"; + }; + + patchPhase = '' + substituteInPlace setup.cfg --replace "--cov" "" + ''; + + propagatedBuildInputs = [ + dateutil + tabulate + colorlog + attrs + csvw + ]; + + checkInputs = [ + mock + postgresql + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "CSV on the Web"; + homepage = "https://github.com/cldf/csvw"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix index 802235d674..7692bd1c9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, beautifulsoup4 , requests , future , pyyaml @@ -9,14 +10,15 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.7.1"; + version = "2.8.13"; src = fetchPypi { inherit pname version; - sha256 = "0w8ihj9gram2d4wkbki8f6gr8hsd950b3wzfi1qqqm17lqfk8k7h"; + sha256 = "a662990737d86984156a48f769e6528d947e90fd1561bb5e19d0036b59b9fd6f"; }; propagatedBuildInputs = [ + beautifulsoup4 requests future pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix index 551dd06f63..092a0f7c0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "1.4.1"; + version = "1.5.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "0b6258a20a143603d53b037a20983016d4e978f554ec4f36b3d0895b947099ae"; + sha256 = "820c9245cebdec7257211cbe88745101d5d6a042bca11336d78ebd4897ddbc82"; }; buildInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index 9d58c13058..f6055ae014 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.0.2"; + version = "1.3.8"; src = fetchPypi { inherit pname version; - sha256 = "1f18plbc9yyvhn0js3d2bii9yld8zfl775gxsaw9jza5pmlg9ss2"; + sha256 = "b6f6254def8ba479088702f97bca1b999c12e0c38ac5d82dc50a44db93c7108c"; }; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix index ad753c1894..8424a560d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "codecov"; - version = "2.1.8"; + version = "2.1.9"; src = fetchPypi { inherit pname version; - sha256 = "0be9cd6358cc6a3c01a1586134b0fb524dfa65ccbec3a40e9f28d5f976676ba2"; + sha256 = "355fc7e0c0b8a133045f0d6089bde351c845e7b52b99fec5903b4ea3ab5f6aab"; }; checkInputs = [ unittest2 ]; # Tests only diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colander/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colander/default.nix index 944a781845..0492e27174 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colander/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colander/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colander"; - version = "1.7.0"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "d758163a22d22c39b9eaae049749a5cd503f341231a02ed95af480b1145e81f2"; + sha256 = "54878d2ffd1afb020daca6cd5c6cfe6c0e44d0069fc825d57fe59aa6e4f6a499"; }; propagatedBuildInputs = [ translationstring iso8601 enum34 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configparser/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/configparser/4.nix index 038ee49d2c..9c6c631d9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configparser/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configparser/4.nix @@ -23,4 +23,4 @@ buildPythonPackage rec { license = licenses.mit; homepage = "https://github.com/jaraco/configparser"; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix index 6aab0f45b3..8048d6f78a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.5.0"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "c2660807e5c1ecd723e280f76918794c3fd84595000c1e8de1f254f5d89a785c"; + sha256 = "9ac812006000887f76c95b8a33a9f0b65845bf072fbc54a42a1acffd34e41120"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix index 873cbe142d..23bc8bcec5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify ]; - + # requires network access for cloning git repos doCheck = false; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix index 442a06061e..9897115353 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "5.0.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "4efa77a0d0402f1b92481a53853d65936956a568d64a4f6a703b62feb5b8cf62"; + sha256 = "4fcf3be295514e7e20fdd602fea8d204127bb02da2ff6bdbc8b6fba859ac9fd0"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix index a22009ac9d..fa5f4bca8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "5.1"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0ll0hr8g3szbxa4al6khhzi6l92a3vwyldj0085whl44s55gq2zr"; + sha256 = "a34cb28e0747ea15e82d13e14de606747e9e484fb28d63c999483f5d5188e89b"; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix index c81cd3c666..64078693ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "coveralls"; - version = "2.0.0"; + version = "2.1.2"; disabled = isPy27; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "d213f5edd49053d03f0db316ccabfe17725f2758147afc9a37eaca9d8e8602b5"; + sha256 = "4430b862baabb3cf090d36d84d331966615e4288d8a8c5957e0fd456d0dd8bd6"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cozy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cozy/default.nix index c55c85c3df..39f2d1227e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cozy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cozy/default.nix @@ -4,6 +4,7 @@ buildPythonPackage { pname = "cozy"; version = "2.0a1"; + disabled = !isPy3k; propagatedBuildInputs = [ z3 ply python-igraph oset ordered-set dictionaries @@ -18,18 +19,18 @@ buildPythonPackage { # Yoink the Z3 dependency name, because our Z3 package doesn't provide it. postPatch = '' - sed -i -e '/z3-solver/d' requirements.txt + sed -i -e '/z3-solver/d' -e 's/^dictionaries.*$/dictionaries/' requirements.txt ''; # Tests are not correctly set up in the source tree. doCheck = false; + pythonImportsCheck = [ "cozy" ]; # There is some first-time-run codegen that we will force to happen. postInstall = '' $out/bin/cozy --help ''; - disabled = !isPy3k; meta = { description = "The collection synthesizer"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix index c6477c1553..fffa917442 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/nucleic/cppy"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix new file mode 100644 index 0000000000..42236b4d7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, urllib3 +, isPy3k +, mock +, sqlalchemy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "crate"; + version = "0.24.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "028q9r1qyqkq185awkazhplfy7y1081963fnjzi3kf3lxvz6yhay"; + }; + + propagatedBuildInputs = [ + urllib3 + ]; + + checkInputs = [ + pytestCheckHook + sqlalchemy + mock + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/crate/crate-python"; + description = "A Python client library for CrateDB"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix index 07547b280f..1abd3f4ed2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }: +{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose +, fetchpatch +}: buildPythonPackage rec { pname = "credstash"; @@ -9,6 +11,12 @@ buildPythonPackage rec { sha256 = "6c04e8734ef556ab459018da142dd0b244093ef176b3be5583e582e9a797a120"; }; + patches = [ + (fetchpatch { + url = "https://github.com/fugue/credstash/commit/9c02ee43ed6e37596cafbca2fe80c532ec19d2d8.patch"; + sha256 = "dlybrpfLK+PqwWWhH9iXgXHYysZGmcZAFGWNOwsG0xA="; + }) + ]; # The install phase puts an executable and a copy of the library it imports in # bin/credstash and bin/credstash.py, despite the fact that the library is also # installed to lib/python/site-packages/credstash.py. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 9f7bb3f1ad..d122c42e84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.0"; # Also update the hash in vectors.nix + version = "3.1"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "0lr06a9317n2iwfqwz9mpalqm99acqwk1478arvyj1jj0ay4v4lf"; + sha256 = "021yccbqr446zh1c9l8yj79h9bgbd1cwv0ppj168w9y67i3rlh16"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix index 02a3f44bb0..99f3b6f897 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0fa26ggksyhknb43cja1g0jwp35qkdbavivdq6yynj1igd2z1vsj"; + sha256 = "10hixzqf2ppw8j61f6p04rgnq8ra6pjml68330s5af8df8xbqq16"; }; # No tests included diff --git a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix new file mode 100644 index 0000000000..76f7cb73b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, attrs +, isodate +, dateutil +, rfc3986 +, uritemplate +, mock +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "csvw"; + version = "1.8.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "cldf"; + repo = "csvw"; + rev = "v${version}"; + sha256 = "0maxrsiv9i9hkg627hwqyq8g6jg3g8iv8gdqaxz4aysjd9xddydd"; + }; + + patchPhase = '' + substituteInPlace setup.cfg --replace "--cov" "" + ''; + + propagatedBuildInputs = [ + attrs + isodate + dateutil + rfc3986 + uritemplate + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "CSV on the Web"; + homepage = "https://github.com/cldf/csvw"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix new file mode 100644 index 0000000000..789a58bb6a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonPackage, pytest, pytest-html }: + +buildPythonPackage rec { + pname = "cucumber-tag-expressions"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kb8dq458sflwl2agb2v9hp04qwygslrhdps819vq27wc44jabxw"; + }; + + checkInputs = [ pytest pytest-html ]; + checkPhase = "pytest tests/*/*.py"; + + meta = with lib; { + homepage = "https://github.com/cucumber/tag-expressions-python"; + description = "Provides tag-expression parser for cucumber/behave"; + license = licenses.mit; + maintainers = with maintainers; [ maxxk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix index 94ec349e03..2bbd20a16d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "7.5.0"; + version = "7.7.0"; src = fetchPypi { inherit pname version; - sha256 = "243254a1607e19ca55191c4cca4c0f2b143e1d5914e2a1bc9e3f715e7ccafc41"; + sha256 = "b4032adf839f63bab7fc9f3e7066ef86abe0928e834aa5d132e4e7ce907951ed"; }; checkInputs = [ @@ -20,7 +20,7 @@ buildPythonPackage rec { preConfigure = '' export CUDA_PATH=${cudatoolkit} - ''; + ''; propagatedBuildInputs = [ cudatoolkit diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 8d2b6398c4..29b1941415 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -11,18 +11,19 @@ , scs , six # Check inputs +, pytestCheckHook , nose }: buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.4"; + version = "1.1.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1f37da2f891508ebc2bbb2b75c46a2076be39a60a45c8a88261e000e8aabeef2"; + sha256 = "7c826a874db2e4cefe54e63ebd3a3763d0d72e55a17c7d1cfec80008a87b8d81"; }; propagatedBuildInputs = [ @@ -36,15 +37,19 @@ buildPythonPackage rec { six ]; - checkInputs = [ nose ]; - checkPhase = '' - nosetests cvxpy - ''; + checkInputs = [ pytestCheckHook nose ]; + pytestFlagsArray = [ "./cvxpy" ]; + # Disable the slowest benchmarking tests, cuts test time in half + disabledTests = [ + "test_tv_inpainting" + "test_diffcp_sdp_example" + ]; meta = with lib; { description = "A domain-specific language for modeling convex optimization problems in Python."; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxgrp/cvxpy/releases"; + changelog = "https://github.com/cvxgrp/cvxpy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix index 98d3460d75..dd8b1dccc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,14 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, ncurses }: +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses }: buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.1"; + version = "6.2"; src = fetchPypi { inherit pname version; - sha256 = "a0181bdb0ed16b292f4cfb8cd3afc84e956fc187431f25392bd981460dd73da0"; + sha256 = "44bbbcea3196b79da77cc22637cb28a825b51182d32209e8a3f6cd4042edc247"; }; + disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ ncurses ]; # timestamp need to come after 1980 for zipfiles and nix store is set to epoch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix index 6ba8f33863..cecb41c3d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.3.0"; + version = "8.0.0"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "2e0da54e948b55e5c75fab14b391d58aa8b9be1eddfd9ec9a8a0e500bc8bfc7e"; + sha256 = "cddc298301789c724de5817611f7bd38b4859b371928e2e85a9c37af222f73c8"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 7aca68b396..d4a6663e7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "8a9879b7d1642ed8cd48115d81f92a246eb7ffeadc42748053c5339a56f569b4"; + sha256 = "ce686b7fd49b3f876d651c87e8468ad71bcd2707399140d6baf198184c45d970"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix index 741e39423a..2794bcba7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.21.0"; pname = "dask-mpi"; src = fetchPypi { inherit pname version; - sha256 = "774cd2d69e5f7154e1fa133c22498062edd31507ffa2ea19f4ab4d8975c27bc3"; + sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7"; }; checkInputs = [ pytest requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix index 9b9388e56c..9730ca8a2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "0.1.10"; + version = "0.1.11"; pname = "dask-xgboost"; src = fetchPypi { inherit pname version; - sha256 = "454c47ccf64315d35beeca32c7cedf20d8a8d42471d5e6ce0c51f4af0a6e021e"; + sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; }; checkInputs = [ pytest scikitlearn ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix new file mode 100644 index 0000000000..59ebd4ef11 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -0,0 +1,32 @@ +{ lib, jdk, buildPythonPackage, fetchPypi, six, py4j }: + +buildPythonPackage rec { + pname = "databricks-connect"; + version = "7.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "996a9d0f271f6c7edbd2d85b2efb6ff4e58d15222e80f87ca17fdbf224e17056"; + }; + + sourceRoot = "."; + + propagatedBuildInputs = [ py4j six jdk ]; + + # requires network access + doCheck = false; + + preFixup = '' + substituteInPlace "$out/bin/find-spark-home" \ + --replace find_spark_home.py .find_spark_home.py-wrapped + ''; + + pythonImportsCheck = [ "pyspark" "six" "py4j" ]; + + meta = with lib; { + description = "Client for connecting to remote Databricks clusters"; + homepage = "https://pypi.org/project/databricks-connect"; + license = licenses.databricks; + maintainers = with maintainers; [ kfollesdal ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix index 807ed5f9a3..748c0a5352 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -1,21 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi -, decorator, requests, simplejson, pillow +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, decorator, requests, simplejson, pillow, typing , nose, mock, pytest, freezegun }: buildPythonPackage rec { pname = "datadog"; - version = "0.36.0"; + version = "0.38.0"; src = fetchPypi { inherit pname version; - sha256 = "1kkbsrzxc2a6k319lh98qkinn99dzcqz8h4fm25q17dlgmc9gq9z"; + sha256 = "401cd1dcf2d5de05786016a1c790bff28d1428d12ae1dbe11485f9cb5502939b"; }; postPatch = '' find . -name '*.pyc' -exec rm {} \; ''; - propagatedBuildInputs = [ decorator requests simplejson pillow ]; + propagatedBuildInputs = [ decorator requests simplejson pillow ] + ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ nose mock pytest freezegun ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix new file mode 100644 index 0000000000..b953ed1dd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, dill +, filelock +, numpy +, pandas +, pyarrow +, requests +, tqdm +, xxhash +}: + +buildPythonPackage rec { + pname = "datasets"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = version; + sha256 = "14f7847b8md5kf631zl8x2f53wy8zbzxypq4wdgzvwsjz4k7v4jn"; + }; + + propagatedBuildInputs = [ + dill + filelock + numpy + pandas + pyarrow + requests + tqdm + xxhash + ]; + + # Tests require pervasive internet access. + doCheck = false; + + # Module import will attempt to create a cache directory. + postFixup = "export HF_MODULES_CACHE=$TMPDIR"; + + pythonImportsCheck = [ "datasets" ]; + + meta = with lib; { + homepage = "https://github.com/huggingface/datasets"; + description = "Fast, efficient, open-access datasets and evaluation metrics for natural language processing"; + changelog = "https://github.com/huggingface/datasets/releases/tag/${version}"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix index b5d9c3dfad..5fa42c861e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -2,19 +2,22 @@ , buildPythonPackage , fetchFromGitHub , aiofiles +, asgi-csrf , click , click-default-group , janus , jinja2 , hupper +, mergedeep , pint , pluggy +, python-baseconv +, pyyaml , uvicorn # Check Inputs , pytestCheckHook , pytestrunner , pytest-asyncio -, black , aiohttp , beautifulsoup4 , asgiref @@ -23,26 +26,30 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.39"; + version = "0.46"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "07d46512bc9sdan9lv39sf1bwlf7vf1bfhcsm825vk7sv7g9kczd"; + sha256 = "0g4dfq5ykifa9628cb4i7gvx98p8hvb99gzfxk3bkvq1v9p4kcqq"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ aiofiles + asgi-csrf click click-default-group janus jinja2 hupper + mergedeep pint pluggy + python-baseconv + pyyaml uvicorn setuptools ]; @@ -52,7 +59,6 @@ buildPythonPackage rec { pytest-asyncio aiohttp beautifulsoup4 - black asgiref ]; @@ -60,22 +66,17 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "click~=7.1.1" "click" \ --replace "click-default-group~=1.2.2" "click-default-group" \ - --replace "Jinja2~=2.10.3" "Jinja2" \ --replace "hupper~=1.9" "hupper" \ --replace "pint~=0.9" "pint" \ - --replace "pluggy~=0.13.0" "pint" \ + --replace "pluggy~=0.13.0" "pluggy" \ --replace "uvicorn~=0.11" "uvicorn" \ - --replace "aiofiles~=0.4.0" "aiofiles" \ - --replace "janus~=0.4.0" "janus" \ --replace "PyYAML~=5.3" "PyYAML" ''; - # many tests require network access + # test_html is very slow # test_black fails on darwin dontUseSetuptoolsCheck = true; pytestFlagsArray = [ - "--ignore=tests/test_api.py" - "--ignore=tests/test_csv.py" "--ignore=tests/test_html.py" "--ignore=tests/test_docs.py" "--ignore=tests/test_black.py" @@ -84,6 +85,7 @@ buildPythonPackage rec { "facet" "_invalid_database" # checks error message when connecting to invalid database ]; + pythonImportsCheck = [ "datasette" ]; meta = with lib; { description = "An instant JSON API for your SQLite databases"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index b5ae4a4c43..d1e2eb3b24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -30,11 +30,11 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.11.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "05p81aff7x70yj8llclclgz6klvfzqixwxfng6awn3y5scv18w40"; + sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix index a2f7b603b8..9eb6e4f89a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.98.3"; + version = "0.99.0"; src = fetchPypi { inherit pname version; - sha256 = "01d71vya2x87f3kl9x0s8xp0n7wixn6ksrd054y7idq3n1mjaxzh"; + sha256 = "a4a7a8cdc113d840142d21a796c16c7d329ad35c48f17156446732c83ebc571a"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix new file mode 100644 index 0000000000..163a7adcb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, dbus, dbus-python, pytest, pytestcov, pytest-asyncio, pytest-timeout +}: + +buildPythonPackage rec { + pname = "dbus-next"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "altdesktop"; + repo = "python-dbus-next"; + rev = "v${version}"; + sha256 = "sha256-C/aFDHmt6Qws6ek+++wM5GRN6TEvMGMiFktKIXRdGL0="; + }; + + checkInputs = [ + dbus + dbus-python + pytest + pytestcov + pytest-asyncio + pytest-timeout + ]; + + # test_peer_interface hits a timeout + checkPhase = '' + dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + ${python.interpreter} -m pytest -sv --cov=dbus_next \ + -k "not test_peer_interface" + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/altdesktop/python-dbus-next"; + description = "A zero-dependency DBus library for Python with asyncio support"; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix index 228d5a7823..e8d2731eb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix @@ -3,6 +3,7 @@ , fetchPypi , mock , jsonpickle +, mmh3 , ordered-set , numpy , pytestCheckHook @@ -10,11 +11,11 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "4.3.2"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "91360be1d9d93b1d9c13ae9c5048fa83d9cff17a88eb30afaa0d7ff2d0fee17d"; + sha256 = "e2b74af4da0ef9cd338bb6e8c97242c1ec9d81fcb28298d7bb24acdc19ea79d7"; }; # # Extra packages (may not be necessary) @@ -24,14 +25,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # skipped tests require murmur module - "test_prep_str_murmur3_64bit" - "test_prep_str_murmur3_128bit" - ]; - propagatedBuildInputs = [ jsonpickle + mmh3 ordered-set ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix new file mode 100644 index 0000000000..25c5902999 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, fonttools +, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens +}: + +buildPythonPackage rec { + pname = "defcon"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lfqsvxmq1j0nvp26gidnqkj1dyxv7jalc6i7fz1r3nc7niflrqr"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + fonttools + ]; + + checkInputs = [ + pytest + pytestrunner + lxml + fs + unicodedata2 + fontpens + ]; + + meta = with lib; { + description = "A set of UFO based objects for use in font editing applications"; + homepage = "https://github.com/robotools/defcon"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index 63fad6467c..1a90462a24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2 }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }: let testPath = @@ -9,15 +9,15 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "3.15.6"; + version = "3.30.4"; src = fetchPypi { inherit pname version; - sha256 = "fcca1464f567d902983bff507b9e2e3fda0f932ee009e36f74ed5b8c348d17f4"; + sha256 = "717388a9346883eb5def3e96def7275763f2a607cac48c272f352e3834e0bd0d"; }; propagatedBuildInputs = [ six ]; - checkInputs = [ unittest2 ]; + checkInputs = [ unittest2 pyyaml flask ]; checkPhase = '' unit2 discover -s tests/unit -p "${testPath}" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix index ba33eeda38..3e05deb5e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "diff-match-patch"; - version = "20181111"; + version = "20200713"; meta = { homepage = "https://github.com/diff-match-patch-python/diff-match-patch"; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb"; + sha256 = "da6f5a01aa586df23dfc89f3827e1cafbb5420be9d87769eeb079ddfd9477a18"; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dipy/default.nix index 939f0912fe..a1360ada22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dipy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dipy"; - version = "1.1.1"; + version = "1.2.0"; disabled = isPy27; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dipy"; repo = pname; rev = version; - sha256 = "08abx0f4li6ya62ilc59miw4mk6wndizahyylxhgcrpacb6ydw28"; + sha256 = "0x49lph400ndlvk419nd2g9ss4jg75xr7xh88ggv5d2ama19v7py"; }; nativeBuildInputs = [ cython packaging ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix index ba11512144..91f6f06f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -23,23 +23,26 @@ , singledispatch , mpi4py , bokeh +, pythonOlder }: buildPythonPackage rec { pname = "distributed"; - version = "2.18.0"; + version = "2.23.0"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "902f098fb7558f035333804a5aeba2fb26a2a715388808205a17cbb2e02e0558"; + sha256 = "469e505fd7ce75f600188bdb69a95641899d5b372f74246c8f308376b6929e9c"; }; + disabled = pythonOlder "3.6"; + checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh - ] ++ lib.optionals (!isPy3k) [ futures singledispatch ]; + ]; # tests take about 10-15 minutes # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix index c419fff790..84b9df28bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi, isPy27 -, ldap , django +, ldap , django , mock }: @@ -14,8 +14,8 @@ buildPythonPackage rec { sha256 = "11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf"; }; - propagatedBuildInputs = [ ldap django ]; - checkInputs = [ mock ]; + propagatedBuildInputs = [ ldap django ]; + checkInputs = [ mock ]; # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix index 1f5e313c39..bb933fd034 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "django-cleanup"; - version = "4.0.1"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "4d0fd9ad3117a219e4cb3e35dd32f39c764a860ce56b820abb88ad3ec063ffd7"; + sha256 = "84f0c0e0a74545adae4c944a76ccf8fb0c195dddccf3b7195c59267abb7763dd"; }; checkInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix index 11c935df99..3614114a3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "73d654950b5f5e7e4f67c05183d2169d4f7518ceb87734eb0d68f9e43be59f1c"; + sha256 = "f5218f2f0bb1210563ff87687afbf10786e080d8494a248e705507ebd92d7153"; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix index d472a59556..de3424c9fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.9"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "407db27bf55d391c4c8a4944e0521f35eff82c2f2fd5a2fc843fb1b4cc1a31f4"; + sha256 = "e4b2bb7b2563c5064ba56dd76441c77e06b850ff1466a386a1cd308909a6c7de"; }; - propagatedBuildInputs = [ six django persisting-theory ]; + propagatedBuildInputs = [ six django persisting-theory ]; # django.core.exceptions.ImproperlyConfigured: Requested setting DYNAMIC_PREFERENCES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix index 08b2460b1b..ecf400b21d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "2.2.8"; + version = "3.0.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj"; + sha256 = "1z2si9wpc8irqhi5i2wp4wr05dqxyw4mn2vj3amp0rvsvydws92c"; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix index 4049f8722f..940bd1f1cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "2.1.0"; + version = "3.0.1"; meta = { description = "A Django application to retrieve user's IP address"; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a7c7a8fd019dbdc9c357e6e582f65034e897572fc79a7e467674efa8aef9d00b"; + sha256 = "73a640a5bff00aa7503a35e92e462001cfabb07d73d649c262f117423beee953"; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix new file mode 100644 index 0000000000..2e433aa5d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, pytest, django }: + +buildPythonPackage rec { + pname = "django-maintenance-mode"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "fabiocaccamo"; + repo = pname; + rev = version; + sha256 = "1k06fhqd8wyrkp795x5j2r328l2phqgg1m1qm7fh4l2qrha43aw6"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Shows a 503 error page when maintenance-mode is on"; + homepage = "https://github.com/fabiocaccamo/django-maintenance-mode"; + maintainers = with maintainers; [ mrmebelman ]; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-multiselectfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-multiselectfield/default.nix index 3561f1d8c1..046c60989a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/goinnn/django-multiselectfield"; license = lib.licenses.lgpl3; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix index a9a03e9066..4710de2c7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix @@ -1,16 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, django }: +{ lib, buildPythonPackage, fetchFromGitHub, django, pytest, pytest-django }: buildPythonPackage rec { pname = "django-picklefield"; version = "3.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "15ccba592ca953b9edf9532e64640329cd47b136b7f8f10f2939caa5f9ce4287"; + # The PyPi source doesn't contain tests + src = fetchFromGitHub { + owner = "gintas"; + repo = pname; + rev = "v${version}"; + sha256 = "0ni7bc86k0ra4pc8zv451pzlpkhs1nyil1sq9jdb4m2mib87b5fk"; }; propagatedBuildInputs = [ django ]; + checkInputs = [ pytest pytest-django ]; + + checkPhase = '' + PYTHONPATH="$(pwd):$PYTHONPATH" \ + DJANGO_SETTINGS_MODULE=tests.settings \ + pytest tests/tests.py + ''; + meta = { description = "A pickled object field for Django"; homepage = "https://github.com/gintas/django-picklefield"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix index 9c19903a3f..a81aa2a63c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.2.4"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "6838e6dda377ab6bd31f5721a66aa6d19ad9a88ca9c03cbb464b2321d3c4c979"; + sha256 = "de7077660ede36bfdd89ab9405d6393b598bb3e0bfed61f59a0a9074cc4942bb"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix new file mode 100644 index 0000000000..99e3abda89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, fetchFromGitHub, python, stdenv, django }: + +buildPythonPackage rec { + pname = "django-widget-tweaks"; + version = "1.4.8"; + + src = fetchFromGitHub { # package from Pypi missing runtests.py + owner = "jazzband"; + repo = pname; + rev = version; + sha256 = "00w1ja56dc7cyw7a3mph69ax6mkch1lsh4p98ijdhzfpjdy36rbg"; + }; + + checkPhase = "${python.interpreter} runtests.py"; + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Tweak the form field rendering in templates, not in python-level form definitions."; + homepage = "https://github.com/jazzband/django-widget-tweaks"; + license = licenses.mit; + maintainers = with maintainers; [ + maxxk + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/1_11.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/1_11.nix deleted file mode 100644 index b38962f4ef..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/1_11.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl, substituteAll, - geos, gdal, pytz, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "Django"; - version = "1.11.28"; - - src = fetchurl { - url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k"; - }; - - patches = stdenv.lib.optionals withGdal [ - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ]; - - propagatedBuildInputs = [ pytz ]; - - # too complicated to setup - doCheck = false; - - meta = with stdenv.lib; { - description = "A high-level Python Web framework"; - homepage = "https://www.djangoproject.com/"; - license = licenses.bsd3; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix index fa5be71095..3a88f0703d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.14"; + version = "2.2.16"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "14b1w00hrf4n7hla6d6nf2p5r4k6jh3fcmv7bd1v04vpcpvfrw7d"; + sha256 = "1535g2r322cl4x52fb0dmzlbg23539j2wx6027j54p22xvjlbkv2"; }; patches = stdenv.lib.optional withGdal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix index 7d53d45804..eac119ef01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "django_evolution"; - version = "0.7.8"; + version = "2.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "493ff2adad760990ce8cf87c13955af85d4dcff097427bc3619ed01672fac4a8"; + sha256 = "a0bc983657de1b0bc5c8d29ddcbf7b6fb113685bf306ccc266cf22b8a77bd862"; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix index b03524aa59..364a5e12f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "django-guardian"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "8cacf49ebcc1e545f0a8997971eec0fe109f5ed31fc2a569a7bf5615453696e2"; + sha256 = "ed2de26e4defb800919c5749fb1bbe370d72829fbd72895b6cf4f7f1a7607e1b"; }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_nose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_nose/default.nix index 5d3522c5b4..66a4ad7857 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_nose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_nose/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-nose"; - version = "1.4.6"; + version = "1.4.7"; src = fetchPypi { inherit pname version; - sha256 = "01wah0ci5xdpiikash68x6lprxlvnkxg72ly9kjrc9lklq34m4sq"; + sha256 = "a4885cd002d65fd2de96e2bb2563ef477c3fbe207009360c015fca5c3b5561b7"; }; # vast dependency list diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix index 28aa28c3b9..0d5190aba7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.13.1"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "366293d7d4e416f9f7d6e2b98775c2129222fbb4dc660f3e6c7b9e35a3cf3fce"; + sha256 = "1b1f80940bb15982e06208b97d7b3d08e1d5f8fb62aa07e5e33599c7ce4c0334"; }; propagatedBuildInputs = [ ply ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 626d704f1d..f4c50a7114 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -3,17 +3,17 @@ buildPythonPackage rec { pname = "djangorestframework_simplejwt"; version = "4.4.0"; - + src = fetchPypi { inherit pname version; sha256 = "c315be70aa12a5f5790c0ab9acd426c3a58eebea65a77d0893248c5144a5080c"; }; - + propagatedBuildInputs = [ django djangorestframework pyjwt ]; - + # Test raises django.core.exceptions.ImproperlyConfigured doCheck = false; - + meta = with lib; { description = "A minimal JSON Web Token authentication plugin for Django REST Framework"; homepage = "https://github.com/davesque/django-rest-framework-simplejwt"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix index 9147435076..aaecda7778 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256:088iz5cqjqh4c7141d94pvn13bh25aizqlrifwv6fs5g16zj094s"; + sha256 = "9a2420bf09af686736773153fca32a02ae11ecbe24b540c26104628959f91121"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix index a57d830755..027500ff2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }: +{ buildPythonPackage, stdenv, lib, dlib, python, pytest, more-itertools +, avxSupport ? stdenv.hostPlatform.avxSupport +}: buildPythonPackage { inherit (dlib) name src nativeBuildInputs buildInputs meta; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix new file mode 100644 index 0000000000..d4ebaf82b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/1.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, lib, pythonOlder }: + +buildPythonPackage rec { + pname = "dnspython"; + version = "1.16.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; + }; + + # needs networking for some tests + doCheck = false; + + meta = { + description = "A DNS toolkit for Python 3.x"; + homepage = "http://www.dnspython.org"; + # BSD-like, check http://www.dnspython.org/LICENSE for details + license = lib.licenses.free; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix index 6a65dba767..c699638083 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix @@ -1,13 +1,14 @@ -{ buildPythonPackage, fetchPypi, lib }: +{ buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "dnspython"; - version = "1.16.0"; + version = "2.0.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; + sha256 = "044af09374469c3a39eeea1a146e8cac27daec951f1f1f157b1962fc7cb9d1b7"; }; # needs networking for some tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix index fd43e8cf77..d46fbe991a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.2.2"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0m4vgk2831yfdjy8vqyvvfnmwv270a44z358frdzb672wzfbmvi6"; + sha256 = "bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2"; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix index 580945656b..c0b14bf88c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { - version = "0.0.18"; + version = "1.0.0"; pname = "dockerfile-parse"; src = fetchPypi { inherit pname version; - sha256 = "a09eae6871b7b314f8a8bddb67b6c5002708b22247511906cf2a9a45564b83db"; + sha256 = "9ed92ede29a646094b52b8b302e477f08e63465b6ee524f5750810280143712e"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix index d79aec5b8d..74ac3bbfdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.14.186"; + version = "2.15.194"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "ba78897869e938c9ad1cb58e7d82bcf693f5e9a0dfa5e2dbfcee2ae5ea5e87f8"; + sha256 = "976e9b4e18bccbabae04149c33247a795edb1f00110f1b511c5517ac6ac353bb"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix index cdc244bc1b..32cb213af4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,14 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, Mako, decorator +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +, pytestcov +, mock +, Mako +, decorator +, stevedore }: buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.9.2"; + version = "1.0.2"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bc9dde1ffa5de0179efbcdc73773ef0553921130ad01955422f2932be35c059e"; + sha256 = "64fda39d25b46486a4876417ca03a4af06f35bfadba9f59613f9b3d748aa21ef"; }; # Disable concurrency tests that often fail, @@ -26,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov mock Mako ]; - propagatedBuildInputs = [ decorator ]; + propagatedBuildInputs = [ decorator stevedore ]; meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix index 3881bf2dd8..7418eb4f95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.5.1"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0y4xzch6kwzddwz6pmk8cd09r3dpkxm1bh4q1byhm37a0lb4h1cv"; + sha256 = "456facce7a7ccfd9363948109cf1e978d48c58e46a46b01c71b4c0adc73b1928"; }; doCheck = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index f271411a28..754fe962b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "10.3.0"; + version = "10.4.1"; src = fetchPypi { inherit pname version; - sha256 = "082ylb6xn8xzix61lv2n8ya1k0gd494kr9vr2ys8ldbwxq9nyaaz"; + sha256 = "sha256-INA50DD3wfVPItGCgywZCe5bViatUkaaGdJ0vwcEHgY="; }; # Set DROPBOX_TOKEN environment variable to a valid token. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index c839dea3d1..ea6dfe32fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -13,6 +13,13 @@ buildPythonPackage rec { pname = "duckdb"; inherit (duckdb) version src; + # build attempts to use git to figure out its own version. don't want to add + # the dependency for something pointless. + postPatch = '' + substituteInPlace scripts/package_build.py --replace \ + "'git'" "'false'" + ''; + postConfigure = '' cd tools/pythonpkg export SETUPTOOLS_SCM_PRETEND_VERSION=${version} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index e060b819a5..38522b233d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.8.1"; + version = "7.9.1"; src = fetchPypi { inherit pname version; - sha256 = "92b534931865a186906873f75ae0b91808ff5036b0f2b9269eb5f6dc09644b55"; + sha256 = "5e08776fbb30c6e92408c7fa8c37d939210d291475ae2f364f0497975918b6fe"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix index 7e9dae53bb..aabebe1c52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.5.4"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0x61xypwswhghchp5svs084didkgfwqpq2fbiapvirff5lx2srb0"; + sha256 = "e42da4f8d648f8ef10691bc246f682a1ec6b18373abfd9be10ec0b398823bd11"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix index 14c5cfcb39..300a660f32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix @@ -12,22 +12,32 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.25.2"; + version = "0.26.1"; src = fetchPypi { inherit pname version; - sha256 = "4c8ab42c51bff55204fef43cff32616558bedbc7538d876bb6a96ce820c7f9ed"; + sha256 = "4f4a43366b4cbd4a3f2f231816e5c3dae8ab316df9b7da11f0525e2800559f33"; }; + propagatedBuildInputs = [ dnspython greenlet monotonic six ] + ++ lib.optional (pythonOlder "3.4") enum34; + + prePatch = '' + substituteInPlace setup.py \ + --replace "dnspython >= 1.15.0, < 2.0.0" "dnspython" + ''; + checkInputs = [ nose ]; doCheck = false; # too much transient errors to bother - propagatedBuildInputs = [ dnspython greenlet monotonic six ] ++ lib.optional (pythonOlder "3.4") enum34; + # unfortunately, it needs /etc/protocol to be present to not fail + #pythonImportsCheck = [ "eventlet" ]; meta = with lib; { homepage = "https://pypi.python.org/pypi/eventlet/"; description = "A concurrent networking library for Python"; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix index 8d9b379187..3e14074f18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix @@ -1,26 +1,31 @@ -{ lib, buildPythonPackage, fetchFromGitHub, coloredlogs, property-manager, fasteners, pytest, mock, virtualenv }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, coloredlogs, property-manager, fasteners, pytestCheckHook, mock, virtualenv }: buildPythonPackage rec { pname = "executor"; - version = "21.3"; + version = "23.1"; + disabled = isPy27; src = fetchFromGitHub { owner = "xolox"; repo = "python-executor"; rev = version; - sha256 = "0rc14vjx3d6irfaw0pczzw1pn0xjl7xikv32hc1fvxv2ibnldv5d"; + sha256 = "1jfmagw126di0qd82bydwvryqcxc54pqja3rbx3ny3fv1ahi5s7k"; }; propagatedBuildInputs = [ coloredlogs property-manager fasteners ]; - checkInputs = [ pytest mock virtualenv ]; + checkInputs = [ pytestCheckHook mock virtualenv ]; # ignore impure tests - checkPhase = '' - pytest . -k "not option and not retry \ - and not remote and not ssh \ - and not foreach and not local_context" - ''; + disabledTests = [ + "option" + "retry" + "remote" + "ssh" + "foreach" + "local_context" + "release" # meant to be ran on ubuntu to succeed + ]; meta = with lib; { description = "Programmer friendly subprocess wrapper"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix index 92e889564a..052551a472 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "factory_boy"; - version = "2.12.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s"; + sha256 = "2ce2f665045d9f15145a6310565fcb8255d52fc6fd867f3b783b3ac3de6cf10e"; }; propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix index ced4744d93..102f506b6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix @@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "4.1.1"; + version = "4.1.2"; src = fetchPypi { inherit pname version; - sha256 = "c006b3664c270a2cfd4785c5e41ff263d48101c4e920b5961cf9c237131d8418"; + sha256 = "ff188c416864e3f7d8becd8f9ee683a4b4101a2a2d2bcdcb3e84bb1bdd06eaae"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index 46c6cfb06c..0a52d89df5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -3,13 +3,13 @@ thrift, pytest, python-snappy, lz4, zstd }: buildPythonPackage rec { pname = "fastparquet"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "0y89gmcfylxqm8rs1fbirwjzmhcvlfx8fhvkm3ssbj1ivfd5mdlr"; + sha256 = "ViZRGEv227/RgCBYAQN8F3Z0m8WrNUT5KUdyFosjg9s="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix index 35bf7cb90d..3042acbbe8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/fixtures"; license = lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix index 761690ba9c..e44aac202c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -19,8 +19,9 @@ buildPythonPackage rec { ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + # fixtures fail to initialize correctly checkPhase = '' - py.test tests + py.test tests --ignore=tests/integration/test_checker.py ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flaky/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flaky/default.nix index 4fe7986479..9bf20e6cc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flaky/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flaky/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "flaky"; - version = "3.6.1"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698"; + sha256 = "3ad100780721a1911f57a165809b7ea265a7863305acb66708220820caf8aa0d"; }; checkInputs = [ mock nose pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-api/default.nix index bbac045675..3bc3061b3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-api/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, flask, markdown }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi, flask, markdown }: buildPythonPackage rec { pname = "Flask-API"; version = "2.0"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "6986642e5b25b7def710ca9489ed2b88c94006bfc06eca01c78da7cf447e66e5"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix index bd28280a47..5d783f6c7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,17 +4,17 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.12.0"; + version = "0.13.0"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; description = "Flask + marshmallow for beautiful APIs"; license = lib.licenses.mit; - }; + }; src = fetchPypi { inherit pname version; - sha256 = "6e6aec171b8e092e0eafaf035ff5b8637bf3a58ab46f568c4c1bab02f2a3c196"; + sha256 = "aefc1f1d96256c430a409f08241bab75ffe97e5d14ac5d1f000764e39bf4873a"; }; propagatedBuildInputs = [ flask marshmallow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix index 88a4028aa6..c0944f4ff1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix @@ -7,7 +7,7 @@ , requests_download , zipfile36 , pythonOlder -, pytest_4 +, pytest , testpath , responses , pytoml @@ -39,7 +39,7 @@ buildPythonPackage rec { zipfile36 ]; - checkInputs = [ pytest_4 testpath responses ]; + checkInputs = [ pytest testpath responses ]; # Disable test that needs some ini file. # Disable test that wants hg diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix index d47465c972..70c9173f4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fluent-logger/default.nix @@ -9,10 +9,21 @@ buildPythonPackage rec { sha256 = "a7d47eae4d2a11c8cb0df10ae3d034d95b0b8cef9d060e59e7519ad1f82ffa73"; }; + prePatch = '' + substituteInPlace setup.py \ + --replace "msgpack<1.0.0" "msgpack" + ''; + propagatedBuildInputs = [ msgpack ]; - + # Tests fail because absent in package doCheck = false; + pythonImportsCheck = [ + "fluent" + "fluent.event" + "fluent.handler" + "fluent.sender" + ]; meta = with lib; { description = "A structured logger for Fluentd (Python)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix index 0a2e8dff1b..deb92ea9ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "flufl.bounce"; - version = "3.0"; + version = "3.0.1"; buildInputs = [ nose2 ]; propagatedBuildInputs = [ atpublic zope_interface ]; src = fetchPypi { inherit pname version; - sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2"; + sha256 = "e432fa1ca25ddbf23e2716b177d4d1c6ab6c078e357df56b0106b92bc10a8f06"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix new file mode 100644 index 0000000000..7a23abdd03 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, fonttools +, pytest, pytestrunner +}: + +buildPythonPackage rec { + pname = "fontMath"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09xdqdjyjlx5k9ymi36d7hkgvn55zzjzd65l2yqidkfazlmh14ss"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fonttools ]; + checkInputs = [ pytest pytestrunner ]; + + meta = with lib; { + description = "A collection of objects that implement fast font, glyph, etc. math"; + homepage = "https://github.com/robotools/fontMath/"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix new file mode 100644 index 0000000000..43fdae8cca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchPypi, python +, fonttools, lxml, fs, unicodedata2 +, defcon, fontpens, fontmath, booleanoperations +, pytest +}: + +buildPythonPackage rec { + pname = "fontParts"; + version = "0.9.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0q8ilc1ypmasci2x1nq69hnfsnvbi1czaxgsb3zgqd8777bn5v9z"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + booleanoperations + fonttools + unicodedata2 # fonttools[unicode] extra + lxml # fonttools[lxml] extra + fs # fonttools[ufo] extra + defcon + fontpens # defcon[pens] extra + fontmath + ]; + + checkPhase = '' + ${python.interpreter} Lib/fontParts/fontshell/test.py + ''; + checkInputs = [ pytest ]; + + meta = with lib; { + description = "An API for interacting with the parts of fonts during the font development process."; + homepage = "https://github.com/robotools/fontParts"; + changelog = "https://github.com/robotools/fontParts/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontpens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontpens/default.nix new file mode 100644 index 0000000000..02adb3b064 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontpens/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchPypi, fonttools }: + +buildPythonPackage rec { + pname = "fontPens"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fonttools ]; + + # can't run normal tests due to circular dependency with fontParts + doCheck = false; + pythonImportsCheck = [ "fontPens" ] ++ (builtins.map (s: "fontPens." + s) [ + "angledMarginPen" + "digestPointPen" + "flattenPen" + "guessSmoothPointPen" + "marginPen" + "penTools" + "printPen" + "printPointPen" + "recordingPointPen" + "thresholdPen" + "thresholdPointPen" + "transformPointPen" + ]); + + meta = with lib; { + description = "A collection of classes implementing the pen protocol for manipulating glyphs"; + homepage = "https://github.com/robotools/fontPens"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index 8aae67443a..a1433d08bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -1,38 +1,70 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 -, numpy +, fetchFromGitHub +, pythonOlder +, brotlipy +, zopfli +, fs +, lxml +, scipy +, munkres +, unicodedata2 +, sympy +, matplotlib +, reportlab , pytest -, pytestrunner +, pytest-randomly , glibcLocales }: buildPythonPackage rec { pname = "fonttools"; - version = "4.11.0"; - disabled = isPy27; + version = "4.14.0"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "7fe5937206099ef284055b8c94798782e0993a740eed87f0dd262ed9870788aa"; - extension = "zip"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in"; }; - buildInputs = [ - numpy - ]; - + # all dependencies are optional, but + # we run the checks with them checkInputs = [ pytest - pytestrunner + pytest-randomly glibcLocales + # etree extra + lxml + # ufo extra + fs + # woff extra + brotlipy + zopfli + # unicode extra + unicodedata2 + # interpolatable extra + scipy + munkres + # symfont + sympy + # varLib + matplotlib + # pens + reportlab ]; preCheck = '' export LC_ALL="en_US.UTF-8" ''; + # avoid timing issues with timestamps in subset_test.py and ttx_test.py + checkPhase = '' + pytest Tests fontTools \ + -k 'not ttcompile_timestamp_calcs and not recalc_timestamp' + ''; + meta = { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix index 941b5792f3..fb1bf7549f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix @@ -1,15 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }: buildPythonPackage rec { - version = "3.4"; + version = "4.0.0"; pname = "ftputil"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "374b01e174079e91babe2a462fbd6f6c00dbfbfa299dec04239ca4229fbf8762"; + sha256 = "d494c47f24fd3f8fbe92d40d90e0902c0e04288f200688af2b16d6b46fe441e1"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest freezegun ]; checkPhase = '' touch Makefile diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix index 8c69ead0ae..ab87f57be3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fuse-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { buildInputs = [ fuse ]; nativeBuildInputs = [ pkgconfig ]; - + # no tests in the Pypi archive doCheck = false; @@ -22,4 +22,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix index 3d073df843..49687ebe31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "gast"; - version = "0.3.3"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b881ef288a49aa81440d2c5eb8aeefd4c2bb8993d5f50edae7413a85bfdb3b57"; + sha256 = "40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1"; }; checkInputs = [ astunparse ] ; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix index 74eb5de486..9af1072728 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix @@ -9,11 +9,11 @@ buildPythonApplication rec { pname = "gdown"; - version = "3.11.1"; + version = "3.12.2"; src = fetchPypi { inherit pname version; - sha256 = "1p023812hh7w7d08njjsfn0xzldl4m73yx8p243yb2q49ypjl6nz"; + sha256 = "4b3a1301e57bfd8dce939bf25ef8fbb4b23967fd0f878eede328bdcc41386bac"; }; propagatedBuildInputs = [ filelock requests tqdm setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix index fea7d226a1..329fe7aa07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "06q9r5sdmncj4yaxrdf0mls05jb5n6pwhf8j8r74825cks4mvysa"; + sha256 = "4afb5d899eac08444e461239c8afb165c90234adc0b5dc952792d9da74c9091b"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index 07982b1e42..200dfffa56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -1,19 +1,27 @@ { stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , pandas, shapely, fiona, descartes, pyproj -, pytest, Rtree }: +, pytest, Rtree, fetchpatch }: buildPythonPackage rec { pname = "geopandas"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "033jygbyycl9s6b0kqix9xynhapc2xd8nh47kcfacn514gyncgah"; + sha256 = "0618p0s0biisxk2s0h43hkc3bs1nwjk84rxbfyd6brfvs9yx4vq7"; }; + patches = [ + # Fix for test test_numerical_operations: https://github.com/geopandas/geopandas/issues/1541 + (fetchpatch { + url = "https://github.com/geopandas/geopandas/pull/1544/commits/6ce868a33a2f483b071089d51e178030fa4414d0.patch"; + sha256 = "1sjgxrqgbhz5krx51hrv230ywszcdl6z8q3bj6830kfad8n8b5dq"; + }) + ]; + checkInputs = [ pytest Rtree ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index f7a8973246..7956a31492 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1fm0iqfbzd13m1lkd4h3ss4y9isp5cadd2w2k0qr3yqwfmrqqba2"; + sha256 = "883a862ddd17b0f4868ec55d6697a64c13d91c41b9fa5103198d2140053abac2"; }; checkPhase = '' @@ -23,11 +23,11 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - + checkInputs = [ flake8 nose2 mock ]; - + propagatedBuildInputs = [ requests pyjwt ]; - + meta = with lib; { description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; homepage = "https://github.com/globus/globus-sdk-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix index 4188bdccf9..916812f153 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix @@ -11,19 +11,18 @@ buildPythonPackage rec { pname = "glom"; - version = "20.5.0"; + version = "20.8.0"; src = fetchPypi { inherit pname version; - sha256 = "e753d2e8d16647ffcd9f0f99ac85d3db523ff0a1f097cf0a154a60702bca7e42"; + sha256 = "5fa3a9d99c7f3e5410a810fa8a158c0f71e39036c47b77745c7f2e4630372f82"; }; propagatedBuildInputs = [ boltons attrs face ]; checkInputs = [ pytest pyyaml ]; - checkPhase = "pytest glom/test"; - - doCheck = !isPy37; # https://github.com/mahmoud/glom/issues/72 + # test_cli.py checks the output of running "glom" + checkPhase = "PATH=$out/bin:$PATH pytest glom/test"; meta = with stdenv.lib; { homepage = "https://github.com/mahmoud/glom"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix index ac658b1940..e183e79f57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix @@ -1,27 +1,37 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k -, google_api_python_client, simplejson, oauth2client, setuptools +, docutils, installShellFiles +, google_api_python_client, simplejson, oauth2client, setuptools, xdg }: buildPythonPackage rec { pname = "goobook"; - version = "3.4"; + version = "3.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "089a95s6g9izsy1fzpz48p6pz0wpngcbbrvsillm1n53492gfhjg"; + sha256 = "1rmfyma3gwdf5mrw4l3j66y86fy8hgdbd0z4a5kck0kcm3hy34j9"; }; - # Required for a breaking change in google-api-python-client 1.8.1: - patches = [ ./fix-build.patch ]; - + nativeBuildInputs = [ docutils installShellFiles ]; propagatedBuildInputs = [ - google_api_python_client simplejson oauth2client setuptools + google_api_python_client simplejson oauth2client setuptools xdg ]; + postInstall = '' + rst2man goobook.1.rst goobook.1 + installManPage goobook.1 + ''; + meta = with stdenv.lib; { - description = "Search your google contacts from the command-line or mutt"; + description = "Access your Google contacts from the command line"; + longDescription = '' + The purpose of GooBook is to make it possible to use your Google Contacts + from the command-line and from MUAs such as Mutt. + It can be used from Mutt the same way as abook. + ''; homepage = "https://pypi.python.org/pypi/goobook"; + changelog = "https://gitlab.com/goobook/goobook/-/blob/${version}/CHANGES.rst"; license = licenses.gpl3; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goobook/fix-build.patch b/third_party/nixpkgs/pkgs/development/python-modules/goobook/fix-build.patch deleted file mode 100644 index 1121dbfdcb..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/goobook/fix-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8de09b82c5ac900317043e1c1025f431516b6788 Mon Sep 17 00:00:00 2001 -From: Michael Weiss -Date: Tue, 21 Apr 2020 21:41:04 +0200 -Subject: [PATCH] Switch from the alias apiclient to googleapiclient - -This fixes the package after a breaking change / bug in -google-api-python-client 1.8.1 (see [0] and a lot of duplicate issues). - -The module apiclient is just an alias for googleapiclient [1]. - -[0]: https://github.com/googleapis/google-api-python-client/issues/870 -[1]: https://github.com/googleapis/google-api-python-client/blob/v1.8.1/apiclient/__init__.py ---- - goobook/goobook.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/goobook/goobook.py b/goobook/goobook.py -index 5bcb0b3..a2e25e9 100755 ---- a/goobook/goobook.py -+++ b/goobook/goobook.py -@@ -31,7 +31,7 @@ import sys - import time - - import httplib2 --from apiclient.discovery import build -+from googleapiclient.discovery import build - - from goobook.storage import Storage, storageify, unstorageify - --- -2.26.1 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 2a7f762970..4b02cfdfa3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.10.0"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "01zzlr21rgl1skl7ayppp0qwn6s883i50xcvxs8jxzr4c5zz097s"; + sha256 = "54a7d330833a2e7b0587446d7e4ae6d0244925a9a8e1dfe878f3f7e06cdedb62"; }; # No tests included in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix new file mode 100644 index 0000000000..fbed406ceb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, cffi, crc32c, pytestCheckHook }: + +buildPythonPackage rec { + pname = "google-crc32c"; + version = "1.0.0"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-crc32c"; + rev = "v${version}"; + sha256 = "0n3ggsxmk1fhq0kz6p5rcj4gypfb05i26fcn7lsawakgl7fzxqyl"; + }; + + buildInputs = [ crc32c ]; + propagatedBuildInputs = [ cffi ]; + + LDFLAGS = "-L${crc32c}/lib"; + CFLAGS = "-I${crc32c}/include"; + + checkInputs = [ pytestCheckHook crc32c ]; + pythonImportsCheck = [ "google_crc32c" ]; + + meta = with lib; { + homepage = "https://github.com/googleapis/python-crc32c"; + description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix index 9033f32042..a72f68c19f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.20.1"; + version = "1.22.1"; disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; - sha256 = "6b757736bbc699db858794e9b71e2bbf17996075773a40551ef5e6b0fad2a2f9"; + sha256 = "35cba563034d668ae90ffe1f03193a84e745b38f09592f60258358b5e5ee6238"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_auth/default.nix index 43c2ff8aa4..59ed94d348 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_auth/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.17.2"; + version = "1.20.1"; src = fetchPypi { inherit pname version; - sha256 = "e634b649967d83c02dd386ecae9ce4a571528d59d51a4228757e45f5404a060b"; + sha256 = "2f34dd810090d0d4c9d5787c4ad7b4413d1fbfb941e13682c7a2298d3b6cdcc8"; }; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix index 5d4328ead5..927ad94e78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "0.10.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d25ab222daaa0b827b00dae8c76e4c1b13ba5c687f0acdfd66529b805d41b7f3"; + sha256 = "fd4c0f7f61a8a1c5907cd6cc27a028b16236bf3d982ff412df0d2c981cef5ae5"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix index 6900b4f212..43ffdc7a70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "0.10.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "031331fs97jpyxacwsmhig0ndidn97r288qnkrzfdvg1wxw5rdhi"; + sha256 = "f08abe78d37fb94a3748aa43e66dae2bad52f991cc7740501a341bc6f6387fd5"; }; checkInputs = [ pandas pytest mock google_cloud_storage ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 0b7c5d5c16..b812028591 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.24.0"; + version = "1.26.1"; src = fetchPypi { inherit pname version; - sha256 = "1ca22hzql8x1z6bx9agidx0q09w24jwzkgg49k5j1spcignwxz3z"; + sha256 = "51c29b95d460486d9e0210f63e8193691cd08480b69775270e84dd3db87c1bf2"; }; checkInputs = [ pytest mock ipython freezegun ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix index dc5098fd67..97ad04334f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "6eae79e6950f70d48b0578ae95f93530b4eac28216b96e2279cb2f94c5f2ba33"; + sha256 = "71791a38a0ec535fdd4970d3403aa4cb2d9ca5c2729f80730858be2776b3c518"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix index 0eb606bf7f..91c3109e91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.2.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1wwhjfhvz5g4720qcdrj01fqb8kh3n36sxjpz8pzwhc7z4z5srs8"; + sha256 = "e777333cbe85888f888c034d32880bb6a602ad83d8c81a95edca7c522cf430d8"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix index e79a3ac56f..ec41592b48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "0.5.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "9dd4523291401d8d872f89a87fa5a1d2bcbf6b8ceb1ec0659098fec37d9250e4"; + sha256 = "6f714e3d427e2b36d1365fc400f4d379972529fb40f798d9c0e06c7c3418fc89"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix index c5a0ead7c5..f277711e8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1n19q57y4d89cjgmrg0f2a7yp7l1np2448mrhpndq354h389m3w7"; + sha256 = "613e56f164b6bee487dd34f606083a0130f66f42f7b10f99730afdf1630df507"; }; propagatedBuildInputs = [ google_api_core grpcio setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix index 9c6067b50e..3db04fb7d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.8.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1ff15c9a06fd7b0402a2549142146f951ca92ebcf5f70f4c96dc9b9397d5279d"; + sha256 = "d6d94af6c0d5aee0bb88d058a180f4d3341209e112f85a1c7ce0df7887cbf867"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix index 6305da93d8..ff2d0b3baa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "1.12.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "c98690833ee2e6341a4b802f278ba17d582ce58eb2e73152516ebc77522d82d7"; + sha256 = "c94bc357e975ce7bd5e5636497316c1bf4d015891e0ed96df9e7ce901415b94a"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix index b0d3aa5a63..8273f40565 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "0.15.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9abef093fb344ec556a94e5466b480046c18b8bb0a12f1d202f06c43f3e01f7d"; + sha256 = "2ccf04209f96b4759d8ed76da2c916a456386836caacd47ce01b6344f5b8f212"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix index abb849f63a..efc52657fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "1.7.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "afd986bc4bb5a92d6ebe02977cc1d5dc56bf401590d1df43c07609dbec21155d"; + sha256 = "dfe02fc0a77a4e28144c46d441553352d81498ffd8f49906b57342d06c7f5b54"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix index c333a1fa13..79fe4bcc80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "1.4.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "9d108b2754cb2c6ccc60604d27855c7139dad4b2455342e1e7bfffc27c5193bd"; + sha256 = "c590a8ab12a3f776ab35e570d21c0881f9d73c444bd509e54321a4c715233372"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix index fa4590ff0b..6aeef14b69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "1.15.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "0smpvzdbz3ih3vc0nmn9619xa40mmqk9rs9ic1mwwyh1iyi44waz"; + sha256 = "cb0d4af9d684eb8a416f14c39d9fa6314be3adf41db2dd8ee8e30db9e8853d90"; }; checkInputs = [ pytest mock webapp2 django flask ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix index e5d62dd8f4..b1e4eae52a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "1.5.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "d396ae1938e966e1ac3b981d14db7b0f9fabab553b0876c3202e187e4b477ab6"; + sha256 = "c8d098ebd208d00c8f3bb55eefecd8553e7391d59700426a97d35125f0dcb248"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index c953407af8..08e2c38ea1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.31.0"; + version = "0.32.0"; src = fetchPypi { inherit pname version; - sha256 = "3e0218abc438f2f43605db27189fa7a48c3ca3defc45054dac01835527058a4c"; + sha256 = "3d125c01817d5bef2b644095b044d22b03b9d8d4591088cadd8e97851f7a150a"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index e6b0fe5f22..a3992825d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "e2c14e01697e54aef9d755bd8abff01af748f42f4e3559efcbb3b0db659f66ac"; + sha256 = "14ebad262cd01c9a3998561684617be2e97ad5d27dab1918c14b964f97e1f8f7"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix index 9446200b65..db11396233 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.29.0"; + version = "1.30.0"; src = fetchPypi { inherit pname version; - sha256 = "07lsdrxypz5i21x99m1zkxwiax89q80v0av6ak0k4fkys48spj0m"; + sha256 = "0634addb7576d48861d9963312fc82a0436042b8f282414ed58ca76d73edee54"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index 2c3ef0d39f..3a052c73cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.0.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4ed3d9f17fa7b8d53dbc4992d976f72d845266786a81938444315e5a7b194b53"; + sha256 = "cbbd397e72b6189668134f3c8e8c303198188334a4e6a5f77cc90c3220772f9e"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix index 4c49b0e70e..5b19243709 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "0.23.0"; + version = "0.24.0"; src = fetchPypi { inherit pname version; - sha256 = "1a3fad1ae2b780dd5e6d5ddc626db722749405b7b66f3c2e5e87a9d29a4819c8"; + sha256 = "0c342dbd9daf5375b3f8bb94302b7ea9a9946f76684e457a38ff0d420b3b6556"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix index 7537b6fe52..f25f4badc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "2.0.1"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "02wlqlrxk0x6a9wifcly2pr84r6k8i97ws0prx21379fss39gf2a"; + sha256 = "ecdea3e176e80f606d08c4c7fd5acea6b3dd960f4b2e9a65951aaf800350a759"; }; # google_cloud_core[grpc] -> grpcio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index 07fb02ea59..a8da09dec6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "c91f605d00926416bcd4d32d6ca195e0e5bd6fb794bc67b09910a19ee2ca6570"; + sha256 = "c2b4b3579196c0bb7301fbe1de7008ac5081f88afc0599a10ee79a5ade385922"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index 55c370717e..a43f7fd5f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "0.4.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1c8031e6eec59ee3e2d4af88090ba36521ceb67d79cb297d3c128d2a16af0798"; + sha256 = "1de60f880487b898b499345f46f7acf38651f5356ebca8673116003a57f25393"; }; checkInputs = [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix index 40c8f2596b..5bd95004f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_resumable_media/default.nix @@ -1,30 +1,35 @@ -{ stdenv +{ lib , buildPythonPackage +, isPy3k , fetchPypi , six , requests , setuptools , pytest , mock +, crcmod +, google-crc32c }: buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.5.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "97155236971970382b738921f978a6f86a7b5a0b0311703d991e065d3cb55773"; + sha256 = "FzrMa63hSApSn6KcbCcXVDri3AnULpRh/bhvOVAu/PI="; }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ requests setuptools six ]; + propagatedBuildInputs = [ requests setuptools six ] + ++ lib.optional isPy3k google-crc32c + ++ lib.optional (!isPy3k) crcmod; checkPhase = '' py.test tests/unit ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for Google Media Downloads and Resumable Uploads"; homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix index 2197cfd9d0..50d5f0f966 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "graph-tool"; format = "other"; - version = "2.31"; + version = "2.32"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "0z6n9xkb5yz7z6rlwl6z9gq3ac5vdsby90nhvvvskadsx2pagd7v"; + sha256 = "0jir6fhi09lf8xf56dcsdk2knx32vq8wrzh0d0zdp22n7baavq70"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix index 159b09d10b..cc070f5532 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphite_beacon/default.nix @@ -1,6 +1,8 @@ { stdenv, buildPythonPackage, fetchPypi -, tornado, pyyaml, funcparserlib +, tornado_5, pyyaml, funcparserlib +, nixosTests }: + buildPythonPackage rec { pname = "graphite_beacon"; version = "0.27.0"; @@ -10,12 +12,18 @@ buildPythonPackage rec { sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks"; }; - propagatedBuildInputs = [ tornado pyyaml funcparserlib ]; + propagatedBuildInputs = [ tornado_5 pyyaml funcparserlib ]; postPatch = '' substituteInPlace requirements.txt --replace "==" ">=" ''; + pythonImportsCheck = [ "graphite_beacon" ]; + + passthru.tests = { + nixos = nixosTests.graphite; + }; + meta = with stdenv.lib; { description = "A simple alerting application for Graphite metrics"; homepage = "https://github.com/klen/graphite-beacon"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix index fcb2867050..f531c547f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.10.1"; + version = "0.14.1"; # patch does not apply to PyPI tarball due to different line endings src = fetchFromGitHub { owner = "xflr6"; repo = "graphviz"; rev = version; - sha256 = "1vqk4xy45c72la56j24z9jmjp5a0aa2k32fybnlbkzqjvvbl72d8"; + sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c"; }; patches = [ @@ -30,9 +30,9 @@ buildPythonPackage rec { }) ]; - # Fontconfig error: Cannot load default config file - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; }; checkInputs = [ mock pytest pytest-mock pytestcov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch index ad632974c2..d6da1ff47c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch @@ -1,38 +1,39 @@ diff --git a/graphviz/backend.py b/graphviz/backend.py -index 704017b..fe4aefe 100644 +index 6f4cc0c..bc4781e 100644 --- a/graphviz/backend.py +++ b/graphviz/backend.py -@@ -114,7 +114,7 @@ def command(engine, format, filepath=None, renderer=None, formatter=None): - suffix = '.'.join(reversed(format_arg)) - format_arg = ':'.join(format_arg) +@@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None): + raise ValueError('unknown formatter: %r' % formatter) -- cmd = [engine, '-T%s' % format_arg] -+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % format_arg] - rendered = None - if filepath is not None: - cmd.extend(['-O', filepath]) -@@ -217,7 +217,7 @@ def version(): + output_format = [f for f in (format_, renderer, formatter) if f is not None] +- cmd = [engine, '-T%s' % ':'.join(output_format)] ++ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)] + + if filepath is None: + rendered = None +@@ -255,7 +255,7 @@ def version(): subprocess.CalledProcessError: If the exit status is non-zero. RuntimmeError: If the output cannot be parsed into a version number. """ - cmd = ['dot', '-V'] + cmd = ['@graphviz@/bin/dot', '-V'] - out, _ = run(cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - - info = out.decode('ascii') + out, _ = run(cmd, check=True, encoding='ascii', + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) diff --git a/tests/test_backend.py b/tests/test_backend.py -index 7ec12f7..2e8550d 100644 +index 9f307f5..e43bf5b 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py -@@ -47,6 +47,7 @@ def test_render_formatter_unknown(): - render('dot', 'ps', 'nonfilepath', 'ps', '') +@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'): + m.decode.assert_called_once_with(encoding) +-@pytest.exe +@pytest.mark.skip(reason='empty $PATH has no effect') @pytest.mark.usefixtures('empty_path') - def test_render_missing_executable(): - with pytest.raises(ExecutableNotFound, match=r'execute'): -@@ -85,7 +86,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): + @pytest.mark.parametrize('func, args', [ + (render, ['dot', 'pdf', 'nonfilepath']), +@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803 assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf' @@ -40,25 +41,17 @@ index 7ec12f7..2e8550d 100644 + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, - startupinfo=mocker.ANY) -@@ -94,6 +95,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): - assert capsys.readouterr() == ('', '' if quiet else 'stderr') - - -+@pytest.mark.skip(reason='empty $PATH has no effect') - @pytest.mark.usefixtures('empty_path') - def test_pipe_missing_executable(): - with pytest.raises(ExecutableNotFound, match=r'execute'): -@@ -143,7 +145,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803 - assert e.value.returncode is mocker.sentinel.returncode + cwd=None, startupinfo=mocker.ANY) +@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803 assert e.value.stdout is mocker.sentinel.out - assert e.value.stderr is err + e.value.stdout = mocker.sentinel.new_stdout + assert e.value.stdout is mocker.sentinel.new_stdout - Popen.assert_called_once_with(['dot', '-Tpng'], + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, -@@ -166,7 +168,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 +@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out @@ -67,16 +60,8 @@ index 7ec12f7..2e8550d 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, -@@ -176,6 +178,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 - assert capsys.readouterr() == ('', '' if quiet else 'stderr') - - -+@pytest.mark.skip(reason='empty $PATH has no effect') - @pytest.mark.usefixtures('empty_path') - def test_version_missing_executable(): - with pytest.raises(ExecutableNotFound, match=r'execute'): -@@ -196,7 +199,7 @@ def test_version_parsefail_mocked(mocker, Popen): - with pytest.raises(RuntimeError): +@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803 + with pytest.raises(RuntimeError, match=r'nonversioninfo'): version() - Popen.assert_called_once_with(['dot', '-V'], @@ -84,9 +69,9 @@ index 7ec12f7..2e8550d 100644 stdout=subprocess.PIPE, stderr=subprocess.STDOUT, startupinfo=mocker.ANY) -@@ -211,7 +214,7 @@ def test_version_mocked(mocker, Popen): +@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803 - assert version() == (1, 2, 3) + assert version() == expected - Popen.assert_called_once_with(['dot', '-V'], + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'], diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graspy/default.nix index 2a7fab12fa..0281e6a973 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graspy/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , isPy27 , fetchFromGitHub -, pytest +, pytestCheckHook , pytestcov +, hyppo , matplotlib , networkx , numpy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "graspy"; - version = "0.2"; + version = "0.3"; disabled = isPy27; @@ -22,10 +23,11 @@ buildPythonPackage rec { owner = "neurodata"; repo = pname; rev = "v${version}"; - sha256 = "1ss7d71lwblimg7ri88ir9w59j0ri13wl75091hjf7q0mchqr6yd"; + sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r"; }; propagatedBuildInputs = [ + hyppo matplotlib networkx numpy @@ -34,14 +36,9 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ pytest pytestcov ]; - - checkPhase = '' - runHook preCheck - # `test_autogmm` takes too long; fixed in next release (graspy/pull/328) - pytest tests -k 'not test_autogmm' - runHook postCheck - ''; + checkInputs = [ pytestCheckHook pytestcov ]; + pytestFlagsArray = [ "tests" "--ignore=docs" ]; + disabledTests = [ "gridplot_outputs" ]; meta = with lib; { homepage = "https://graspy.neurodata.io"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix index de1831e331..5ecf9a18ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix @@ -4,22 +4,22 @@ , termstyle , lxml , unidecode -, mock -, backports_shutil_get_terminal_size }: buildPythonPackage rec { pname = "green"; - version = "3.1.4"; + version = "3.2.1"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "65f87e4c0d2aca63eb32b01c78233e6f920a58ebabc4f85dd9d8f1c6a92a5184"; + sha256 = "c5a90e247237ac7e320120961608cf65191134fa400d327cbd4d09864c880935"; }; propagatedBuildInputs = [ colorama coverage termstyle unidecode lxml - ] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ]; + ]; # let green run it's own test suite checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index 37ffc8beca..c60acb2d1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }: +{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }: buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.31.0"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "3b08cbd3f4d5b60e3bff8f859e6e03db739967a684268164abc940415e23ca51"; + sha256 = "28547272c51e1d2d343685b9f531e85bb90ad7bd93e726ba646b5627173cbc47"; }; enableParallelBuilding = true; - propagatedBuildInputs = [ protobuf grpcio ]; + propagatedBuildInputs = [ protobuf grpcio setuptools ]; # no tests in the package doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix index ecb15cc024..9311838627 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; + GRPC_BUILD_WITH_BORING_SSL_ASM = ""; GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix b/third_party/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix index c9b3078cd4..6e6f0504aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gsd/1.7.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.9.3"; + version = "1.7.0"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "c6b37344e69020f69fda2b8d97f894cb41fd720840abeda682edd680d1cff838"; + sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 5c9c644abd..5fd73541dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -3,6 +3,7 @@ , fetchPypi , requests , google_auth +, google-auth-oauthlib }: buildPythonPackage rec { @@ -14,14 +15,12 @@ buildPythonPackage rec { sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests google_auth google-auth-oauthlib ]; meta = with stdenv.lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; - # missing multiple google libraries - broken = true; # 2020-08-15 }; # No tests included diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix index 622360edd2..9013c7d978 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -1,14 +1,13 @@ { stdenv , lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , six -, enum34 , decorator , nose , krb5Full , darwin -, isPy27 , parameterized , shouldbe , cython @@ -18,13 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.2"; + version = "1.6.9"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "195x3zqzyv491i9hf7l4asmic5pb2w3l1r7bps89651wkb3mrz1l"; + sha256 = "1shm3pc0l2r91qadkpq4bx45my0165nw3kdcp0gw4lk50z215hag"; }; # It's used to locate headers @@ -41,7 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator six - ] ++ lib.optional isPy27 enum34; + ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.GSS @@ -55,12 +55,21 @@ buildPythonPackage rec { six ]; - doCheck = !stdenv.isDarwin; # many failures on darwin + doCheck = pythonOlder "3.8" # `shouldbe` not available + && !stdenv.isDarwin; # many failures on darwin + # skip tests which fail possibly due to be an upstream issue (see + # https://github.com/pythongssapi/python-gssapi/issues/220) checkPhase = '' + # some tests don't respond to being disabled through nosetests -x + echo $'\ndel CredsTestCase.test_add_with_impersonate' >> gssapi/tests/test_high_level.py + echo $'\ndel TestBaseUtilities.test_acquire_creds_impersonate_name' >> gssapi/tests/test_raw.py + echo $'\ndel TestBaseUtilities.test_add_cred_impersonate_name' >> gssapi/tests/test_raw.py + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py nosetests + ${python.interpreter} setup.py nosetests -e 'ext_test_\d.*' ''; + pythonImportsCheck = [ "gssapi" ]; meta = with lib; { homepage = "https://pypi.python.org/pypi/gssapi"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix index 2937b876de..ccf1627d7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , numba , ndtypes , xnd @@ -25,4 +27,20 @@ buildPythonPackage { --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \ 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so + ''; + + checkPhase = '' + pushd python + mv gumath _gumath + # minor precision issues + substituteInPlace test_gumath.py --replace 'test_sin' 'dont_test_sin' + python test_gumath.py + python test_xndarray.py + popd + ''; + } + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix index 3d66291aed..316c5bc4d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 7886746e31..9a99fb0953 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "0dk30ga59lhqba1facram6ls52z45sld6b81gy5cl63q67smy08f"; + sha256 = "069bf78a3c6cd642aae0b1a562b443d2670e6d73d507ce77cbf8a2c16974ca29"; }; propagatedBuildInputs = [ future requests python-dateutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/helpdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/helpdev/default.nix index c4caf0e46a..34b4d69744 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/helpdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/helpdev/default.nix @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix index 179830f8b5..0806573d7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchPypi +, pythonOlder , h5py , numpy , dill @@ -18,11 +19,12 @@ buildPythonPackage rec { pname = "hickle"; - version = "3.4.8"; + version = "4.0.1"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "09e73029dc6c122f483fca4313a27cc483534145961e4786e65d60895054d940"; + sha256 = "fcf2c4f9e4b7f0d9dae7aa6c59a58473884017875d3b17898d56eaf8a9c1da96"; }; postPatch = '' @@ -31,10 +33,14 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ h5py numpy dill ]; + + doCheck = false; # incompatible with latest astropy checkInputs = [ pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov ]; + pythonImportsCheck = [ "hickle" ]; + meta = { description = "Serialize Python data to HDF5"; homepage = "https://github.com/telegraphic/hickle"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix index ab6203581c..0959d117de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hieroglyph/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchPypi, buildPythonPackage, sphinx }: +{ stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }: buildPythonPackage rec { pname = "hieroglyph"; - version = "1.0.0"; + version = "2.1.0"; + disabled = isPy27; # python2 compatible sphinx is too low src = fetchPypi { inherit pname version; - sha256 = "8e137f0b1cd60c47b870011089790d3c8ddb74fcf409a75ddf2c7f2516ff337c"; + sha256 = "b4b5db13a9d387438e610c2ca1d81386ccd206944d9a9dd273f21874486cddaf"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix index c22de6d8a6..891c79f1b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix @@ -7,17 +7,19 @@ buildPythonPackage rec { pname = "hiredis"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "aa59dd63bb3f736de4fc2d080114429d5d369dfb3265f771778e8349d67a97a4"; + sha256 = "996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132"; }; propagatedBuildInputs = [ redis ]; checkPhase = '' + mv hiredis _hiredis ${python.interpreter} test.py ''; + pythonImportsCheck = [ "hiredis" ]; meta = with stdenv.lib; { description = "Wraps protocol parsing code in hiredis, speeds up parsing of multi bulk replies"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix index 79d49e654f..10ee1bbf2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -1,4 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, dateutil, convertdate }: +{ stdenv +, buildPythonPackage +, fetchPypi +, convertdate +, dateutil +, korean-lunar-calendar +, six +}: buildPythonPackage rec { pname = "holidays"; @@ -9,7 +16,13 @@ buildPythonPackage rec { sha256 = "839281f2b1ae7ac576da7951472482f6e714818296853107ea861fa60f5013cc"; }; - propagatedBuildInputs = [ six dateutil convertdate ]; + propagatedBuildInputs = [ + convertdate + dateutil + korean-lunar-calendar + six + ]; + pythonImportsCheck = [ "holidays" ]; meta = with stdenv.lib; { homepage = "https://github.com/dr-prodigy/python-holidays"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index c98192e9b0..a4f1ab6b77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -2,27 +2,37 @@ , buildPythonPackage , fetchPypi , six -, requests-cache , pygments , pyquery , cachelib , appdirs +, keep }: buildPythonPackage rec { pname = "howdoi"; - version = "1.2.1"; + version = "2.0.5"; src = fetchPypi { inherit pname version; - sha256 = "3b322668606d29d8a841c3b28c0574851f512b55c33a7ceb982b6a98d82fa3e3"; + sha256 = "8e4d048ae7ca6182d648f62a66d07360cca2504fe46649c32748b6ef2735f7f4"; }; - propagatedBuildInputs = [ six requests-cache pygments pyquery cachelib appdirs ]; + postPatch = '' + substituteInPlace setup.py --replace 'cachelib==0.1' 'cachelib' + ''; + propagatedBuildInputs = [ six pygments pyquery cachelib appdirs keep ]; + + # author hasn't included page_cache directory (which allows tests to run without + # external requests) in pypi tarball. github repo doesn't have release revisions + # clearly tagged. re-enable tests when either is sorted. + doCheck = false; preCheck = '' + mv howdoi _howdoi export HOME=$(mktemp -d) ''; + pythonImportsCheck = [ "howdoi" ]; meta = with lib; { description = "Instant coding answers via the command line"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix index 81042ac340..f0abbcfbec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "html5lib"; - version = "1.0.1"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"; + sha256 = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"; }; checkInputs = [ flake8 pytest_4 pytest-expect mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix new file mode 100644 index 0000000000..d98785576f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "http-parser"; + version = "0.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "benoitc"; + repo = pname; + rev = version; + sha256 = "05byv1079qi7ypvzm13yf5nc23ink6gr6c5wrhq7fwld4syscy2q"; + }; + + checkInputs = [ pytest ]; + + checkPhase = "pytest testing/"; + + pythonImportsCheck = [ "http_parser" ]; + + meta = with lib; { + description = "HTTP request/response parser for python in C"; + homepage = "https://github.com/benoitc/http-parser"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix new file mode 100644 index 0000000000..9ac9b76d2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, h11 +, sniffio +}: + +buildPythonPackage rec { + pname = "httpcore"; + version = "0.10.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "00gn8nfv814rg6fj7xv97mrra3fvx6fzjcgx9y051ihm6hxljdsi"; + }; + + propagatedBuildInputs = [ h11 sniffio ]; + + # tests require pythonic access to mitmproxy, which isn't (yet?) packaged as + # a pythonPackage. + doCheck = false; + pythonImportsCheck = [ "httpcore" ]; + + meta = with stdenv.lib; { + description = "A minimal HTTP client"; + homepage = "https://github.com/encode/httpcore"; + license = licenses.bsd3; + maintainers = [ maintainers.ris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 0b29c80fc3..5361e04720 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -1,65 +1,70 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , certifi -, hstspreload , chardet , h11 , h2 +, httpcore , idna , rfc3986 , sniffio , isPy27 , pytest +, pytest-asyncio +, pytest-trio , pytestcov , trustme , uvicorn -, trio , brotli -, urllib3 }: buildPythonPackage rec { pname = "httpx"; - version = "0.12.1"; + version = "0.14.2"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "1nrp4h1ppb5vll81fzxmks82p0hxcil9f3mja3dgya511kc703h6"; + sha256 = "08b6k5g8car3bic90aw4ysb2zvsa5nm8qk3hk4dgamllnnxzl5br"; }; + patches = [ + (fetchpatch { + name = "fix-cookie-test-timestamp.patch"; + url = "https://github.com/encode/httpx/pull/1270.patch"; + sha256 = "1hgrynac6226sgnyzmsr1nr15rn49gbfmk4c2kx3dwkbh6vr7jpd"; + }) + ]; + propagatedBuildInputs = [ certifi - hstspreload chardet h11 h2 + httpcore idna rfc3986 sniffio - urllib3 ]; checkInputs = [ pytest + pytest-asyncio + pytest-trio pytestcov trustme uvicorn - trio brotli ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "h11==0.8.*" "h11" - ''; - checkPhase = '' - PYTHONPATH=.:$PYTHONPATH pytest + PYTHONPATH=.:$PYTHONPATH pytest -k 'not (test_connect_timeout or test_elapsed_timer)' ''; + pythonImportsCheck = [ "httpx" ]; meta = with lib; { description = "The next generation HTTP client"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix index 70489cc3bf..4676c30047 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "2.4.1"; + version = "2.6.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "4b4ce2fc1c9d79c63f68009ddf5a12ad238aa78e2fceb256b5aa921763551422"; + sha256 = "8ee358ea6c23de896b9d1925ebe6a8504bb2ba7e98d5ccf4d07ab7f3b28f3819"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix index 1fc4901782..bab7986eda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperlink/default.nix @@ -1,17 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi, idna }: +{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing }: buildPythonPackage rec { pname = "hyperlink"; - version = "19.0.0"; + version = "20.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4288e34705da077fada1111a24a0aa08bb1e76699c9ce49876af722441845654"; + sha256 = "47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af"; }; - propagatedBuildInputs = [ idna ]; + propagatedBuildInputs = [ idna ] + ++ lib.optionals isPy27 [ typing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A featureful, correct URL for Python"; license = licenses.mit; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix new file mode 100644 index 0000000000..692db49adc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi +, hypothesis +, poetry +, pydantic +, pytest +}: + +buildPythonPackage rec { + pname = "hypothesis-auto"; + version = "1.1.4"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c9jksza0gg2gva3liy0s8riv6imjavhnqw05m8l5660knq2yb2y"; + }; + + nativeBuildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + pydantic + hypothesis + pytest + ]; + + pythonImportsCheck = [ "hypothesis_auto" ]; + + meta = with lib; { + description = "Enables fully automatic tests for type annotated functions"; + homepage = "https://github.com/timothycrosley/hypothesis-auto/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix index f79fe02820..dac4ca43fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "5.11.0"; + version = "5.30.0"; pname = "hypothesis"; # Use github tarballs that includes tests @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "1ca2dwih65s4r8vazwqm963ywngdr3v854ldnfyny7bvx1v28m8k"; + sha256 = "0fmc4jfaksr285fjhp18ibj2rr8cxmbd0pwx370r5wf8jnhm6jb3"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix new file mode 100644 index 0000000000..5b2869e10d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook , pytestcov , numba +, numpy +, scikitlearn +, scipy +}: + +buildPythonPackage rec { + pname = "hyppo"; + version = "0.1.3"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "neurodata"; + repo = pname; + rev = "v${version}"; + sha256 = "0qdnb1l4hz4dgwhapz1fp9sb2vxxvr8h2ngsbvyf50h3kapcn19r"; + }; + + propagatedBuildInputs = [ + numba + numpy + scikitlearn + scipy + ]; + + checkInputs = [ pytestCheckHook pytestcov ]; + pytestFlagsArray = [ "--ignore=docs" ]; + + meta = with lib; { + homepage = "https://github.com/neurodata/hyppo"; + description = "Indepedence testing in Python"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix index 4cc8574c84..231cb4f1d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, xorgserver, pytest, pytest-xvfb, pytest-asyncio, i3, python, xlib, xdpyinfo +, xorgserver, pytest, pytest-xvfb, i3, python, xlib, xdpyinfo , makeFontsConf, coreutils }: @@ -19,7 +19,7 @@ buildPythonPackage rec { fontDirectories = [ ]; }; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file - checkInputs = [ pytest xdpyinfo pytest-asyncio pytest-xvfb xorgserver i3 ]; + checkInputs = [ pytest xdpyinfo pytest-xvfb xorgserver i3 ]; postPatch = '' substituteInPlace test/i3.config \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix index 3605e88edd..76330af43e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "iapws"; - version = "1.4.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "d65c813bb6b100a8d1ed79e00148832a0321b3063e9632a990344890acb02493"; + sha256 = "781285acaedff49d72c074aa308aabf7ca17f486cca490e5ed3f35526bbe4153"; }; propagatedBuildInputs = [ scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index 6aba70d3a5..68a71e0974 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.25"; + version = "1.4.29"; src = fetchPypi { inherit pname version; - sha256 = "110ed090fec6bce1aabe3c72d9258a9de82207adeaa5a05cd75c635880312f9a"; + sha256 = "9f5fcf22b665eaece583bd395b103c2769772a0f646ffabb5b1f155901b07de2"; }; # Tests not included in PyPI tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix index 13e8fb43bb..613fde773a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "idna"; - version = "2.9"; + version = "2.10"; src = fetchPypi { inherit pname version; - sha256 = "7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb"; + sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; }; meta = { @@ -17,4 +17,4 @@ buildPythonPackage rec { description = "Internationalized Domain Names in Applications (IDNA)"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix index bcca68600e..3e36b4dd8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix @@ -30,6 +30,7 @@ , wtforms , psycopg2 # optional, for postgresql support , flask_testing +, pytestCheckHook }: # ihatemoney is not really a library. It will only ever be imported @@ -113,12 +114,19 @@ buildPythonPackage rec { ]; checkInputs = [ - flask_testing + flask_testing pytestCheckHook + ]; + + pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ]; + disabledTests = [ + "test_notifications" # requires running service. + "test_invite" # requires running service. ]; passthru.tests = { - inherit (nixosTests) ihatemoney; + inherit (nixosTests.ihatemoney) ihatemoney-postgresql ihatemoney-sqlite; }; + meta = with lib; { homepage = "https://ihatemoney.org"; description = "A simple shared budget manager web application"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix index 4bcbe6a061..d877c09835 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "3.0.4"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "6e25448318cda55e82a5de52beb6813b003cb8e4a7b5753305912a30055a29f8"; + sha256 = "815e9ce9d2de7ddd58ba01834d8f55790b7daddbac6c844cba0fc459b7d5005a"; }; doCheck = false; # something about yajl diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix index f77e2dcab0..3ebd22ffeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "'opencv-python >= 3.4.5'," "" ''; - + propagatedBuildInputs = [ numpy scikitimage diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 4868f3ae37..ce24dfb589 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.8.0"; + version = "2.9.0"; disabled = isPy27; src = fetchPypi { - sha256 = "fb5fd6d3d17126bbaac9af29fe340e2c97a196eb9416d4f28c0e543744a152cf"; + sha256 = "52ddbaeca2dccf53ba2d6dec5676ca7bc3b2403ef8b37f7da78b7654bb3e10f0"; inherit pname version; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index 49a98d675e..1cb3dc2a7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.6.2"; + version = "0.7.0"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "942b9a7f2e1df831097fbee587c5c90a4cc6afa6105b23d3e30d8798f1a9b17d"; + sha256 = "da59de0d1c0fa66f62054dd9a0a295a182563aa1abbb3bf9224a3678fcfe8fa4"; }; propagatedBuildInputs = [ scikitlearn ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index 2fa46c2ed9..7e9a6b5daa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -1,16 +1,17 @@ -{ lib, pillow, fetchPypi, buildPythonPackage, isPy27 }: +{ lib, pillow, fetchPypi, buildPythonPackage, isPy27, pikepdf }: buildPythonPackage rec { pname = "img2pdf"; - version = "0.3.6"; + version = "0.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1yx0ljbg7phpix507wq584qvspp2jgax7flpp1148pxpc2d51mcc"; + sha256 = "eaee690ab8403dd1a9cb4db10afee41dd3e6c7ed63bdace02a0121f9feadb0c9"; }; propagatedBuildInputs = [ + pikepdf pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imgsize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imgsize/default.nix new file mode 100644 index 0000000000..d4f066b8b0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/imgsize/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "imgsize"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "ojii"; + repo = pname; + rev = version; + sha256 = "0k24qj4i996fz7lpjrs36il6lp51rh13b0j2wip87cy5v9109m2d"; + }; + + meta = with stdenv.lib; { + description = "Pure Python image size library"; + homepage = "https://github.com/ojii/imgsize"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix index 5a31379224..edab68aa18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "07icyggasn38yv2swdrd8z6i0plazmc9adavsdkbqqj91j53ll9l"; + sha256 = "10vz0ydrzspdhdbxrzwr9vhs693hzh4ff71lnqsifvdzvf66bfwh"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix index 7faefd4c0e..0e1d4654c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "importlib_resources"; - version = "1.5.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1jilyxyb2z7hzcjhx1ddni52mq00i728wqh8f5k4469yhdkdz1vg"; + sha256 = "19f745a6eca188b490b1428c8d1d4a0d2368759f32370ea8fb89cad2ab1106c3"; }; nativeBuildInputs = [ setuptools_scm toml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix index bf370d7ebf..6f439f0f69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "inflection"; - version = "0.4.0"; + version = "0.5.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "32a5c3341d9583ec319548b9015b7fbdf8c429cbcb575d326c33ae3a0e90d52c"; + sha256 = "1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix new file mode 100644 index 0000000000..f6383e46d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "iniconfig"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s9z9n4603fdpv2vzh6ddzfgsjmb09n6qalkjl2xwrss6n4jzyg5"; + }; + + doCheck = false; # avoid circular import with pytest + pythonImportsCheck = [ "iniconfig" ]; + + meta = with lib; { + description = "brain-dead simple parsing of ini files"; + homepage = "https://github.com/CHANGE/iniconfig/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix index 58e7f61b67..560ae55293 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "inquirer"; - version = "2.6.3"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "01lf51y3bxsxkghbdk9hr42yvihpwi2s5zpxnra3bx41r35msvjz"; + sha256 = "e819188de0ca7985a99c282176c6f50fb08b0d33867fd1965d3f3e97d6c8f83f"; }; propagatedBuildInputs = [ python-editor readchar blessings ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix index 209920db2b..8b0bbf2dd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intervaltree/default.nix @@ -2,12 +2,12 @@ , python, pytest, sortedcontainers }: buildPythonPackage rec { - version = "3.0.2"; + version = "3.1.0"; pname = "intervaltree"; src = fetchPypi { inherit pname version; - sha256 = "0wz234g6irlm4hivs2qzmnywk0ss06ckagwh15nflkyb3p462kyb"; + sha256 = "902b1b88936918f9b2a19e0e5eb7ccb430ae45cde4f39ea4b36932920d33952d"; }; buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix index edf9d0863a..c8539598fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { "test_subprocess_print" "test_subprocess_error" "test_ipython_start_kernel_no_userns" - + # https://github.com/ipython/ipykernel/issues/506 - "test_unc_paths" + "test_unc_paths" ] ++ lib.optionals (pythonOlder "3.8") [ # flaky test https://github.com/ipython/ipykernel/issues/485 "test_shutdown" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/7.16.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/7.16.nix new file mode 100644 index 0000000000..9700737f48 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/7.16.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +# Build dependencies +, glibcLocales +# Test dependencies +, nose +, pygments +# Runtime dependencies +, jedi +, decorator +, pickleshare +, traitlets +, prompt_toolkit +, pexpect +, appnope +, backcall +, fetchpatch +}: + +buildPythonPackage rec { + pname = "ipython"; + version = "7.16.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf"; + }; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py --replace "'gnureadline'" " " + ''; + + buildInputs = [ glibcLocales ]; + + checkInputs = [ nose pygments ]; + + propagatedBuildInputs = [ + jedi + decorator + pickleshare + traitlets + prompt_toolkit + pygments + pexpect + backcall + ] ++ lib.optionals stdenv.isDarwin [appnope]; + + LC_ALL="en_US.UTF-8"; + + doCheck = false; # Circular dependency with ipykernel + + checkPhase = '' + nosetests + ''; + + pythonImportsCheck = [ + "IPython" + ]; + + meta = with lib; { + description = "IPython: Productive Interactive Computing"; + homepage = "http://ipython.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor fridh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix index 9700737f48..1f1a50363f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.16.1"; - disabled = pythonOlder "3.6"; + version = "7.17.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf"; + sha256 = "b70974aaa2674b05eb86a910c02ed09956a33f2dd6c71afc60f0b128a77e7f28"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix index 8507dfc7e6..c9426473ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.3.4"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "009815638f33e67f0fd9cc4fa2087b2faa438e32703877ca14ecf9826508b724"; + sha256 = "3253727e8e12e3c157550e3e8d6986edf61ad0d68299992fbf3fa6acec41a12e"; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix index 45d18085cc..c63cee7912 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.4.1"; + version = "1.5.1"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "eb940d89fb7c877a3d42e08e7ae1d5cf8a501e059db165007687fdf648598b06"; + sha256 = "593f5d6761e304cbb78bca967030485d8835e8d310ef7d83ac1b0e6a13e4911c"; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix index b04ab3febd..bc87015f10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -1,21 +1,23 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm, jaraco_collections, importlib-metadata +, setuptools_scm, jaraco_collections, importlib-metadata, toml }: buildPythonPackage rec { pname = "irc"; - version = "18.0.0"; + version = "19.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1qg5996mzvhnkm74ksaa4d47fz5vrpw6hvxyaq9kf6y4cf1l76wq"; + sha256 = "29026b1e977dacb621c710ae9531fcab6fa21825b743c616c220da0e58a32233"; }; doCheck = false; + pythonImportsCheck = [ "irc" ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six @@ -26,6 +28,7 @@ buildPythonPackage rec { pytz jaraco_itertools jaraco_collections + toml ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix index 22426d331c..5b2a8e1614 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "islpy"; - version = "2019.1.2"; + version = "2020.2"; src = fetchPypi { inherit pname version; - sha256 = "834b6b946f33d578d5c6b2f863dd93f7ecc4c0a2bf73407c96ef9f95b6b71bbf"; + sha256 = "ee797e1284bffe897568f9cc1f063f1a6fac8d7b87596308b7467e9b870a90ef"; }; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix index 3350432380..4d4cf95fc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.14"; + version = "1.16"; src = fetchPypi { inherit pname version; - sha256 = "089pln3c41n6dyh91hw9gy6mpm9s663lpmdc4gamig3g6pfmbsk4"; + sha256 = "8dead057b09ed4ac03c6caae7890489da1d823215ec5166789739ece941bdcbc"; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jdcal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jdcal/default.nix index 4fd89c83ab..c2dd66ac66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jdcal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jdcal/default.nix @@ -25,4 +25,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ lihop ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix index 59c22caf31..ab8f72ea9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix @@ -1,12 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; - version = "0.17.2"; + # switch back to stable version on the next release. + # current stable is incompatible with parso + version = "2020-08-06"; - src = fetchPypi { - inherit pname version; - sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"; + src = fetchFromGitHub { + owner = "davidhalter"; + repo = "jedi"; + rev = "216f976fd5cab7a460e5d287e853d11759251e52"; + sha256 = "1kb2ajzigadl95pnwglg8fxz9cvpg9hx30hqqj91jkgrc7djdldj"; + fetchSubmodules = true; }; checkInputs = [ pytest glibcLocales tox pytestcov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index e5f4fae63d..e185cf8b6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "80a7e8d3bebb1e792ff347e9dd072879ce105424224fe804e6671c32a2e8e4bf"; + sha256 = "20efe98718e61ea7bd69b2178d93c5435bbf2e1ba78a47366632c84970e026c9"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix index 7fe7f2baa4..40bf7752a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix @@ -1,12 +1,13 @@ { stdenv , buildPythonPackage , fetchPypi +, mock +, pytest +, pytest-mock , pytz , requests -, coverage -, mock -, nose -, unittest2 +, requests-kerberos +, toml }: buildPythonPackage rec { @@ -19,14 +20,21 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pytz requests ]; - buildInputs = [ coverage mock nose unittest2 ]; + checkInputs = [ mock pytest pytest-mock requests-kerberos toml ]; + # TODO requests-kerberos is broken on darwin, weeding out the broken tests without + # access to macOS is not an adventure I am ready to embark on - @rski + doCheck = !stdenv.isDarwin; + # don't run tests that try to spin up jenkins, and a few more that are mysteriously broken + checkPhase = '' + py.test jenkinsapi_tests \ + -k "not systests and not test_plugins and not test_view" + ''; meta = with stdenv.lib; { description = "A Python API for accessing resources on a Jenkins continuous-integration server"; homepage = "https://github.com/salimfadhley/jenkinsapi"; maintainers = with maintainers; [ drets ]; license = licenses.mit; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix index 42e45d162b..4517837702 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix @@ -3,7 +3,9 @@ , isPy3k , fetchPypi , pytest -, markupsafe }: +, markupsafe +, setuptools +}: buildPythonPackage rec { pname = "Jinja2"; @@ -15,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ markupsafe ]; + propagatedBuildInputs = [ markupsafe setuptools ]; # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix index da6e53fa12..fa4fc450f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix @@ -1,4 +1,5 @@ { lib +, pythonOlder , buildPythonPackage , fetchPypi , stdenv @@ -12,11 +13,12 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.15.1"; + version = "0.16.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "61e49189c84b3c5d99a969d314853f4d1d263316cc694bec17548ebaa9c47b6e"; + sha256 = "8f52bf24c64b608bf0b2563e0e47d6fcf516abc8cfafe10cfd98ad66d94f92d6"; }; checkInputs = [ sphinx numpydoc pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix index d34fc8cb57..73bdb31da9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "068nkdbag049cjs9q3rrs5j5f1239202y0g9xblii6rr0fjgyhf3"; + sha256 = "c37ff4b93606e6a452b72cdb992da5e0544be12912fac01b31ddbdd61f6d5bd0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix index 3f1941b2a2..72776a0371 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix @@ -1,21 +1,15 @@ -{ buildPythonPackage, fetchPypi, lib, cython, jq }: +{ buildPythonPackage, fetchPypi, lib, jq }: buildPythonPackage rec { pname = "jq"; - version = "0.1.6"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "34bdf9f9e49e522e1790afc03f3584c6b57329215ea0567fb2157867d6d6f602"; + sha256 = "9fe6ce07bc8d209c385d8ba132a2971c69aef015103c46bea87a73a16c5ec147"; }; patches = [ ./jq-py-setup.patch ]; - nativeBuildInputs = [ cython ]; - - preBuild = '' - cython jq.pyx - ''; - buildInputs = [ jq ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch b/third_party/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch index 53092b8a1f..df5245a0c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/jq-py-setup.patch @@ -1,61 +1,69 @@ -From 3f369cf8b9f7134d0792f6b141d39b5342a8274f Mon Sep 17 00:00:00 2001 -From: Benjamin Staffin -Date: Mon, 14 Jan 2019 17:27:06 -0500 +From 968ddf2bd773e800e46737fced743bd00af9aa0d Mon Sep 17 00:00:00 2001 +From: William Kral +Date: Tue, 8 Sep 2020 22:04:24 -0700 Subject: [PATCH] Vastly simplify setup.py for distro compatibility --- - setup.py | 81 +------------------------------------------------------- - 1 file changed, 1 insertion(+), 80 deletions(-) + setup.py | 101 ++----------------------------------------------------- + 1 file changed, 2 insertions(+), 99 deletions(-) diff --git a/setup.py b/setup.py -index 77933f2..2b71e25 100644 +index cb63f60..87380ed 100644 --- a/setup.py +++ b/setup.py -@@ -1,10 +1,6 @@ +@@ -1,114 +1,19 @@ #!/usr/bin/env python import os --import platform -import subprocess -import tarfile -import shutil +-import sysconfig - try: - import sysconfig -@@ -14,88 +10,15 @@ except ImportError: - +-import requests from setuptools import setup - from distutils.extension import Extension --from distutils.command.build_ext import build_ext +-from setuptools.command.build_ext import build_ext + from setuptools.extension import Extension + + +-def urlretrieve(source_url, destination_path): +- response = requests.get(source_url, stream=True) +- if response.status_code != 200: +- raise Exception("status code was: {}".format(response.status_code)) - --try: -- from urllib import urlretrieve --except ImportError: -- from urllib.request import urlretrieve +- with open(destination_path, "wb") as fileobj: +- for chunk in response.iter_content(chunk_size=128): +- fileobj.write(chunk) - -def path_in_dir(relative_path): - return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path)) - +- +-def dependency_path(relative_path): +- return os.path.join(path_in_dir("_deps"), relative_path) +- def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() --jq_lib_tarball_path = path_in_dir("_jq-lib-1.5.tar.gz") --jq_lib_dir = path_in_dir("jq-jq-1.5") +-jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz") +-jq_lib_dir = dependency_path("jq-1.6") - --oniguruma_lib_tarball_path = path_in_dir("_onig-5.9.6.tar.gz") --oniguruma_lib_build_dir = path_in_dir("onig-5.9.6") --oniguruma_lib_install_dir = path_in_dir("onig-install-5.9.6") +-oniguruma_version = "6.9.4" +-oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version)) +-oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version)) +-oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version)) - -class jq_build_ext(build_ext): - def run(self): +- if not os.path.exists(dependency_path(".")): +- os.makedirs(dependency_path(".")) - self._build_oniguruma() - self._build_libjq() - build_ext.run(self) -- +- - def _build_oniguruma(self): - self._build_lib( -- source_url="https://github.com/kkos/oniguruma/releases/download/v5.9.6/onig-5.9.6.tar.gz", +- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version), - tarball_path=oniguruma_lib_tarball_path, - lib_dir=oniguruma_lib_build_dir, - commands=[ @@ -63,11 +71,11 @@ index 77933f2..2b71e25 100644 - ["make"], - ["make", "install"], - ]) -- -- +- +- - def _build_libjq(self): - self._build_lib( -- source_url="https://github.com/stedolan/jq/archive/jq-1.5.tar.gz", +- source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz", - tarball_path=jq_lib_tarball_path, - lib_dir=jq_lib_dir, - commands=[ @@ -75,9 +83,13 @@ index 77933f2..2b71e25 100644 - ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], - ["make"], - ]) -- +- - def _build_lib(self, source_url, tarball_path, lib_dir, commands): -- self._download_tarball(source_url, tarball_path) +- self._download_tarball( +- source_url=source_url, +- tarball_path=tarball_path, +- lib_dir=lib_dir, +- ) - - macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET") - if macosx_deployment_target: @@ -86,45 +98,50 @@ index 77933f2..2b71e25 100644 - def run_command(args): - print("Executing: %s" % ' '.join(args)) - subprocess.check_call(args, cwd=lib_dir) -- +- - for command in commands: - run_command(command) -- -- def _download_tarball(self, source_url, tarball_path): +- +- def _download_tarball(self, source_url, tarball_path, lib_dir): - if os.path.exists(tarball_path): - os.unlink(tarball_path) +- print("Downloading {}".format(source_url)) - urlretrieve(source_url, tarball_path) -- -- if os.path.exists(jq_lib_dir): -- shutil.rmtree(jq_lib_dir) -- tarfile.open(tarball_path, "r:gz").extractall(path_in_dir(".")) +- print("Downloaded {}".format(source_url)) +- +- if os.path.exists(lib_dir): +- shutil.rmtree(lib_dir) +- tarfile.open(tarball_path, "r:gz").extractall(dependency_path(".")) - - jq_extension = Extension( "jq", sources=["jq.c"], -- include_dirs=[jq_lib_dir], +- include_dirs=[os.path.join(jq_lib_dir, "src")], +- extra_link_args=["-lm"], - extra_objects=[ - os.path.join(jq_lib_dir, ".libs/libjq.a"), - os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"), - ], -+ libraries=["jq"], ++ libraries=["jq"] ) setup( -@@ -107,7 +30,6 @@ setup( - url='https://github.com/mwilliamson/jq.py', +@@ -120,8 +25,7 @@ setup( + url='http://github.com/mwilliamson/jq.py', + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', license='BSD 2-Clause', - ext_modules = [jq_extension], +- ext_modules = [jq_extension], - cmdclass={"build_ext": jq_build_ext}, ++ ext_modules=[jq_extension], classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', -@@ -123,4 +45,3 @@ setup( - 'Programming Language :: Python :: 3.5', +@@ -137,4 +41,3 @@ setup( + 'Programming Language :: Python :: 3.8', ], ) - -- -2.19.2 +2.28.0 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix index 225fa48c72..f3eb0a173d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.11.0"; + version = "1.12.0"; propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "4f670c6f4f8d4caca9a348271010742f494becb96fe0a9be6ffac8b3d46350ca"; + sha256 = "65dea76bf2f551d7f1686111d2794506e07b6c7c477feca2124596376feb8713"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix index 82ef58bab5..a4a66aab44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.25"; + version = "1.26"; src = fetchPypi { inherit pname version; - sha256 = "ddc0f7628b8bfdd62e3cbfbc24ca6671b0b6265b50d186c2cf3659dc0f78fd6a"; + sha256 = "e45df18b0ab7df1925f20671bbc3f6bd0b4b556fb4b9c5d97684b0a7eac01744"; }; # test files are missing diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix index 9b71a1515a..d55a5fad44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix @@ -1,7 +1,8 @@ { stdenv, buildPythonPackage, fetchPypi, fetchpatch , nose, numpy , bottle, pyyaml, redis, six -, zlib }: +, zlib +, pytestCheckHook }: buildPythonPackage rec { pname = "Jug"; @@ -21,6 +22,9 @@ buildPythonPackage rec { sha256 = "859a4b4cb26a0010299b189c92cfba626852c97a38e22f3d1b56e4e1d8ad8620"; }; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jug" ]; + meta = with stdenv.lib; { description = "A Task-Based Parallelization Framework"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix index 1f92045c41..22ff5caad8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix @@ -7,26 +7,28 @@ , paramiko , netaddr , ncclient +, ntc-templates , lxml , jinja2 , pyyaml +, transitions +, yamlordereddictloader , nose }: buildPythonPackage rec { pname = "junos-eznc"; - version = "2.4.1"; + version = "2.5.3"; src = fetchPypi { inherit pname version; - sha256 = "8f3ecf06ab4d630f27e7ed7a7b605122ee5c5e5386b1f5186f6cb52810750b18"; + sha256 = "521659fe94da796897abc16773c3d84fa44d3e1f5386c71fbaef44cb80159855"; }; - checkInputs = [ nose ]; propagatedBuildInputs = [ - scp six pyserial paramiko netaddr ncclient lxml jinja2 pyyaml + scp six pyserial paramiko netaddr ncclient ntc-templates lxml jinja2 pyyaml transitions yamlordereddictloader ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix index 9f2143e2f2..4d2efcf00b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Jupyter Sphinx Extensions"; homepage = "https://github.com/jupyter/jupyter-sphinx/"; license = licenses.bsd3; - }; + }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix index 8ce8150cbd..201fbec02c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.3.4"; + version = "5.3.5"; src = fetchPypi { inherit pname version; - sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910"; + sha256 = "5efdf4131124d4a0d5789101e74827022585f172d2f4b60cf6fa98e0a7511b25"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix index 39f8c71a4d..47d3bb6af0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "6.1.6"; + version = "6.1.7"; src = fetchPypi { inherit pname version; - sha256 = "b360f8d4638bc577a4656e93f86298db755f915098dc763f6fc05da0c5d7a595"; + sha256 = "49e390b36fe4b4226724704ea28d9fb903f1a3601b6882ce3105221cd09377a1"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 9d5d2a4c23..4d0831ff97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; - version = "1.3.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "920b115babdc32e7b159fc497a0a794bb0f57b222ce2c26c74a23594892f9d3c"; + sha256 = "758081bbdb28b26313bb18c9d8aa2b8fcdc9162e4d3ab196c626567e64f1ab8b"; }; # No tests implemented doCheck = false; - + propagatedBuildInputs = [ jupyterhub ldap3 ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix new file mode 100644 index 0000000000..2aef23fe4a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, jupyterhub +}: + +buildPythonPackage rec { + pname = "jupyterhub-tmpauthenticator"; + version = "0.6"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "064x1ypxwx1l270ic97p8czbzb7swl9758v40k3w2gaqf9762f0l"; + }; + + propagatedBuildInputs = [ jupyterhub ]; + + # No tests available in the package + doCheck = false; + + pythonImportsCheck = [ "tmpauthenticator" ]; + + meta = with lib; { + description = "Simple Jupyterhub authenticator that allows anyone to log in."; + license = with licenses; [ bsd3 ]; + homepage = "https://github.com/jupyterhub/tmpauthenticator"; + maintainers = with maintainers; [ chiroptical ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix new file mode 100644 index 0000000000..91ae426147 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, notebook +, nbdime +, git +, pytest +}: + +buildPythonPackage rec { + pname = "jupyterlab_git"; + version = "0.20.0"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qs3wrcils07xlz698xr7giqf9v63n2qb338mlh7wql93rmjg45i"; + }; + + propagatedBuildInputs = [ notebook nbdime git ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest jupyterlab_git/ --ignore=jupyterlab_git/tests/test_handlers.py + ''; + + pythonImportsCheck = [ "jupyterlab_git" ]; + + meta = with lib; { + description = "Jupyter lab extension for version control with Git."; + license = with licenses; [ bsd3 ]; + homepage = "https://github.com/jupyterlab/jupyterlab-git"; + maintainers = with maintainers; [ chiroptical ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 0aab09117e..fb5ac3d06a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.1.5"; + version = "2.2.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "162jn51cg36fsn4l2zhnb5n4nbkhm9wlv974ggcnmdij3i4r4yya"; + sha256 = "6554b022d2cd120100e165ec537c6511d70de7f89e253b3c667ea28f2a9263ff"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index c101ae8e2e..0344a66cf6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "132xby7531rbrjg9bqvsx86birr1blynjxy8gi5kcnb6x7fxjcal"; + sha256 = "5431d9dde96659364b7cc877693d5d21e7b80cea7ae3959ecc2b87518e5f5d8c"; }; checkInputs = [ requests pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix index cee21edd24..e4b285d4ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.4.2"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "58b4c6bf48ba2e18bfc2d8358e852b6e3538ff664843398be09157c184ee1a27"; + sha256 = "1cebc9f5975b4c08db3de6d7d61b35f8c33a24cf2c8c04eee7b8a7aab8ddc39b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix index 997e3aedf5..42ed4cf879 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jwcrypto"; - version = "0.7"; + version = "0.8"; src = fetchPypi { inherit pname version; - sha256 = "002i60yidafpr642qcxrd74d8frbc4ci8vfysm05vqydcri1zgmd"; + sha256 = "b7fee2635bbefdf145399392f5be26ad54161c8271c66b5fe107b4b452f06c24"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix new file mode 100644 index 0000000000..6108ea5068 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, PyGithub +, terminaltables +, click +, requests +}: + +buildPythonPackage rec { + pname = "keep"; + version = "2.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2"; + }; + + propagatedBuildInputs = [ + click + requests + terminaltables + PyGithub + ]; + + # no tests + pythonImportsCheck = [ "keep" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/orkohunter/keep"; + description = "A Meta CLI toolkit: Personal shell command keeper and snippets manager"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix index e255789aaf..8b6301ab59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.3.1"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "321d43772006a25a1d58eea17401ef2a34d388b588c9f7646c34796151ebc8cc"; + sha256 = "fedd729b52572fb108a98e3d97e1bac10a81d3917d2103cc20ab2a5f03beb973"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix index 9495245ea6..560986f9c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "21.2.1"; + version = "21.3.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c53e0e5ccde3ad34284a40ce7976b5b3a3d6de70344c3f8ee44364cc340976ec"; + sha256 = "182f94fc0381546489e3e4d90384a8c1d43cc09ffe2eb4a826e7312df6e1be7c"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix index 23cff218e8..393e2d134c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix @@ -14,9 +14,9 @@ buildPythonPackage rec { inherit pname version; sha256 = "247800260cd38160c362d211dcaf4ed0f7816afb5efe56544748b21d6ad6d17f"; }; - + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - + nativeBuildInputs = [ cppy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix new file mode 100644 index 0000000000..41569ac9dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "korean-lunar-calendar"; + version = "0.2.1"; + + src = fetchPypi { + inherit version; + pname = "korean_lunar_calendar"; + sha256 = "0p97r21298ipgvsqh978aq2n6cvybzp8bskcvj15mm1f76qm9khj"; + }; + + # no real tests + pythonImportsCheck = [ "korean_lunar_calendar" ]; + + meta = with stdenv.lib; { + description = "A library to convert Korean lunar-calendar to Gregorian calendar."; + homepage = "https://github.com/usingsky/korean_lunar_calendar_py"; + license = licenses.mit; + maintainers = [ maintainers.ris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index 15c8a8144c..d5ed1b4cc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3"; checkPhase = '' - py.test + py.test --ignore=kubernetes/dynamic/test_client.py ''; src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index ffc393ab45..ad8d2853b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.4.1"; + version = "2.4.4"; src = fetchPypi { inherit pname version; - sha256 = "1d7a7304fe6a33c1345ab569e70019f7fa11c97d49948e4fc4bf3bbc1f202703"; + sha256 = "a455ae30ccb9328731fca7f7f4cefaa7da69a2fe3e43d1b742bae5ff4693c695"; }; propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ]; # Test cases are not running on pypi or GitHub - doCheck = false; + doCheck = false; meta = with lib; { homepage = "https://github.com/Labelbox/Labelbox"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy/default.nix index ff967d62dc..1e5f72ff80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazy/default.nix @@ -18,4 +18,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; homepage = "https://github.com/stefanholek/lazy"; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix index eb2d09d8d2..9842c4d759 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.7"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "1h1q8g1c2nkhx8p5n91bzkvjx5js5didi9xqbnmfrxqbnyc45w0p"; + sha256 = "59d1adcd5ead263387039e2a37d7cd772a2006b1cdb3ecfcbaab5192a601c515"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix index cd5f0aef64..5b68695f83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.6.1"; + version = "4.7.1"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1sfy8skvgw6hiihs9jmfn7a13yappqwffir98pahyg7cim7p55kr"; + sha256 = "0wmrcvw7k34ib93shhmjzh6kpndgqr37kyr377sril5clmac0z1f"; }; disabled = pythonOlder "3.4.0"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix index e680e45391..52c1cf9a9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.8.2"; + version = "2.8.3"; src = fetchPypi { inherit pname version; - sha256 = "1wvm8vixhcapkfv5k6xaf8c8w647kx2rdifarg6j0s34r4jzblfg"; + sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix index ade83d6721..0fc5d857fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -9,26 +9,33 @@ , audioread , resampy , soundfile +, pooch }: buildPythonPackage rec { pname = "librosa"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "656bbda80e98e6330db1ead79cd084b13a762284834d7603fcf7cf7c0dc65f3c"; + sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839"; }; - propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile ]; + propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ]; # No tests + # 1. Internet connection is required + # 2. Got error "module 'librosa' has no attribute 'version'" doCheck = false; + # check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160 + pythonImportsCheck = [ "librosa" ]; + meta = with stdenv.lib; { description = "Python module for audio and music processing"; homepage = "http://librosa.github.io/"; license = licenses.isc; + maintainers = with maintainers; [ GuillaumeDesforges ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix index 32717e127f..27144ccf1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.6.1"; + version = "4.7.1"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "0nk8zl5b0b36wrrkj271ck4phzxsigkjsazndscjslc9nkldmnpq"; + sha256 = "0mzr3ynfap51bcn6kshyi2h6iny2gpavn6g3b1xcsgzzlxqgfixf"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index 65accea559..605cbe0402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.8.2"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0nh6dvf8g93hv7cma6r8l88k8l20zck6a0ax29mrdg03f9hqdk9a"; + sha256 = "a4c7379604ccdc684aa865723211184709f9a2b45511772989b5f26ad156650e"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightparam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightparam/default.nix index 6681b528b8..0c3eb5292a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightparam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightparam/default.nix @@ -1,24 +1,31 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k +{ lib, pkgs, buildPythonPackage, fetchFromGitHub, isPy3k +, ipython +, ipywidgets , numpy +, pyqt5 }: buildPythonPackage rec { pname = "lightparam"; - version = "0.3.7"; + version = "0.4.6"; disabled = !isPy3k; - format = "wheel"; - src = fetchPypi { - inherit pname version; - format = "wheel"; - python = "py3"; - sha256 = "53d5d5b225bac27bc14929c9ad4e51ece4f692813dd367f317fb1586145d93f1"; + src = fetchFromGitHub { + owner = "portugueslab"; + repo = pname; + rev = "v${version}"; + sha256 = "13hlkvjcyz2lhvlfqyavja64jccbidshhs39sl4fibrn9iq34s3i"; }; propagatedBuildInputs = [ + ipython + ipywidgets numpy + pyqt5 ]; + pythonImportsCheck = [ "lightparam" ]; + meta = { homepage = "https://github.com/portugueslab/lightparam"; description = "Another attempt at parameters in Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index c96975412b..7a7106a5ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.33.0"; + version = "0.34.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9c8aae96f7fba10d9ac864b443d1e8c7ee4765c31569a2b201b3d0b67d8fc596"; + sha256 = "f03ee0d19bca8f2fe922bb424a909d05c28411983b0c2bc58b020032a0d11f63"; }; nativeBuildInputs = [ llvm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lmdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lmdb/default.nix index 5f31511451..328e5a428f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lmdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lmdb/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "0.98"; + version = "0.99"; src = fetchPypi { inherit pname version; - sha256 = "0625bc28bf0893e6000a83be7234f915ca078c32f9e73d8ae48b3508db7af708"; + sha256 = "f9eb844aaaacc8a4bc175e1c1f8a8fb538c330e378fd9eb40e8708d4dca7dc89"; }; checkInputs = [ pytest cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix new file mode 100644 index 0000000000..c1320eef04 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, mock +}: + +buildPythonPackage rec { + pname = "lml"; + version = "0.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "6luoF7Styen1whclzSR1+RKTO34t/fB5Ku2AB3FU9j8="; + }; + + checkInputs = [ + nose + mock + ]; + + checkPhase = "nosetests"; + + meta = { + description = "Load me later. A lazy plugin management system for Python"; + homepage = "http://lml.readthedocs.io/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix index 0078c91756..e9dd42219e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lmtpd/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "lmtpd"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "256e23a3292818ecccf9a76ef52e0064c6f7e1f8602904e15337c8917ed0fafe"; + sha256 = "2c6825d2ffa1de099440411a742f58e1b3e8deeb3345adcfd4c2c38d4baf62b3"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix index a52f194b8b..5f83c8633d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jwiegley ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix index fbda4989a2..18b1594b28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "loguru"; version = "0.5.1"; - + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix index 7bea2b04bb..e87146f6fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix @@ -8,15 +8,16 @@ , lxml , namedlist , sqlalchemy -, tornado_4 +, tornado , Yapsy +, pythonAtLeast }: buildPythonPackage rec { pname = "ludios_wpull"; version = "3.0.7"; - disabled = !isPy3k; + disabled = (!isPy3k) || (pythonAtLeast "3.8"); src = fetchFromGitHub { rev = version; @@ -25,7 +26,7 @@ buildPythonPackage rec { sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf"; }; - propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado_4 Yapsy ]; + propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ]; # Test suite has tests that fail on all platforms doCheck = false; @@ -35,5 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/ludios/wpull"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ivan ]; + broken = lib.versions.major tornado.version != "4"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix index c7a4fc3f42..99b7f304a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -3,27 +3,28 @@ , fetchFromGitHub , pythonOlder , python -, blinker, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, u-msgpack-python, watchdog +, blinker, bugsnag, click, dbus-next, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, sqlalchemy, u-msgpack-python, watchdog , sdnotify , systemd }: buildPythonPackage rec { pname = "maestral"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "0d1pxbg69ll07w4bbpzs7zz1yn82qyrym95b0mqmhrrg2ysxjngg"; + sha256 = "sha256-/xm6sGios5N68X94GqFFzH1jNSMK1OnvQiEykU9IAZU="; }; propagatedBuildInputs = [ blinker bugsnag click + dbus-next dropbox fasteners keyring @@ -31,6 +32,7 @@ buildPythonPackage rec { pathspec Pyro5 requests + sqlalchemy u-msgpack-python watchdog ] ++ stdenv.lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maildir-deduplicate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maildir-deduplicate/default.nix deleted file mode 100644 index 33728ef411..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/maildir-deduplicate/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, isPy27 -, click -}: - -buildPythonPackage rec { - pname = "maildir-deduplicate"; - version = "2.1.0"; - disabled = !isPy27; - - src = fetchPypi { - inherit pname version; - sha256 = "263c7f2c85dafe06eaa15e8d7ab83817204f70a5f08cc25a607f3f01ed130b42"; - }; - - propagatedBuildInputs = [ click ]; - - meta = with stdenv.lib; { - description = "Command-line tool to deduplicate mails from a set of maildir folders"; - homepage = "https://github.com/kdeldycke/maildir-deduplicate"; - license = licenses.gpl2; - broken = true; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/default.nix index 29d38a1f2f..187e3a646a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { sha256 = "041cd779ae383fb5c56f2bb44824f4e80ba895febd9a3f21570ac274221c82e0"; }; - propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest - wptserve manifestparser marionette_driver ]; + propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest + wptserve manifestparser marionette_driver ]; meta = { description = "Mozilla Marionette protocol test automation harness"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index 60e9e0460e..28193528ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "99ca2513d4e2ca29a08e550346f23947a50627a2b02f6ad36a4550e779fa0ce8"; }; - propagatedBuildInputs = [ mozversion mozrunner ]; + propagatedBuildInputs = [ mozversion mozrunner ]; meta = { description = "Mozilla Marionette driver"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index 3520d23081..a7cbb7ece0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mozhttpd"; - version = "0.7"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "10y1cr933ajx9ni701ayb7r361pak9wrzr7pdpyx81kkbjddq7qa"; + sha256 = "3e2a9b4d6c007a1a9fb729d6e95b5404d138914727747e10155426492dced975"; }; - propagatedBuildInputs = [ moznetwork ]; + propagatedBuildInputs = [ moznetwork ]; meta = { description = "Webserver for Mozilla testing"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/moznetwork.nix index 3029f7ed54..6bdc93f680 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0ws20l4ggb6mj7ycwrk5h7hj1jmj3mj0ca48k5jzsa4n042ahwrd"; }; - propagatedBuildInputs = [ mozlog mozinfo ]; + propagatedBuildInputs = [ mozlog mozinfo ]; meta = { description = "Network utilities for Mozilla testing"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown/3_1.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown/3_1.nix index b07d36e22c..eb9b2e59ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown/3_1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown/3_1.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; }; - propagatedBuildInputs = [ - setuptools + propagatedBuildInputs = [ + setuptools ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix index aa076cddad..c97f74a2f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { sha256 = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17"; }; - propagatedBuildInputs = [ - setuptools + propagatedBuildInputs = [ + setuptools ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 3b18c10cbc..e3b629b303 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -31,4 +31,4 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix index 4dd2ac8bca..cf54e38385 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.6.1"; + version = "3.7.1"; disabled = isPy27; meta = { @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "35ee2fb188f0bd9fc1cf9ac35e45fd394bd1c153cee430745a465ea435514bd5"; + sha256 = "a2a5eefb4b75a3b43f05be1cca0b6686adf56af7465c3ca629e5ad8d1e1fe13d"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix index e9362f4e07..ae07e7928a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mask-rcnn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mask-rcnn"; version = "2.1"; - + src = fetchFromGitHub { owner = "matterport"; repo = "Mask_RCNN"; @@ -49,4 +49,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ rakesh4g ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix new file mode 100644 index 0000000000..f9c1cf6839 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, PyGithub, GitPython, toml, click, tqdm, + paramiko, networkx, pydot, pyyaml }: + +buildPythonPackage rec { + pname = "mathlibtools"; + version = "0.0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d708bgsxjhhchqc56afi1h7k87vbfn7v40f4y1zlv7hsjc69s36"; + }; + + propagatedBuildInputs = [ + PyGithub GitPython toml click tqdm paramiko networkx pydot pyyaml + ]; + + # requires internet access + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/leanprover-community/mathlib-tools"; + description = "leanproject is a supporting tool for Lean's mathlib"; + license = licenses.asl20; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index 774fbc2879..732a6c89f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection -, pillow +, certifi, pillow , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -20,14 +20,14 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt5 != null; buildPythonPackage rec { - version = "3.3.0"; + version = "3.3.1"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "24e8db94948019d531ce0bcd637ac24b1c8f6744ac86d2aa0eb6dbaeb1386f82"; + sha256 = "87f53bcce90772f942c2db56736788b39332d552461a5cb13f05ff45c1680f0e"; }; XDG_RUNTIME_DIR = "/tmp"; @@ -40,12 +40,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ cycler dateutil numpy pyparsing tornado freetype kiwisolver - libpng mock pytz pillow ] + certifi libpng mock pytz pillow ] ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableQt [ pyqt5 ]; - setup_cfg = ./setup.cfg; + setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg; preBuild = '' cp "$setup_cfg" ./setup.cfg ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup-darwin.cfg b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup-darwin.cfg new file mode 100644 index 0000000000..f6463d9c57 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/setup-darwin.cfg @@ -0,0 +1,7 @@ +[directories] +basedirlist = . + +[libs] +system_freetype = true +# LTO not working in darwin stdenv, see #19312 +enable_lto = false diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index 890518658a..59c3f47d2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "0mgb9m3298jvw3wa051zn7vp1m8qriys3ps0qn3sq54fndljgg5k"; + sha256 = "127n4sqdcip1ld42w9wz49pxkpvi765qzvivvwl26720n11zq5cd"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix index f92b96c9ad..0afdeef222 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "15z5557rn4yvrhnpdm9l4kczr151qv9px736hd361rlr2z98wpdr"; + sha256 = "b95d8ed21799e6604683669c7ed3c6a184fcd92434d5762dccdb139b4f29e597"; }; buildInputs = [ libmaxminddb ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix new file mode 100644 index 0000000000..3b5536ed6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "mergedeep"; + version = "1.3.0"; + disabled = isPy27; + + # PyPI tarball doesn't include tests directory + src = fetchFromGitHub { + owner = "clarketm"; + repo = "mergedeep"; + rev = "v${version}"; + sha256 = "1a0y26a04limiggjwqyyqpryxiylbqya74nq1bij75zhz42sa02b"; + }; + + checkInputs = [ pytest ]; + checkPhase = "pytest"; + pythonImportsCheck = [ "mergedeep" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/clarketm/mergedeep"; + description = "A deep merge function for python"; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix index 6fdc962cdb..7799a7a9ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "minio"; - version = "5.0.10"; + version = "6.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6ecb7637a35f806733e9d112eacfa599a58d7c3d4698fda2b5c86fff5d34b417"; + sha256 = "97d275ff01ddae45101eced0d9d5258f2869308c949b17d86a77b77a2a50b7b3"; }; propagatedBuildInputs = [ @@ -29,6 +29,8 @@ buildPythonPackage rec { ]; checkInputs = [ faker mock nose pytestCheckHook ]; + # example credentials aren't present + pytestFlagsArray = [ "--ignore=tests/unit/credentials_test.py" ]; meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix new file mode 100644 index 0000000000..29666254e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix @@ -0,0 +1,22 @@ +{ lib +, isPy3k +, fetchPypi +, buildPythonPackage }: + +buildPythonPackage rec { + pname = "mistletoe"; + version = "0.7.2"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "18z6hqfnfjqnrcgfgl5pkj9ggf9yx0yyy94azcn1qf7hqn6g3l14"; + }; + + meta = with lib; { + description = "A fast, extensible Markdown parser in pure Python."; + homepage = "https://github.com/miyuchina/mistletoe"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix new file mode 100644 index 0000000000..cb5b5cc80f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -0,0 +1,121 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, isPy27 +, fetchpatch +# Mitmproxy requirements +, blinker +, brotli +, certifi +, click +, cryptography +, flask +, h2 +, hyperframe +, kaitaistruct +, ldap3 +, passlib +, protobuf +, pyasn1 +, pyopenssl +, pyparsing +, pyperclip +, ruamel_yaml +, setuptools +, sortedcontainers +, tornado +, urwid +, wsproto +, publicsuffix2 +, zstandard +# Additional check requirements +, beautifulsoup4 +, glibcLocales +, pytest +, requests +, asynctest +, parver +, pytest-asyncio +, hypothesis +}: + +buildPythonPackage rec { + pname = "mitmproxy"; + version = "5.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0ja0aqnfmkvns5qmd51hmrvbw8dnccaks30gxgzgcjgy30rj4brq"; + }; + + patches = [ + # Apply patch from upstream to make mitmproxy v5.2 compatible with urwid >v2.1.0 + (fetchpatch { + name = "urwid-lt-2.1.0.patch"; + url = "https://github.com/mitmproxy/mitmproxy/commit/ea9177217208fdf642ffc54f6b1f6507a199350c.patch"; + sha256 = "1z5r8izg5nvay01ywl3xc6in1vjfi9f144j057p3k5rzfliv49gg"; + }) + ]; + + postPatch = '' + # remove dependency constraints + sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py + ''; + + doCheck = (!stdenv.isDarwin); + + checkPhase = '' + export HOME=$(mktemp -d) + pytest -k 'not test_get_version' # expects a Git repository + ''; + + propagatedBuildInputs = [ + setuptools + # setup.py + blinker + brotli + certifi + click + cryptography + flask + h2 + hyperframe + kaitaistruct + ldap3 + passlib + protobuf + publicsuffix2 + pyasn1 + pyopenssl + pyparsing + pyperclip + ruamel_yaml + sortedcontainers + tornado + urwid + wsproto + zstandard + ]; + + checkInputs = [ + asynctest + beautifulsoup4 + flask + glibcLocales + hypothesis + parver + pytest + pytest-asyncio + requests + ]; + + meta = with stdenv.lib; { + description = "Man-in-the-middle proxy"; + homepage = "https://mitmproxy.org/"; + license = licenses.mit; + maintainers = with maintainers; [ fpletz kamilchm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 4d65d7fce4..1acd8bf569 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.8.0"; + version = "1.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bab1b95da17ffb1856fec35fc1a0bc9d16e1811e41610a97c2c955884eb6ac53"; + sha256 = "11fe050373f3dbd422aa476c42cb0ed15467268bc1ad07e221e550bc54f94b75"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix new file mode 100644 index 0000000000..8ac2418800 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "mmh3"; + version = "2.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0265pvfbcsijf51szsh14qk3l3zgs0rb5rbrw11zwan52yi0jlhq"; + }; + + pythonImportsCheck = [ "mmh3" ]; + + meta = with lib; { + description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions"; + homepage = "https://pypi.org/project/mmh3/"; + license = licenses.cc0; + maintainers = [ maintainers.danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mock-open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mock-open/default.nix index 449430a593..391ba29a98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mock-open/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mock-open/default.nix @@ -1,17 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, mock }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, mock }: buildPythonPackage rec { pname = "mock-open"; - version = "1.3.1"; + version = "1.4.0"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "nivbend"; repo = pname; rev = "v${version}"; - sha256 = "0ikhrhlkl5c7qbigpsv44jw89ws1z7j06gzyg5dh1ki533ifbjm2"; + sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm"; }; + patches = lib.optional (pythonOlder "3.0") + (fetchpatch { + name = "ascii-only.patch"; + url = "https://github.com/das-g/mock-open/commit/521ff260da127949fe4aceff1667cba223c5b07b.patch"; + sha256 = "0ampbhk7kwkn0q5d2h9wrflkr8fji2bybmdck4qdzw1qkslfwwrn"; + }); + propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mock/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/mock/2.nix index 9ab8de1ba5..190297b41a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mock/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mock/2.nix @@ -41,4 +41,4 @@ buildPythonPackage rec { license = licenses.bsd2; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix index fa469b619a..234fdbebc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 , decorator +, http-parser , importlib-metadata , python , python_magic @@ -8,11 +9,11 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.8.7"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1zj2p20blf4p071kcs86h2c9sc964x6sahff60gg7y4d2c0iq3rs"; + sha256 = "1n1h9xbi1my0vgjsh7mfkd51qfa6imjzxnwqccsvshqa8grcv1wm"; }; patchPhase = '' @@ -24,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator + http-parser python_magic urllib3 six diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mohawk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mohawk/default.nix new file mode 100644 index 0000000000..e260bb7b54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mohawk/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, python, mock, nose, pytest, six }: + +with lib; +buildPythonPackage rec { + pname = "mohawk"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "08wppsv65yd0gdxy5zwq37yp6jmxakfz4a2yx5wwq2d222my786j"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ mock nose pytest ]; + + checkPhase = '' + pytest mohawk/tests.py + ''; + + meta = { + description = "Python library for Hawk HTTP authorization."; + homepage = "https://github.com/kumar303/mohawk"; + license = licenses.mpl20; + maintainers = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix index 8806bdf11c..ec6ce4ed3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.3.0"; + version = "8.4.0"; src = fetchPypi { inherit pname version; - sha256 = "558bb897a2232f5e4f8e2399089e35aecb746e1f9191b6584a151647e89267be"; + sha256 = "68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/morphys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/morphys/default.nix index 8f8525f7af..b89055829e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/morphys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/morphys/default.nix @@ -21,4 +21,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix index e07be20b26..a75560e3b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.3.0"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "5442a3a9d006506e653d3c4daff40538bdf067bf07b6b73b32d1b231d5e77a92"; + sha256 = "51b8e8e0d918d9b4813f006324e7c4e21eb76268dd4c1a06d811a3475ad4ac57"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix index 01abd718c7..e169929294 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.21.0"; + version = "4.23.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "7cbd88fd7252d5a2694593633b31f819eb302423058fecb9f9959e74c01c2b86"; + sha256 = "9274bc8298b2d4b69cb3936bdcda315b50e45975789f519a237bdec58346b8d7"; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multitasking/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multitasking/default.nix new file mode 100644 index 0000000000..8ea4d633f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/multitasking/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "multitasking"; + version = "0.0.9"; + + # GitHub source releases aren't tagged + src = fetchPypi { + inherit pname version; + sha256 = "b59d99f709d2e17d60ccaa2be09771b6e9ed9391c63f083c0701e724f624d2e0"; + }; + + doCheck = false; # No tests included + pythonImportsCheck = [ "multitasking" ]; + + meta = with lib; { + description = "Non-blocking Python methods using decorators"; + homepage = "https://github.com/ranaroussi/multitasking"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/1.43.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/1.43.nix index 3947dc05fa..a7a7c7c660 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/1.43.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/1.43.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.43.0"; + version = "1.43.1"; src = fetchPypi { inherit pname version; - sha256 = "125m0pkiw5lsffc0236xdlxfhwpr8csvxpmg6855405qy4wjv61s"; + sha256 = "d873baeb7815311d3420aab0a1d83f050f628228cbc2d6045a14a16460411bc9"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix index 9494d2c84a..df0872242a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix @@ -3,6 +3,7 @@ , fetchPypi , isPy27 , fetchpatch +, flake8 , hypothesis , pycodestyle , pyflakes @@ -13,18 +14,18 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.44.0"; + version = "1.45.1"; disabled = isPy27; # abandoned src = fetchPypi { inherit pname version; - sha256 = "56065d8a9ca0bc64610a4d0f37e2bd4453381dde3226b8835ee656faa3287be4"; + sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1"; }; propagatedBuildInputs = [ setuptools ]; checkInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis + pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis flake8 ]; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix new file mode 100644 index 0000000000..9336dbf354 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, defcon, fontmath +, unicodedata2, fs +}: + +buildPythonPackage rec { + pname = "MutatorMath"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fontmath unicodedata2 defcon ]; + checkInputs = [ unicodedata2 fs ]; + + meta = with lib; { + description = "Piecewise linear interpolation in multiple dimensions with multiple, arbitrarily placed, masters"; + homepage = "https://github.com/LettError/MutatorMath"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix index 94a85d41d9..0a73e99391 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # package has no tests doCheck = false; - + propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix index a4a937d18d..53e5f82534 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.14.0"; + version = "1.16.1"; src = fetchPypi { inherit pname version; - sha256 = "66bf61c3d782cd80f380d3856da5f635f5b8de032e62d916c26d48dc322846a6"; + sha256 = "c2275e91c794a3569a76c47c78cf2ff04d7f569a98558227e899ead7b30af0d6"; }; # Remove overly restrictive version constraints on keyring and keyrings.alt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix index 5eda75d9c7..3e0ab2cf18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.21"; + version = "1.23"; src = fetchPypi { inherit pname version; - sha256 = "0eb8db49b014d1082f370a39eeaf272d1cc9978f728b64ee6fcc822d00a8793c"; + sha256 = "cf79c77e828a2de9bdc74b43ad4abd4c2a3a30f0471b46e9b4e01b9877f166fb"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix index 72bf06893e..0d4aa54232 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.4.6"; + version = "2.0.1"; nativeBuildInputs = [ libmysqlclient @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f3fdaa9a38752a3b214a6fe79d7cae3653731a53e577821f9187e67cbecb2e16"; + sha256 = "fb2f75aea14722390d2d8ddf384ad99da708c707a96656210a7be8af20a2c5e5"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix index 08cfb66408..0df4b0218b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nassl/default.nix @@ -80,14 +80,14 @@ buildPythonPackage rec { cp ${opensslLegacyStatic.out}/lib/libssl.a \ ${opensslLegacyStatic.out}/lib/libcrypto.a \ deps/openssl-OpenSSL_1_0_2e/ - ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps mkdir -p deps/openssl-OpenSSL_1_1_1/ cp ${opensslStatic.out}/lib/libssl.a \ ${opensslStatic.out}/lib/libcrypto.a \ deps/openssl-OpenSSL_1_1_1/ - ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps mkdir -p deps/zlib-1.2.11/ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index 990854b109..f6009bf500 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.4.1"; + version = "0.4.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "31fdb4bd45ebcd98eeda01e2c38fb391eae8a8480bdddbebb6cfd088486948a7"; + sha256 = "311e14e463a300239c558a95023f6d1007c3f69f589bd51a76b1b6b3f19a7f4b"; }; checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix index 2ca203e65a..e86119036b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix @@ -3,22 +3,22 @@ buildPythonPackage rec { pname = "nbconflux"; version = "0.7.0"; - + src = fetchFromGitHub { owner = "Valassis-Digital-Media"; repo = "nbconflux"; rev = version; sha256 = "1708qkb275d6f7b4b5zmqx3i0jh56nrx2n9rwwp5nbaah5p2wwlh"; }; - + propagatedBuildInputs = [ nbconvert requests ]; - + checkInputs = [ pytest responses ]; - + checkPhase = '' pytest tests ''; - + meta = with lib; { description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert"; homepage = "https://github.com/Valassis-Digital-Media/nbconflux"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 0f84486674..fb1945ddf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchzip, pyopenssl, python }: +{ stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: let pname = "nbxmpp"; - version = "0.6.10"; + version = "1.0.2"; name = "${pname}-${version}"; in buildPythonPackage { inherit pname version; @@ -11,16 +11,12 @@ in buildPythonPackage { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "1w31a747mj9rvlp3n20z0fnvyvihphkgkyr22sk2kap3migw8vai"; + sha256 = "1rhzsakqrybzq5j5b9400wjd14pncph47c1ggn5a6f3di03lk4az"; }; - propagatedBuildInputs = [ pyopenssl ]; - - checkPhase = '' - # Disable tests requiring networking - echo "" > test/unit/test_xmpp_transports_nb2.py - ${python.executable} test/runtests.py - ''; + buildInputs = [ precis-i18n ]; + checkInputs = [ gobject-introspection libsoup pygobject3 ]; + propagatedBuildInputs = [ idna pyopenssl ]; meta = with stdenv.lib; { homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix index ca0a9d34b3..203ffc6568 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.7"; + version = "0.6.9"; src = fetchPypi { inherit pname version; - sha256 = "efdf3c868cd9f104d4e9fe4c233df78bfbbed4b3d78ba19dc27cec3cf6a63680"; + sha256 = "0112f2ad41fb658f52446d870853a63691d69299c73c7351c520d38dbd8dc0c4"; }; checkInputs = [ nose rednose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix index 0d5923820d..0a6e5635a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ndtypes/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , numpy , libndtypes , isPy27 @@ -24,5 +26,14 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/ndtypes/*.h $out/include + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so + ''; + + checkPhase = '' + pushd python + mv ndtypes _ndtypes + python test_ndtypes.py + popd ''; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netaddr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netaddr/default.nix index 200392c85f..95f567a6c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netaddr/default.nix @@ -1,41 +1,32 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest -, fetchpatch +, pythonOlder , glibcLocales +, importlib-resources +, pytestCheckHook }: buildPythonPackage rec { pname = "netaddr"; - version = "0.7.19"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd"; + sha256 = "0hx2npi0wnhwlcybilgwlddw6qffx1mb7a3sj4p9s7bvl33mgk6n"; }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ glibcLocales pytest ]; - checkPhase = '' - # fails on python3.7: https://github.com/drkjam/netaddr/issues/182 - py.test \ - -k 'not test_ip_splitter_remove_prefix_larger_than_input_range' \ - netaddr/tests - ''; + propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.7") [ importlib-resources ]; - patches = [ - (fetchpatch { - url = "https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch"; - sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39"; - }) - ]; + checkInputs = [ glibcLocales pytestCheckHook ]; meta = with stdenv.lib; { - homepage = "https://github.com/drkjam/netaddr/"; + homepage = "https://netaddr.readthedocs.io/en/latest/"; + downloadPage = "https://github.com/netaddr/netaddr/releases"; + changelog = "https://netaddr.readthedocs.io/en/latest/changes.html"; description = "A network address manipulation library for Python"; license = licenses.mit; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix index 3d5c1520d3..a26a212d8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "netdisco"; - version = "2.7.1"; + version = "2.8.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0rkaz9377f4ldxcqxcmcc9hwdv5dda8nl7vrnp2pj3ppivq5629w"; + sha256 = "dcaabf83b204282aacfb213b18799eb7af2d5a6defe529487bbd0548036392fe"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 4e47a4a931..80ee7691a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix @@ -50,11 +50,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "8c837eafdaa68e85d911aca20c8a2cd9210e4fffabbcbc5bd2eb6e26f8553da9"; + sha256 = "3d6aa37186e1d2f90917dfdf1faf5aeff469912554990e5d182ffe8435f250d5"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix index 6ee4d937cf..67873f929a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -15,17 +15,13 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "2.4"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E="; + sha256 = "sha256-EN+EbVXUaf+id5UsK4EBm/9k9FYaH79g08kblvW60XA="; }; - # The tests for this package require nix and network access. That's - # why we cannot execute them inside the building process. - doCheck = false; - propagatedBuildInputs = [ attrs click @@ -34,6 +30,9 @@ buildPythonPackage rec { ]; checkInputs = [ pytestCheckHook pytest-black pytestcov pytest-isort git ]; + checkPhase = '' + pytest -m 'not network' + ''; # latest version of isort will cause tests to fail # ignore tests which are impure diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix index 98d95afa99..4a2327bf92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nmigen/default.nix @@ -8,6 +8,7 @@ , jinja2 # for tests +, pytestCheckHook , yosys , symbiyosys , yices @@ -18,6 +19,7 @@ buildPythonPackage rec { version = "unstable-2020-04-02"; # python setup.py --version realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nmigen"; @@ -26,18 +28,23 @@ buildPythonPackage rec { sha256 = "sha256-3+mxHyg0a92/BfyePtKT5Hsk+ra+fQzTjCJ2Ech44/s="; }; - disabled = pythonOlder "3.6"; - nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ setuptools pyvcd jinja2 ]; - checkInputs = [ yosys symbiyosys yices ]; + checkInputs = [ pytestCheckHook yosys symbiyosys yices ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; + # Fail b/c can't find sby (symbiyosys) executable, which should be on path. + disabledTests = [ + "test_distance" + "test_reversible" + "FIFOFormalCase" + ]; + meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; homepage = "https://nmigen.info/nmigen"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix index 14a67fe54a..b4acefaeb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nodeenv"; - version = "1.3.3"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "ad8259494cf1c9034539f6cced78a1da4840a4b157e23640bc4a0c0546b0cb7a"; + sha256 = "7389d06a7ea50c80ca51eda1b185db7b9ec38af1304d12d8b8299d6218486e91"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook/2.nix index 37f39c4496..0e5cfdf439 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/2.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.7.8"; + version = "5.7.10"; src = fetchPypi { inherit pname version; - sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8"; + sha256 = "b10107e1438e7a564292aa32510e610c88844cae03c882fe5286b891792b5c11"; }; LC_ALL = "en_US.utf8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix index 4550bb6363..04fe19377f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchPypi +, argon2_cffi , nose , nose_warnings_filters , glibcLocales @@ -11,6 +12,7 @@ , tornado , ipython_genutils , traitlets +, jupyter , jupyter_core , jupyter_client , nbformat @@ -21,27 +23,28 @@ , send2trash , pexpect , prometheus_client +, pytestCheckHook }: buildPythonPackage rec { pname = "notebook"; - version = "6.0.3"; + version = "6.1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "47a9092975c9e7965ada00b9a20f0cf637d001db60d241d479f53c0be117ad48"; + sha256 = "0cnyi4zd3byh7zixdj2q71axm31xgjiyfklh1c63c87acgwh2zb8"; }; LC_ALL = "en_US.utf8"; - checkInputs = [ nose glibcLocales ] + checkInputs = [ nose pytestCheckHook glibcLocales ] ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); propagatedBuildInputs = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect - prometheus_client + prometheus_client argon2_cffi ]; # disable warning_filters @@ -52,18 +55,22 @@ buildPythonPackage rec { postPatch = '' # Remove selenium tests rm -rf notebook/tests/selenium - + export HOME=$TMPDIR ''; - checkPhase = '' - runHook preCheck - mkdir tmp - HOME=tmp nosetests -v ${if (stdenv.isDarwin) then '' - --exclude test_delete \ - --exclude test_checkpoints_follow_file - '' - else ""} - ''; + disabledTests = [ + # a "system_config" is generated, and fails many tests + "config" + "load_ordered" + # requires jupyter, but will cause circular imports + "test_run" + "TestInstallServerExtension" + "launch_socket" + "sock_server" + ] ++ lib.optional stdenv.isDarwin [ + "test_delete" + "test_checkpoints_follow_file" + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notify2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notify2/default.nix index a7928fb66c..28c74415c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notify2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notify2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests require Xorg and Dbus instance doCheck = false; propagatedBuildInputs = [ pygobject3 - dbus-python ]; + dbus-python ]; meta = { description = "Pure Python interface to DBus notifications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix new file mode 100644 index 0000000000..923f8c1969 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, textfsm +, pytestCheckHook +, ruamel_yaml +, yamllint +}: + +buildPythonPackage rec { + pname = "ntc-templates"; + version = "1.5.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "networktocode"; + repo = pname; + rev = "v${version}"; + sha256 = "0pvd9n7hcmxl9cr8m1xlqcjmy3k2hga0qmn2k3x9hripjis7pbbi"; + }; + + propagatedBuildInputs = [ textfsm ]; + + checkInputs = [ pytestCheckHook ruamel_yaml yamllint ]; + + # https://github.com/networktocode/ntc-templates/issues/743 + disabledTests = [ "test_raw_data_against_mock" "test_verify_parsed_and_reference_data_exists" ]; + + meta = with lib; { + description = "TextFSM templates for parsing show commands of network devices"; + homepage = "https://github.com/networktocode/ntc-templates"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix index f34301a5d7..c3a6484adb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -13,14 +13,14 @@ }: buildPythonPackage rec { - version = "0.50.1"; + version = "0.51.1"; pname = "numba"; # uses f-strings disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "89e81b51b880f9b18c82b7095beaccc6856fcf84ba29c4f0ced42e4e5748a3a7"; + sha256 = "1e765b1a41535684bf3b0465c1d0a24dcbbff6af325270c8f4dad924c0940160"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix index af419c5e0a..6fa77d8fa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix @@ -21,27 +21,30 @@ let ${blas.implementation} = { include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; library_dirs = "${blas}/lib:${lapack}/lib"; + runtime_library_dirs = "${blas}/lib:${lapack}/lib"; libraries = "lapack,lapacke,blas,cblas"; }; lapack = { include_dirs = "${lib.getDev lapack}/include"; library_dirs = "${lapack}/lib"; + runtime_library_dirs = "${lapack}/lib"; }; blas = { include_dirs = "${lib.getDev blas}/include"; library_dirs = "${blas}/lib"; + runtime_library_dirs = "${blas}/lib"; }; }); }; in buildPythonPackage rec { pname = "numpy"; - version = "1.16.5"; + version = "1.16.6"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c"; + sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 4501eafe7b..9502cdc5b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -3,6 +3,7 @@ , python , buildPythonPackage , gfortran +, hypothesis , pytest , blas , lapack @@ -21,15 +22,18 @@ let ${blas.implementation} = { include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; library_dirs = "${blas}/lib:${lapack}/lib"; + runtime_library_dirs = "${blas}/lib:${lapack}/lib"; libraries = "lapack,lapacke,blas,cblas"; }; lapack = { include_dirs = "${lib.getDev lapack}/include"; library_dirs = "${lapack}/lib"; + runtime_library_dirs = "${lapack}/lib"; }; blas = { include_dirs = "${lib.getDev blas}/include"; library_dirs = "${blas}/lib"; + runtime_library_dirs = "${blas}/lib"; }; }); }; @@ -67,6 +71,8 @@ in buildPythonPackage rec { doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) + checkInputs = [ hypothesis ]; + checkPhase = '' runHook preCheck pushd dist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix index 725d1f9968..0f57847b3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy27 , jinja2 , nose , pytest @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.0.0"; + version = "1.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname; inherit version; - sha256 = "e481c0799dfda208b6a2c2cb28757fa6b6cbc4d6e43722173697996cf556df7f"; + sha256 = "c36fd6cb7ffdc9b4e165a43f67bf6271a7b024d0bb6b00ac468c9e2bfc76448e"; }; checkInputs = [ nose pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index 96247c9300..4905a8da7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "0.3.0"; + version = "0.3.6"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "1ycnxrw2qgm7kdapsnhz80jsqkghgvb5giqwapn0m30rplwc3s36"; + sha256 = "434edabdc431b9af719896e0de4bd0deead657777d1d8aa4e3cd0dcdff6298bc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index 56c9eece4e..bf2ad31ec3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -29,10 +29,10 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - + checkInputs = [ globus-sdk mwoauth codecov flake8 pytest pytestcov pytest-tornado requests-mock pyjwt ]; - + propagatedBuildInputs = [ jupyterhub ]; disabled = pythonOlder "3.4"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix index 72205f8727..5a7d2a6425 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.0.4"; + version = "3.0.5"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "d88dd1480668019684c66cfff3e52a5de4ed41e9df5dd52e008cbf27af0dbf87"; + sha256 = "18e11f9a650128a12580a58e3daba14e00a11d9e907c554a17ea016bf1a2c71b"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentracing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentracing/default.nix index 63107ec372..f499470e25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentracing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentracing/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional isPy27 futures; checkInputs = [ gevent mock pytest tornado ]; - + checkPhase = '' pytest ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pa-ringbuffer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pa-ringbuffer/default.nix new file mode 100644 index 0000000000..fd05e7e805 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pa-ringbuffer/default.nix @@ -0,0 +1,20 @@ +{ fetchFromGitHub, buildPythonPackage, lib }: + +buildPythonPackage rec { + pname = "pa-ringbuffer"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "spatialaudio"; + repo = "python-pa-ringbuffer"; + rev = "${version}"; + sha256 = "0afpydy1l20hd1xncjppjhqa2c8dj5h9nlv4z8m55cs9hc9h1mxv"; + }; + + meta = { + description = "Adds ring buffer functionality"; + homepage = "https://github.com/spatialaudio/python-pa-ringbuffer"; + maintainers = with lib.maintainers; [ laikq ]; + license = lib.licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix index 747b4c14cd..02255f4bfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.42.0"; + version = "1.43.0"; src = fetchPypi { inherit pname version; - sha256 = "c3342085b2b96591b9d214d10fe39d85e1a2487c5b0883a90ff0bf6123086f07"; + sha256 = "48fcc5ca6e7f3d84ef91016585d1894bb9deb3dae6591ffab90fdf05006c3e48"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix index 9f1aed30ff..f96e05950b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix @@ -10,9 +10,9 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - + checkPhase = '' - pytest + pytest ''; meta = with stdenv.lib; { @@ -22,4 +22,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pam/default.nix deleted file mode 100644 index 6b58553797..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pam/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pam -}: - -buildPythonPackage rec { - pname = "python-pam"; - version = "1.8.4"; - - src = fetchFromGitHub { - owner = "FirefighterBlu3"; - repo = pname; - rev = "v${version}"; - sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; - }; - - buildInputs = [ - pam - ]; - - postPatch = '' - sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py - ''; - - meta = with lib; { - description = "Python pam module supporting py3 (and py2)"; - homepage = "https://github.com/FirefighterBlu3/python-pam"; - license = licenses.mit; - maintainers = with maintainers; [ mkg20001 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index cebb7c2b93..d4c9706fe6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -31,11 +31,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "b39508562ad0bb3f384b0db24da7d68a2608b9ddc85b1d931ccaaa92d5e45273"; + sha256 = "53328284a7bb046e2e885fd1b8c078bd896d7fc4575b915d4936f54984a2ba67"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; @@ -58,6 +58,10 @@ in buildPythonPackage rec { xlwt ]; + # doesn't work with -Werror,-Wunused-command-line-argument + # https://github.com/NixOS/nixpkgs/issues/39687 + hardeningDisable = optional stdenv.cc.isClang "strictoverflow"; + # 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 '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix index 43c13c2606..0e5c62277a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "aadc23f0ae2eaa75868e4359f1ea7d75ff46bc8cb1988651f3f3fd5d4ec44679"; + sha256 = "ecd4cafa9179693b0eedc3b6f4560f9ee47826a6e366e42bfa3cc20f7931b3f8"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix index 6c490cb344..41951f1d89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -1,6 +1,7 @@ { pkgs , buildPythonPackage , fetchPypi +, fetchpatch , cryptography , bcrypt , invoke @@ -20,6 +21,13 @@ buildPythonPackage rec { sha256 = "920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f"; }; + patches = [ + # fix RSA key loading with cryptography 3.1, remove >2.7.1 + (fetchpatch { + url = "https://github.com/paramiko/paramiko/commit/81064206bf3cec2ca4372257ff138481e1227b91.patch"; + sha256 = "01b87ffgyvd6rilp1w1kf7lk29z706ch39nwl21ifklqpjhmazww"; + }) + ]; checkInputs = [ invoke pytest mock pytest-relaxed ]; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; @@ -27,6 +35,7 @@ buildPythonPackage rec { # 2 sftp tests fail (skip for now) # test_config relies on artifacts to be to downloaded + # RSA tests don't have valid keys checkPhase = '' pytest tests \ --ignore=tests/test_sftp.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix index 7ce02fb96a..a6dacf0402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "parfive"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "faa60c34dfbd080f011c1af0587f932874dcdf602d0336227d540899dbc41b50"; + sha256 = "5793fdf9859a9a9fc93f033db9dc067a89626910355a14bbe425feb3956df6db"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parse/default.nix index bb09646b6b..7b160237d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.15.0"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "1h4m5df5grjpaf087g8ciishz5ajl28s3140s8bngppvy71f5m56"; + sha256 = "91666032d6723dc5905248417ef0dc9e4c51df9526aaeef271eacad6491f06a4"; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix index 413955c6a3..0b7d5cd6fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , pytest , pytestrunner , future @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "parsedatetime"; version = "2.6"; + disabled = isPy27; # no longer compatible with icu package src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix index 4406524bda..f9a87fa5f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "parso"; - version = "0.7.1"; + version = "0.8.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9"; + sha256 = "2b6db14759c528d857eeb9eac559c2166b2554548af39f5198bdfb976f72aa64"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - meta = { + meta = with lib; { description = "A Python Parser"; - homepage = "https://github.com/davidhalter/parso"; - license = lib.licenses.mit; + homepage = "https://parso.readthedocs.io/en/latest/"; + changelog = "https://github.com/davidhalter/parso/blob/master/CHANGELOG.rst"; + license = licenses.mit; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix index 46601c1675..81d9e50b28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "patator"; - version = "0.7"; + version = "0.9"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1"; + sha256 = "68cb24bdc3042ee0d47a288b19a8b99a6c54bdbd4ddf0c5817d9b9ac0a0d8a15"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix index 1cba07ba6b..bb52cd51a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix @@ -18,4 +18,4 @@ buildPythonPackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ copumpkin ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pcpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pcpp/default.nix index f621140f13..f57798c40a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pcpp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0k52qyxzdngdhyn4sya2qn1w1a4ll0mcla4h4gb1v91fk4lw25dm"; fetchSubmodules = true; }; - + meta = with stdenv.lib; { homepage = "https://github.com/ned14/pcpp"; description = "A C99 preprocessor written in pure Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix index 41459a8f4a..08f482e622 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200720"; + version = "20200726"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "19cnl1b6mrk9i18a1k4vdl5k85ww8yhfq89w3fxh6rb0fla5d71i"; + sha256 = "1hlaz7ax1czb028x3nhk3l2jy07f26q5hbhmdirljaaga24vd96z"; }; propagatedBuildInputs = [ chardet cryptography sortedcontainers ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix index 24be7ce7f8..a52160363d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.1.4"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "00xf3jmpb4m3q758wvk4khpcmiys4gmd88vvrz6i7yw1jl268y6k"; + sha256 = "98aeb8b07a4127e1a30223bd933ef080bbd29aa88f801717ca6c5618380b8aa6"; }; buildInputs = [ poppler ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix index 9f3c009f8c..332f5153a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix @@ -1,38 +1,59 @@ { stdenv , fetchPypi , buildPythonPackage +, isPy27 # Python deps -, singledispatch , logutils -, webtest , Mako +, singledispatch +, six +, webtest +# Test Inputs +, pytestCheckHook , genshi -, Kajiki -, sqlalchemy , gunicorn , jinja2 -, virtualenv +, Kajiki , mock +, sqlalchemy +, uwsgi +, virtualenv }: buildPythonPackage rec { pname = "pecan"; - version = "1.3.3"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b5461add4e3f35a7ee377b3d7f72ff13e93f40f3823b3208ab978b29bde936ff"; + sha256 = "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9d3389a"; }; - propagatedBuildInputs = [ singledispatch logutils ]; - buildInputs = [ - webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv + propagatedBuildInputs = [ + logutils + Mako + singledispatch + six + webtest ]; - checkInputs = [ mock ]; + checkInputs = [ + pytestCheckHook + genshi + gunicorn + jinja2 + mock + sqlalchemy + virtualenv + ] ++ stdenv.lib.optionals isPy27 [ Kajiki ]; + + pytestFlagsArray = [ + "--pyargs pecan " + ]; meta = with stdenv.lib; { description = "Pecan"; - homepage = "https://github.com/pecan/pecan"; + homepage = "http://www.pecanpy.org/"; + changelog = "https://pecan.readthedocs.io/en/latest/changes.html"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix index c7c1ced34f..30d6546d57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator -, blinker, pillow, beautifulsoup4, markupsafe }: +, blinker, pillow, beautifulsoup4, markupsafe, pandoc }: buildPythonPackage rec { pname = "pelican"; - version = "4.2.0"; + version = "4.5.0"; + + disabled = isPy27; src = fetchFromGitHub { owner = "getpelican"; repo = "pelican"; rev = version; - sha256 = "0w9nqdw2jmqc6kqwg4rh6irr5k6j7hk8axg6vgd137rs50v62yv5"; + sha256 = "0p8p84fcpkr19d54dhxvldd8ijbg334wmrmkr99pnbrdl1gf64qi"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -24,15 +26,15 @@ buildPythonPackage rec { # Exclude custom locale test, which files were removed above to fix the source checksum checkPhase = '' - nosetests -sv --exclude=test_custom_locale_generation_works pelican + nosetests -s \ + --exclude=test_custom_locale_generation_works \ + --exclude=test_log_filter \ + pelican ''; buildInputs = [ glibcLocales - # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this - # again. Compare https://github.com/getpelican/pelican/pull/2252. - # Version 4.2.0 is incompatible with our current pandoc version. - # pandoc + pandoc git mock markdown @@ -46,21 +48,16 @@ buildPythonPackage rec { checkInputs = [ nose + pandoc ]; postPatch= '' substituteInPlace pelican/tests/test_pelican.py \ --replace "'git'" "'${git}/bin/git'" - - # Markdown-3.1 changed footnote separator to colon - # https://github.com/getpelican/pelican/issues/2493#issuecomment-491723744 - sed -i '/test_article_with_footnote/i\ - @unittest.skip("")' pelican/tests/test_readers.py ''; LC_ALL="en_US.UTF-8"; - # We only want to patch shebangs in /bin, and not those # of the project scripts that are created by Pelican. # See https://github.com/NixOS/nixpkgs/issues/30116 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix index 1eb2895068..a563665698 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix @@ -49,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.mit; homepage = "https://github.com/pypa/pep517"; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 0212e7ea42..e4a158a718 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.15.3"; + version = "1.16.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "af97353076b8e5d271d91c64c8ca806e2157d11b7862c90ff6f0e23be0fc217d"; + sha256 = "8af70cdfcc1fadafa32468a6af563e1c0b5271c4dcc99a4490030a128cb295a3"; }; propagatedBuildInputs = [ passlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix index 1668cd94ad..032524fc5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.11"; + version = "1.12"; src = fetchPypi { inherit pname version; - sha256 = "8463d60b9065daf26e3c0fa6e7515d2a4594847ab417be018858832a475105f1"; + sha256 = "b5d6a105928d2285e43afb87d638ada844ed8933cc306c23a3c095684f3d3af4"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index e3e23fa8e8..1aef55e821 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.7"; + version = "8.12.8"; src = fetchPypi { inherit pname version; - sha256 = "652c418f8e97c8438f227a524ddf8d7d325c4a47e4924ce865b827c24ec3194d"; + sha256 = "3a8b8f7b60ea00b83ca588b5ca57e48d9a3c223aa42f1a3d5fa88566424216c3"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix index 5dd4e25b66..b476543c06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix @@ -1,23 +1,23 @@ -{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py }: +{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: buildPythonPackage rec { pname = "phonopy"; - version = "2.4.2"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "6e6ce41ce8a51723b94d974adfee032cddce5b9300984dd23b59e101ed0a2861"; + sha256 = "482c6ff29c058d091ac885e561e28ba3e516ea9e91c44a951cad11f3ae19856c"; }; - propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; + propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; - checkPhase = '' - cd test - # dynamic structure factor test ocassionally fails do to roundoff - # see issue https://github.com/atztogo/phonopy/issues/79 - rm spectrum/test_dynamic_structure_factor.py - ${python.interpreter} -m unittest discover -b - cd ../.. + checkInputs = [ pytestCheckHook ]; + # flakey due to floating point inaccuracy + disabledTests = [ "test_NaCl" ]; + + # prevent pytest from importing local directory + preCheck = '' + rm -r phonopy ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/picos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/picos/default.nix index ca6346d1cd..a6f1aa1a14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/picos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/picos/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ networkx ]; - + propagatedBuildInputs = [ numpy cvxopt @@ -31,7 +31,7 @@ buildPythonPackage rec { checkPhase = '' ${python.interpreter} test.py ''; - + meta = with lib; { description = "A Python interface to conic optimization solvers"; homepage = "https://gitlab.com/picos-api/picos"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index e349892385..3db9a2642c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.14.0"; + version = "1.18.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5b371c71b0da42d87371ed39973f07c7eb67d939ca5031f0c1637cfb3a2d79f5"; + sha256 = "4d0840a5c16b535f9b6e56fb4421a43f88760e6cabcf7fd44bdd0436107b61dc"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix index cc9a77be78..ab971e4201 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "Pillow"; - version = "7.1.2"; + version = "7.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1pdh1zzdwxilvsjg6rnl4q810pc2p2y16q6lx9gzzihb25h9kd50"; + sha256 = "97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626"; }; # Disable imagefont tests, because they don't work well with infinality: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix index c7037cf538..76eaa4fac6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "0.5"; pname = "PIMS"; src = fetchPypi { inherit pname version; - sha256 = "6a53a155e900b44e71127a1e1fccbfbaed7eec3c2b52497c40c23a05f334c9dd"; + sha256 = "a02cdcbb153e2792042fb0bae7df4f30878bbba1f2d176114a87ee0dc18715a0"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix index 939eeafd9b..bb2a20cf62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 , pythonOlder -, funcsigs , setuptools_scm +, importlib-metadata +, packaging # Check Inputs , pytestCheckHook , numpy @@ -24,9 +24,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ - setuptools_scm - ] ++ lib.optional isPy27 funcsigs; + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ packaging ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Test suite explicitly requires pytest checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index e9d3159382..104619711a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "5.2.1"; + version = "5.3.1"; src = fetchPypi { inherit pname version; - sha256 = "5b4b6e7b6e66357685c73e856296b4792b2d159ff6074729e250e291834bfd9d"; + sha256 = "5672c2b6ca0f1fd803f3b45568c2cf7fadf135b4971e7d665232b2075544c0ef"; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip2nix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip2nix/default.nix deleted file mode 100644 index f6474883b8..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip2nix/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, click -, configobj -, contexter -, jinja2 -, pytest -, pip -}: - -buildPythonPackage rec { - pname = "pip2nix"; - version = "0.7.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "ec9a71e09ac7f43cc7b6c9d386384eb7b5c331bf6ea0e72ca559d87979397a95"; - }; - - propagatedBuildInputs = [ click configobj contexter pip jinja2 pytest ]; - - postPatch = '' - sed -i "s/'pip>=8,<10'/'pip'/" setup.py - sed -i "s/pip<10,>=8/pip/" ${pname}.egg-info/requires.txt - ''; - - # tests not included with pypi release - doCheck = false; - - # Requires an old pip version - broken = true; - - meta = with stdenv.lib; { - description = "Generate Nix expressions for Python packages"; - homepage = "https://github.com/johbo/pip2nix"; - license = licenses.gpl3; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix index c0a34d1d8a..35fbb624e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix @@ -7,11 +7,13 @@ , importlib-metadata , requests , pytest +, wheel }: buildPythonPackage rec { pname = "pipdate"; version = "0.5.2"; + format = "pyproject"; disabled = isPy27; # abandoned src = fetchPypi { @@ -19,6 +21,8 @@ buildPythonPackage rec { sha256 = "507065231f2d50b6319d483432cba82aadad78be21b7a2969b5881ed8dee9ab4"; }; + nativeBuildInputs = [ wheel ]; + propagatedBuildInputs = [ appdirs requests @@ -26,12 +30,6 @@ buildPythonPackage rec { importlib-metadata ]; - # can be removed when https://github.com/nschloe/pipdate/pull/41 gets merged - postPatch = '' - substituteInPlace setup.cfg \ - --replace "importlib_metadata" "importlib_metadata; python_version < \"3.8\"" - ''; - checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix new file mode 100644 index 0000000000..3b35b67bf0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, userpath +, argcomplete +, packaging +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pipx"; + version = "0.15.5.1"; + + disabled = pythonOlder "3.6"; + + # no tests in the pypi tarball, so we directly fetch from github + src = fetchFromGitHub { + owner = "pipxproject"; + repo = pname; + rev = version; + sha256 = "0lq8dfkq4ji11r4k5csqzyv0757fbxiax6ixn94f9747zrikssf6"; + }; + + propagatedBuildInputs = [ userpath argcomplete packaging ]; + + checkInputs = [ pytestCheckHook ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # disable tests, which require internet connection + disabledTests = [ + "install" + "inject" + "ensure_null_pythonpath" + "missing_interpreter" + "cache" + "internet" + "runpip" + "upgrade" + ]; + + meta = with lib; { + description = + "Install and Run Python Applications in Isolated Environments"; + homepage = "https://github.com/pipxproject/pipx"; + license = licenses.mit; + maintainers = with maintainers; [ yevhenshymotiuk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix index 36427f9958..8f1b7de92b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: buildPythonPackage rec { pname = "pivy"; @@ -12,20 +12,20 @@ buildPythonPackage rec { }; nativeBuildInputs = with pkgs; [ - swig qt5.qmake cmake + swig qmake cmake ]; buildInputs = with pkgs; with xorg; [ - coin3d soqt qt5.qtbase + coin3d soqt qtbase libGLU libGL libXi libXext libSM libICE libX11 ]; NIX_CFLAGS_COMPILE = toString [ - "-I${pkgs.qt5.qtbase.dev}/include/QtCore" - "-I${pkgs.qt5.qtbase.dev}/include/QtGui" - "-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL" - "-I${pkgs.qt5.qtbase.dev}/include/QtWidgets" + "-I${qtbase.dev}/include/QtCore" + "-I${qtbase.dev}/include/QtGui" + "-I${qtbase.dev}/include/QtOpenGL" + "-I${qtbase.dev}/include/QtWidgets" ]; dontUseQmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix index a9a46bfc9e..cc33babd64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.8.2"; + version = "4.9.0"; src = fetchPypi { inherit pname version; - sha256 = "ce55e1a9669ea7455574ddbfe2fb52636eb63a6c29387ee0c0a929ed2325f916"; + sha256 = "257f530ffd73754bd008454826905657b329053364597479bb9774437a396837"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix index 796f941849..e08537ff1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix @@ -16,4 +16,4 @@ buildPythonPackage rec { inherit pname version; sha256 = "1ps37vamqav6p277dlp51jnacd5q4x4z1x8y0nfjw3y8jsfy3f8n"; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix index a81e1e52ae..937a758b9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pythonOlder, fetchpatch , cachecontrol , cachy , cleo @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.1\"" \ --replace 'importlib-metadata = {version = "~1.1.3", python = "<3.8"}' \ 'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}' \ - --replace "tomlkit = \"^0.5.11\"" "tomlkit = \"^0.6.0\"" \ + --replace "tomlkit = \"^0.5.11\"" "tomlkit = \"<2\"" \ --replace "cleo = \"^0.7.6\"" "cleo = \"^0.8.0\"" \ --replace "version = \"^20.0.1\", python = \"^3.5\"" "version = \"^21.0.0\", python = \"^3.5\"" \ --replace "clikit = \"^0.4.2\"" "clikit = \"^0.6.2\"" @@ -90,6 +90,8 @@ buildPythonPackage rec { "prereleases_if_they_are_compatible" # requires git history to work correctly "default_with_excluded_data" + # toml ordering has changed + "lock" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix new file mode 100644 index 0000000000..378035bb7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, buildPythonPackage +, isPy27 +, fetchPypi +, pytestCheckHook +, packaging +, appdirs +, requests +}: + +buildPythonPackage rec { + pname = "pooch"; + version = "1.0.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1k2vinlhkzl7lzhvbz20x3a2r2zqqila0yxg3a3fax2r6qxbxxzi"; + }; + + propagatedBuildInputs = [ packaging appdirs requests ]; + + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + "pooch_custom_url" + "pooch_download" + "pooch_logging_level" + "pooch_update" + "pooch_corrupted" + "check_availability" + "downloader" + "test_fetch" + "decompress" + "extractprocessor_fails" + "processor" + "integration" + ]; + + meta = with stdenv.lib; { + description = "A friend to fetch your data files."; + homepage = "https://github.com/fatiando/pooch"; + license = licenses.bsd3; + maintainers = with maintainers; [ GuillaumeDesforges ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pq/default.nix index 1227a67498..cfc5419bd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pq/default.nix @@ -1,36 +1,22 @@ { lib , buildPythonPackage , fetchPypi -, psycopg2 , isPy27 }: buildPythonPackage rec { pname = "pq"; - version = "1.8.1"; + version = "1.8.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9e2c0195488263902ebc9da8df6c82bebe4ee32c79d9ecd0cdc2945afbf7ad32"; + sha256 = "f54143844e73f4182532e68548dee447dd78dd00310a087e8cdee756d476a173"; }; - # psycopg2cffi is compatible with psycopg2 and author states that - # module is compatible with psycopg2 - postConfigure = '' - substituteInPlace setup.py \ - --replace "psycopg2cffi" "psycopg2" - - substituteInPlace pq/tests.py \ - --replace "psycopg2cffi" "psycopg2" - ''; - - checkInputs = [ - psycopg2 - ]; - # tests require running postgresql cluster doCheck = false; + pythonImportsCheck = [ "pq" ]; meta = with lib; { description = "PQ is a transactional queue for PostgreSQL"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix index c0f536480d..88fb6e3abf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.6.0"; + version = "2.7.1"; disabled = isPy27; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "05d9635v0yzrj2848m2hn9axbvds0dymv49rlyj238v3vlzncmqn"; + sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix index 050295204b..96a015076d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { checkPhase = '' ${python.interpreter} setup.py test ''; - + meta = with stdenv.lib; { description = "Cython hash tables that assume keys are pre-hashed"; homepage = "https://github.com/explosion/preshed"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix index 9d969b5d34..47fbace69d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "3.0.5"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8"; + sha256 = "7630ab85a23302839a0f26b31cc24f518e6155dea1ed395ea61b42c45941b6a6"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix new file mode 100644 index 0000000000..0f89069c7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, fonttools, lxml, fs +, setuptools_scm +, pytest, pytestcov, pytest_xdist, pytest-randomly +}: + +buildPythonPackage rec { + pname = "psautohint"; + version = "2.1.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "adobe-type-tools"; + repo = pname; + sha256 = "1k1rx1adqxdxj5v3788lwnvygylp73sps1p0q44hws2vmsag2s8r"; + rev = "v${version}"; + fetchSubmodules = true; # data dir for tests + }; + + postPatch = '' + echo '#define PSAUTOHINT_VERSION "${version}"' > libpsautohint/src/version.h + sed -i '/use_scm_version/,+3d' setup.py + sed -i '/setup(/a \ version="${version}",' setup.py + ''; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ fonttools lxml fs ]; + + checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ]; + checkPhase = "pytest tests"; + + meta = with lib; { + description = "Script to normalize the XML and other data inside of a UFO"; + homepage = "https://github.com/adobe-type-tools/psautohint"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix index 89797c4802..ab3a3c1665 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix @@ -25,9 +25,7 @@ buildPythonPackage rec { # cpu_times is flakey on darwin checkPhase = '' pytest $out/${python.sitePackages}/psutil/tests/test_system.py \ - -k 'not user \ - and not disk_io_counters and not sensors_battery \ - and not cpu_times' + -k 'not user and not disk_io_counters and not sensors_battery and not cpu_times' ''; buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix index 47fd2b3345..e92a99d998 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.3"; + version = "3.0.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9ac4e4047ca3a03133702a353a93cf56ca1ec1162bc7ecaff087a91c03e3827b"; + sha256 = "5094e7e4daa77453d3c33eb7b7ebbf1060be4446521865a94e698bc85ff15930"; }; propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix index ab6fda9d3d..a98c7a518d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix @@ -2,18 +2,19 @@ , fetchPypi , buildPythonPackage , pyparsing +, amply }: buildPythonPackage rec { pname = "PuLP"; - version = "2.1"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "06swbi7wygh7y0kxc85q1pdhzk662375d9a5jnahgr76hkwwkybn"; + sha256 = "9d8ecf532868cc31fa9ff59ee5d5b2049600c5c902c18c794a2bad677c1f92e5"; }; - propagatedBuildInputs = [ pyparsing ]; + propagatedBuildInputs = [ pyparsing amply ]; # only one test that requires an extra doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix new file mode 100644 index 0000000000..d7e92f0978 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, setuptools_scm, toml, pytest }: + +buildPythonPackage rec { + pname = "pure_eval"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "alexmojaki"; + repo = pname; + rev = "v${version}"; + sha256 = "1d3gpc9mrmwdk6l87x7ll23vwv6l8l2iqvi63r86j7bj5s8m2ci8"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ toml ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "Safely evaluate AST nodes without side effects"; + homepage = "http://github.com/alexmojaki/pure_eval"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index c7aae24f1d..623140546e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -1,8 +1,10 @@ { stdenv , buildPythonPackage +, debugger , fetchPypi , isPy3k , Mako +, makeWrapper , packaging , pysocks , pygments @@ -58,10 +60,15 @@ buildPythonPackage rec { doCheck = false; # no setuptools tests for the package + postFixup = '' + mkdir -p "$out/bin" + makeWrapper "${debugger}/bin/${stdenv.lib.strings.getName debugger}" "$out/bin/pwntools-gdb" + ''; + meta = with stdenv.lib; { homepage = "http://pwntools.com"; description = "CTF framework and exploit development library"; license = licenses.mit; - maintainers = with maintainers; [ bennofs kristoff3r ]; + maintainers = with maintainers; [ bennofs kristoff3r pamplemousse ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix index 59876b473a..c304e68fd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix @@ -43,4 +43,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix index f81b7fb764..5034f6df46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix @@ -46,4 +46,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py/default.nix index edc35bb134..19366ea714 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "py"; - version = "1.8.2"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "f3b3a4c36512a4c4f024041ab51866f11761cc169670204b235f6b20523d4e6b"; + sha256 = "9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"; }; # Circular dependency on pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 9434944a1f..2ecdfb17aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.7.2"; + version = "3.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1jbd2npa942f3bqwpvc6kb3b9jxk7ksczd4grrdimfb6w7binzv4"; + sha256 = "ce42d84442ff2ce4918de6550cf377253f61e28e4fac2634495683d12df66d00"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix index f440715020..fda497b796 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - + propagatedBuildInputs = [ numpy six ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index cb628561fd..ec959740f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "3.3.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9949338833a27b6c3251b52bf70b73aa99c43c56153541338cb63001afafdd1e"; + sha256 = "148713395d51a57f1f3102eacbb9286a859fc5c18c066238a961a1acf189b930"; }; propagatedBuildInputs = [ oauthlib requests requests_oauthlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index b8a607f4d4..8d6da02e5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.6.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "0f9wj1ggllwpjd9nh6nsrck7m4gbz29q6vqbrhbkc2kz6waqkgwc"; + sha256 = "83d86fac517d33a1e3063a547ee2a520fde74c74a1b95cb5a6f20afccfd59843"; }; nativeBuildInputs = [ pytestrunner]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix index 588b865a35..9d889214e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.8.4"; + version = "2.8.7"; src = fetchPypi { inherit pname version; - sha256 = "39fb2ae8ef99c7096295a368e232224b68bf209059c1977d7189c28ec833d043"; + sha256 = "9d3a8bdc9b4acce086c485ba719aabee33de7a867d84a058b182b139c789ad55"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index 72a527b807..e6aef54557 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "7.1.2"; + version = "7.2.1"; src = fetchPypi { inherit pname version; - sha256 = "adcf478d7fc539e9decde59b2db7b6a4b1d679c4cf78d515d880adb1c4bc1c30"; + sha256 = "9aad074d0361791af8ccb8fb7ea0f1646db3d89600fed85c5562b64c8b1aa899"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix index a0b743bb8b..da09cfdd64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycoin"; - version = "0.90.20200322"; + version = "0.90.20200809"; src = fetchPypi { inherit pname version; - sha256 = "c8af579e86c118deb64d39e0d844d53a065cdd8227ddd632112e5667370b53a3"; + sha256 = "301dd6df9d9d580701d7325c4d1c341233ba1a94cb805305ea3a43c31bdaaa4c"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix index 1825c690f3..cef9e96442 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ snowballstemmer ]; - checkInputs = [ pytest pytestpep8 mock ]; + checkInputs = [ pytest mock ]; checkPhase = '' # test_integration.py installs packages via pip - py.test --pep8 --cache-clear -vv src/tests -k "not test_integration" + py.test --cache-clear -vv src/tests -k "not test_integration" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix index 8499db31e0..42d33c00cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pydub"; - version = "0.24.0"; + version = "0.24.1"; # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; repo = pname; rev = "v${version}"; - sha256 = "0cnhkk44cn3wa4fmd1rwzdx2zgrn87qg25pbcp9wsisdlpn4bj6d"; + sha256 = "1pv4n54kkjpbjlvwh9b6a7zyq1ylg0fjmd2q4ws9nc2a6mrcivhc"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix new file mode 100644 index 0000000000..8a788402b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lml +}: + +buildPythonPackage rec { + pname = "pyexcel-io"; + version = "0.5.20"; + + src = fetchPypi { + inherit pname version; + sha256 = "CN/jlVO5ljWbFD3j2exD4ZbxE41HyrtzrwShaCG4TXk="; + }; + + propagatedBuildInputs = [ + lml + ]; + + # Tests depend on stuff that depends on this. + doCheck = false; + + pythonImportsCheck = [ "pyexcel_io" ]; + + meta = { + description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix new file mode 100644 index 0000000000..9e5b32ea86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyexcel-io +, odfpy +, nose +, pyexcel +, pyexcel-xls +, psutil +}: + +buildPythonPackage rec { + pname = "pyexcel-ods"; + version = "0.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "O+Uv2KrdvYvJKG9+sUj0VT1MlyUtaVw6nse5XmZmoiM="; + }; + + propagatedBuildInputs = [ + pyexcel-io + odfpy + ]; + + checkInputs = [ + nose + pyexcel + pyexcel-xls + psutil + ]; + + checkPhase = "nosetests"; + + meta = { + description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix new file mode 100644 index 0000000000..2dd4533c2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyexcel-io +, xlrd +, xlwt +, nose +, pyexcel +, mock +}: + +buildPythonPackage rec { + pname = "pyexcel-xls"; + version = "0.5.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1Wyt6gpmBoRFaXbZgFJVTTu+KnivxfmpHIaR9iZghVU="; + }; + + propagatedBuildInputs = [ + pyexcel-io + xlrd + xlwt + ]; + + checkInputs = [ + nose + pyexcel + mock + ]; + + checkPhase = "nosetests"; + + meta = { + description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix new file mode 100644 index 0000000000..71219c32ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, lml +, pyexcel-io +, texttable +, nose +}: + +buildPythonPackage rec { + pname = "pyexcel"; + version = "0.6.4"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "pPNYnimHhW7SL6X6OLwagZoadTD7IdUSbO7vAqQPQu8="; + }; + + propagatedBuildInputs = [ + lml + pyexcel-io + texttable + ]; + + checkInputs = [ + nose + ]; + + # Tests depend on pyexcel-xls & co. causing circular dependency. + # https://github.com/pyexcel/pyexcel/blob/dev/tests/requirements.txt + doCheck = false; + + pythonImportsCheck = [ "pyexcel" ]; + + checkPhase = "nosetests"; + + meta = { + description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index 14c69fd799..7c1dc4fbb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales, isPy37 }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }: buildPythonPackage rec { - version = "4.0.2"; + version = "4.1.0"; pname = "pyfakefs"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "c415e1c737e3aa72b92af41832a7e0a2c325eb8d3a72a210750714e00fcaeace"; + sha256 = "bbbaa8b622fa50751a5839350fff3c1f8b1bbd364cd40fd0c7442e18fe5edc8e"; }; postPatch = '' @@ -24,8 +25,6 @@ buildPythonPackage rec { --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); - # https://github.com/jmcgeheeiv/pyfakefs/issues/508 - doCheck = !isPy37; checkInputs = [ pytest glibcLocales ]; checkPhase = '' @@ -39,6 +38,7 @@ buildPythonPackage rec { description = "Fake file system that mocks the Python file system modules"; license = licenses.asl20; homepage = "http://pyfakefs.org/"; + changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; maintainers = with maintainers; [ gebner ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix index 5cc8346626..eb5403c2b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , requests, cryptography, pybrowserid, hawkauthlib, six -, grequests, mock, responses, pytest }: +, grequests, mock, responses, pytest, pyjwt }: buildPythonPackage rec { pname = "PyFxA"; @@ -17,15 +17,16 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - requests cryptography pybrowserid hawkauthlib six + pyjwt requests cryptography pybrowserid hawkauthlib six ]; checkInputs = [ grequests mock responses pytest ]; + # test_oath is mostly network calls checkPhase = '' - pytest + pytest --ignore=fxa/tests/test_oauth.py ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix index 1a084f8a87..3a451f4af1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.5"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "179i3mjprhn200gcj6jq7c4mdrzckyqlh1srz78hynnw0nijka2h"; + sha256 = "411ae84a5bc313e3e1523a1cace59159f512336318a510573b47f824edef8860"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix index 381ec45388..b6ef4bc4a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k # propagatedBuildInputs , aiohttp , async-timeout +, semantic-version # buildInputs , pytestrunner # checkInputs @@ -15,6 +17,9 @@ buildPythonPackage rec { pname = "pyhaversion"; version = "3.3.0"; + # needs aiohttp which is py3k-only + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "376a1b232a26035bc82d64affa1c4f312d782234fe5453e8d0f9e1350a97be5b"; @@ -23,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp async-timeout + semantic-version ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix index 14bf1cfe7b..3f12888d53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.67"; + version = "0.1.68"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2d18e0059367e9e32d6472023322113fce431bcc72187b4a6eb7402fe5d2794b"; + sha256 = "7f8ec68238a441cfe593fa9028509fd0c3dc67400b4dd520c8c02088f177302e"; }; # PyPI tarball does not include tests/ directory diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix index cf6b67c548..98bb6360ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.10.1"; + version = "0.11.0"; disabled = isPy27; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-ipp"; rev = version; - sha256 = "0y9mkrx66f4m77jzfgdgmvlqismvimb6hm61j2va7zapm8dyabvr"; + sha256 = "0ar3mkyfa9qi3av3885bvacpwlxh420if9ymdj8i4x06ymzc213d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix index c535ddad10..abf4beaada 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix @@ -1,12 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, cython, nose, numpy }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, pytest, numpy }: buildPythonPackage rec { pname = "pyjet"; version = "1.6.0"; - src = fetchPypi { - inherit pname version; - sha256 = "ab6e63f8a8fd73bbd76ef2a384eea69bc1c201f2ce876faa4151ade6c0b20615"; + # tests not included in pypi tarball + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = pname; + rev = version; + sha256 = "0b68jnbfk2rw9i1nnwsrbrbgkj7r0w1nw0i9f8fah1wmn78k9csv"; }; # fix for python37 @@ -19,7 +22,11 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose ]; + checkInputs = [ pytest ]; + checkPhase = '' + mv pyjet _pyjet + pytest tests/ + ''; meta = with lib; { homepage = "https://github.com/scikit-hep/pyjet"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix new file mode 100644 index 0000000000..5fc38cd5dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, toPythonModule, cmake, orocos-kdl, python, sip }: + +toPythonModule (stdenv.mkDerivation { + pname = "pykdl"; + inherit (orocos-kdl) version src; + + sourceRoot = "source/python_orocos_kdl"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ orocos-kdl ]; + propagatedBuildInputs = [ python sip ]; + + meta = with lib; { + description = "Kinematics and Dynamics Library (Python bindings)"; + homepage = "https://www.orocos.org/kdl.html"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix index 02a0f87583..6b56a42246 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pylatexenc"; - version = "2.4"; + version = "2.7"; src = fetchFromGitHub { owner = "phfaist"; repo = "pylatexenc"; rev = "v${version}"; - sha256 = "0i4frypbv90mjir8bkp03cwkvwhgvc9p3fw6q2jz1dn7fw94v2rv"; + sha256 = "1hpcwbknfah3mky2m4asw15b9qdvv4k5ni0js764n1jpi83m1zgk"; }; pythonImportsCheck = [ "pylatexenc" ]; @@ -26,4 +26,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylibftdi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylibftdi/default.nix index 54058ae198..c001594d62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylibftdi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylibftdi/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pylibftdi"; - version = "0.18.1"; + version = "0.19.0"; src = fetchPypi { inherit pname version; - sha256 = "17c5h4xz1grynbpffngjflk3dlw2g2zbhkwb7h5v4n9rjdv41l5x"; + sha256 = "bb0ec74df292ef884aa37bf1e98fb9df4d338718e1559eebda363317a792123e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index 2cd0a0a020..635d951f56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2020.4.29"; + version = "2020.8.13"; src = fetchPypi { inherit pname version; - sha256 = "cf9c89f2c742acf524f3a778cd269164abf582e87ab5f297cd83802fe00c309d"; + sha256 = "23e5885e15195b37ce4c16ef93f474f741cb98451fa8dd4c319ec121f4887256"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix index 0c99b501c3..bda74c5063 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.8"; + version = "3.9.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1bb2915e4a29877c681ead13932b0b7d276f7f496e9c3f09ba96b977c99caf00"; + sha256 = "abe046f5a5d0e5baee80b7c4bc0a4c218f61b517b62d77be4f89cf4784c27d78"; }; # No need for coverage stats in Nix builds diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix index b7da796d3b..2838362f1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.10.1"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "993257f6ca3cde55332af1f62af3e04ca89ce63c08b56a387cdd46136c72f2fa"; + sha256 = "076a7f2f7c251635cf6116ac8e45eefac77758ee5a77ab7bd2f63999e957613b"; }; # Tests call a running mongodb instance diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index a1fbe4b8dc..bc2f2c6e95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.17.4"; + version = "1.17.6"; src = fetchPypi { inherit pname version; - sha256 = "e04421ac7e9e892ea482d0bbf8b590ae7a4f82858faa6fd24943b037122971c0"; + sha256 = "5eef4ff61698016a296932858625a5a0039b923ba692043e2c98ca02966f1da2"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix index 7e83976cc4..53df38b583 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "4.3.2"; + version = "4.3.3"; src = fetchPypi { inherit pname version; - sha256 = "58bd62089741ef689f845d6ca826ab50e39b9a0a8ae3bd7a84dc167c1a4ec8fa"; + sha256 = "ced47c200073dbbfafb10b26931b9c9bf3c6b898f41dffa3676f5c2e2eddc2f0"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index 766952ee26..e5eddd81d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2020.2"; + version = "2020.2.1"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "afd9f22547bcd879b9e54252fc885b45034ebfd1890e630827f1afb408a03d23"; + sha256 = "deb6c50f37f8f88960a943b379eca8c0a9a80634cf60e09aee691a7453ae202e"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix new file mode 100644 index 0000000000..23de6b2323 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, lib +}: + +buildPythonPackage rec { + pname = "pyopengl-accelerate"; + version = "3.1.5"; + + src = fetchPypi { + pname = "PyOpenGL-accelerate"; + inherit version; + sha256 = "01iggy5jwxv7lxnj51zbmlbhag9wcb7dvrbwgi97i90n0a5m3r8j"; + }; + + meta = { + description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x"; + homepage = "http://pyopengl.sourceforge.net/"; + maintainers = with lib.maintainers; [ laikq ]; + license = lib.licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix index c78b7fb145..1a3d674779 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "18d13ikra1iq0xyfqfm72zhgwxi2qi9ps6z1a6zmqp4qrn57wlzw"; + sha256 = "01eceab573181188fe038d001e42777884a7f5367203080ef5bda0e30fe82d28"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyphotonfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyphotonfile/default.nix index dd8d643f6b..7a350bd3b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyphotonfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyphotonfile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage { pname = "pyphotonfile"; inherit version; propagatedBuildInputs = [ pillow numpy ]; - + src = fetchFromGitHub { owner = "fookatchu"; repo = "pyphotonfile"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix index 81d4c47652..c3157c3d30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.4.0"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "a034d9311d4715a2e8e127e0a4dd2996cbd34c4b85ac57b02b277c176b0a62ff"; + sha256 = "e863321bee141fb8d20d621aedc5925c472e06c08988447490115f54a31487ad"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix index bb3c2c895b..5afce4a37d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "Pyro5"; - version = "5.10"; + version = "5.11"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e518e2a3375bc04c073f7c8c82509d314b00fa2f65cead9f134ebe42a922b360"; + sha256 = "867cdd291d85560373e0c468da7fd18754f2568ef60e0bc504af42f391d7a3e5"; }; propagatedBuildInputs = [ serpent ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch index ca723a0e57..db6895edfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch @@ -1,119 +1,100 @@ -diff -ru PySDL2-0.9.6-old/sdl2/dll.py PySDL2-0.9.6/sdl2/dll.py ---- PySDL2-0.9.6-old/sdl2/dll.py 2018-03-08 10:18:37.583471745 +0100 -+++ PySDL2-0.9.6/sdl2/dll.py 2018-03-08 10:20:06.705517520 +0100 -@@ -45,29 +45,31 @@ +diff -ru PySDL2-0.9.7-old/sdl2/dll.py PySDL2-0.9.7/sdl2/dll.py +--- PySDL2-0.9.7-old/sdl2/dll.py 2020-02-15 09:36:29.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/dll.py 2020-09-23 20:24:09.365497270 +0200 +@@ -94,15 +94,16 @@ """Function wrapper around the different DLL functions. Do not use or instantiate this one directly from your user code. """ - def __init__(self, libinfo, libnames, path=None): -- self._dll = None ++ def __init__(self, libinfo, libfile): + self._dll = None + self._libname = libinfo + self._version = None - foundlibs = _findlib(libnames, path) - dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") - if len(foundlibs) == 0: - raise RuntimeError("could not find any library for %s (%s)" % - (libinfo, dllmsg)) -- for libfile in foundlibs: -- try: -- self._dll = CDLL(libfile) -- self._libfile = libfile -- break -- except Exception as exc: -- # Could not load the DLL, move to the next, but inform the user -- # about something weird going on - this may become noisy, but -- # is better than confusing the users with the RuntimeError below -- warnings.warn(repr(exc), DLLWarning) -- if self._dll is None: -- raise RuntimeError("found %s, but it's not usable for the library %s" % -- (foundlibs, libinfo)) ++ #foundlibs = _findlib(libnames, path) ++ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") ++ #if len(foundlibs) == 0: ++ # raise RuntimeError("could not find any library for %s (%s)" % ++ # (libinfo, dllmsg)) ++ foundlibs = [ libfile ] + for libfile in foundlibs: + try: + self._dll = CDLL(libfile) +@@ -117,9 +118,9 @@ + if self._dll is None: + raise RuntimeError("found %s, but it's not usable for the library %s" % + (foundlibs, libinfo)) - if path is not None and sys.platform in ("win32",) and \ - path in self._libfile: - os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) -+ def __init__(self, libfile): -+ self._dll = CDLL(libfile) -+ self._libfile = libfile -+ # self._dll = None -+ # foundlibs = _findlib(libnames, path) -+ # dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") -+ # if len(foundlibs) == 0: -+ # raise RuntimeError("could not find any library for %s (%s)" % -+ # (libinfo, dllmsg)) -+ # for libfile in foundlibs: -+ # try: -+ # self._dll = CDLL(libfile) -+ # self._libfile = libfile -+ # break -+ # except Exception as exc: -+ # # Could not load the DLL, move to the next, but inform the user -+ # # about something weird going on - this may become noisy, but -+ # # is better than confusing the users with the RuntimeError below -+ # warnings.warn(repr(exc), DLLWarning) -+ # if self._dll is None: -+ # raise RuntimeError("found %s, but it's not usable for the library %s" % -+ # (foundlibs, libinfo)) -+ # if path is not None and sys.platform in ("win32",) and \ -+ # path in self._libfile: -+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) ++ #if path is not None and sys.platform in ("win32",) and \ ++ # path in self._libfile: ++ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) - def bind_function(self, funcname, args=None, returns=None, optfunc=None): + def bind_function(self, funcname, args=None, returns=None, added=None): """Binds the passed argument and return value types to the specified -@@ -110,7 +112,7 @@ +@@ -220,7 +221,7 @@ return try: - dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2") ++ dll = DLL("SDL2", "@sdl2@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlgfx.py PySDL2-0.9.6/sdl2/sdlgfx.py ---- PySDL2-0.9.6-old/sdl2/sdlgfx.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlgfx.py 2018-03-08 10:20:06.705517520 +0100 -@@ -34,8 +34,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlgfx.py PySDL2-0.9.7/sdl2/sdlgfx.py +--- PySDL2-0.9.7-old/sdl2/sdlgfx.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlgfx.py 2020-09-23 20:23:56.997419129 +0200 +@@ -39,8 +39,7 @@ ] try: - dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_gfx") ++ dll = DLL("SDL2_gfx", "@sdl2_gfx@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlimage.py PySDL2-0.9.6/sdl2/sdlimage.py ---- PySDL2-0.9.6-old/sdl2/sdlimage.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlimage.py 2018-03-08 10:20:06.705517520 +0100 -@@ -26,8 +26,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlimage.py PySDL2-0.9.7/sdl2/sdlimage.py +--- PySDL2-0.9.7-old/sdl2/sdlimage.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlimage.py 2020-09-23 20:23:50.085375658 +0200 +@@ -27,8 +27,7 @@ ] try: - dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_image") ++ dll = DLL("SDL2_image", "@sdl2_image@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlmixer.py PySDL2-0.9.6/sdl2/sdlmixer.py ---- PySDL2-0.9.6-old/sdl2/sdlmixer.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlmixer.py 2018-03-08 10:20:27.415758478 +0100 -@@ -50,8 +50,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlmixer.py PySDL2-0.9.7/sdl2/sdlmixer.py +--- PySDL2-0.9.7-old/sdl2/sdlmixer.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlmixer.py 2020-09-23 20:23:46.117350771 +0200 +@@ -53,8 +53,7 @@ ] try: - dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_mixer") ++ dll = DLL("SDL2_mixer", "@sdl2_mixer@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlttf.py PySDL2-0.9.6/sdl2/sdlttf.py ---- PySDL2-0.9.6-old/sdl2/sdlttf.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlttf.py 2018-03-08 10:20:06.705517520 +0100 -@@ -38,8 +38,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlttf.py PySDL2-0.9.7/sdl2/sdlttf.py +--- PySDL2-0.9.7-old/sdl2/sdlttf.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlttf.py 2020-09-23 20:23:40.069312931 +0200 +@@ -39,8 +39,7 @@ ] try: - dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_ttf") ++ dll = DLL("SDL2_ttf", "@sdl2_ttf@") except RuntimeError as exc: raise ImportError(exc) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix index b22da8b83a..be9663245b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: +{ stdenv, lib, substituteAll, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: buildPythonPackage rec { pname = "PySDL2"; @@ -18,19 +18,18 @@ buildPythonPackage rec { # which library they want to include. buildInputs = [ SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer ]; propagatedBuildInputs = [ SDL2 ]; - patches = [ ./PySDL2-dll.patch ]; - postPatch = '' - substituteInPlace sdl2/dll.py --replace \ - "DLL(\"SDL2\")" "DLL('${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlttf.py --replace \ - "DLL(\"SDL2_ttf\")" "DLL('${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlimage.py --replace \ - "DLL(\"SDL2_image\")" "DLL('${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlgfx.py --replace \ - "DLL(\"SDL2_gfx\")" "DLL('${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlmixer.py --replace \ - "DLL(\"SDL2_mixer\")" "DLL('${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}')" - ''; + patches = [ + (substituteAll ({ + src = ./PySDL2-dll.patch; + } // builtins.mapAttrs (_: pkg: "${pkg}/lib/lib${pkg.pname}${stdenv.hostPlatform.extensions.sharedLibrary}") { + # substituteAll keys must start lowercase + sdl2 = SDL2; + sdl2_ttf = SDL2_ttf; + sdl2_image = SDL2_image; + sdl2_gfx = SDL2_gfx; + sdl2_mixer = SDL2_mixer; + })) + ]; meta = { description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix index f9d07be579..6d8b828fb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.14.2"; + version = "5.15.0"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "1cwjpv8qmjksi7cj4naw54h2afphw44chrf1pmfjamyyj8vz6ykw"; + sha256 = "0s3bgddcsf6w297nyxv08xpc2nnr3sli980p24nf4xivvr9yxkgi"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index f5169b6839..a113314aa4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -22,5 +22,6 @@ buildPythonPackage rec { description = "Python bindings to Slurm"; license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; + broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix index ef7fcd20e7..d8d6b4f440 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, pythonAtLeast +, fetchFromGitHub +, poetry , brotli , ijson , nose -, requests_oauthlib +, httpretty +, requests_oauthlib , python_magic , pytz }: @@ -14,32 +15,43 @@ buildPythonPackage rec { pname = "pysnow"; version = "0.7.16"; - - src = fetchPypi { - inherit pname version; - sha256 = "5df61091470e48b5b3a6ea75637f69d3aacae20041487ea457a9a0e3093fba8c"; - }; + # tests not included in pypi tarball + src = fetchFromGitHub { + owner = "rbw"; + repo = pname; + rev = version; + sha256 = "0dj90w742klfcjnx7yhp0nzki2mzafqzzr0rk2dp6vxn8h58z8ww"; + }; + format = "pyproject"; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'ijson = "^2.5.1"' 'ijson = "*"' \ + --replace 'pytz = "^2019.3"' 'pytz = "*"' \ + --replace 'oauthlib = "^3.1.0"' 'oauthlib = "*"' + ''; + + nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ brotli - ijson - python_magic - pytz + ijson + python_magic + pytz requests_oauthlib ]; - checkInputs = [ nose ]; - + checkInputs = [ nose httpretty ]; checkPhase = '' nosetests --cover-package=pysnow --with-coverage --cover-erase ''; + pythonImportsCheck = [ "pysnow" ]; meta = with lib; { description = "ServiceNow HTTP client library written in Python"; homepage = "https://github.com/rbw/pysnow"; license = licenses.mit; - maintainers = [ maintainers.almac ]; + maintainers = [ maintainers.almac ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix index 8c7e0f64c1..22b6840608 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.4.6"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b4b319a3ffd187a3019f654ae1c8ac38048bcec2940f8cecdef829302d166feb"; + sha256 = "8c6e5cc51d91eb8d43e81d0b7093292b5e144ac81445491d5f887d2cf4fe121f"; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspice/default.nix new file mode 100644 index 0000000000..f2cce09c8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspice/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, libngspice +, numpy +, ply +, scipy +, pyyaml +, cffi +, requests +, matplotlib +, setuptools +}: + +buildPythonPackage rec { + pname = "PySpice"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mnyy8nr06d1al99kniyqcm0p9a8dvkg719s42sajl8yf51sayc9"; + }; + + propagatedBuildInputs = [ + setuptools + requests + pyyaml + cffi + matplotlib + numpy + ply + scipy + libngspice + ]; + + doCheck = false; + pythonImportsCheck = [ "PySpice" ]; + + postPatch = '' + substituteInPlace PySpice/Spice/NgSpice/Shared.py --replace \ + "ffi.dlopen(self.library_path)" \ + "ffi.dlopen('${libngspice}/lib/libngspice${stdenv.hostPlatform.extensions.sharedLibrary}')" + ''; + + meta = with stdenv.lib; { + description = "Simulate electronic circuit using Python and the Ngspice / Xyce simulators"; + homepage = "https://github.com/FabriceSalvaire/PySpice"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix new file mode 100644 index 0000000000..33149e99e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: + +buildPythonPackage rec { + pname = "pysqueezebox"; + version = "0.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "02d73e98314a63a38c314d40942a0b098fb59d2f08ac39b2627cfa73f785cf0d"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # No tests in the Pypi distribution + doCheck = false; + pythonImportsCheck = [ "pysqueezebox" ]; + + meta = with stdenv.lib; { + description = "Asynchronous library to control Logitech Media Server"; + homepage = "https://github.com/rajlaud/pysqueezebox"; + license = licenses.asl20; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytabix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytabix/default.nix new file mode 100644 index 0000000000..eb21ca1981 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytabix/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, isPy3k +, fetchPypi +, zlib +}: + +buildPythonPackage rec { + pname = "pytabix"; + version = "0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ldp5r4ggskji6qx4bp2qxy2vrvb3fam03ksn0gq2hdxgrlg2x07"; + }; + + buildInputs = [ zlib ]; + + doCheck = !isPy3k; + preCheck = '' + substituteInPlace test/test.py \ + --replace 'test_remote_file' 'dont_test_remote_file' + ''; + pythonImportsCheck = [ "tabix" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/slowkow/pytabix"; + description = "Python interface for tabix"; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix index c4a9b6fdd1..8942263a57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.12.0"; + version = "0.14.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1lpb1q297rly685yl23mni3mmv6vmyx3qsv5ccj1vh8bvkrx4ns7"; + sha256 = "9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700"; }; buildInputs = [ pytest ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix index 29225859df..0ad4392bee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { checkPhase = '' pytest ''; - + meta = with stdenv.lib; { description = "BDD library for the py.test runner"; homepage = "https://github.com/pytest-dev/pytest-bdd"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix index 5affa8ae35..649e41f7d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "2.9.0"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "b6a814b8ed6247bd81ff47f038511b57fe1ce7f4cc25b9106f1a4b106f1d9322"; + sha256 = "47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"; }; buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix index 421cca3398..c9c373a275 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.7.0"; + version = "0.8.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "ed440f43e33191f09aed7bbc4f60db3dfb8f295ab33e04c59302af7eda9e29aa"; + sha256 = "fb083925a17ce636f33997c275f61123e63372c1db11fefac1e991ed25a4ca37"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix index 3139e32a0b..89200f519e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-forked"; - version = "1.1.3"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1805699ed9c9e60cb7a8179b8d4fa2b8898098e82d229b0825d8095f0f261100"; + sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"; }; buildInputs = [ pytest setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix index ff08efc12b..c21175bf33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "636e792f7dd9e2c80657e174c04bf7aa92672350090736d82e97e92ce8f68737"; + sha256 = "7122d55505d5ed5a6f3df940ad174b3f606ecae5e9bc379569cdcbd4cd9d2b83"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; @@ -27,8 +27,9 @@ buildPythonPackage rec { pytest ]; + # ignore test which only works with pytest5 output structure checkPhase = '' - pytest + pytest -k 'not detailed_introspection_async' ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix new file mode 100644 index 0000000000..c4523ac728 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, factory_boy, faker, numpy +, pytest, pytest_xdist +}: + +buildPythonPackage rec { + pname = "pytest-randomly"; + version = "3.4.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0s9cx692cdchfrjqx7fgf9wnm3fdac211a4hjq1cx9qqnbpdpl2z"; + }; + + propagatedBuildInputs = [ numpy factory_boy faker ]; + + checkInputs = [ pytest pytest_xdist ]; + + # test warnings are fixed on an unreleased version: + # https://github.com/pytest-dev/pytest-randomly/pull/281 + checkPhase = "pytest -p no:randomly"; + + meta = with lib; { + description = "Pytest plugin to randomly order tests and control random.seed"; + homepage = "https://github.com/pytest-dev/pytest-randomly"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix index 909b8e8010..93b60ecbe4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pytest-services"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0848cead86d3816b9c4e37cecfda31d21a4366f0dca2313ea29f3ca375c6295d"; + sha256 = "0037101eaa17e050542808ecb2e799e9b2b148f1867f62b2296329fdd2034cf5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix index 53bdbdf1f4..923fe14cfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, trio, async_generator, hypothesis, outcome, pytest, pytestcov }: +, trio, python, async_generator, hypothesis, outcome, pytest }: buildPythonPackage rec { pname = "pytest-trio"; @@ -22,14 +22,18 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov hypothesis ]; + # broken with pytest 5 and 6 + doCheck = false; checkPhase = '' - pytest + rm pytest.ini + PYTHONPATH=$PWD:$PYTHONPATH pytest ''; + pythonImportsCheck = [ "pytest_trio" ]; + meta = with lib; { description = "Pytest plugin for trio"; homepage = "https://github.com/python-trio/pytest-trio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix new file mode 100644 index 0000000000..a3d80f9402 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 +, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: + +buildPythonPackage rec { + pname = "pytest-xdist"; + version = "2.0.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "3217b1f40290570bf27b1f82714fc4ed44c3260ba9b2f6cde0372378fc707ad3"; + }; + + nativeBuildInputs = [ setuptools_scm pytest_6 ]; + checkInputs = [ pytest_6 filelock ]; + propagatedBuildInputs = [ execnet pytest-forked psutil six ]; + + # pytest6 doesn't allow for new lines + checkPhase = '' + # Excluded tests access file system + export HOME=$TMPDIR + pytest -n $NIX_BUILD_CORES -k "not (distribution_rsyncdirs_example or rsync)" + ''; + + meta = with stdenv.lib; { + description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; + homepage = "https://github.com/pytest-dev/pytest-xdist"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix index d5fc8ce25b..6dc4b666db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchPypi, buildPythonPackage, execnet, pytest -, setuptools_scm, pytest-forked, filelock, six, isPy3k }: +, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.32.0"; + version = "1.34.0"; src = fetchPypi { inherit pname version; - sha256 = "1d4166dcac69adb38eeaedb88c8fada8588348258a3492ab49ba9161f2971129"; + sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il"; }; nativeBuildInputs = [ setuptools_scm pytest ]; checkInputs = [ pytest filelock ]; - propagatedBuildInputs = [ execnet pytest-forked six ]; + propagatedBuildInputs = [ execnet pytest-forked psutil six ]; # Encountered a memory leak # https://github.com/pytest-dev/pytest-xdist/issues/462 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/4.nix index 4fe588f645..43cfe6c822 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/4.nix @@ -3,12 +3,12 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "4.6.9"; + version = "4.6.11"; pname = "pytest"; src = fetchPypi { inherit pname version; - sha256 = "0fgkmpc31nzy97fxfrkqbzycigdwxwwmninx3qhkzp81migggs0r"; + sha256 = "50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353"; }; checkInputs = [ hypothesis mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/5.nix new file mode 100644 index 0000000000..2b45c330cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/5.nix @@ -0,0 +1,80 @@ +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +, atomicwrites +, attrs +, funcsigs +, hypothesis +, mock +, more-itertools +, packaging +, pathlib2 +, pluggy +, py +, pygments +, python +, setuptools +, setuptools_scm +, six +, toml +, wcwidth +, writeText +}: + +buildPythonPackage rec { + version = "5.4.3"; + pname = "pytest"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1n67lk8iwlsmfdm8663k8l7isllg1xd3n9p1yla7885szhdk6ybr"; + }; + + checkInputs = [ hypothesis pygments ]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + atomicwrites + attrs + more-itertools + packaging + pluggy + py + setuptools + six + toml + wcwidth + ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py + runHook postCheck + ''; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + preDistPhases+=" pytestcachePhase" + ''; + + pythonImportsCheck = [ + "pytest" + ]; + + meta = with stdenv.lib; { + homepage = "https://docs.pytest.org"; + description = "Framework for writing tests"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix index daf43961ea..ce742d65ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -3,6 +3,7 @@ , attrs , funcsigs , hypothesis +, iniconfig , mock , more-itertools , packaging @@ -14,33 +15,45 @@ , setuptools , setuptools_scm , six +, toml , wcwidth , writeText }: buildPythonPackage rec { - version = "5.4.3"; + version = "6.0.1"; pname = "pytest"; disabled = !isPy3k; + src = fetchPypi { + inherit pname version; + sha256 = "85228d75db9f45e06e57ef9bf4429267f81ac7c0d742cc9ed63d09886a9fe6f4"; + }; + + checkInputs = [ hypothesis pygments ]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + atomicwrites + attrs + iniconfig + more-itertools + packaging + pluggy + py + setuptools + six + toml + wcwidth + ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 + preCheck = '' # don't test bash builtins rm testing/test_argcomplete.py ''; - src = fetchPypi { - inherit pname version; - sha256 = "7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"; - }; - - checkInputs = [ hypothesis pygments ]; - nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] - ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; - - doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 - # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-docx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-docx/default.nix index 15ccd45760..025a13958c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-docx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-docx/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { checkPhase = '' py.test tests + behave --format progress --stop --tags=-wip ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index 1c48cfa6c6..a74ee0455f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -9,17 +9,18 @@ , tornado , websocket_client , websockets +, pytestCheckHook }: buildPythonPackage rec { pname = "python-engineio"; - version = "3.13.0"; + version = "3.13.2"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "1fgfrgcvjg3fyza5lhl1l9cfq073xrwwhh3xs178csrjz4s8s378"; + sha256 = "1hn5nnxp7y2dpf52vrwdxza2sqmzj8admcnwgjkmcxk65s2dhvy1"; }; propagatedBuildInputs = [ @@ -34,15 +35,19 @@ buildPythonPackage rec { tornado websocket_client websockets + pytestCheckHook ]; - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox preCheck = stdenv.lib.optionalString stdenv.isLinux '' - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so ''; postCheck = "unset NIX_REDIRECTS LD_PRELOAD"; + # somehow effective log level does not change? + disabledTests = [ "test_logger" ]; + meta = with stdenv.lib; { description = "Engine.IO server"; homepage = "https://github.com/miguelgrinberg/python-engineio/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index 0c1f7c67e3..470095eae8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder }: +{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder, pytest, responses }: buildPythonPackage rec { pname = "python-gitlab"; - version = "2.2.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "4c4ea60c8303f4214522b18038df017cae35afda7474efa0b4e19c2e73bc3ae2"; + sha256 = "e240b5c371d9e98c46c980d878c3f03cd83f3da6cda01d533db27fa3e0dd474f"; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ mock httmock ]; + checkInputs = [ mock httmock pytest responses ]; disabled = pythonOlder "3.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix index c223ccb89b..4558bc7edb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson , # Allow building a limited set of providers, e.g. ["pycodestyle"]. @@ -21,15 +21,23 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.33.1"; + version = "0.34.1"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "064ck4ikrrrhq8wjpbs5k6hzkrjvfg91pd6351471xpsij0kj16f"; + sha256 = "sha256-/tVzaoyUO6+7DSvnf3JxpcTY0rU+hHBu5qlru/ZTpxU="; }; + patches = [ + # https://github.com/palantir/python-language-server/pull/851 + (fetchpatch { + url = "https://github.com/palantir/python-language-server/commit/f513f3297132492dd41e001d943980e6c4f40809.patch"; + sha256 = "04c9hrb3dzlfchjk4625ipazyfcbq6qq2kj2hg3zf2xsny2jcvi5"; + }) + ]; + postPatch = '' # https://github.com/palantir/python-jsonrpc-server/issues/36 sed -i -e 's!ujson<=!ujson>=!' setup.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-libarchive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-libarchive/default.nix deleted file mode 100644 index 02fe234792..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-libarchive/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchurl -, isPy3k -, pkgs -}: - -buildPythonPackage rec { - version = "3.1.2-1"; - pname = "libarchive"; - disabled = isPy3k; - - src = fetchurl { - url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz"; - sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x"; - }; - - propagatedBuildInputs = [ pkgs.libarchive.lib ]; - - meta = with stdenv.lib; { - description = "Multi-format archive and compression library"; - homepage = "https://libarchive.org/"; - license = licenses.bsd0; - broken = true; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix index a72e20021d..ea08d7f902 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-markdown-math"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "c68d8cb9695cb7b435484403dc18941d1bad0ff148e4166d9417046a0d5d3022"; + sha256 = "17a12175e8b2052a1c3402fca410841c551c678046293b1f7c280ccfe7b302a0"; }; checkInputs = [ markdown ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-packer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-packer/default.nix index 04cbaf7724..420efb4003 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-packer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-packer/default.nix @@ -16,10 +16,10 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ sh ]; - + # Tests requires network connections doCheck = false; - + meta = with stdenv.lib; { description = "An interface for packer.io"; homepage = "https://github.com/nir0s/python-packer"; @@ -27,4 +27,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix index 4065cd7c01..f152c1f264 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix @@ -1,23 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi, pam }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pam +}: buildPythonPackage rec { pname = "python-pam"; version = "1.8.4"; - src = fetchPypi { - inherit pname version; - sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8"; + src = fetchFromGitHub { + owner = "FirefighterBlu3"; + repo = pname; + rev = "v${version}"; + sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; }; + buildInputs = [ + pam + ]; + postPatch = '' - substituteInPlace pam.py --replace 'find_library("pam")' \ - '"${pam}/lib/libpam${stdenv.hostPlatform.extensions.sharedLibrary}"' + sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py ''; - meta = with stdenv.lib; { - description = "Python PAM module using ctypes"; + meta = with lib; { + description = "Python pam module supporting py3 (and py2)"; homepage = "https://github.com/FirefighterBlu3/python-pam"; - maintainers = with maintainers; [ abbradar ]; license = licenses.mit; + maintainers = with maintainers; [ abbradar mkg20001 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix index f116ec556d..5eff4707d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ptrace/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-ptrace"; - version = "0.9.5"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "c46287ae611e3041bbd0572221cd1f121100dfc98d1d6c9ad6dd97e35f62501a"; + sha256 = "b998e3436cec975b6907552af6e7f3ff8779097e32d2b905696e5a9feb09e070"; }; # requires distorm, which is optionally diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix index f3e58a1a62..2ee2113714 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-redis-lock"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "06f28f63bf4ea3d739ff5c472e76563e24aa5c887002a85cbdb7a5b13aa05897"; + sha256 = "6c79b87f2fefcf47bbcebea56056d324e9d7971c9b98123b79590e08cbb0a8f7"; }; checkInputs = [ pytest process-tests pkgs.redis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix index 34b2c1fd74..c2cced8350 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.4.2"; + version = "1.4.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3721ed3643f407cd96ad377cff0c2e28f2e8df0abbbe15a8a9668daae0b2b743"; + sha256 = "3dd1909d0f44f03a4191131f1829cac2ee6a94f5a4be2a9606354748e594e704"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix new file mode 100644 index 0000000000..06e1185e34 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, snap7, fetchFromGitHub, six, setuptools }: + +buildPythonPackage rec { + pname = "python-snap7"; + version = "0.11"; + + src = fetchFromGitHub { + owner = "gijzelaerr"; + repo = "python-snap7"; + rev = "899a94c6eeca76fb9b18afd5056e5003646d7f94"; + sha256 = "169zd1nxq86nmi6132vxl1f6wxm9w3waihq2wn14kkmld1vkmvfd"; + }; + + propagatedBuildInputs = [ setuptools six ]; + + prePatch = '' + substituteInPlace snap7/common.py \ + --replace "lib_location = None" "lib_location = '${snap7}/lib/libsnap7.so'" + ''; + + # Tests require root privileges to open privilaged ports + # We cannot run them + doCheck = false; + + pythonImportsCheck = [ + "snap7" + "snap7.six" + "snap7.util" + ]; + + meta = with lib; { + description = "Python wrapper for the snap7 PLC communication library "; + homepage = "https://github.com/gijzelaerr/python-snap7"; + license = licenses.mit; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix index 39153f4a4d..eb912b2bc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.13"; + version = "1.14"; pname = "python-stdnum"; src = fetchPypi { inherit pname version; - sha256 = "0q4128rjdgavywhzlm2gz2n5ybc9b9sxs81g50dvxf5q7z9q63qj"; + sha256 = "fd3a92b8ec82a159c41dbaa3c5397934d090090c92b04e346412e0fd7e6a1b1c"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix index 965f7f3508..f8f9ef27ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , decorator , appdirs , six @@ -10,11 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2020.2"; + version = "2020.4"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3cacefed54148aafb07502c7c907cae8d9327ea35df16e3366c883a706ed5601"; + sha256 = "37db39ff11a1b5fc8aec875ae4ddb3d6c21aa0e95bddc9c841aa98e1631ae460"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix new file mode 100644 index 0000000000..63991752a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, future +, pytestCheckHook +, pytorch +, pyyaml +, tensorflow-tensorboard +, tqdm }: + +buildPythonPackage rec { + pname = "pytorch-lightning"; + version = "0.8.5"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "PyTorchLightning"; + repo = pname; + rev = version; + sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a"; + }; + + propagatedBuildInputs = [ + future + pytorch + pyyaml + tensorflow-tensorboard + tqdm + ]; + + checkInputs = [ pytestCheckHook ]; + # Some packages are not in NixPkgs; other tests try to build distributed + # models, which doesn't work in the sandbox. + doCheck = false; + + pythonImportsCheck = [ "pytorch_lightning" ]; + + meta = with lib; { + description = "Lightweight PyTorch wrapper for machine learning researchers"; + homepage = "https://pytorch-lightning.readthedocs.io"; + license = licenses.asl20; + maintainers = with maintainers; [ tbenst ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix new file mode 100644 index 0000000000..b1b662e95b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPy37 +, isPy38 +, python +, nvidia_x11 +, addOpenGLRunpath +, future +, numpy +, patchelf +, pyyaml +, requests +}: + +let + pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; + platform = if stdenv.isDarwin then "darwin" else "linux"; + srcs = import ./binary-hashes.nix; + unsupported = throw "Unsupported system"; +in buildPythonPackage { + pname = "pytorch"; + # Don't forget to update pytorch to the same version. + version = "1.6.0"; + + format = "wheel"; + + disabled = !(isPy37 || isPy38); + + src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; + + nativeBuildInputs = [ + addOpenGLRunpath + patchelf + ]; + + propagatedBuildInputs = [ + future + numpy + pyyaml + requests + ]; + + postInstall = '' + # ONNX conversion + rm -rf $out/bin + ''; + + postFixup = let + rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ]; + in '' + find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + echo "setting rpath for $lib..." + patchelf --set-rpath "${rpath}:$out/${python.sitePackages}/torch/lib" "$lib" + addOpenGLRunpath "$lib" + done + ''; + + pythonImportsCheck = [ "torch" ]; + + meta = with stdenv.lib; { + description = "Open source, prototype-to-production deep learning platform"; + homepage = "https://pytorch.org/"; + license = licenses.unfree; # Includes CUDA and Intel MKL. + platforms = platforms.linux; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix new file mode 100644 index 0000000000..481dc6825c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -0,0 +1,10 @@ +{ + x86_64-linux-37 = { + url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0xhwv68j8gvahfzcp43bqp2x71iwv6zjhkw2f1hb82xps40mrml7"; + }; + x86_64-linux-38 = { + url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp38-cp38-linux_x86_64.whl"; + sha256 = "05m2l04wqzw5xvjam6zwvlmc3979cksl3hrdqc2aikrv4hz8fmsk"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 0aea3b38b5..4635f813c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -4,7 +4,7 @@ openMPISupport ? false, openmpi ? null, buildDocs ? false, cudaArchList ? null, - numpy, pyyaml, cffi, click, typing, cmake, oneDNN, hypothesis, numactl, psutil, + numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil, linkFarm, symlinkJoin, # virtual pkg that consistently instantiates blas across nixpkgs @@ -25,15 +25,11 @@ assert !openMPISupport || openmpi != null; assert !cudaSupport || cudatoolkit != null; assert cudnn == null || cudatoolkit != null; assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; - in majorIs == "9" || majorIs == "10"); + in majorIs == "9" || majorIs == "10" || majorIs == "11"); -let - hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs; - matchesCudatoolkit = hasDependency cudatoolkit; -in # confirm that cudatoolkits are sync'd across dependencies -assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi; -assert !cudaSupport || matchesCudatoolkit magma; +assert !(openMPISupport && cudaSupport) || openmpi.cudatoolkit == cudatoolkit; +assert !cudaSupport || magma.cudatoolkit == cudatoolkit; let cudatoolkit_joined = symlinkJoin { @@ -104,8 +100,10 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.6.0"; pname = "pytorch"; + # Don't forget to update pytorch-bin to the same version. + version = "1.6.0"; + disabled = !isPy3k; outputs = [ @@ -159,9 +157,9 @@ in buildPythonPackage rec { USE_MKL = blas.implementation == "mkl"; - # Unlike MKL, MKLDNN is FOSS, so we enable support for it by default. Note - # that this was renamed to dnnl and then renamed again to oneDNN upstream, but - # pytorch still calls it by the old name mkldnn. + # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for + # it by default. PyTorch currently uses its own vendored version + # of oneDNN through Intel iDeep. USE_MKLDNN = mklDnnSupport; USE_MKLDNN_CBLAS = mklDnnSupport; @@ -210,7 +208,7 @@ in buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; - buildInputs = [ blas blas.provider oneDNN ] + buildInputs = [ blas blas.provider ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix index 0c78b30595..ff01ea90e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyuavcan/default.nix @@ -25,7 +25,7 @@ preBuild = '' export HOME=$TMPDIR export PYTHONASYNCIODEBUG=1 - ''; + ''; # tests fail ATM. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix index c0a401a1b2..aabf9cd5de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ - --replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'" + --replace "find_library(name)" "'${lib.getLib systemd}/lib/libudev.so'" ''; checkInputs = [ pytest mock hypothesis docutils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix index 26d9d650d5..7c51361775 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ scalavision ]; longDescription = '' - The intent of this module is to mimic the csv module in the Python stdlib, - as opposed to more flexible serialization formats like JSON or YAML. - vcf will attempt to parse the content of each record based on the data + The intent of this module is to mimic the csv module in the Python stdlib, + as opposed to more flexible serialization formats like JSON or YAML. + vcf will attempt to parse the content of each record based on the data types specified in the meta-information lines ''; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix index 74626c38eb..345908031c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "0.17.4"; + version = "1.0.2"; # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release disabled = isPy37; src = fetchPypi { inherit pname version; - sha256 = "5b54b65a5434bb16432415743c0d154feee0c6d7a8a2fee208719c67d6d24c97"; + sha256 = "66d8ec82d30f2b95d8b4bd51659429066c2879d3f46292561f5fdbc7fed10f3d"; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { # Wants `wbemcli` in PATH rm testsuite/test_wbemcli.py - + # Disables tests that use testfixtures which is currently broken by nonbuilding zope_component rm testsuite/{test_logging,test_recorder,test_wbemconnection_mock}.* ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix index 65cb438958..48c9512168 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxdg/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - patches = [ - # see: https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/5 + patches = [ + # see: https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/5 (fetchpatch { url = "https://gitlab.freedesktop.org/xdg/pyxdg/-/commit/78405aaa34463db2c6f33ca28ae2293dd3bb1e91.patch"; sha256 = "17cjax546rkqv5kvwczjqjdd6vmlvcxjanz0296dlfq23j2wbx63"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix new file mode 100644 index 0000000000..2c25575372 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, nose +, lxml +, requests +}: + +buildPythonPackage rec { + pname = "pyxnat"; + version = "1.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "113d13cs5ab7wy4vmyqyh8isjhlgfvan7y2g8n25vcpn3j4j00h0"; + }; + + propagatedBuildInputs = [ lxml requests ]; + + checkInputs = [ nose ]; + checkPhase = "nosetests pyxnat/tests"; + doCheck = false; # requires a docker container running an XNAT server + + pythonImportsCheck = [ "pyxnat" ]; + + meta = with lib; { + homepage = "https://pyxnat.github.io/pyxnat"; + description = "Python API to XNAT"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix index 96c100ace8..f23d86eb4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "19.0.1"; + version = "19.0.2"; src = fetchPypi { inherit pname version; - sha256 = "13a5638ab24d628a6ade8f794195e1a1acd573496c3b85af2f1183603b7bf5e0"; + sha256 = "296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438"; }; checkInputs = [ pytest tornado ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix index 3f0439efc7..8e73e942be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix @@ -6,6 +6,9 @@ , cmake , cvxpy , cython +, muparserx +, ninja +, nlohmann_json , numpy , openblas , pybind11 @@ -19,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.5.2"; + version = "0.6.1"; disabled = pythonOlder "3.5"; @@ -27,18 +30,20 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - fetchSubmodules = true; # fetch muparserx and other required libraries - sha256 = "0vw6b69h8pvzxhaz3k8sg9ac792gz3kklfv0izs6ra83y1dfwhjz"; + sha256 = "1fnv11diis0as8zcc57mamz0gbjd6vj7nw3arxzvwa77ja803sr4"; }; nativeBuildInputs = [ cmake + ninja scikit-build ]; buildInputs = [ openblas spdlog + nlohmann_json + muparserx ]; propagatedBuildInputs = [ @@ -48,10 +53,10 @@ buildPythonPackage rec { pybind11 ]; - postPatch = '' - # remove dependency on PyPi cmake package, which isn't in Nixpkgs - substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'" "" - ''; + patches = [ + # TODO: remove in favor of qiskit-aer PR #877 patch once accepted/stable + ./remove-conan-install.patch + ]; dontUseCmakeConfigure = true; @@ -60,11 +65,6 @@ buildPythonPackage rec { "-DAER_THRUST_BACKEND=OMP" ]; - # Needed to find qiskit.providers.aer modules in cython. This exists in GitHub, don't know why it isn't copied by default - postFixup = '' - touch $out/${python.sitePackages}/qiskit/__init__.pxd - ''; - # *** Testing *** pythonImportsCheck = [ @@ -77,11 +77,6 @@ buildPythonPackage rec { pytestCheckHook ]; dontUseSetuptoolsCheck = true; # Otherwise runs tests twice - disabledTests = [ - # broken with cvxpy >= 1.1.0, see https://github.com/Qiskit/qiskit-aer/issues/779. - # TODO: Remove once resolved, probably next qiskit-aer version - "test_clifford" - ]; preCheck = '' # Tests include a compiled "circuit" which is auto-built in $HOME @@ -100,11 +95,8 @@ buildPythonPackage rec { description = "High performance simulators for Qiskit"; homepage = "https://qiskit.org/aer"; downloadPage = "https://github.com/QISKit/qiskit-aer/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; - # Doesn't build on aarch64 (libmuparserx issue). - # Can fix by building muparserx from source (https://github.com/beltoforion/muparserx) - # or in future updates (e.g. Raspberry Pi enabled via https://github.com/Qiskit/qiskit-aer/pull/651 & https://github.com/Qiskit/qiskit-aer/pull/660) - platforms = platforms.x86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch new file mode 100644 index 0000000000..1c5ae87b08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch @@ -0,0 +1,63 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index efeacfc..77bd6bd 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,7 +121,11 @@ endif() + # Looking for external libraries + # + +-setup_conan() ++find_package(muparserx REQUIRED) ++find_package(nlohmann_json REQUIRED) ++find_package(spdlog REQUIRED) ++# for tests only ++find_package(catch2) + + # If we do not set them with a space CMake fails afterwards if nothing is set for this vars! + set(AER_LINKER_FLAGS " ") +@@ -269,16 +273,16 @@ endif() + set(AER_LIBRARIES + ${AER_LIBRARIES} + ${BLAS_LIBRARIES} +- CONAN_PKG::nlohmann_json ++ nlohmann_json + Threads::Threads +- CONAN_PKG::spdlog ++ spdlog + ${DL_LIB} + ${THRUST_DEPENDANT_LIBS}) + + set(AER_COMPILER_DEFINITIONS ${AER_COMPILER_DEFINITIONS} ${CONAN_DEFINES}) + # Cython build is only enabled if building through scikit-build. + if(SKBUILD) # Terra Addon build +- set(AER_LIBRARIES ${AER_LIBRARIES} CONAN_PKG::muparserx) ++ set(AER_LIBRARIES ${AER_LIBRARIES} muparserx) + add_subdirectory(qiskit/providers/aer/pulse/qutip_extra_lite/cy) + add_subdirectory(qiskit/providers/aer/backends/wrappers) + add_subdirectory(src/open_pulse) +diff --git a/setup.py b/setup.py +index fd71e9f..1561cc4 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,12 +11,6 @@ import inspect + + PACKAGE_NAME = os.getenv('QISKIT_AER_PACKAGE_NAME', 'qiskit-aer') + +-try: +- from conans import client +-except ImportError: +- subprocess.call([sys.executable, '-m', 'pip', 'install', 'conan']) +- from conans import client +- + try: + from skbuild import setup + except ImportError: +@@ -46,8 +40,6 @@ common_requirements = [ + + setup_requirements = common_requirements + [ + 'scikit-build', +- 'cmake!=3.17,!=3.17.0', +- 'conan>=1.22.2' + ] + + requirements = common_requirements + ['qiskit-terra>=0.12.0'] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix index fe90ee63e0..c90f9ddf2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -2,6 +2,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, fetchpatch # , cplex , cvxpy , dlx @@ -16,6 +17,7 @@ , qiskit-terra , quandl , scikitlearn +, yfinance # Check Inputs , ddt , pytestCheckHook @@ -24,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.7.3"; + version = "0.7.5"; disabled = pythonOlder "3.5"; @@ -33,9 +35,18 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "04zcnrc0vi6dfjahp1019h2ngdgi7l7jvfs9aw0y306nd9g6qgjc"; + sha256 = "19sdv7lnc4b1c86rd1dv7pjpi8cmrpzbv7nav0fb899ki8ldqdwq"; }; + # TODO: remove in next release + patches = [ + (fetchpatch { + name = "qiskit-aqua-fix-test-issue-1214.patch"; + url = "https://github.com/Qiskit/qiskit-aqua/commit/284a4323192ac85787b22cbe5f344996fae16f7d.patch"; + sha256 = "0zl8hqa2fq9ng793x4dhh0ny67nnbjcd8l1cdsaaab4ca1y0xcfr"; + }) + ]; + # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. propagatedBuildInputs = [ # cplex @@ -51,6 +62,7 @@ buildPythonPackage rec { qiskit-ignis quandl scikitlearn + yfinance ]; # *** NOTE *** @@ -105,8 +117,9 @@ buildPythonPackage rec { # Disabled due to missing pyscf "test_validate" # test/chemistry/test_inputparser.py - "test_binary" # in SklearnSVM, seems to have trouble with eigenvectors converging - "test_pauli_expect_single" # fails for unknown reason, 3e-3 out of tolerance + # Online tests + "test_exchangedata" + "test_yahoo" # Disabling slow tests > 10 seconds "TestVQE" @@ -119,7 +132,6 @@ buildPythonPackage rec { "TestQGAN" "test_evaluate_qasm_mode" "test_measurement_error_mitigation_auto_refresh" - "test_exchangedata" "test_wikipedia" "test_shor_factoring_1__15___qasm_simulator____3__5__" "test_readme_sample" @@ -138,11 +150,13 @@ buildPythonPackage rec { "test_oh" "test_confidence_intervals_00001" "test_eoh" + "test_qasm_5" ]; meta = with lib; { description = "An extensible library of quantum computing algorithms"; homepage = "https://github.com/QISKit/qiskit-aqua"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 02cdb8397c..eaf10fd608 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.7.2"; + version = "0.8.0"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "11h1ca4v11pajzn1cxqhim1hfziqzj27xzakwln13g8zmiqx3csp"; + sha256 = "0rrpwr4a82j69j5ibl2g0nw8wbpg201cfz6f234k2v6pj500x9nl"; }; propagatedBuildInputs = [ @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Qiskit provider for accessing the quantum devices and simulators at IBMQ"; homepage = "https://github.com/Qiskit/qiskit-ibmq-provider"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix index bfd2bffbf4..d40afe43f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -9,14 +9,15 @@ , scikitlearn , scipy # Check Inputs -, ddt , pytestCheckHook +, ddt +, pyfakefs , qiskit-aer }: buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.3.3"; + version = "0.4.0"; disabled = pythonOlder "3.6"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - sha256 = "0sy9qpw0jqirsk9y61j5kr18jrw1wa812n7y98fjj6w668rrv560"; + sha256 = "07mxhaknkp121xm6mgrpcrbj9qw6j924ra3k0s6vr8qgvfcxvh0y"; }; propagatedBuildInputs = [ @@ -41,18 +42,21 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; preCheck = "export HOME=$TMPDIR"; checkInputs = [ - ddt pytestCheckHook + ddt + pyfakefs qiskit-aer ]; - # Test is in test/verification/test_entanglemet.py. test fails due to out-of-date calls & bad logic with this file since qiskit-ignis#328 - # see qiskit-ignis#386 for all issues. Should be able to re-enable in future. - disabledTests = [ "TestEntanglement" ]; + disabledTests = [ + "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds + "test_qv_fitter" # execution hangs, ran for several minutes + ]; meta = with lib; { description = "Qiskit tools for quantum hardware verification, noise characterization, and error correction"; homepage = "https://qiskit.org/ignis"; downloadPage = "https://github.com/QISKit/qiskit-ignis/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index c1c0dd9283..aad0370c3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -8,12 +8,11 @@ , fastjsonschema , jsonschema , numpy -, marshmallow -, marshmallow-polyfield , networkx , ply , psutil , python-constraint +, python-dateutil , retworkx , scipy , sympy @@ -36,7 +35,7 @@ buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.14.2"; + version = "0.15.1"; disabled = pythonOlder "3.5"; @@ -44,7 +43,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0p5wapjvy81pnks100xbb23kbs2wyys9ykyc8z4968wl487lq4g5"; + sha256 = "1p7y36gj3675dmp05nwi0m9nc7h0bwyimir3ncf9wbkx3crrh99c"; }; nativeBuildInputs = [ cython ]; @@ -54,13 +53,12 @@ buildPythonPackage rec { fastjsonschema jsonschema numpy - marshmallow - marshmallow-polyfield matplotlib networkx ply psutil python-constraint + python-dateutil retworkx scipy sympy @@ -74,10 +72,6 @@ buildPythonPackage rec { seaborn ]; - postPatch = '' - # Fix relative imports in tests - touch test/python/dagcircuit/__init__.py - ''; # *** Tests *** checkInputs = [ @@ -94,9 +88,6 @@ buildPythonPackage rec { "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" ]; - disabledTests = [ - "test_random_clifford_valid" # random test, fails at least once when testing locally. - ]; pytestFlagsArray = [ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency ]; @@ -106,9 +97,9 @@ buildPythonPackage rec { preCheck = '' export PACKAGEDIR=$out/${python.sitePackages} echo "Moving Qiskit test files to package directory" - cp -r $TMP/source/test $PACKAGEDIR - cp -r $TMP/source/examples $PACKAGEDIR - cp -r $TMP/source/qiskit/schemas/examples $PACKAGEDIR/qiskit/schemas/ + cp -r $TMP/$sourceRoot/test $PACKAGEDIR + cp -r $TMP/$sourceRoot/examples $PACKAGEDIR + cp -r $TMP/$sourceRoot/qiskit/schemas/examples $PACKAGEDIR/qiskit/schemas/ # run pytest from Nix's $out path pushd $PACKAGEDIR @@ -127,6 +118,7 @@ buildPythonPackage rec { ''; homepage = "https://qiskit.org/terra"; downloadPage = "https://github.com/QISKit/qiskit-terra/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix index 81468da30f..46fcf49859 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.19.6"; + version = "0.20.0"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "0liby6ffgrla6wr4k742qkg8m80im372p6hmr4gkz47nmc76zy1i"; + sha256 = "1r23pjnql49gczf4k4m6ir5rr95gqdxjrks60p8a93d243mxx3c9"; }; propagatedBuildInputs = [ @@ -36,14 +36,21 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; - # following doesn't work b/c they are distributed across different nix sitePackages dirs. Tested with pytest though. - pythonImportsCheck = [ "qiskit" "qiskit.circuit" "qiskit.ignis" "qiskit.providers.aer" "qiskit.aqua" ]; - meta = { + pythonImportsCheck = [ + "qiskit" + "qiskit.aqua" + "qiskit.circuit" + "qiskit.ignis" + "qiskit.providers.aer" + ]; + + meta = with lib; { description = "Software for developing quantum computing programs"; homepage = "https://qiskit.org"; downloadPage = "https://github.com/QISKit/qiskit/releases"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ drewrisinger pandaman ]; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger pandaman ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index ca6a19220d..a1bf4d5301 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.7.5"; + version = "4.7.6"; src = fetchPypi { inherit pname version; - sha256 = "f5cb275d30fc8085e2d1d18bc363e5ba0ce6e559bf37d7d6727b773134298754"; + sha256 = "6c24397c19a49a5cf69582c931db4b0f6b00a78530a2bfd122936f2ebfae2fef"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix deleted file mode 100644 index 6066e1e3b8..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchurl -, numpy -, scipy -, matplotlib -, pyqt4 -, cython -, pkgs -, nose -}: - -buildPythonPackage rec { - pname = "qutip"; - version = "2.2.0"; - - src = fetchurl { - url = "https://qutip.googlecode.com/files/QuTiP-${version}.tar.gz"; - sha256 = "a26a639d74b2754b3a1e329d91300e587e8c399d8a81d8f18a4a74c6d6f02ba3"; - }; - - propagatedBuildInputs = [ numpy scipy matplotlib pyqt4 cython ]; - - buildInputs = [ pkgs.gcc pkgs.qt4 pkgs.blas nose ]; - - meta = with stdenv.lib; { - description = "QuTiP - Quantum Toolbox in Python"; - longDescription = '' - QuTiP is open-source software for simulating the dynamics of - open quantum systems. The QuTiP library depends on the - excellent Numpy and Scipy numerical packages. In addition, - graphical output is provided by Matplotlib. QuTiP aims to - provide user-friendly and efficient numerical simulations of a - wide variety of Hamiltonians, including those with arbitrary - time-dependence, commonly found in a wide range of physics - applications such as quantum optics, trapped ions, - superconducting circuits, and quantum nanomechanical - resonators. - ''; - homepage = "http://qutip.org/"; - license = licenses.bsd0; - broken = true; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix index 26f3ffd4fe..9844c8dca4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "2.0.1"; pname = "rabbitpy"; # No tests in the pypi tarball, so we directly fetch from git @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "gmr"; repo = pname; rev = version; - sha256 = "0fd80zlr4p2sh77rxyyfi9l0h2zqi2csgadr0rhnpgpqsy10qck6"; + sha256 = "0m5z3i3d5adrz1wh6y35xjlls3cq6p4y9p1mzghw3k7hdvg26cck"; }; propagatedBuildInputs = [ pamqp ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' # See: https://github.com/gmr/rabbitpy/issues/118 substituteInPlace setup.py \ - --replace 'pamqp>=1.6.1,<2.0' 'pamqp' + --replace 'pamqp>=2,<3' 'pamqp' ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 68ccf676f2..1a97320dc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "1.0.4"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "33dbb135373d539233f7fbdb5e8dcfa07d41254300ee23719eb9caa8c68a40ae"; + sha256 = "1d8343982cae238da82c809dcbd82d53f9560b50e17b1dd727123f576385139d"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regex/default.nix index 038d6d2c90..19cb7bd232 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/regex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2020.5.14"; + version = "2020.7.14"; src = fetchPypi { inherit pname version; - sha256 = "ce450ffbfec93821ab1fea94779a8440e10cf63819be6e176eb1973a6017aff5"; + sha256 = "3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb"; }; postCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix index a6da936999..b723cd0b18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "relatorio"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "0an1yiy4pxfazrbaw4sm8ybhxqn46yzsakkl9qjklafn1j69lnza"; + sha256 = "0753e78b235b1e8da275509351257a861cf2cf9fafe1b414f8c1deb858a4f94e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index a7c96ef2e6..cbd3f54c54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.47"; + version = "3.5.48"; src = fetchPypi { inherit pname version; - sha256 = "0gw0902yjszwxk0air69in7nk4h2q36r96ga3r4bz0p0cnmagcj5"; + sha256 = "0bfe3fe6e1bd1d922f83683eae2ba1d2d29de94e25fb115eacca9530b4b02f76"; }; checkInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix index 2cbbee3c9c..f954a340b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -1,23 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: +{ lib, buildPythonPackage, fetchPypi, python, requests }: with lib; buildPythonPackage rec { pname = "requests-aws4auth"; - version = "0.9"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "0g52a1pm53aqkc9qb5q1m918c1qy6q47c1qz63p5ilynfbs3m5y9"; + sha256 = "2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce"; }; - postPatch = optionalString isPy3k '' - sed "s/path_encoding_style/'path_encoding_style'/" \ - -i requests_aws4auth/service_parameters.py - ''; - propagatedBuildInputs = [ requests ]; - # The test fail on Python >= 3 because of module import errors. - doCheck = !isPy3k; + checkPhase = '' + cd requests_aws4auth + ${python.interpreter} test/requests_aws4auth_test.py + ''; meta = { description = "Amazon Web Services version 4 authentication for the Python Requests library."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix index 9b443df4be..9ed590ba19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests"; - version = "2.23.0"; + version = "2.24.0"; src = fetchPypi { inherit pname version; - sha256 = "1rhpg0jb08v0gd7f19jjiwlcdnxpmqi1fhvw7r4s9avddi4kvx5k"; + sha256 = "b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b"; }; nativeBuildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix index 0b24b7b62f..78daa0e24f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.10.15"; + version = "0.10.16"; src = fetchPypi { inherit pname version; - sha256 = "7bb697a5fedeb41d81e8b87f152d453d5cab42dcd1691b6a7d6097e94d33f373"; + sha256 = "fa125311607ab3e57d8fcc4da20587f041b4485bdfb06dd6bdf19d8b66f870c1"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix index 64de384dcb..616cabc29a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , six +, setuptools }: buildPythonPackage rec { @@ -13,7 +14,7 @@ buildPythonPackage rec { sha256 = "945b5efdc10f468fc056bd53a4e4224ec4c2fe1a7e83ae47443bbb6e7c7a1f7d"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six setuptools ]; doCheck = false; pythonImportsCheck = [ "rethinkdb" ]; @@ -21,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python driver library for the RethinkDB database server"; homepage = "https://pypi.python.org/pypi/rethinkdb"; - license = licenses.agpl3; + license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix index 309f3532cf..49e4b1c2fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix @@ -1,53 +1,60 @@ { lib -, buildPythonPackage -, pythonOlder -, pythonAtLeast +, rustPlatform , python +, fetchpatch , fetchFromGitHub -, fetchPypi +, pipInstallHook +, maturin +, pip # Check inputs , pytestCheckHook +, numpy }: -let - rx-version = "0.3.4"; - wheel-hashes = { - "3.7" = { python = "cp37"; sha256 = "1hfrdj8svkfdraa299gcj18a601l4zn646fkgq7m56brpagssf9l"; }; - "3.8" = { python = "cp38"; sha256 = "0jm10ywaqr0b456pcp01pb7035nawlndfi998jv8p1a2f5xwjgiq"; }; - }; - lookup = set: key: default: if (builtins.hasAttr key set) then (builtins.getAttr key set) else default; - wheel-args = lookup - wheel-hashes - python.pythonVersion - (throw "retworkx python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"); +rustPlatform.buildRustPackage rec { + pname = "retworkx"; + version = "0.4.0"; - github-source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; - rev = rx-version; - sha256 = "0cd3x64y49q9a3jrkiknlfkiccxkxgl624x5pqk7gm34s1lnzl8h"; - }; -in -buildPythonPackage rec { - pname = "retworkx"; - version = rx-version; - format = "wheel"; - - disabled = pythonOlder "3.5" || pythonAtLeast "3.9"; # compiled versions only included for 3.5 <= py <= 3.8 - - src = fetchPypi { - inherit pname version format; - inherit (wheel-args) python sha256; - abi = if pythonOlder "3.8" then "${wheel-args.python}m" else wheel-args.python; - platform = "manylinux2010_x86_64"; # i686, aarch64, and ppc64 also available, restricting to x86 for simplicity + rev = version; + sha256 = "1xqp6d39apkjvd0ad9vw81cp2iqzhpagfa4p171xqm3bwfn2imdc"; }; - pythonImportsCheck = [ "retworkx" ]; + cargoSha256 = "0bma0l14jv5qhcsxck7vw3ak1w3c8v84cq4hii86i4iqk523zns5"; + cargoPatches = [ + ( fetchpatch { + name = "retworkx-cargo-lock.patch"; + url = "https://github.com/Qiskit/retworkx/commit/a02fd33d357a92dbe9530696a6d85aa59fe8a5b9.patch"; + sha256 = "0gvxr1nqp9ll4skfks4p4d964pshal25kb1nbfzhpyipnzddizr5"; + } ) + ]; - checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ python ]; + + nativeBuildInputs = [ pipInstallHook maturin pip ]; + + # Need to check AFTER python wheel is installed (b/c using Rust Build, not buildPythonPackage) + doCheck = false; + doInstallCheck = true; + + buildPhase = '' + runHook preBuild + maturin build --release --manylinux off --strip --interpreter ${python.interpreter} + runHook postBuild + ''; + + installPhase = '' + install -Dm644 -t dist target/wheels/*.whl + pipInstallPhase + ''; + + installCheckInputs = [ pytestCheckHook numpy ]; preCheck = '' - pushd $(mktemp -d) - cp -r ${github-source}/$sourceRoot/tests . + export TESTDIR=$(mktemp -d) + cp -r $TMP/$sourceRoot/tests $TESTDIR + pushd $TESTDIR ''; postCheck = "popd"; @@ -55,8 +62,8 @@ buildPythonPackage rec { description = "A python graph library implemented in Rust."; homepage = "https://retworkx.readthedocs.io/en/latest/index.html"; downloadPage = "https://github.com/Qiskit/retworkx/releases"; + changelog = "https://github.com/Qiskit/retworkx/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; - platforms = platforms.x86_64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rhpl/builder.sh b/third_party/nixpkgs/pkgs/development/python-modules/rhpl/builder.sh index dc93effe80..15e05a73f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rhpl/builder.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/rhpl/builder.sh @@ -8,6 +8,6 @@ incl=$(echo $python/include/python2.*) sed -i -e "s@/usr/include/\$(PYTHON)@$incl@" \ -e "s@PYTHONLIBDIR = /usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR = $(toPythonPath $out)@" Makefile.inc sed -i -e "s@/usr/bin/install@install@g" \ - -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile + -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile make PREFIX=$out make PREFIX=$out install diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix index 6bb9eb7177..9e2e76464d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , cython , numpy , scipy @@ -11,11 +12,12 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.4.1"; + version = "0.5.4"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a4015b413c24e3074f82f31771b1eb805e054b8cf444db51ce8ca5afa42cf130"; + sha256 = "7a54750427e3f1bbb26c625075c831314760a9e5b5bcd3b797df668f020c9eb6"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix new file mode 100644 index 0000000000..eb9afc8353 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook +, pytestcov +, dill +, numpy +, pytorch +, threadpoolctl +, tqdm +}: + +buildPythonPackage rec { + pname = "rising"; + version = "0.2.0post0"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "PhoenixDL"; + repo = pname; + rev = "v${version}"; + sha256 = "0fb9894ppcp18wc2dhhjizj8ja53gbv9wpql4mixxxdz8z2bn33c"; + }; + + propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ]; + checkInputs = [ dill pytestcov pytestCheckHook ]; + + disabledTests = [ "test_affine" ]; # deprecated division operator '/' + + meta = { + description = "High-performance data loading and augmentation library in PyTorch"; + homepage = "https://rising.rtfd.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roboschool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roboschool/default.nix index 53b909844a..9387f3775b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roboschool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roboschool/default.nix @@ -4,7 +4,7 @@ , python , fetchFromGitHub , fetchpatch -, qt5 +, qtbase , boost , assimp , gym @@ -33,14 +33,14 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig - qt5.qtbase # needs the `moc` tool + qtbase # needs the `moc` tool which ]; buildInputs = [ bullet-roboschool assimp - qt5.qtbase + qtbase boost ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix index e62087628a..72f7aabb70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.7.1"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "da7bf998f9cbf8261199db7c96b95be1bf29d1db7f59dfbc77c435761698dc75"; + sha256 = "501a1c7415f839d6837eedd57f2b6ed20576aab318bf14e3878a77c9b106aa45"; }; buildInputs = [ unittest2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix index 23d8444c50..66ca024b2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy27, click, redis }: +{ stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: buildPythonPackage rec { pname = "rq"; - version = "1.4.3"; + version = "1.5.1"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "60509898c9ebc40e4155fde8bf88a204ed1914cc9e1cde3d19188b1c5bd5efbd"; + src = fetchFromGitHub { + owner = "rq"; + repo = "rq"; + rev = "v${version}"; + sha256 = "0i7yyw828wdvl7ap4gb7jhm4p94502is3xxrgrdgwwp0l1rac004"; }; # test require a running redis rerver, which is something we can't do yet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix index 41bb4f17a1..a5380709ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "rsa"; - version = "4.1.1"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "1a7245638fa914ed6196b5e88fa5064cd95c7e65df800ec5d4f288e2b19fb4af"; + sha256 = "109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa"; }; checkInputs = [ unittest2 mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix new file mode 100644 index 0000000000..e1115bd818 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix @@ -0,0 +1,40 @@ +{ fetchFromGitHub +, buildPythonPackage +, isPy27 +, cython +, portaudio +, cffi +, pa-ringbuffer +, sounddevice +, lib +}: + +buildPythonPackage rec { + pname = "rtmixer"; + version = "0.1.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "spatialaudio"; + repo = "python-rtmixer"; + rev = "${version}"; + sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y"; + fetchSubmodules = true; + }; + + buildInputs = [ portaudio ]; + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ + cffi + pa-ringbuffer + sounddevice + ]; + + meta = { + description = "Reliable low-latency audio playback and recording with Python, using PortAudio via the sounddevice module"; + homepage = "https://python-rtmixer.readthedocs.io"; + maintainers = with lib.maintainers; [ laikq ]; + license = lib.licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix index 4f042dcf90..9668a26e09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "rubymarshal"; - version = "1.2.6"; + version = "1.2.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0gq344jlb9wkapzpxj7jqwjlc5ccdhhspkw6rfb1d0rammq6hpf6"; + sha256 = "94aa84fa42393f773c8215fab679bd3b72bbdb9f7931643d3672184cde9981d9"; }; propagatedBuildInputs = [ hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix index 23455ae894..9c7f89585d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix @@ -5,6 +5,7 @@ , flask-compress , flask-cors , flask-sockets +, imageio , numpy , scipy , pillow @@ -25,7 +26,22 @@ buildPythonPackage rec { sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8"; }; - propagatedBuildInputs = [ flask flask-compress flask-cors flask-sockets numpy scipy pillow gevent wget six colorcet unidecode urllib3 ]; + propagatedBuildInputs = [ + colorcet + flask + flask-compress + flask-cors + flask-sockets + gevent + imageio + numpy + pillow + scipy + six + unidecode + urllib3 + wget + ]; # tests are not packaged in the released tarball doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix new file mode 100644 index 0000000000..aab3201047 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "sabyenc3"; + version = "4.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "dfaa0bdd01752a9cfde0d349a8f4e178b04b1cf9c1bc018b287961192cd2bb90"; + }; + + # tests are not included in pypi distribution + doCheck = false; + + meta = { + description = "yEnc Decoding for Python 3"; + homepage = "https://github.com/sabnzbd/sabyenc/"; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.lovek323 ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/samsungctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/samsungctl/default.nix new file mode 100644 index 0000000000..d29e89db84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/samsungctl/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi +, websocket_client +}: + +buildPythonPackage rec { + pname = "samsungctl"; + version = "0.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; + }; + + propagatedBuildInputs = [ + websocket_client + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "samsungctl" ]; + + meta = with lib; { + description = "Remote control Samsung televisions via a TCP/IP connection"; + homepage = "https://github.com/Ape/samsungctl"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix new file mode 100644 index 0000000000..b41935c582 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, requests +, websocket_client +}: + +buildPythonPackage rec { + pname = "samsungtvws"; + version = "1.5.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n"; + }; + + patchPhase = '' + substituteInPlace setup.py --replace "websocket-client==" "websocket-client>=" + ''; + + propagatedBuildInputs = [ + websocket_client + requests + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "samsungtvws" ]; + + meta = with lib; { + description = "Samsung Smart TV WS API wrapper"; + homepage = "https://github.com/xchwarze/samsung-tv-ws-api"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix index 498e9cb34b..4642b69f7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix @@ -3,20 +3,20 @@ buildPythonPackage rec { pname = "Sanic-Auth"; version = "0.2.0"; - + src = fetchPypi { inherit pname version; sha256 = "b7cb9e93296c035ada0aa1ebfb33f9f7b62f7774c519e374b7fe703ff73589cb"; }; - + propagatedBuildInputs = [ sanic ]; - + checkInputs = [ pytest ]; - + checkPhase = '' pytest tests ''; - + meta = with lib; { description = "Simple Authentication for Sanic"; homepage = "https://github.com/pyx/sanic-auth/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix index 155950dff2..847acb3c9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sapi-python-client/default.nix @@ -1,8 +1,8 @@ -{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: +{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: -buildPythonPackage rec { - pname = "sapi-python-client"; - version = "0.1.3"; +buildPythonPackage rec { + pname = "sapi-python-client"; + version = "0.1.3"; src = fetchFromGitHub { owner = "keboola"; @@ -17,15 +17,14 @@ buildPythonPackage rec { doCheck = false; # requires API token and an active keboola bucket - nativeBuildInputs = [ git setuptools_scm ]; + nativeBuildInputs = [ git setuptools_scm ]; - propagatedBuildInputs = [ setuptools requests boto3 responses ]; + propagatedBuildInputs = [ setuptools requests boto3 responses ]; - meta = with stdenv.lib; { - description = "Keboola Connection Storage API client"; - homepage = "https://github.com/keboola/sapi-python-client"; + meta = with stdenv.lib; { + description = "Keboola Connection Storage API client"; + homepage = "https://github.com/keboola/sapi-python-client"; maintainers = with maintainers; [ mrmebelman ]; - license = licenses.mit; - }; + license = licenses.mit; + }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix index 37a72278d8..1d46e65d34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sarge"; - version = "0.1.5.post0"; + version = "0.1.6"; src = fetchPypi { inherit pname version; - sha256 = "da8cc90883f8e5ab4af0d746438f608662f5f2a35da2e858517927edefa134b0"; + sha256 = "f48fb904e64f10ad6bef62422eaf4736acfd9b13ab64ba44822637a9dbb53265"; }; # No tests in PyPI tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix index ec0ccc102f..2b9eb5517a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackage, fetchFromGitHub, lib, isPyPy, isPy3k, pythonOlder +{ buildPythonPackage, fetchFromGitHub, lib, isPyPy , pycrypto, ecdsa # TODO -, enum34, mock +, tox, mock, coverage, can, brotli , withOptionalDeps ? true, tcpdump, ipython , withCryptography ? true, cryptography , withVoipSupport ? true, sox @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "scapy"; - version = "2.4.3"; + version = "2.4.4"; disabled = isPyPy; @@ -21,14 +21,11 @@ buildPythonPackage rec { owner = "secdev"; repo = "scapy"; rev = "v${version}"; - sha256 = "08ypdzp0p3gvmz3pwi0i9q5f7hz9cq8yn6gawia49ynallwnv4zy"; + sha256 = "1wpx7gps3g8q5ykbfcd67mxwcs416zg37b53fwfzzlc1m58vhk3p"; }; - # TODO: Temporary workaround - patches = [ ./fix-version.patch ]; - postPatch = '' - sed -i "s/NIXPKGS_SCAPY_VERSION/${version}/" scapy/__init__.py + printf "${version}" > scapy/VERSION '' + lib.optionalString withManufDb '' substituteInPlace scapy/data.py --replace "/opt/wireshark" "${wireshark}" ''; @@ -38,16 +35,41 @@ buildPythonPackage rec { ++ lib.optional withCryptography cryptography ++ lib.optional withVoipSupport sox ++ lib.optional withPlottingSupport matplotlib - ++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ] - ++ lib.optional (isPy3k && pythonOlder "3.4") enum34 - ++ lib.optional doCheck mock; + ++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ]; - # Tests fail with Python 3.6 (seems to be an upstream bug, I'll investigate) - doCheck = if isPy3k then false else true; + # Running the tests seems too complicated: + doCheck = false; + checkInputs = [ tox mock coverage can brotli ]; + checkPhase = '' + patchShebangs . + .config/ci/test.sh + ''; meta = with lib; { - description = "Powerful interactive network packet manipulation program"; + description = "A Python-based network packet manipulation program and library"; + longDescription = '' + Scapy is a powerful Python-based interactive packet manipulation program + and library. + + It is able to forge or decode packets of a wide number of protocols, send + them on the wire, capture them, store or read them using pcap files, + match requests and replies, and much more. It is designed to allow fast + packet prototyping by using default values that work. + + It can easily handle most classical tasks like scanning, tracerouting, + probing, unit tests, attacks or network discovery (it can replace hping, + 85% of nmap, arpspoof, arp-sk, arping, tcpdump, wireshark, p0f, etc.). It + also performs very well at a lot of other specific tasks that most other + tools can't handle, like sending invalid frames, injecting your own + 802.11 frames, combining techniques (VLAN hopping+ARP cache poisoning, + VoIP decoding on WEP protected channel, ...), etc. + + Scapy supports Python 2.7 and Python 3 (3.4 to 3.8). It's intended to be + cross platform, and runs on many different platforms (Linux, OSX, *BSD, + and Windows). + ''; homepage = "https://scapy.net/"; + changelog = "https://github.com/secdev/scapy/releases/tag/v${version}"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ primeos bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scapy/fix-version.patch b/third_party/nixpkgs/pkgs/development/python-modules/scapy/fix-version.patch deleted file mode 100644 index c39458e9fe..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/scapy/fix-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scapy/__init__.py b/scapy/__init__.py -index d5ad6164..245ce2fb 100644 ---- a/scapy/__init__.py -+++ b/scapy/__init__.py -@@ -90,7 +90,7 @@ def _version(): - return 'unknown.version' - - --VERSION = __version__ = _version() -+VERSION = __version__ = "NIXPKGS_SCAPY_VERSION" - VERSION_MAIN = re.search(r"[0-9.]+", VERSION).group() - - if __name__ == "__main__": diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix index 2214bc2da5..8dd8948007 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "schema"; - version = "0.7.2"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "b536f2375b49fdf56f36279addae98bd86a8afbd58b3c32ce363c464bed5fc1c"; + sha256 = "4cf529318cfd1e844ecbe02f41f7e5aa027463e7403666a52746f31f04f47a5e"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix index f8e3039718..0a5171f22f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix @@ -1,25 +1,29 @@ { lib +, isPy27 , buildPythonPackage , fetchFromGitHub +, matplotlib , numpy , scipy , scikitlearn , pyaml -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "scikit-optimize"; - version = "0.6"; + version = "0.8.1"; + disabled = isPy27; src = fetchFromGitHub { owner = "scikit-optimize"; repo = "scikit-optimize"; rev = "v${version}"; - sha256 = "1srbb20k8ddhpcfxwdflapfh6xfyrd3dnclcg3bsfq1byrcmv0d4"; + sha256 = "1bz8gxccx8n99abw49j8h5zf3i568g5hcf8nz1yinma8jqhxjkjh"; }; propagatedBuildInputs = [ + matplotlib numpy scipy scikitlearn @@ -27,14 +31,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - # remove --ignore at next release > 0.6 - checkPhase = '' - pytest skopt --ignore skopt/tests/test_searchcv.py - ''; - meta = with lib; { description = "Sequential model-based optimization toolbox"; homepage = "https://scikit-optimize.github.io/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix index a9bbad04ea..cffd29f09d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.23.1"; + version = "0.23.2"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "e3fec1c8831f8f93ad85581ca29ca1bb88e2da377fb097cf8322aa89c21bc9b8"; + sha256 = "20766f515e6cd6f954554387dfae705d93c7b544ec0e6c6a5d8e006f6f7ef480"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix index 7927da30c8..d85d8e396f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix @@ -6,6 +6,7 @@ , cython , enum34 , gfortran +, isPy27 , isPy3k , numpy , pytest @@ -18,6 +19,8 @@ buildPythonPackage rec { pname = "scikits.odes"; version = "2.6.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b"; @@ -46,7 +49,7 @@ buildPythonPackage rec { description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy"; homepage = "https://github.com/bmcage/odes"; license = licenses.bsd3; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; + maintainers = with maintainers; [ idontgetoutmuch ]; platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scour/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scour/default.nix index 67eac72964..4f1f392938 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scour/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scour/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scour"; - version = "0.37"; + version = "0.38"; src = fetchPypi { inherit pname version; - sha256 = "05k1f8i8v7sp5v39lian865vwvapq05a6vmvk7fwnxv8kivi6ccn"; + sha256 = "cf50a13dcdf8cfe1861f0ce334f413604e376a7681c5b181e15322f43c3befcd"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index 26e142434c..d3bf05b096 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scrapy-fake-useragent"; - version = "1.2.0"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "02mayk804vdl15wjpx7jcjkc4zgrra4izf6iv00mcxq4fd4ck03l"; + sha256 = "3b17e982e646918dc25080da0672812d07bfb7a92a58377c014c74e0182c665e"; }; propagatedBuildInputs = [ fake-useragent ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seekpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seekpath/default.nix index e387f27c67..e70ba02ce0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seekpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seekpath/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, future, spglib, glibcLocales, pytest, scipy }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, future, spglib, glibcLocales, pytest, scipy }: buildPythonPackage rec { pname = "seekpath"; version = "2.0.1"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "giovannipizzi"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix new file mode 100644 index 0000000000..8c2e22708a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, regex +, csvw +, clldutils +, mock +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "segments"; + version = "2.1.3"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "cldf"; + repo = pname; + rev = "v${version}"; + sha256 = "12lnpk834r3y7hw5x7nvswa60ddh69ylvr44k46gqcfba160hhb0"; + }; + + patchPhase = '' + substituteInPlace setup.cfg --replace "--cov" "" + ''; + + propagatedBuildInputs = [ + regex + csvw + clldutils + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "Unicode Standard tokenization routines and orthography profile segmentation"; + homepage = "https://github.com/cldf/segments"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index 3018cabd02..8aa61748af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -19,18 +19,22 @@ , urllib3 , trytond , werkzeug +, executing +, pure-eval +, asttokens }: buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.14.4"; + version = "0.16.5"; src = fetchPypi { inherit pname version; - sha256 = "0e5e947d0f7a969314aa23669a94a9712be5a688ff069ff7b9fc36c66adc160c"; + sha256 = "e12eb1c2c01cd9e9cfe70608dbda4ef451f37ef0b7cbb92e5d43f87c341d6334"; }; - checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond ] + checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond + executing pure-eval asttokens ] ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; propagatedBuildInputs = [ urllib3 certifi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix index 1623d216ac..068ed93431 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonAtLeast , fetchPypi , nose , forbiddenfruit @@ -8,6 +9,8 @@ buildPythonPackage rec { version = "0.1.2"; pname = "shouldbe"; + # incompatible, https://github.com/DirectXMan12/should_be/issues/4 + disabled = pythonAtLeast "3.8"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix index 8204cc3b41..7fd955abd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix @@ -12,9 +12,15 @@ buildPythonPackage rec { patches = [ (fetchpatch { + name = "pip-10-pip-req.patch"; url = "https://github.com/tonioo/sievelib/commit/1deef0e2bf039a0e817ea6f19aaf1947dc9fafbc.patch"; sha256 = "0vaj73mcij9dism8vfaai82irh8j1b2n8gf9jl1a19d2l26jrflk"; }) + (fetchpatch { + name = "requirements-in-setup-py.patch"; + url = "https://github.com/tonioo/sievelib/commit/91f40ec226ea288e98379da01672a46dabd89fc9.patch"; + sha256 = "0hph89xn16r353rg6f05bh0cgigmwdc736bya089qc03jhssrgns"; + }) ]; buildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix index c3cac404d1..6dff98a09b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , boto , boto3 , bz2file @@ -12,11 +13,12 @@ buildPythonPackage rec { pname = "smart_open"; - version = "2.0.0"; + version = "2.1.1"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "555962abf982faff8a8aeb65e0695474e3091f604826055782beffa8400e4e4e"; + sha256 = "51b05acd85ec007e1d4dcdbf2bbf917218a45026f37d559559401114bb5e5840"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 08b4f24970..ae280eb96c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.2.9"; + version = "2.2.10"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c880f86514008555afa62562def1e975f23c61ff4b3fc1991932ed692ac61a6d"; + sha256 = "0beba8eb9c1dec2782d52491d058256e1f5d9e010114a80ff3b8e3905be655fd"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix index 1b1896187f..0ce6e338e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "solo-python"; - version = "0.0.23"; + version = "0.0.26"; format = "flit"; disabled = pythonOlder "3.6"; # only python>=3.6 is supported @@ -11,7 +11,7 @@ owner = "solokeys"; repo = pname; rev = version; - sha256 = "0r9cq0sd8pqnavgwa5cqgdxzbgly2baq8fpclnnz6anb2974kg3f"; + sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz"; }; # replaced pinned fido, with unrestricted fido version diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix index 61a0414a99..0c4c3f9b7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0f0aixwjh5nax0hzar4993rg9yn1x23rksz5jl5gj8g2jyblsfay"; + sha256 = "5e394d9797e221f90a95e5eb9987e8c1faf4f2488964f521e8ca1628798f0a38"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix index c5ae45b850..9df3d809f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sortedcontainers"; - version = "2.1.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a"; + sha256 = "4e73a757831fc3ca4de2859c422564239a31d8213d09a2a666e375807034d2ba"; }; # pypi tarball does not come with tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix index 21dd487aaf..eb46580a7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , cffi , numpy , portaudio @@ -10,6 +11,7 @@ buildPythonPackage rec { pname = "sounddevice"; version = "0.4.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix index 2044e37993..37b9c24a22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.15.1"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1nbpd5wy361xga8lw36xwc9yyz7rylsjr0z7aw7bn3s35bnkbx"; + sha256 = "94d056e48e7e6fe2e6fe4161471e774ac03221a6225fd83d551d3184220c1edf"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 7c5c95d6ad..d3e9f30f50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools_scm +, m2r , pyyaml , jsonschema , sphinxcontrib_httpdomain @@ -16,7 +17,8 @@ buildPythonPackage rec { sha256 = "1c1bd10d7653912c59a42f727c62cbb7b75f7905ddd9ccc477ebfd1bc69f0cf3"; }; - propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pyyaml jsonschema m2r sphinxcontrib_httpdomain ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index c0efaec4be..0dc7297be6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "5.1.2"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "7f220647f1d9270bd90f0a42146b75a03c51a60184ced6584a9e5ef8f385b5a1"; + sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index 1ca4db4026..45027ba15c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -1,19 +1,20 @@ { lib , buildPythonPackage , fetchPypi +, sphinxcontrib-serializinghtml , six }: buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "ee1d43e6e0332558a66fcb4005b9ba7313ad9764d0df0e6703ae869a028e451f"; + sha256 = "4edf0223a0685a7c485ae5a156b6f529ba1ee481a1417817935b20bde1956232"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six sphinxcontrib-serializinghtml ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix index 1ff38f0a6d..fde5733a86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "9e92535f273622507ac157612c3bb0e9cee7b5ccd2aa097d47b408e34c2ca356"; + sha256 = "459e39e7a9f7572db6f1cdb5fdc5ccfc6404f021dccb969ee6287be2386a40db"; }; propagatedBuildInputs = [ selenium ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix index fb1c847469..47b12a3565 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix @@ -1,15 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests }: +{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock }: buildPythonPackage rec { pname = "spotipy"; - version = "2.12.0"; + version = "2.13.0"; src = fetchPypi { inherit pname version; - sha256 = "f3a08edd516ffaf0731d40fdb7943445fe7b1b412700d042cbd168a726685222"; + sha256 = "d1a85b8831ed60d2290ab9bbba289c548fb9680889757252c02dab2f2327d865"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests six ]; + checkInputs = [ mock ]; + + preConfigure = '' + substituteInPlace setup.py \ + --replace "mock==2.0.0" "mock" + ''; + + pythonImportsCheck = [ "spotipy" ]; meta = with stdenv.lib; { homepage = "https://spotipy.readthedocs.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix index c4a6152033..63ed0604fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix @@ -1,4 +1,4 @@ -{ +{ lib , buildPythonPackage , fetchFromGitHub @@ -6,7 +6,7 @@ , ipykernel , wurlitzer , jupyter_client - , pyzmq + , pyzmq , numpy , pandas , scipy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix index 7652d2cf4c..868ce80558 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.9.3"; + version = "1.9.4"; src = fetchPypi { inherit pname version; - sha256 = "877109d0691376f8ffb380ec1daf9b867958231065660277dbc5ccf0b4bf87d0"; + sha256 = "ca9d997c475b714b54d2fd67aa140837ec3630e91cbbc2e0cd190f1b0bd9fe9d"; }; propagatedBuildInputs = [ @@ -23,7 +23,9 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Jupyter kernels for Spyder's console"; - homepage = "https://github.com/spyder-ide/spyder-kernels"; + homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html"; + downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases"; + changelog = "https://github.com/spyder-ide/spyder-kernels/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/3.nix index e5c5683f5d..cac20ad6fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/3.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc + jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 pygments qtpy pyzmq chardet pyqtwebengine ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix index acaa2e888f..2b0276afc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.1.4"; + version = "4.1.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6946b2128afaf1b64e878a74d33f9abd60c91f75949b3d05f305b3c3f5fec1e2"; + sha256 = "d467f020b694193873a237ce6744ae36bd5a59f4d2b7ffbeb15dda68b03f5aa1"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; @@ -42,7 +42,10 @@ buildPythonPackage rec { # remove dependency on pyqtwebengine # this is still part of the pyqt 5.11 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py - substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" + substituteInPlace setup.py \ + --replace "pyqt5<5.13" "pyqt5" \ + --replace "parso==0.7.0" "parso" \ + --replace "jedi==0.17.1" "jedi" ''; postInstall = '' @@ -69,7 +72,9 @@ buildPythonPackage rec { environment for the Python language with advanced editing, interactive testing, debugging and introspection features. ''; - homepage = "https://github.com/spyder-ide/spyder/"; + homepage = "https://www.spyder-ide.org/"; + downloadPage = "https://github.com/spyder-ide/spyder/releases"; + changelog = "https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix index 300941e261..bf8a9d3bbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -7,20 +7,21 @@ buildPythonPackage rec { pname = "sqlalchemy-citext"; - version = "1.6.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1d66e7d49826fec28a9ce69053fdf82d3a5ff397968c5bf38a0d83dcb4bf2303"; + sha256 = "69ba00f5505f92a1455a94eefc6d3fcf72dda3691ab5398a0b4d0d8d85bd6aab"; }; propagatedBuildInputs = [ sqlalchemy ]; - checkPhase = '' - ${python.interpreter} tests/test_citext.py - ''; + # tests are not packaged in pypi tarball + doCheck = false; + + pythonImportsCheck = [ "citext" ]; meta = with lib; { description = "A sqlalchemy plugin that allows postgres use of CITEXT"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index dac38c55b7..a4cb3bd6d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.3.18"; + version = "1.3.19"; src = fetchPypi { inherit pname version; - sha256 = "da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7"; + sha256 = "3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix index 5037aa2c36..1c28d6a097 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix @@ -3,20 +3,20 @@ buildPythonPackage rec { pname = "sqlitedict"; version = "1.6.0"; - + src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; rev = version; sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m"; }; - + checkInputs = [ pytest ]; - + checkPhase = '' pytest tests ''; - + meta = with lib; { description = "Persistent, thread-safe dict"; homepage = "https://github.com/RaRe-Technologies/sqlitedict"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 8ccfaca179..f2decd2c0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.7"; + version = "1.4.8"; src = fetchPypi { inherit pname version; - sha256 = "0096vrdnax467vl0xl4m0z9pqddl9dhvk6gyryx6gvaslrvn2j26"; + sha256 = "af789cc2d9b7cab2f71087967867b3587db9636b38bef1ffb39165a0675a6d87"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix index c127f6ea2e..24b334ef88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sslyze/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<=2.9" "cryptography>=2.6,<=3" + --replace "cryptography>=2.6,<=2.9" "cryptography" ''; checkInputs = [ pytest ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { tests/plugins_tests/certificate_info/test_certificate_utils.py \ -k "not (TestScanner and test_client_certificate_missing)" ''; + pythonImportsCheck = [ "sslyze" ]; propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 130a098a23..ff8a93d335 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -21,19 +21,14 @@ buildPythonPackage rec { pname = "starlette"; - # This is not the latest version of Starlette, however, later - # versions of Starlette break FastAPI due to - # https://github.com/tiangolo/fastapi/issues/683. Please update when - # possible. FastAPI is currently Starlette's only dependent. - - version = "0.13.6"; + version = "0.13.8"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "08d1d4qdwhi1xxag4am5ijingdyn0mbyqajs9ql5shxnybyjv321"; + sha256 = "11i0yd8cqwscixajl734g11vf8pghki11c81chzfh8ifmj6mf9jk"; }; propagatedBuildInputs = [ @@ -57,6 +52,7 @@ buildPythonPackage rec { checkPhase = '' pytest --ignore=tests/test_graphql.py ''; + pythonImportsCheck = [ "starlette" ]; meta = with lib; { homepage = "https://www.starlette.io/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix index 51edec4dc8..2c09017d05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix @@ -1,20 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pbr, setuptools, six }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, importlib-metadata +, pbr +, setuptools +, six +}: buildPythonPackage rec { pname = "stevedore"; - version = "2.0.1"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "609912b87df5ad338ff8e44d13eaad4f4170a65b79ae9cb0aa5632598994a1b7"; + sha256 = "1r8m8g7f13wdmfw5m7k0vj7bcx3psfg5yg2i8jlb08nrpsjily9q"; }; + propagatedBuildInputs = [ pbr setuptools six ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + doCheck = false; + pythonImportsCheck = [ "stevedore" ]; - propagatedBuildInputs = [ pbr setuptools six ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Manage dynamic plugins for Python applications"; homepage = "https://pypi.python.org/pypi/stevedore"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix index 88feccc86c..d34a826a06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -10,6 +10,7 @@ , toolz , tornado , zict +, pythonOlder }: buildPythonPackage rec { @@ -18,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0r83z3233pfwjw31bkmdldjqlx533f27iimayadfgcn5jr3xwykq"; + sha256 = "787ade4796c5b2e79af2aac678841ba3748a65a3adce150697dcdd31c4f80365"; }; propagatedBuildInputs = [ @@ -38,6 +39,8 @@ buildPythonPackage rec { requests ]; + disabled = pythonOlder "3.6"; + # Disable test_tcp_async because fails on sandbox build # disable kafka tests checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix index e2d8e12fd4..44345a9aa5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1jj20fwcpvqzp7rnzk3mc3xm94wz3gy3zi3787nj7c3syzadn1vb"; + sha256 = "6b07dbd4f77ab023ed4167c43ffc1b9f9354fb6075cc6ff3b91fefcbb80342ca"; }; propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index ea48474045..c2f170fc69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.49.0"; + version = "2.50.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "10dgll0x709n91p8m9qmifsdhx2sc2920xxhqzd335l4z20iwcw9"; + sha256 = "0c3c02c9b65644502a701d4ff939964799bd1a581fb3f8bf75a3f8675527ef48"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix index cee258dbd3..10c8f28e44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix @@ -7,20 +7,13 @@ buildPythonPackage rec { pname = "supervisor"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "64082ebedf6d36ff409ab2878f1aad5c9035f916c5f15a9a1ec7dffc6dfbbed8"; + sha256 = "c479c875853e9c013d1fa73e529fd2165ff1ecaecc7e82810ba57e7362ae984d"; }; - patches = [ - # SOMAXCONN limit of glibc-2.31 has been increased from 128 to 4096: - # * https://sourceware.org/git/?p=glibc.git;a=commit;h=96958e2700f5b4f4d1183a0606b2b9848a53ea44 - # * https://github.com/Supervisor/supervisor/issues/1346 - ./glibc-2.31.patch - ]; - # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/glibc-2.31.patch b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/glibc-2.31.patch deleted file mode 100644 index b2d9564eea..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/glibc-2.31.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/supervisor/tests/base.py b/supervisor/tests/base.py -index 643e609..8aa45e7 100644 ---- a/supervisor/tests/base.py -+++ b/supervisor/tests/base.py -@@ -358,7 +358,7 @@ class DummySocketConfig: - return not self.__eq__(other) - - def get_backlog(self): -- return 128 -+ return 4096 - - def create_and_bind(self): - return DummySocket(self.fd) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/suseapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/suseapi/default.nix index 0e9f4f4365..1c36f45090 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/suseapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/suseapi/default.nix @@ -36,4 +36,4 @@ buildPythonPackage rec { description = "Python module to work with various SUSE services"; license = lib.licenses.gpl3Plus; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix index c986b9108b..acd8fcb781 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b17d4a6352f6c25ca3718d2b66a2f1ecfcdf558b1f6646c37f5c191b655979f1"; + sha256 = "ff01593e8c07ea462d3742e1f4141bfa261cbd4400ceb25dfb8fec3508ad0e50"; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix index 630a660019..a6f604dea0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "54dfac7b3c043dbf484b832512ad2103089f347b5b12307c63ffb4c287742382"; + sha256 = "fc46117619f2f704d1d1b02634fa3285f40479a3008172763b9998fe964f4d11"; }; checkInputs = [ pytest nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix index 4e8f9ca857..52e2bb5af1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.6.1"; # Upgrades may break sage. Please test or ping @timokau. + version = "1.6.2"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "7386dba4f7e162e90766b5ea7cab5938c2fe3c620b310518c8ff504b283cb15b"; + sha256 = "1cfadcc80506e4b793f5b088558ca1fcbeaec24cd6fc86f1fdccaa3ee1d48708"; }; checkInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tasklib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tasklib/default.nix index a49ba37e91..1f204aecf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tasklib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tasklib/default.nix @@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true"; in buildPythonPackage rec { pname = "tasklib"; - version = "2.1.1"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e2cfe5073b9d30c564e6c547fdb0f45eb66da5d4d138c20fb87d549315892f2c"; + sha256 = "da66e84614b09443aa67c4dc2922213417329c39511dc5b384d8a5671e29115e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tblib/default.nix index 86d1cdc887..86992e6e16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tblib/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0b48bx1h720rmmd9nmw50y5cq9vhdppnl0bn9yfl2yza0rrxg6q5"; + sha256 = "059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch b/third_party/nixpkgs/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch deleted file mode 100644 index f807a6d251..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9dfd2a8fac4a643fd007390762ccc8564588b4bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Thu, 25 Jun 2020 10:16:52 +0100 -Subject: [PATCH] pytest: remove flake8/black/coverage -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - pytest.ini | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pytest.ini b/pytest.ini -index bd6998d..a464529 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -1,6 +1,6 @@ - [pytest] - norecursedirs=dist build .tox .eggs --addopts=--doctest-modules --flake8 --black --cov -+addopts=--doctest-modules - doctest_optionflags=ALLOW_UNICODE ELLIPSIS - filterwarnings= - # suppress known warning --- -2.27.0 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix index d4139ce762..238b250136 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -1,28 +1,27 @@ { lib, buildPythonPackage, fetchPypi , setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock -, six, pytz, jaraco_functools, pythonOlder }: +, six, pytz, jaraco_functools, pythonOlder +, pytest-flake8, pytestcov, pytest-black, pytest-mypy +}: buildPythonPackage rec { pname = "tempora"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e370d822cf48f5356aab0734ea45807250f5120e291c76712a1d766b49ae34f8"; + sha256 = "599a3a910b377f2b544c7b221582ecf4cb049b017c994b37f2b1a9ed1099716e"; }; disabled = pythonOlder "3.2"; nativeBuildInputs = [ setuptools_scm ]; - patches = [ - ./0001-pytest-remove-flake8-black-coverage.patch - ]; - propagatedBuildInputs = [ six pytz jaraco_functools ]; checkInputs = [ pytest-freezegun pytest freezegun backports_unittest-mock + pytest-flake8 pytestcov pytest-black pytest-mypy ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix index 4dc5c57070..1aad8677ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix @@ -23,9 +23,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] -, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] -, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, sse42Support ? stdenv.hostPlatform.sse4_2Support +, avx2Support ? stdenv.hostPlatform.avx2Support +, fmaSupport ? stdenv.hostPlatform.fmaSupport # Darwin deps , Foundation, Security }: @@ -132,6 +132,13 @@ let }) ./lift-gast-restriction.patch + (fetchpatch { + # fix compilation with numpy >= 1.19 + name = "add-const-overload.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch"; + sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv"; + }) + # cuda 10.2 does not have "-bin2c-path" option anymore # https://github.com/tensorflow/tensorflow/issues/34429 ../cuda-10.2-no-bin2c-path.patch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix index 4dd378d141..eedd6e6d0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix @@ -23,9 +23,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] -, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] -, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, sse42Support ? stdenv.hostPlatform.sse4_2Support +, avx2Support ? stdenv.hostPlatform.avx2Support +, fmaSupport ? stdenv.hostPlatform.fmaSupport # Darwin deps , Foundation, Security }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix new file mode 100644 index 0000000000..f0c26292c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytestCheckHook +, future +, imageio +, numpy +, pandas +, pytorch +, tensorflow-tensorboard +}: + +buildPythonPackage rec { + pname = "test-tube"; + version = "0.7.5"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "williamFalcon"; + repo = pname; + rev = version; + sha256 = "0zpvlp1ybp2dhgap8jsalpfdyg8ycjhlfi3xrdf5dqffqvh2yhp2"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + propagatedBuildInputs = [ + future + imageio + numpy + pandas + pytorch + tensorflow-tensorboard + ]; + + meta = with lib; { + homepage = "https://github.com/williamFalcon/test-tube"; + description = "Framework-agnostic library to track and parallelize hyperparameter search in machine learning experiments"; + license = licenses.mit; + maintainers = [ maintainers.tbenst ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix new file mode 100644 index 0000000000..04bc47913d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, six +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "textfsm"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "0fq2hphd89hns11nh0yifcp6brg6yy4n4hbvfk6avbjd7s40789a"; + }; + + patches = [ + (fetchpatch { + # remove pytest-runner dependency + url = "https://github.com/google/textfsm/commit/212db75fea4a79aca0f8f85a78954ffbc5667096.patch"; + sha256 = "0n6qh3sz9wy5gdpq9jjxx8firis48ypr20yacs5bqri59sziwjp0"; + }) + ]; + + propagatedBuildInputs = [ six future ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Python module for parsing semi-structured text into python tables"; + homepage = "https://github.com/google/textfsm"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index 6317f12e8a..77187f42b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2020.6.3"; + version = "2020.8.25"; src = fetchPypi { inherit pname version; - sha256 = "e79403a8b98b0df7ade8d43469151b959fd56239001471fac62beabca6f56377"; + sha256 = "b51e496bd9ee9c6875170a018bdb7b6f67e3946c4ab57afdb95b18b2c6937783"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix index 808a6c5482..d5379b849a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix @@ -3,28 +3,31 @@ , buildPythonPackage , fetchFromGitHub , cython +, pybind11 , tiledb , numpy , wheel , isPy3k , setuptools_scm , psutil +, pandas }: buildPythonPackage rec { pname = "tiledb"; - version = "0.5.6"; + version = "0.6.6"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = version; - sha256 = "0cgm4dhyqay26xmrzlv21ha8qh55m4q3yr338lrv81ngz77zxsvw"; + sha256 = "0b2kn1xyf7d994kz29dpqiaf8yzvx0axw4yqi854c54pl22ddgzl"; }; nativeBuildInputs = [ cython + pybind11 setuptools_scm ]; @@ -39,6 +42,8 @@ buildPythonPackage rec { checkInputs = [ psutil + # optional + pandas ]; TILEDB_PATH = tiledb; @@ -57,16 +62,19 @@ buildPythonPackage rec { "test_docs" "dont_test_docs" # these tests don't always fail substituteInPlace tiledb/tests/test_libtiledb.py --replace \ - "test_varlen_write_int_subarray" "dont_test_varlen_write_int_subarray" + "test_varlen_write_int_subarray" "dont_test_varlen_write_int_subarray" \ + --replace "test_memory_cleanup" "dont_test_memory_cleanup" \ + --replace "test_ctx_thread_cleanup" "dont_test_ctx_thread_cleanup" substituteInPlace tiledb/tests/test_metadata.py --replace \ "test_metadata_consecutive" "dont_test_metadata_consecutive" ''; checkPhase = '' - pushd "$out" + pushd "$TMPDIR" ${python.interpreter} -m unittest tiledb.tests.all.suite_test popd ''; + pythonImportsCheck = [ "tiledb" ]; meta = with lib; { description = "Python interface to the TileDB storage manager"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timelib/default.nix index 39ff4b6de1..559dd0dd92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timelib/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "timelib"; - version = "0.2.4"; + version = "0.2.5"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "49142233bdb5971d64a41e05a1f80a408a02be0dc7d9f8c99e7bdd0613ba81cb"; + sha256 = "6ac9f79b09b63bbc07db88525c1f62de1f6d50b0fd9937a0cb05e3d38ce0af45"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix index 895ebd130e..ca07b50cef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix @@ -4,24 +4,26 @@ , isPy27 , numba , numpy +, pytestCheckHook +, pytestcov }: buildPythonPackage rec { pname = "timezonefinder"; - version = "4.4.0"; + version = "4.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ccb7ee58f5da4b05eae2154eb615eb791487d3cfeaa2a690877737a898580a9e"; + sha256 = "c84e0f4b501419349e67972d25c535d9b5fd6c100c319747049b67812a4c6b97"; }; propagatedBuildInputs = [ numpy ]; - checkInputs = [ numba ]; + checkInputs = [ numba pytestCheckHook pytestcov ]; meta = with lib; { description = "fast python package for finding the timezone of any point on earth (coordinates) offline"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix index 6f4eb927f3..35c0f76b08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix @@ -36,6 +36,11 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + # https://github.com/PyCQA/pycodestyle/issues/598 + preCheck = '' + printf "[flake8]\nignore=W504,E741,E126" >> setup.cfg + ''; + meta = with lib; { description = "Low-level CSS parser for Python"; homepage = "https://github.com/Kozea/tinycss2"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix index f4de29b5e6..96b6242c85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "A lightweight document oriented database written in pure Python with no external dependencies"; homepage = "https://github.com/msiemens/tinydb"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ marcus7070 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix index aed342c119..c1de2454e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "titlecase"; - version = "0.12.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0486i99wf8ssa7sgn81fn6fv6i4rhhq6n751bc740b3hzfbpmpl4"; + sha256 = "16e279edf085293bc9c44a68ce959c7d6cd5c653e6b5669a3a3640015cb63eb6"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix index e771470b40..b7df857533 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix @@ -1,19 +1,20 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage, setuptools_scm , requests, requests-file, idna, pytest , responses }: buildPythonPackage rec { pname = "tldextract"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "9aa21a1f7827df4209e242ec4fc2293af5940ec730cde46ea80f66ed97bfc808"; + sha256 = "ab0e38977a129c72729476d5f8c85a8e1f8e49e9202e1db8dca76e95da7be9a8"; }; propagatedBuildInputs = [ requests requests-file idna ]; checkInputs = [ pytest responses ]; + nativeBuildInputs = [ setuptools_scm ]; meta = { homepage = "https://github.com/john-kurkowski/tldextract"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix index f420cbaee9..ac78179623 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix @@ -1,20 +1,34 @@ { stdenv, fetchPypi, buildPythonPackage -, requests }: +, requests, fetchpatch, pythonOlder, typing +}: buildPythonPackage rec { pname = "todoist-python"; - version = "8.1.1"; + version = "8.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0khipf8v0gqvspq7m67aqv0ql3rdqyqr8qfhbm1szc1z6mygj8ns"; + sha256 = "750b2d2300e8590cd56414ab7bbbc8dfcaf8c27102b342398955812176499498"; }; - propagatedBuildInputs = [ requests ]; + patches = [ + # From https://github.com/Doist/todoist-python/pull/80 + (fetchpatch { + url = "https://github.com/Doist/todoist-python/commit/605443c67a8e2f105071e0da001c9f6f2a89ef19.patch"; + sha256 = "0ah0s5by783kqlaimsbxz11idz0bhc2428aw9vdjpngmzb7ih1pa"; + }) + (fetchpatch { + url = "https://github.com/Doist/todoist-python/commit/f2f8e1e5b3ab1674ad9f0dff885702a25d1d18e9.patch"; + sha256 = "1kp63yk9kj87zvvgfl60m6lxdm5sx3dny4g0s67ap1jbz350wifn"; + }) + ]; + + propagatedBuildInputs = [ requests ] ++ stdenv.lib.optional (pythonOlder "3.5") typing; meta = { description = "The official Todoist Python API library"; homepage = "https://todoist-python.readthedocs.io/en/latest/"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix index 2e3a50bfd9..27f952386f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "74f976908030ff164c0aa1edabe3bf83ea004b3daa5b0940b9c86a060c004e9a"; + sha256 = "ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"; }; propagatedBuildInputs = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix index cac97d92b2..40883928f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.15.2"; + version = "3.19.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c696d36cd7c6a28ada2da780400e44851b20ee19ef08cfe73344a1dcebbbe9f3"; + sha256 = "17e61a93afe5c49281fb969ab71f7a3f22d7586d1c56f9a74219910f356fe7d3"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index d3f83cec48..c83f6159fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.48.0"; + version = "4.48.2"; src = fetchPypi { inherit pname version; - sha256 = "6baa75a88582b1db6d34ce4690da5501d2a1cb65c34664840a456b2c9f794d29"; + sha256 = "564d632ea2b9cb52979f7956e093e831c28d441c11751682f84c86fc46e4fd21"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index eb7c1c2aa4..328cfb0ba8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -6,6 +6,7 @@ , regex , requests , numpy +, parameterized , sacremoses , sentencepiece , timeout-decorator @@ -16,13 +17,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.0.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6"; + sha256 = "0jj94153kgdyklra30xcszxv11hwzfigzy82fgvgzvbwlxv3a1j5"; }; propagatedBuildInputs = [ @@ -38,22 +39,33 @@ buildPythonPackage rec { ]; checkInputs = [ + parameterized pytestCheckHook timeout-decorator ]; postPatch = '' substituteInPlace setup.py \ - --replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8" + --replace "tokenizers == 0.8.1.rc2" "tokenizers>=0.8" ''; preCheck = '' export HOME="$TMPDIR" - cd tests + + # This test requires the nlp module, which we haven't + # packaged yet. However, nlp is optional for transformers + # itself + rm tests/test_trainer.py ''; + # We have to run from the main directory for the tests. However, + # letting pytest discover tests leads to errors. + pytestFlagsArray = [ "tests" ]; + # Disable tests that require network access. disabledTests = [ + "PegasusTokenizationTest" + "T5TokenizationTest" "test_all_tokenizers" "test_batch_encoding_is_fast" "test_batch_encoding_pickle" @@ -63,17 +75,20 @@ buildPythonPackage rec { "test_hf_api" "test_outputs_can_be_shorter" "test_outputs_not_longer_than_maxlen" + "test_padding_accepts_tensors" "test_pretokenized_tokenizers" "test_tokenizer_equivalence_en_de" "test_tokenizer_from_model_type" "test_tokenizer_from_model_type" "test_tokenizer_from_pretrained" + "test_tokenizer_from_tokenizer_class" "test_tokenizer_identifier_with_correct_config" ]; meta = with stdenv.lib; { homepage = "https://github.com/huggingface/transformers"; description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch"; + changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ danieldk pashashocky ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transip/default.nix index e71660d5b8..8ea70a19ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transip/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchFromGitHub +, isPy27 , requests , cryptography , suds-jurko @@ -10,6 +11,7 @@ buildPythonPackage rec { pname = "transip-api"; version = "2.0.0"; + disabled = isPy27; src = fetchFromGitHub { owner = "benkonrath"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/translationstring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/translationstring/default.nix index 0933b90ede..013615de80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/translationstring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/translationstring/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "translationstring"; - version = "1.3"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d"; + sha256 = "bf947538d76e69ba12ab17283b10355a9ecfbc078e6123443f43f2107f6376f3"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix index 3d1bb053cd..0e0c6da021 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -1,34 +1,56 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, python, pytest -, typing-extensions -, protobuf -, hidapi -, ecdsa -, mnemonic -, requests -, pyblake2 +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, installShellFiles +, attrs , click , construct +, ecdsa +, hidapi , libusb1 +, mnemonic +, pillow +, protobuf +, pyblake2 +, requests , rlp , shamir-mnemonic +, typing-extensions , trezor-udev-rules -, installShellFiles +, pytest }: buildPythonPackage rec { pname = "trezor"; - version = "0.12.1"; + version = "0.12.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1w19m9lws55k9sjhras47hpfpqwq1jm5vy135nj65yhkblygqg19"; + sha256 = "0r0j0y0ii62ppawc8qqjyaq0fkmmb0zk1xb3f9navxp556w2dljv"; }; nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic trezor-udev-rules ]; + propagatedBuildInputs = [ + attrs + click + construct + ecdsa + hidapi + libusb1 + mnemonic + pillow + protobuf + pyblake2 + requests + rlp + shamir-mnemonic + typing-extensions + trezor-udev-rules + ]; checkInputs = [ pytest @@ -52,7 +74,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; + description = "Python library for communicating with Trezor Hardware Wallet"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; license = licenses.gpl3; maintainers = with maintainers; [ np prusnak mmahut _1000101 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 7d749ea4a9..f9a2dfa6af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.7.14"; + version = "3.8.4"; src = fetchPypi { inherit pname version; - sha256 = "bd3d88fc179d6dfd6d47f63dec4bb8da204c070e78cb2b483f86b33886bf627b"; + sha256 = "50d2e74f2047a50d097a394fb11b12443f764dfc7145140d5029f7019dea6d4d"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix index 9a63850e53..658dea9104 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix @@ -5,7 +5,7 @@ , idna , outcome , contextvars -, pytest +, pytestCheckHook , pyopenssl , trustme , sniffio @@ -18,23 +18,23 @@ buildPythonPackage rec { pname = "trio"; - version = "0.15.1"; + version = "0.16.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3010864ab8d8b2ae44d3bc97b0e8924d8f5170bf32f07c7638a930a129687f33"; + sha256 = "df067dd0560c321af39d412cd81fc3a7d13f55af9150527daab980683e9fcf3c"; }; - checkInputs = [ astor pytest pyopenssl trustme jedi pylint yapf ]; + checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. - checkPhase = '' - HOME=$TMPDIR py.test -k 'not getnameinfo \ - and not SocketType_resolve \ - and not getprotobyname \ - and not waitpid \ - and not static_tool_sees_all_symbols' - ''; + disabledTests = [ + "getnameinfo" + "SocketType_resolve" + "getprotobyname" + "waitpid" + "static_tool_sees_all_symbols" + ]; propagatedBuildInputs = [ attrs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index 21e1ac13ca..54eae801df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonApplication , fetchPypi +, pythonOlder , mock , lxml , relatorio @@ -24,10 +25,12 @@ with stdenv.lib; buildPythonApplication rec { pname = "trytond"; - version = "5.6.4"; + version = "5.6.5"; + disabled = pythonOlder "3.5"; + src = fetchPypi { inherit pname version; - sha256 = "d89da52a9a0a9bcbbc316fc72eea8810bac64307d22c90ab2d70a4b0cd9b1a9c"; + sha256 = "a373d73b141d71f8e30d728dd8380955bc0f33daaa097201fa9a952e3663e6d8"; }; # Tells the tests which database to use diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix index dc52590177..1b4e32de68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0szg3k9zcnba7a8fw1fz3hr72lwlysfbm7hkabkaik69vra77bh0"; + sha256 = "00ae7354dec9cca8e652139eba9cf6945371321cdf05ee903a6a59f6d31cef6b"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix index 13fafe788f..1c5535ec07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.8.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0sri92mzhkifn16klkk2mhc2vcrvdmfp2wvkpfss518sln5q5gca"; + sha256 = "bfd19a5c11f35f7f199c795f99d9cbf8a52eb33f0ecfb6c91ee10b601180f604"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix index d6ae7cefc3..655b3384af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.7.4.2"; + version = "3.7.4.3"; src = fetchPypi { inherit pname version; - sha256 = "79ee589a3caca649a9bfd2a8de4709837400dfa00b6cc81962a1e6a1815969ae"; + sha256 = "99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix index a41351916b..ef4fe47b7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "754edb07eaee39a9686a99823892e3a1be4e0948d9cc5c717946750c27643c9c"; + sha256 = "996e4c4454771f0ff0fd2a7566b1a159d305d3611cd755addf444e3533e2bc54"; }; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 71a38c88d2..1e7132525a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.9"; + version = "1.2.10"; src = fetchPypi { inherit pname version; - sha256 = "1gqccakzivga3lb9sh4aniamqpnlbbwxfbkhrb6833k1zha01w8j"; + sha256 = "398dd818e9a6c14f00c434e7ad3fcbe1d0344f2f4c23bca8c5026280ae032f4f"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix new file mode 100644 index 0000000000..1fbed4ad1a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ufonormalizer"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rn64a0i151qk6h5f9pijcmja195i2d6f8jbi5h4xkgkinm9wwzj"; + extension = "zip"; + }; + + meta = with lib; { + description = "Script to normalize the XML and other data inside of a UFO"; + homepage = "https://github.com/unified-font-object/ufoNormalizer"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufoprocessor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufoprocessor/default.nix new file mode 100644 index 0000000000..db5b1400fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufoprocessor/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi +, defcon, fonttools, lxml, fs +, mutatormath, fontmath, fontparts +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "ufoProcessor"; + version = "1.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ns11aamgavgsfj8qf5kq7dvzmgl0mhr1cbych2f075ipfdvva5s"; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + defcon + lxml + fonttools + fs + fontmath + fontparts + mutatormath + ]; + + meta = with lib; { + description = "Read, write and generate UFOs with designspace data"; + homepage = "https://github.com/LettError/ufoProcessor"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ujson/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/2.nix new file mode 100644 index 0000000000..e1d1185f6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/2.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ujson"; + version = "2.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with stdenv.lib; { + homepage = "https://pypi.python.org/pypi/ujson"; + description = "Ultra fast JSON encoder and decoder for Python"; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix index 295d6febf3..9df71ee49c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "3.0.0"; + version = "3.1.0"; disabled = isPyPy || (!isPy3k); src = fetchPypi { inherit pname version; - sha256 = "e0199849d61cc6418f94d52a314c6a27524d65e82174d2a043fb718f73d1520d"; + sha256 = "00bda1de275ed6fe81817902189c75dfd156b4fa29b44dc1f4620775d2f50cf7"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix new file mode 100644 index 0000000000..09b75e0c77 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "unicodedata2"; + version = "13.0.0-2"; + + src = fetchFromGitHub { + owner = "mikekap"; + repo = pname; + rev = version; + sha256 = "0p9brbiwyg98q52y0gfyps52xv57fwqfpq0mn18p1xc1imip3h2b"; + }; + + checkInputs = [ pytest ]; + checkPhase = "pytest tests"; + + meta = with lib; { + description = "Backport and updates for the unicodedata module"; + homepage = "http://github.com/mikekap/unicodedata2"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 113f5535f6..c8d1edc421 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "3.0.2"; + version = "3.0.4"; disabled = isPy27; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e09b8ae70cce9904cdd331f53bf929150962869a5324ab7ff3dd6c8b87e01f7d"; + sha256 = "984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695"; }; meta = with lib; { homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix index 9b8e915a8b..820c96c38c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "untangle"; version = "1.1.1"; - + src = fetchFromGitHub { owner = "stchris"; repo = "untangle"; @@ -11,11 +11,11 @@ buildPythonPackage rec { rev = "61b57cd771a40df7d1621e9ec3c68d9acd733d31"; sha256 = "0ffvlfyyl82xi4akz1lls32lrnlrn44ik41v8x8xh9ghy0n0ick7"; }; - + checkPhase = '' ${python.interpreter} -m unittest discover -s tests ''; - + meta = with lib; { description = "Convert XML documents into Python objects"; homepage = "https://github.com/stchris/untangle"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/update_checker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/update_checker/default.nix index e319422ce7..fd3d0b02b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/update_checker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/update_checker/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "update_checker"; - version = "0.17"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "0qhfn5fjjab50gbnj2053wdfppzkydqgapfz35ymrm1vysvqvvrd"; + sha256 = "6a2d45bb4ac585884a6b03f9eade9161cedd9e8111545141e9aa9058932acb13"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 3d472a604d..81b6f27628 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.11.7"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "3fbf9dfe5ce996ffda3a49d16eba804b95fb05bc041fc4e7bc05317a03bf6cba"; + sha256 = "1603140896b9d3495cedeee2b872e97759085777c1299317072ad3f415211abc"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix index af13fa8d17..0bcfa0305e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.6.1"; + version = "4.7.1"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "07pksjbgxs1ks2i6pgxkwfg9c56pcql7f9p89dnwaf2rcn7yhx6r"; + sha256 = "1h5d3scy3cnbyhh0pbavflpqklhn2lbp7hl193rc5gx8yzr3mqbh"; }; disabled = pythonOlder "3.5.0"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix new file mode 100644 index 0000000000..1ded152cba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, urwid +, glibcLocales +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "urwid_readline"; + version = "0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "24e376d4b75940d19e8bc81c264be5d383f8d4da560f68f648dd16c85f6afdb5"; + }; + + propagatedBuildInputs = [ + urwid + ]; + + checkInputs = [ + glibcLocales + pytestCheckHook + ]; + + meta = with lib; { + description = "A textbox edit widget for urwid that supports readline shortcuts"; + homepage = "https://github.com/rr-/urwid_readline"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix index 6a6cc44d66..36fe4b5149 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: buildPythonPackage rec { pname = "urwid"; version = "2.1.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -13,6 +14,11 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ glibcLocales ]; + # tests which assert on strings don't decode results correctly + doCheck = isPy3k; + + pythonImportsCheck = [ "urwid" ]; + meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = "http://excess.org/urwid"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix new file mode 100644 index 0000000000..8366a56158 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, distro +}: + +buildPythonPackage rec { + pname = "userpath"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256="0mfjmvx286z1dmnrc7bm65x8gj8qrmkcyagl0vf5ywfq0bm48591"; + }; + + propagatedBuildInputs = [ click distro ]; + + # test suite is difficult to emulate in sandbox due to shell manipulation + doCheck = false; + + pythonImportsCheck = [ "click" "userpath" ]; + + meta = with lib; { + description = "Cross-platform tool for adding locations to the user PATH"; + homepage = "https://github.com/ofek/userpath"; + license = [ licenses.asl20 licenses.mit ]; + maintainers = with maintainers; [ yevhenshymotiuk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix index dbed55725b..6ec8db3406 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix @@ -11,11 +11,12 @@ buildPythonPackage rec { pname = "validators"; - version = "0.15.0"; + version = "0.17.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "31e8bb01b48b48940a021b8a9576b840f98fa06b91762ef921d02cb96d38727a"; + sha256 = "401cb441dd61bb1a03b10c8a3a884642409e22a2a19e03bbfc4891e0ddbc7268"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/varint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/varint/default.nix index 5f32dff4aa..143a452344 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/varint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/varint/default.nix @@ -22,4 +22,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix index 0dd88ba197..633c4f266c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9740c5b1b63626ec55cefb415259a2c77ce00751e97b0f7f214037baaf13c7bf"; + sha256 = "4138e79eb35981ad391406cbb7227bce7eba8bad788dcf1a89c2e4a8b740debe"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix index 8beb39b26d..7247e07946 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix @@ -2,22 +2,22 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "0.10.4"; - + version = "0.11.0"; + src = fetchPypi { inherit pname version; - sha256 = "570525d0371806993874bd2ee0f47cc5d68994abb5aa382e964e53e0b81160b2"; + sha256 = "cceb39d081b8d1628956205642e740a9fabcfd2c6ecd982c51134fba8215d0bd"; }; - + propagatedBuildInputs = [ future dateutil six ]; - + checkInputs = [ pytest mock parameterized ]; - + # Integration tests require an accessible Vertica db checkPhase = '' pytest --ignore vertica_python/tests/integration_tests ''; - + meta = with lib; { description = "Native Python client for Vertica database"; homepage = "https://github.com/vertica/vertica-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index 8be6bb146f..6a9d91d79c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.0.28"; + version = "20.0.31"; src = fetchPypi { inherit pname version; - sha256 = "688a61d7976d82b92f7906c367e83bb4b3f0af96f8f75bfcd3da95608fe8ac6c"; + sha256 = "43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix index 06f3265d42..22b5af442d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix @@ -1,12 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, coverage, pytest, pytestcov }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, coverage, pytest, pytestcov }: buildPythonPackage rec { pname = "vulture"; - version = "1.6"; + version = "2.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1sbwbwkpk3s7iwnwsdrvj1ydw9lgbn3xqhji7f8y5y6vvr77i53v"; + sha256 = "ab0dce458ab746212cc02ac10cf31912c43bbfdcccb49025745b00850beab086"; }; checkInputs = [ coverage pytest pytestcov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix index a545a9510b..ec9cbb3d56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix @@ -1,30 +1,25 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "wasabi"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "ee3809f4ce00e1e7f424b1572c753cff0dcaca2ca684e67e31f985033a9f070b"; + sha256 = "75fec6db6193c8615d7f398ae4aa2c4ad294e6e3e81c6a6dbbbd3864ee2223c3"; }; - checkInputs = [ - pytest - ]; - - checkPhase = '' - pytest wasabi/tests - ''; + checkInputs = [ pytestCheckHook ]; meta = with stdenv.lib; { description = "A lightweight console printing and formatting toolkit"; homepage = "https://github.com/ines/wasabi"; + changelog = "https://github.com/ines/wasabi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; - }; + }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix index 6749ed2b83..bf21d7ed5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.51"; + version = "0.61"; pname = "web.py"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b50343941360984d37270186453bb897d13630028a739394fedf38f9cde2fd07"; + sha256 = "c7a9081aeb086cd3e703c7553a47ee75188d1d325f25eec7654d9bb00b5eccbb"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix index 1e1e1ef58a..eeb12bd5b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix @@ -22,6 +22,13 @@ buildPythonPackage rec { # Tests fail on Darwin with `OSError: AF_UNIX path too long` doCheck = !stdenv.isDarwin; + # Disable all tests that need to terminate within a predetermined amount of + # time. This is nondeterministic. + patchPhase = '' + sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ + tests/test_protocol.py + ''; + meta = with lib; { description = "WebSocket implementation in Python 3"; homepage = "https://github.com/aaugustin/websockets"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix index 3d4427f492..686ba1196b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.7.3"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11dbzlcg48fymddqjrrs60pr7y33qjjv0y5zrfjc56gkc190gmz6"; + sha256 = "86a36049ae3c8b1ce12d3183911b3082b38b2998e858285309581e37dc22d8fa"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix index cf24f7fb1d..dbc069f434 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "5.1.0"; + version = "5.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "60154b976a13901414a25b0273a841145f77eb34a141f9ae032a0ace3e4d5b27"; + sha256 = "05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7"; }; # No tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix index 367c299a70..1e448c3770 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix @@ -1,14 +1,23 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchzip , cython , numpy , scikitlearn , six -, python +, setuptools_scm +, gcc +, pytest +, pytestcov , isPy27 }: - +let + testData = fetchzip { + url = "http://mattmahoney.net/dc/text8.zip"; + sha256 = "0w3l64bww9znmmvd9cqbfmh3dddnlrjicz43y5qq6fhi9cfqjfar"; + }; +in buildPythonPackage rec { pname = "word2vec"; version = "0.11.1"; @@ -19,17 +28,25 @@ buildPythonPackage rec { sha256 = "222d8ffb47f385c43eba45e3f308e605fc9736b2b7137d74979adf1a31e7c8b4"; }; + nativeBuildInputs = [ setuptools_scm gcc ]; + propagatedBuildInputs = [ cython numpy scikitlearn six ]; + checkInputs = [ pytest pytestcov ]; + + # Checks require test data downloaded separately + # See project source Makefile:test-data rule for reference checkPhase = '' - cd word2vec/tests; - ${python.interpreter} test_word2vec.py + PATH=$PATH:$out/bin + mkdir data + head -c 100000 ${testData}/text8 > data/text8-small + pytest ''; meta = with stdenv.lib; { description = "Tool for computing continuous distributed representations of words"; homepage = "https://github.com/danielfrg/word2vec"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ NikolaMandic ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix index 344615c901..d905a11e34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.16.0"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "1js3xr3fl9bwid8hl3w2pnigqzjd2rvkncald5x1x5fg7wjy8pb6"; + sha256 = "5e1af056ff834bf62ca57da917159328fab21b1f8c25284f92083016bb2d92a5"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix index 1bb421194f..8f949f20e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix @@ -3,16 +3,17 @@ , fetchPypi , xorg , cffi +, nose , six }: buildPythonPackage rec { - version = "0.9.0"; + version = "0.10.1"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "1r03yvxwbimh8ngfrbd436f9r535vvj6m1b3zfgz9kl76c8yn5ic"; + sha256 = "cab1630a51076b11819c97e6da461ddd4cb21bdf65c071d1c57a846c9b129c12"; }; patchPhase = '' @@ -22,6 +23,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi six ]; + checkInputs = [ nose ]; + + pythonImportsCheck = [ "xcffib" ]; + meta = with stdenv.lib; { description = "A drop in replacement for xpyb, an XCB python binding"; homepage = "https://github.com/tych0/xcffib"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix index b4c8e46f14..27f3c1af20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "4.2.4"; + version = "5.0.4"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0nq6ijmj48c2dk75vmb040wgvr4y7wyjxrcm2dyvcwfk2h6phwri"; + sha256 = "0hh5pam8dabvh0w1bks0rqfq85gjy3h6ljrzmjg0nqsaapp1g4dd"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix index 4c98497c8b..3d82b599dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "xlib"; - version = "0.25"; + version = "0.28"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; rev = version; - sha256 = "1nncx7v9chmgh56afg6dklz3479s5zg3kq91mzh4mj512y0skyki"; + sha256 = "13551vi65034pjf2g7zkw5dyjqcjfyk32a640g5jr055ssf0bjkc"; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index 7dc6cf2896..d02b7e2e06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,20 +1,22 @@ { lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml, google-i18n-address -, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint +, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2 , stdenv }: buildPythonPackage rec { pname = "xml2rfc"; - version = "2.45.3"; + version = "2.47.0"; src = fetchPypi { inherit pname version; - sha256 = "e083195efc07f84fb22da9e74d5d9f857d3c82a3947995b0d4f3ff9b11a1a7c5"; + sha256 = "7f621ed0e5a30c2b67c0e50778627b7a35e1ccfea9db19ea89b4c72a8faf42c0"; }; propagatedBuildInputs = [ intervaltree + jinja2 pyflakes + pyyaml requests lxml google-i18n-address diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xnd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xnd/default.nix index 558e414deb..3178e171f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xnd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xnd/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , ndtypes , libndtypes , libxnd @@ -25,5 +27,14 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/xnd/*.h $out/include + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so + ''; + + checkPhase = '' + pushd python + mv xnd _xnd + python test_xnd.py + popd ''; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xpybutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xpybutil/default.nix index 60c96582ea..07cfc96e7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xpybutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xpybutil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, xcffib, pillow }: +{ lib, buildPythonPackage, fetchFromGitHub, xcffib, pillow, nose }: buildPythonPackage rec { pname = "xpybutil"; @@ -15,6 +15,8 @@ buildPythonPackage rec { # pillow is a dependency in image.py which is not listed in setup.py propagatedBuildInputs = [ xcffib pillow ]; + checkInputs = [ nose ]; + meta = with lib; { homepage = "https://github.com/BurntSushi/xpybutil"; description = "An incomplete xcb-util port plus some extras"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix index ee385e483b..52b3f8b1b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.4.4"; + version = "2.0.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "0impn5fbs9h8qjnbvn7j2v25lh20z8gbcx5xi9dhhzcp2z9gjvbx"; + sha256 = "58ca818554c1476fa1456f6cd4b87002e2294f09baf0f81e5a2a4968e62c423c"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamlordereddictloader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamlordereddictloader/default.nix new file mode 100644 index 0000000000..ce9602a472 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, ordereddict +, pyyaml +}: + +buildPythonPackage rec { + pname = "yamlordereddictloader"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03h8wa6pzqjiw25s3jv9gydn77gs444mf31lrgvpgy53kswz0c3z"; + }; + + propagatedBuildInputs = [ pyyaml ] ++ lib.optional (isPy27) ordereddict; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "yamlordereddictloader" ]; + + meta = with lib; { + description = "YAML loader and dump for PyYAML allowing to keep keys order"; + homepage = "https://github.com/fmenabe/python-yamlordereddictloader"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix index bfb09f9c1c..3ab7fb49c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix @@ -1,23 +1,29 @@ { stdenv +, lib , fetchPypi , buildPythonPackage +, pythonOlder , multidict , pytestrunner , pytest +, typing-extensions , idna }: buildPythonPackage rec { pname = "yarl"; - version = "1.4.2"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b"; + sha256 = "c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6"; }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ multidict idna ]; + propagatedBuildInputs = [ multidict idna ] + ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; meta = with stdenv.lib; { description = "Yet another URL library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix index f9b597e9f7..211a4b60c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.13.2"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "41c1182f81e69bc53d8763c5bb9d27f54ae05ce581ee4e41c7931cc2f2479262"; + sha256 = "5731a31cb7452c0c6930dd1a284e0170b39eee959851a2aceb8d6af4134a5fa8"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix index ea30e62546..822bb40783 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ydiff"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; }; # test suite requires a multitude of other version control tooling diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix new file mode 100644 index 0000000000..4cc7056da1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, future, enum-compat }: + +buildPythonPackage rec { + pname = "yeelight"; + version = "0.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "8d49846f0cede1e312cbcd1d0e44c42073910bbcadb31b87ce2a7d24dea3af38"; + }; + + propagatedBuildInputs = [ future enum-compat ]; + + meta = with stdenv.lib; { + description = "A Python library for controlling YeeLight RGB bulbs"; + homepage = "https://gitlab.com/stavros/python-yeelight/"; + license = licenses.asl20; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix new file mode 100644 index 0000000000..55068d3d5e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, multitasking +, numpy +, pandas +, requests +}: + +buildPythonPackage rec { + pname = "yfinance"; + version = "0.1.54"; + + # GitHub source releases aren't tagged + src = fetchPypi { + inherit pname version; + sha256 = "cee223cbd31e14955869f7978bcf83776d644345c7dea31ba5d41c309bfb0d3d"; + }; + + propagatedBuildInputs = [ + multitasking + numpy + pandas + requests + ]; + + doCheck = false; # Tests require internet access + pythonImportsCheck = [ "yfinance" ]; + + meta = with lib; { + description = "Yahoo! Finance market data downloader (+faster Pandas Datareader)"; + homepage = "https://aroussi.com/post/python-yahoo-finance"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix similarity index 56% rename from third_party/nixpkgs/pkgs/development/tools/yq/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix index cfca8a32f9..f795a8fdfa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -1,6 +1,7 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi +, pkgs , argcomplete , pyyaml , xmltodict @@ -9,31 +10,40 @@ , flake8 , jq , pytest +, unixtools , toml }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "yq"; - version = "2.10.1"; + version = "2.11.0"; - propagatedBuildInputs = [ pyyaml xmltodict jq argcomplete ]; + src = fetchPypi { + inherit pname version; + sha256 = "1gp9q5w1bjbw7wmba5hm8ippwvkind0p02n07fqa9jlqglhxhm46"; + }; + + propagatedBuildInputs = [ + pyyaml + xmltodict + argcomplete + ]; doCheck = true; checkInputs = [ + unixtools.script pytest coverage flake8 - jq + pkgs.jq toml ]; - checkPhase = "pytest ./test/test.py"; + # tests fails if stdin is not a tty + checkPhase = "echo | script -c 'pytest ./test/test.py'"; - src = fetchPypi { - inherit pname version; - sha256 = "1h6nnkp53mm4spwy8nyxwvh9j6p4lxvf20j4bgjskhnhaw3jl9gn"; - }; + pythonImportsCheck = [ "yq" ]; meta = with lib; { description = "Command-line YAML processor - jq wrapper for YAML documents."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix index d7d1df5993..c51694c630 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, isPy27 , fetchPypi , setuptools_scm , asciitree @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "zarr"; version = "2.4.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 1e51db1ab5..9e8d0853ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.27.1"; + version = "0.28.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "51a8bc581036cabcf82523c81b72f6a11b2c7913eb7eb418b6dad60cd40f9ef2"; + sha256 = "447d6da0b6426c0c67d5c29339e51b2d75e2c1f129605ad35a0cb84a454f09bc"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index abb7354db0..1e1a55d689 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.42"; + version = "0.0.43"; nativeBuildInputs = [ pytest ]; buildInputs = [ aiohttp zigpy ]; src = fetchPypi { inherit pname version; - sha256 = "7b9c6217054b9c49bfe249fa38d993490e901ab29f198022d569e3505e6c7f20"; + sha256 = "16f62dddce73bb27408b13a0d6526a250b588ca020405b2369e72d5dc9fa7607"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix index 0aa379322e..c5629a6fb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, heapdict }: +, pytest, heapdict, pythonOlder }: buildPythonPackage rec { pname = "zict"; @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16"; }; + disabled = pythonOlder "3.6"; + buildInputs = [ pytest ]; propagatedBuildInputs = [ heapdict ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix index 7223800caa..76887e3992 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zigpy-cc"; - version = "0.4.4"; + version = "0.5.1"; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; checkInputs = [ asynctest pytest pytest-asyncio ]; src = fetchPypi { inherit pname version; - sha256 = "117a9xak4y5nksfk9rgvzd6l7hscvzspl1wf3gydyq2lc7b3ggnl"; + sha256 = "06759615b28c45beaa5f03e594769a373d41674b96aeafefccd5c4e1c67e25ca"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipp/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipp/1.nix index d7447a2615..0de729928d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipp/1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipp/1.nix @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix index bcc164ea38..e8097461d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix @@ -1,8 +1,8 @@ { stdenv , fetchPypi -, fetchpatch , buildPythonPackage , python +, pythonAtLeast , zope_testrunner , transaction , six @@ -17,26 +17,21 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.5.1"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "20155942fa326e89ad8544225bafd74237af332ce9d7c7105a22318fe8269666"; + sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; }; - patches = [ - # Compatibility with transaction v3.0 - (fetchpatch { - url = "https://github.com/zopefoundation/ZODB/commit/0adcc6877f690186c97cc5da7e13788946d5e0df.patch"; - sha256 = "1zmbgm7r36nj5w7icpinp61fm81svh2wk213pzr3l0jxzr9i5qi4"; - }) - ]; - # remove broken test postPatch = '' rm -vf src/ZODB/tests/testdocumentation.py ''; + # ZConfig 3.5.0 is not compatible with Python 3.8 + disabled = pythonAtLeast "3.8"; + propagatedBuildInputs = [ transaction six diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix index 04e68f038e..ae7797b873 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_exceptions/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.exceptions"; - version = "4.3"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "5fa59c3c1044bb9448aeec8328db0bfceaae2a2174e88528d3fe04adf8d47211"; + sha256 = "0d72886b1bb8af4c346a117a540f28ab122577f5e3a105a261be72cd15776fda"; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_i18n/default.nix deleted file mode 100644 index 662188db15..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_i18n/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, pytz -, zope_component -}: - -buildPythonPackage rec { - pname = "zope.i18n"; - version = "4.7.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "9fcc1adb4e5f6188769ab36f6f40a59b567bb5eef91f714584e0dfd0891be5d0"; - }; - - propagatedBuildInputs = [ pytz zope_component ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/zopefoundation/zope.i18n"; - description = "Zope Internationalization Support"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - broken = true; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix index 9b7145a585..90fa0b8143 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.1"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "354a65f6c6fe6c0584e2fcf06d7318e90dc7f7de1b7008d8913733e299317870"; + sha256 = "873d6017abadc213992a0c38c786ed020341b6e0fe78d14bc2a684cf5a70de4b"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix new file mode 100644 index 0000000000..58b7d43f3d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "zopfli"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0smaxh7iihjr9mwxw1ifc9vnlh3ra8l060dd1gbvp1963k0r68pd"; + extension = "zip"; + }; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "cPython bindings for zopfli"; + homepage = "https://github.com/obp/py-zopfli"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix index a0c7ccd438..58b3c5af82 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "zstandard"; version = "0.14.0"; - + src = fetchPypi { inherit pname version; sha256 = "0lkn7n3bfp7zip6hkqwkqwc8pxmhhs4rr699k77h51rfln6kjllh"; }; - + propagatedBuildInputs = [ cffi ]; - + checkInputs = [ hypothesis ]; - + meta = with lib; { description = "zstandard bindings for Python"; homepage = "https://github.com/indygreg/python-zstandard"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix new file mode 100644 index 0000000000..229a4f17bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, requests +, matrix-client +, distro +}: + +buildPythonPackage rec { + pname = "zulip"; + version = "0.7.0"; + + disabled = !isPy3k; + + # no sdist on PyPI + src = fetchFromGitHub { + owner = "zulip"; + repo = "python-zulip-api"; + rev = version; + sha256 = "0waldgpzq3ms1r1z14lxdj56lf082fnmi83l3fn8i8gqr8nvnch1"; + }; + sourceRoot = "source/zulip"; + + propagatedBuildInputs = [ + requests + matrix-client + distro + ]; + + preCheck = '' + export COLUMNS=80 + ''; + + meta = with lib; { + description = "Bindings for the Zulip message API"; + homepage = "https://github.com/zulip/python-zulip-api"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock index d9438a7995..f5ef7d8d32 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - ast (2.4.0) + ast (2.4.1) backport (1.1.2) benchmark (0.1.0) e2mmap (0.1.0) @@ -11,22 +11,26 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.0.5) + parser (2.7.1.3) ast (~> 2.4.0) rainbow (3.0.0) - reverse_markdown (1.4.0) + regexp_parser (1.7.1) + reverse_markdown (2.0.0) nokogiri rexml (3.2.4) - rubocop (0.80.1) - jaro_winkler (~> 1.5.1) + rubocop (0.85.1) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) ruby-progressbar (1.10.1) - solargraph (0.38.6) + solargraph (0.39.8) backport (~> 1.1) benchmark bundler (>= 1.17.2) @@ -35,15 +39,15 @@ GEM maruku (~> 0.7, >= 0.7.3) nokogiri (~> 1.9, >= 1.9.1) parser (~> 2.3) - reverse_markdown (~> 1.0, >= 1.0.5) + reverse_markdown (>= 1.0.5, < 3) rubocop (~> 0.52) thor (~> 1.0) tilt (~> 2.0) - yard (~> 0.9) + yard (~> 0.9, >= 0.9.24) thor (1.0.1) tilt (2.0.10) - unicode-display_width (1.6.1) - yard (0.9.24) + unicode-display_width (1.7.0) + yard (0.9.25) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix index a6ec78b745..655384ec49 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -1,14 +1,13 @@ { ast = { - dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; backport = { dependencies = []; @@ -104,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc"; + sha256 = "162122h7vkg9crc9gsjwpy6bjrwg9r8ghhimwk952i5rrln3kird"; type = "gem"; }; - version = "2.7.0.5"; + version = "2.7.1.3"; }; rainbow = { dependencies = []; @@ -120,16 +119,26 @@ }; version = "3.0.0"; }; + regexp_parser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "106azpr2c280y2f8jnr6fd49q1abb43xh9hhgbxc4d4kvzpa8094"; + type = "gem"; + }; + version = "1.7.1"; + }; reverse_markdown = { dependencies = ["nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; + sha256 = "0w6fv779542vdliq2kmikfhymjv55z8mgzblkfjdy2agl07da9c6"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.0"; }; rexml = { dependencies = []; @@ -143,15 +152,26 @@ version = "3.2.4"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8pw7p4dk11xpahs0j6vlvqlv3rgapaccj933g0i34hbx392lj8"; + sha256 = "1ghvlbaxcvwqqpkikzdg125frf5i733lhnih79ghrvc4rykvi86h"; type = "gem"; }; - version = "0.80.1"; + version = "0.85.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbs9is1y85cmd6p3yq3v0nppq4rhpy8ynk2ln0y4rwrlb5088dh"; + type = "gem"; + }; + version = "0.0.3"; }; ruby-progressbar = { dependencies = []; @@ -170,10 +190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kcqm032sq1y4pgg7cl32hv74573b1vsy79x81zglar80ybgzv4"; + sha256 = "140zs7syf6l641p6459rg1byc2h9z2ldhmc0hbzmkgqp4lw18n7c"; type = "gem"; }; - version = "0.38.6"; + version = "0.39.8"; }; thor = { dependencies = []; @@ -198,25 +218,23 @@ version = "2.0.10"; }; unicode-display_width = { - dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; yard = { - dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp"; + sha256 = "126m49mvh4lbvlvrprq7xj2vjixbq3xqr8dwr089vadvs0rkn4rd"; type = "gem"; }; - version = "0.9.24"; + version = "0.9.25"; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/alloy/default.nix b/third_party/nixpkgs/pkgs/development/tools/alloy/default.nix index ed91df066c..44a6d7329b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/alloy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/alloy/default.nix @@ -44,7 +44,7 @@ let generic = { major, version, src }: homepage = "http://alloytools.org/"; downloadPage = "http://alloytools.org/download.html"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ notbandali ]; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix index 0ac36c4c20..9b7cf3f1de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0myy11g62pa1yh9szj03v2lhc5s9xwzr76v4x6hznidpq1b67jn8"; + sha256 = "0wyfx9nwda0s3arpdalz5zgh83v6wfz1a3l2k5v0jglpczq3m04m"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index b8797c3dfe..48805d1680 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "1skiaiz3xyi6cf62fkg7i7ahncm7vcg3aq4s4a5lrls30gr0n288"; + sha256 = "03d8h5b174699yivaamlvaqzck9zs119jk29yf70dvxw7cs0nngv"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "1klmdwpqk995pdyms40x7gk4l2mf4ncj7cgknl91kmyvpn4j1y4g"; + cargoSha256 = "0zzp2wyq48j6n64fm37qfl65cg4yzf9ysichhkmkc6viq8x0f66d"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 8ea63aa155..5dba30e766 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.35"; + version = "8.36"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1jvm49cbwyqxmz8zb9f6wim4rnna2dg1yk95123h46vl6s5cxcc0"; + sha256 = "1f8g330akx3sdc35dgvy6kksr7y3dnnj7029qrpn745bd9fh92hh"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index cc73e14690..e450bbefe2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.2.4"; + version = "2.2.5"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "0vrl9q7rm8bjxbb5076qx2cbva1wp1gp6z0pjwpg70z90gp49n2p"; + sha256 = "1x9crby4idkvfy6i5l0r00ixnx3ij68zjh1l5n92hyzlf0snv28d"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 60a7499c72..cc3ef8ed0f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.131.0"; + version = "0.133.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "13a7gfsnfyssyi3b48s0d9k34rim493rarxd2rdyxyr4ir7jnb1p"; + sha256 = "1r4s4gw50pvp4r4mq2w45s9i7fbkf7zycgp8rrj1dqzmkl9v6kii"; }; installPhase = '' @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; + broken = stdenv.isAarch64; # https://github.com/facebook/flow/issues/7556 maintainers = with maintainers; [ marsam puffnfresh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix index 23ca35b371..f04d060290 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "hotspot"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "v${version}"; - sha256 = "05rkzrvak93z8mzcpm4mcjxb933l8pjsxr9a595wfn1gn2ihmada"; + sha256 = "1f68bssh3p387hkavfjkqcf7qf7w5caznmjfjldicxphap4riqr5"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index f80483e0e1..f91cdbead8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.25.0"; + version = "6.26.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0ykg0wylyfiwjlhkbfjqfam34174paihrw7x1dwfq9anyn5bjf0k"; + sha256 = "1vlqwrbqk2cbp8kgxkm61c4blai81ib35yjf6wms16w0hvbqf2b4"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix index ff6d7765ea..5fde4e1f43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1xvdap7hpkjz6rg0ngnql1p18p93b8w9gv130g818nwcjsh9i2y5"; + sha256 = "0kscl0yf5qxacqnz3pp47r94yiwnc4rwirnr2x580z10fwhsivki"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 7d42b77223..e86ef25324 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -110,22 +110,22 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "25005"; - gittap = "4.5.0"; - gittip = "9d7eda5ec7367d1682e489e92d1be8e37e459296"; - rev = "4.5.0"; - version = "4.5.0"; - sha256 = "1vnvfgg48bccm41pdyjsql6fy1pymmfnip4w2w56b45d7rqcc3v8"; + version_commit = "24959"; + gittap = "4.5.1"; + gittip = "293cf5ae65ba4e28828095dcae212955593ba255"; + rev = "4.5.1"; + version = "4.5.1"; + sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj"; cs_ver = "4.0.2"; cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; r2-for-cutter = generic { - version_commit = "25024"; - gittap = "4.5.0"; - gittip = "9d7eda5ec7367d1682e489e92d1be8e37e459296"; - rev = "9d7eda5ec7367d1682e489e92d1be8e37e459296"; - version = "2020-07-17"; - sha256 = "1vnvfgg48bccm41pdyjsql6fy1pymmfnip4w2w56b45d7rqcc3v8"; + version_commit = "24959"; + gittap = "4.5.1"; + gittip = "293cf5ae65ba4e28828095dcae212955593ba255"; + rev = "4.5.1"; + version = "4.5.1"; + sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj"; cs_ver = "4.0.2"; cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py index b9e72e6236..ebd6e073fe 100755 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py @@ -5,6 +5,8 @@ # and is formatted with black. import fileinput import json +import xml.etree.ElementTree as ET +from urllib.parse import urlparse import re import subprocess import tempfile @@ -30,10 +32,20 @@ def prefetch_github(owner: str, repo: str, ref: str) -> str: def get_radare2_rev() -> str: - url = "https://api.github.com/repos/radare/radare2/releases/latest" - with urllib.request.urlopen(url) as response: - release = json.load(response) # type: ignore - return release["tag_name"] + feed_url = "http://github.com/radareorg/radare2/releases.atom" + with urllib.request.urlopen(feed_url) as resp: + tree = ET.fromstring(resp.read()) + releases = tree.findall(".//{http://www.w3.org/2005/Atom}entry") + for release in releases: + link = release.find("{http://www.w3.org/2005/Atom}link") + assert link is not None + url = urlparse(link.attrib["href"]) + tag = url.path.split("/")[-1] + if re.match(r"[0-9.]+", tag): + return tag + else: + print(f"ignore {tag}") + raise RuntimeError(f"No release found at {feed_url}") def get_cutter_version() -> str: diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix new file mode 100644 index 0000000000..adf17dabec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "svlint"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = "svlint"; + rev = "v${version}"; + sha256 = "0gn68achvhyxljvhw5rwraxjcgdwrl1bwbsn596ka15nrk4lwb34"; + }; + + cargoSha256 = "0v94zsh4jhzjnqbkgwn8rjbs72i5cw2nmkwn7xhdbbwxh17a88x4"; + + meta = with lib; { + description = "SystemVerilog linter"; + homepage = "https://github.com/dalance/svlint"; + license = licenses.mit; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index b4e66f507d..fe7b834e8e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.19.0"; + version = "0.20.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "14pgsx136ibaf1mqkwn8ibnn4g6q5xx0r7xbijj521v12m145i8g"; + sha256 = "123ndg7byrflczxzhk2c48bb8wlwgqzf1m0dzi0mnw3h52qiqjyp"; }; - vendorSha256 = "0bzd58ry5k100mjgvl1mxz7aysm75s4vkilcykrqy1s5sc0h3ng5"; + vendorSha256 = "1prf1hffvwl2hdkrr8hqz1wwcz2n9dzhf68ziz5k3fzsx30jki9l"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 61ed0e07af..e10052203e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "06sr20zrbhyj35cyw64bk6sjj9q9lh52kc8wg1ryaimr3dc6lrn1"; + sha256 = "12n6l18g0kg28clzyzwc2lq9rnch3vshp07isgvfp7193bhf8hyv"; }; goPackagePath = "github.com/liamg/tfsec"; diff --git a/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix index c337afa5a6..e78f344499 100644 --- a/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "avro-tools"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "0d73qbfx59pa4mgsjwgl5dvc4895rm90pdwr4sbd77biscjad94s"; + sha256 = "169cv4fjsj69fa2s87gh1i7wk0xzh3l7sx5yyz3cgyjalg4a12n1"; }; dontUnpack = true; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://avro.apache.org/"; description = "Avro command-line tools and utilities"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.nequissimus ]; + maintainers = with lib.maintainers; [ nequissimus ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index c2ebf22350..a486d31860 100644 --- a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -79,8 +79,8 @@ buildPythonApplication rec { --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.6.0" \ - --replace "requests==2.22.0" "requests~=2.22" + --replace "tomlkit==0.5.8" "tomlkit~=0.7.0" \ + --replace "requests==2.23.0" "requests~=2.24" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix index c08ca1429c..3d0fe8513c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.5.1"; + version = "10.6.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "0bygbg1k6926ri3988wbz0b1vv6wamk799mn5nkjf0xa6gjfqqsr"; + sha256 = "0izjnbldgf0597j4rh2ir9jsc2nzp9vwxcgllvkm5lh1xqf6i0nf"; }; subPackages = [ "." ]; - vendorSha256 = "10bpzf8f7ibx1wzd0nzh5q1ynwfjr4n1gjygq4zqqxg51ganqj82"; + vendorSha256 = "10sxkb2dh1il4ps15dlvq0xsry8hax27imb5qg3khdmjhb4yaj7k"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix index 62c5e6c9ef..55f79a993a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.0.11"; + version = "0.1.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "0fcm7gjsv70qxnwbgy2sgx7clyhlfnkvdxsjgcrkaf5xds8hpys7"; + sha256 = "121asn0h2vfgqnjk72wqjcfq0w15k15abjdm39i8hv455kzrc2hs"; }; vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; diff --git a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix index 131b76f782..e639c7ab31 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.6.0"; + version = "1.6.1"; patches = [ ./gomod.patch ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "0l1032c0nqbdyasq6f8yf0vph06w6v81w044fs70rgzsa91m038r"; + sha256 = "0g5zwdk7p1snqcbm4w3hsi3fm7sbsijrfj4ajxg7mifywqpmzm2l"; }; vendorSha256 = "1jgm6j04glvk7ib5yd0h04p9qxzl1ca100cv909kngx52jp61yxp"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index 6d4ba50a9f..c507169cf3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -236,6 +236,8 @@ stdenv.mkDerivation rec { fetch --experimental_distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -245,6 +247,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 19d33235a3..ad6e9ee445 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -417,6 +417,8 @@ stdenv.mkDerivation rec { fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -426,6 +428,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index eff8aede6c..8dcdc71415 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -417,6 +417,8 @@ stdenv.mkDerivation rec { fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -426,6 +428,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 845469e1c7..0bfc9071d7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -429,6 +429,8 @@ stdenv.mkDerivation rec { fetch --distdir=${distDir} build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" + build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" build --host_javabase='@local_jdk//:jdk' @@ -438,6 +440,8 @@ stdenv.mkDerivation rec { # add the same environment vars to compile.sh sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index dd1342a37d..c3049edee6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.3"; + version = "1.4.4"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "0abl91l2sb08pwr98mw910zibzwk6lss9r62h2s3g7qnnxp3z59r"; + sha256 = "1pyf559bpnsmvca4kw36nb9lwkwa9q0ghrpa117s96dhvrp3i2bv"; }; bloop-bash = fetchurl { @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1ncl34f39mvk0zb5jl1l77cwjdg3xfnhjxbzz11pdfqw0d7wqywj" - else if stdenv.isDarwin && stdenv.isx86_64 then "06c885w088yvh8l1r1jbrz0549gx2xvc8xr6rlxy6y27jk5655p2" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0hf0priy93zqba78a9nvbgl3mzwlc4jz43gz7cv2cdkj6x0lp0y1" + else if stdenv.isDarwin && stdenv.isx86_64 then "0g2rnmlfnqymji4f4rn0kaz7hipgv3bakdpn08600gg1f3s8gabw" else throw "unsupported platform"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 0b296f023a..559a4c191b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig, fetchpatch , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.18.0"; + version = "3.18.2"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0aby67jn3i0rqhj6cvpm0f7idw3dl7jayaqxa9hkk9w2jk5zzd43"; + sha256 = "0zhxsnxm5d8wdarz2gs3r41r1dfrnh35ki75fa684gaxfzy40kjx"; }; patches = [ @@ -110,8 +110,17 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with lib; { - homepage = "http://www.cmake.org/"; + homepage = "https://cmake.org/"; + changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/" + + "release/${lib.versions.majorMinor version}.html"; description = "Cross-Platform Makefile Generator"; + longDescription = '' + CMake is an open-source, cross-platform family of tools designed to + build, test and package software. CMake is used to control the software + compilation process using simple platform and compiler independent + configuration files, and generate native makefiles and workspaces that + can be used in the compiler environment of your choice. + ''; platforms = if useQt4 then qt4.meta.platforms else platforms.all; maintainers = with maintainers; [ ttuegel lnl7 ]; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 73f24a9a20..0bb695615f 100755 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -48,7 +48,7 @@ cmakeConfigurePhase() { # on macOS we want to prefer Unix-style headers to Frameworks # because we usually do not package the framework - cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags" + cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags" # on macOS i686 was only relevant for 10.5 or earlier. cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags" @@ -77,7 +77,7 @@ cmakeConfigurePhase() { fi # The argument sometimes contains garbage or variable interpolation. # When that is the case, let’s fall back to the derivation name. - if [[ -z "$shareDocName" ]] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-+]'; then + if [[ -z "$shareDocName" ]] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_+-]'; then if [[ -n "${pname-}" ]]; then shareDocName="$pname" else diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/cargo-lock.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/cargo-lock.patch new file mode 100644 index 0000000000..86768d4611 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/cargo-lock.patch @@ -0,0 +1,802 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..4ab2c17 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,796 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ahash" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "bigbro" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3eaac07a3e62cd31e2102ca97c7fdf20002893ba2a396d29ea4710d2415cdce5" ++dependencies = [ ++ "libc", ++ "seccomp-droundy", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "cc" ++version = "1.0.59" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "clap" ++version = "2.33.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "crude-profiler" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9389510ac716b6ace8c4b635420cf023e12c81b61e933bfef06639142f149ecd" ++dependencies = [ ++ "lazy_static 0.2.11", ++] ++ ++[[package]] ++name = "ctrlc" ++version = "3.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d0b676fa23f995faf587496dcd1c80fead847ed58d2da52ac1caca9a72790dd2" ++dependencies = [ ++ "nix", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f" ++ ++[[package]] ++name = "env_logger" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" ++dependencies = [ ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "fac" ++version = "0.5.3" ++dependencies = [ ++ "atty", ++ "bigbro", ++ "clap", ++ "crude-profiler", ++ "ctrlc", ++ "git-version", ++ "internment", ++ "lazy_static 1.4.0", ++ "libc", ++ "metrohash", ++ "notify", ++ "num_cpus", ++ "pathdiff", ++ "quickcheck", ++ "termcolor", ++ "tinyset", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.2.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "fsevent" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" ++dependencies = [ ++ "bitflags", ++ "fsevent-sys", ++] ++ ++[[package]] ++name = "fsevent-sys" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "gcc" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" ++ ++[[package]] ++name = "getrandom" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "git-version" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94918e83f1e01dedc2e361d00ce9487b14c58c7f40bab148026fa39d42cb41e2" ++dependencies = [ ++ "git-version-macro", ++ "proc-macro-hack", ++] ++ ++[[package]] ++name = "git-version-macro" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34a97a52fdee1870a34fa6e4b77570cba531b27d1838874fef4429a791a3d657" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" ++dependencies = [ ++ "ahash", ++ "autocfg", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" ++dependencies = [ ++ "bitflags", ++ "inotify-sys", ++ "libc", ++] ++ ++[[package]] ++name = "inotify-sys" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "internment" ++version = "0.3.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e5cba670f596a69e619cb796bcf609cb32c0ba4415d1e809104b8b832130d79" ++dependencies = [ ++ "hashbrown", ++ "lazy_static 1.4.0", ++ "serde", ++ "state", ++ "tinyset", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "lazycell" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" ++ ++[[package]] ++name = "libc" ++version = "0.2.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235" ++ ++[[package]] ++name = "log" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++ ++[[package]] ++name = "metrohash" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ba553cb19e2acbc54baa16faef215126243fe45e53357a3b2e9f4ebc7b0506c" ++ ++[[package]] ++name = "mio" ++version = "0.6.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" ++dependencies = [ ++ "cfg-if", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", ++] ++ ++[[package]] ++name = "mio-extras" ++version = "2.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" ++dependencies = [ ++ "lazycell", ++ "log", ++ "mio", ++ "slab", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++dependencies = [ ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "nix" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" ++dependencies = [ ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", ++] ++ ++[[package]] ++name = "notify" ++version = "4.0.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" ++dependencies = [ ++ "bitflags", ++ "filetime", ++ "fsevent", ++ "fsevent-sys", ++ "inotify", ++ "libc", ++ "mio", ++ "mio-extras", ++ "walkdir", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "pathdiff" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quickcheck" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" ++dependencies = [ ++ "env_logger", ++ "log", ++ "rand", ++ "rand_core", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++ ++[[package]] ++name = "regex" ++version = "1.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local 1.0.1", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "seccomp-droundy" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4b762ab71c6bf1a9a3e0b21e8600b73b088f2a6562e03cd77b2826821fae5f8" ++dependencies = [ ++ "libc", ++ "seccomp-droundy-sys", ++] ++ ++[[package]] ++name = "seccomp-droundy-sys" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "200976cc4ff22cd8b9c6c23681fe6aa89a12aa3637c86dd16e44c05d7c373488" ++dependencies = [ ++ "gcc", ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.115" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++ ++[[package]] ++name = "state" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7345c971d1ef21ffdbd103a75990a15eb03604fc8b8852ca8cb418ee1a099028" ++dependencies = [ ++ "thread_local 0.3.3", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "syn" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thread-id" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" ++dependencies = [ ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c85048c6260d17cf486ceae3282d9fb6b90be220bf5b28c400f5485ffc29f0c7" ++dependencies = [ ++ "thread-id", ++ "unreachable", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static 1.4.0", ++] ++ ++[[package]] ++name = "tinyset" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "784f540960a63144d63992caf430ed87e39d920f2c474cb8ac586ff31fb861fc" ++dependencies = [ ++ "itertools", ++ "rand", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "unreachable" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" ++dependencies = [ ++ "void", ++] ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "void" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++dependencies = [ ++ "same-file", ++ "winapi 0.3.9", ++ "winapi-util", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix new file mode 100644 index 0000000000..8c41eb3ac5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix @@ -0,0 +1,50 @@ +{ stdenv, git, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "fac-build"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "droundy"; + repo = "fac"; + rev = version; + sha256 = "1gifrlb31jy8633rnhny58ccp3wlmd338129c6sh0h1a38vkmsxk"; + }; + + # workaround for missing Cargo.lock file + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "0hjfq61y1ikdcajr2k514k7fad2zxbwq7yb5nk1wx38f1524709q"; + + # fac includes a unit test called ls_files_works which assumes it's + # running in a git repo. Nix's sandbox runs cargo build outside git, + # so this test won't work. + checkFlagsArray = [ "--skip=ls_files_works" ]; + + # fac calls git at runtime, expecting it to be in the PATH, + # so we need to patch it to call git by absolute path instead. + postPatch = '' + substituteInPlace src/git.rs \ + --replace 'std::process::Command::new("git")' \ + 'std::process::Command::new("${git}/bin/git")' + ''; + + meta = with stdenv.lib; { + description = '' + A build system that uses ptrace to handle dependencies automatically + ''; + longDescription = '' + Fac is a general-purpose build system inspired by make that utilizes + ptrace to ensure that all dependences are enumerated and that all + source files are added to a (git) repo. An important feature of fac + is that it automatically handles dependencies, rather than either + complaining about them or giving an incorrect build. Currently, fac + only runs on linux systems, but on those systems it is incredibly + easy to use! + ''; + homepage = "https://physics.oregonstate.edu/~roundyd/fac"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.dpercy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch index bd81efd520..e5ac95d0b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -1,6 +1,6 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -483,7 +483,6 @@ class CoreData: +@@ -491,7 +491,6 @@ class CoreData: return value if option.endswith('dir') and value.is_absolute() and \ option not in builtin_dir_noprefix_options: @@ -8,7 +8,7 @@ # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -@@ -495,7 +494,7 @@ class CoreData: +@@ -503,7 +502,7 @@ class CoreData: try: value = value.relative_to(prefix) except ValueError: diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch index 0a52fe60e9..f1e3c76e8b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch @@ -1,8 +1,8 @@ diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py -index 77ac03d66..d12f77592 100644 +index 4176b9a03..faaabf616 100644 --- a/mesonbuild/scripts/depfixer.py +++ b/mesonbuild/scripts/depfixer.py -@@ -337,6 +337,15 @@ class Elf(DataSizes): +@@ -336,6 +336,15 @@ class Elf(DataSizes): if not new_rpath: self.remove_rpath_entry(entrynum) else: diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index a1c94fa1fc..aa11ba7638 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.55.0"; + version = "0.55.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "Chriv+KuFKxHWTU3+TKQ+3npt3XFW0xTwoK8PKN0WzU="; + sha256 = "O1dB+ITgSSi9+hlHRn/wavpsmOYjwlzvda33HKOc4IA="; }; patches = [ @@ -67,10 +67,6 @@ python3.pkgs.buildPythonApplication rec { # workaround until https://github.com/mesonbuild/meson/pull/6512 lands. depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ]; - pythonPath = [ - python3.pkgs.setuptools # for pkg_resources - ]; - # 0.45 update enabled tests but they are failing doCheck = false; # checkInputs = [ ninja pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch index c98506fcd9..d34b6c4c43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch @@ -1,6 +1,6 @@ --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py -@@ -453,6 +453,21 @@ class Backend: +@@ -456,6 +456,21 @@ class Backend: args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang)) except Exception: pass @@ -19,6 +19,6 @@ + dirs.add(flag) + next_is_path = False + - for arg in args: - if arg.startswith('-Wl,-rpath='): - for dir in arg.replace('-Wl,-rpath=','').split(':'): + # Match rpath formats: + # -Wl,-rpath= + # -Wl,-rpath, diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch index e59795486a..0c924bacf7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch @@ -1,8 +1,8 @@ --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py -@@ -801,6 +801,13 @@ class GnomeModule(ExtensionModule): - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), self.interpreter.subproject_dir, state.subproject)] - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), self.interpreter.subproject_dir, state.subproject)] +@@ -807,6 +807,13 @@ class GnomeModule(ExtensionModule): + if fatal_warnings: + scan_command.append('--warn-error') + if len(set([girtarget.get_custom_install_dir()[0] for girtarget in girtargets])) > 1: + raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets]))) diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch index 6326f5ec3c..ada58fff6d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -1,8 +1,8 @@ diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 17058df6b..7a68b7f15 100644 +index 219b62ec8..e3ceaddbd 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -120,7 +120,7 @@ def get_env_var_pair(for_machine: MachineChoice, +@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice, # compiling we fall back on the unprefixed host version. This # allows native builds to never need to worry about the 'BUILD_*' # ones. diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix index efe9a49549..bc5ad7744d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/ninja/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "ninja"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - sha256 = "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4"; + sha256 = "1bmv7zfqwp48ga6vnqvy0gzkclv40xgq19q4ihl58r6cn4swccn3"; }; nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix index d8c6cdf188..315b74b820 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation { - version = "2.0.3"; + version = "4.0.3"; pname = "redo-sh"; src = fetchurl { url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; - sha256 = "1ycx3hik7vnlbwxacn1dzr48fwsn2ials0sg6k9l3gcyrha5wf1n"; + sha256 = "1n84ld4fihqa7a6kn3f177dknz89qcvissfwz1m21bwdq950avia"; }; buildInputs = [ makeWrapper ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation { mv man "$out/share" mv bin "$out" for p in $out/bin/*; do - wrapProgram "$p" --suffix PATH : "$out/bin" + wrapProgram "$p" --prefix PATH : "$out/bin:${coreutils}/bin" done ''; @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Redo implementation in Bourne Shell"; homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; license = licenses.agpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 41149522e7..ae2e63e040 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.5.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 95e38e3a0f..7c796b47f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -1,6 +1,7 @@ { stdenv , buildGoModule , fetchFromGitHub +, go-md2man , installShellFiles , pkg-config , gpgme @@ -13,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.15.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "15pnyi6gay287vkcrgsirsyyps3ya2lsih1ljkcsqdxzr596mcv3"; + sha256 = "0zvf060nsd8cvyclkaasqlc9bw699vh2004qrvcy8hf50b2z1bi2"; }; outputs = [ "out" "man" ]; @@ -28,7 +29,7 @@ buildGoModule rec { doCheck = false; - nativeBuildInputs = [ installShellFiles pkg-config ]; + nativeBuildInputs = [ go-md2man installShellFiles pkg-config ]; buildInputs = [ btrfs-progs @@ -41,12 +42,12 @@ buildGoModule rec { buildPhase = '' patchShebangs . - make GIT_COMMIT="unknown" - make -C docs + make bin/buildah GIT_COMMIT="unknown" + make -C docs GOMD2MAN="${go-md2man}/bin/go-md2man" ''; installPhase = '' - install -Dm755 buildah $out/bin/buildah + install -Dm755 bin/buildah $out/bin/buildah installShellCompletion --bash contrib/completions/bash/buildah make -C docs install PREFIX="$man" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix index 9d0c1ab92f..642c42108a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }: buildGoPackage rec { pname = "cloudfoundry-cli"; - version = "6.51.0"; + version = "7.0.1"; goPackagePath = "code.cloudfoundry.org/cli"; @@ -12,7 +12,14 @@ buildGoPackage rec { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "189cqng7y12knqm4n1bfajbc2lx027rwb44wddmj5iya27i7fv8f"; + sha256 = "0jh4x7xlijp1naak5qyc256zkzlrczl6g4iz94s8wx2zj7np0q5l"; + }; + + # upstream have helpfully moved the bash completion script to a separate + # repo which receives no releases or even tags + bashCompletionScript = fetchurl { + url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7"; + sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy"; }; nativeBuildInputs = [ installShellFiles ]; @@ -35,7 +42,7 @@ buildGoPackage rec { installPhase = '' install -Dm555 out/cf "$out/bin/cf" - installShellCompletion --bash "$src/ci/installers/completion/cf" + installShellCompletion --bash $bashCompletionScript ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/cmake-format/default.nix b/third_party/nixpkgs/pkgs/development/tools/cmake-format/default.nix index b0e97de550..0d9edebe19 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cmake-format/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cmake-format/default.nix @@ -10,12 +10,15 @@ buildPythonApplication rec { pname = "cmake-format"; - version = "0.6.11"; + version = "0.6.13"; + # The source distribution does not build because of missing files. + format = "wheel"; src = fetchPypi { - inherit version; - pname = "cmake_format"; - sha256 = "1wvmv8242xjkxgr266dkn4vrn5wm94fwn333pn7sxm5warhhwgda"; + inherit version format; + python = "py3"; + pname = "cmakelang"; + sha256 = "0kmggnfbv6bba75l3zfzqwk0swi90brjka307m2kcz2w35kr8jvn"; }; propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index 55a4434658..c85f5473de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.4.1"; + version = "6.5.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "16si1qm835yyvk2f0kwn9wnk8vpy5q4whgws1s2p6jr7dswg43h8"; + sha256 = "0ldw40xn9nb5picly32nq558x0klvkyrr9af0jfngbvm4l5209bc"; }; - vendorSha256 = "0nv9q3j9cja8c6d7ac8fzb8zf82zz1z77f8cxvn3vxjki7fhlavm"; + vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 890c561cad..af591a540d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.3.0"; + version = "13.4.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}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0pi33mgcmw1n5myyczg1nx1s8rqx6b4vr7s09jsjd6z81irhc87c"; + sha256 = "0rdnrnkm9pcdzi3ddmk0ia9r6lv548by08q1nrb7683jywr7bin3"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "071bsfnkasdj7lfidfhwcklycan2zpyalqia3rmbwd93m5rwqgrd"; + sha256 = "1nd32vqp096h36p89c0v21yijn3dzz4ix5bwsbl20mc8m802wvg7"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0idbj8jmycrh61bvkzjl5xffhvv9jnjqv9q0ivl457sn2jii9bhi"; + sha256 = "124gplxs3a6kyc7b7mwsf0l02i9qi0ifjn3r2m7vq5wvk31qa97b"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 8723ca2b44..310755fb53 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.235.5"; + version = "2.249.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "02zpnqhdkhg8p8cddkqklgihjpwcbnybkcw5rspipz6kiyqzg1n7"; + sha256 = "1mjvxl48v0rdrs6hzwh4mx5xvx3lnqs6njx3d7nfdfp2nf2s9353"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix new file mode 100644 index 0000000000..5a326e94a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -0,0 +1,80 @@ +{ stdenv +, lib +, fetchurl +, cmake +, capnproto +, sqlite +, boost +, zlib +, rapidjson +, pandoc +, enableSystemd ? false +, customConfig ? null +}: +let + js.vue = fetchurl { + url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js"; + sha256 = "01zklp5cyik65dfn64m8h2y2dxzgbyzgmbf99y7fwgnf0155r7pq"; + }; + js.vue-router = fetchurl { + url = + "https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js"; + sha256 = "07gx7znb30rk1z7w6ca7dlfjp44q12bbq6jghwfm27mf6psa80as"; + }; + js.ansi_up = fetchurl { + url = "https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js"; + sha256 = "1993dywxqi2ylnxybwk7m0s0bg2bq7kfllpyr0s8ck6chd0p8i6r"; + }; + js.Chart = fetchurl { + url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"; + sha256 = "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9"; + }; + css.bootstrap = fetchurl { + url = + "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"; + sha256 = "11vx860prsx7wsy8b0yrrk04ih8kvrxkk8l16snsc4n286bdkyri"; + }; +in stdenv.mkDerivation rec { + name = "laminar"; + version = "0.8"; + src = fetchurl { + url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; + sha256 = "05g73j3vpib47kr7mackcazf7s6bc3xwz4h6k7sp7yb5ng7gj20g"; + }; + patches = [ ./patches/no-network.patch ]; + nativeBuildInputs = [ cmake pandoc ]; + buildInputs = [ capnproto sqlite boost zlib rapidjson ]; + preBuild = '' + mkdir -p js css + cp ${js.vue} js/vue.min.js + cp ${js.vue-router} js/vue-router.min.js + cp ${js.ansi_up} js/ansi_up.js + cp ${js.Chart} js/Chart.min.js + cp ${css.bootstrap} css/bootstrap.min.css + ''; + postInstall = '' + mv $out/usr/share $out + mkdir $out/bin + mv $out/usr/{bin,sbin}/* $out/bin + rmdir $out/usr/{bin,sbin} + rmdir $out/usr + + mkdir -p $out/share/doc/laminar + pandoc -s ../UserManual.md -o $out/share/doc/laminar/UserManual.html + '' + lib.optionalString (customConfig != null) '' + cp ${customConfig} /etc/etc/laminar.conf + '' + (if enableSystemd then '' + sed -i "s,/etc/,$out/etc/," $out/lib/systemd/system/laminar.service + sed -i "s,/usr/sbin/,$out/bin/," $out/lib/systemd/system/laminar.service + '' else '' + rm -r $out/lib # it contains only systemd unit file + ''); + + meta = with stdenv.lib; { + description = "Lightweight and modular continuous integration service"; + homepage = "https://laminar.ohwg.net"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch new file mode 100644 index 0000000000..80e74de95a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch @@ -0,0 +1,26 @@ +Build system that downloads stuff from network is bad. Build system that +does so unconditionally is twice as bad. + +Required files are downloaded as separate fixed-output derivations and +put into correct location before build phase starts. + +--- laminar-0.8/CMakeLists.txt ++++ laminar-0.8-new/CMakeLists.txt +@@ -69,17 +69,6 @@ + COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h' + DEPENDS src/resources/index.html) + +-# Download 3rd-party frontend JS libs... +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js +- js/vue.min.js EXPECTED_MD5 ae2fca1cfa0e31377819b1b0ffef704c) +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js +- js/vue-router.min.js EXPECTED_MD5 5d3e35710dbe02de78c39e3e439b8d4e) +-file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js +- js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6) +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js +- js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e) +-file(DOWNLOAD https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css +- css/bootstrap.min.css EXPECTED_MD5 5d5357cb3704e1f43a1f5bfed2aebf42) + # ...and compile them + generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js + js/ansi_up.js js/Chart.min.js css/bootstrap.min.css) diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index b54a831e95..921c5194d5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.0-RC6-18"; + version = "2.0.0-RC6-26"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0vym99fyn0g8l5y2zvhf73ww17wywrh503wg5aw4nilj8w1ncvn2"; + sha256 = "0dpm1q4vxhv9ji87qdnsqvdmi0k5757kkd3p83g116skpkzmymvq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/dapper/default.nix b/third_party/nixpkgs/pkgs/development/tools/dapper/default.nix index c2dadeb6a9..664dd61246 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dapper/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "dapper"; - version = "0.5.1"; + version = "0.5.3"; goPackagePath = "github.com/rancher/dapper"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "rancher"; repo = "dapper"; rev = "v${version}"; - sha256 = "0sf56ii4sn2wdq5kiyl02sgvq0lvynzgiq8v5wrkkabj5107fiqw"; + sha256 = "1h62jahrxpmqx6r3mlakzap8gisrymgkp5syyarpab05qm1inngd"; }; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index d2e2638a70..4858b84abf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "0s7ymw1r1k1s8kwyg6nxpgak6kh9z3649a0axdfpjnm62v283shd"; + sha256 = "09zb7r8f6m1w9ax9ayaxjzwmqcgx5f6x4lclfi1wdn6f6qaans4w"; }; - vendorSha256 = "00vp925vf9clk5bkw5fvj34id4v548rlssizh52z9psvdizj8q5p"; + vendorSha256 = "012kgdvw7hj3m40v3nnpg916n02nxv19zid07h8g4qwprzg49iq2"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 104b1c46e0..553f9ce928 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.10.2"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "19wdflkp4n0pds4lkliagg8l5kf9db5f5bn39akhwasc4yj0g7j2"; + sha256 = "06wpvqyv7w749l3ndvzg1p774rv1apbmbpwbdlad57pih4nqa7mm"; }; buildInputs = [ jre makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 166cda52a3..a0e05bf4ae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -1,26 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "timescaledb-parallel-copy"; - version = "0.2.0"; - - owner = "timescale"; - repo = "timescaledb-parallel-copy"; - - goPackagePath = with src; "github.com/${owner}/${repo}"; - goDeps = ./deps.nix; +buildGoModule rec { + pname = "timescaledb-parallel-copy"; + version = "0.3.0"; src = fetchFromGitHub { - inherit owner repo; - rev = version; - sha256 = "1z9vf29vrxqs8imbisv681d02p4cfk3hlsrin6hhibxf1h0br9gd"; + owner = "timescale"; + repo = pname; + rev = "v${version}"; + sha256 = "0r8c78l8vg7l24c3vzs2qr2prfjpagvdkp95fh9gyz76nvik29ba"; }; + vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b"; + meta = with stdenv.lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; - homepage = "https://github.com/timescale/timescaledb-parallel-copy"; - license = licenses.asl20; - platforms = platforms.unix; + homepage = "https://github.com/timescale/timescaledb-parallel-copy"; + license = licenses.asl20; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix deleted file mode 100644 index ac145fcd34..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/jmoiron/sqlx"; - fetch = { - type = "git"; - url = "https://github.com/jmoiron/sqlx"; - rev = "82935fac6c1a317907c8f43ed3f7f85ea844a78b"; - sha256 = "0cbscnss2ifc3qgmy97i0zbirrp4hix4jlcz853f4bg5n2zzgwh2"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "7aad666537ab32b76f0966145530335f1fed51fd"; - sha256 = "12qczn5afbf6203wnbpay1kazzh20jg5qyakrph3j1r13n91nc1r"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index da5ba3fea6..2079925049 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -1,20 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "timescaledb-tune"; - version = "0.6.0"; - - goPackagePath = "github.com/timescale/timescaledb-tune"; - - goDeps = ./deps.nix; +buildGoModule rec { + pname = "timescaledb-tune"; + version = "0.9.0"; src = fetchFromGitHub { owner = "timescale"; - repo = name; - rev = version; - sha256 = "0hjxmjgkqm9sbjbyhs3pzkk1d9vvlcbzwl7ghsigh4h7rw3a0mpk"; + repo = pname; + rev = "v${version}"; + sha256 = "0vncwwvw7y6g3crd4n5vvd6jwdsa8vsvsmfwy5mad4j6lix09ajx"; }; + vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z"; + meta = with stdenv.lib; { description = "A tool for tuning your TimescaleDB for better performance"; homepage = "https://github.com/timescale/timescaledb-tune"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/deps.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/deps.nix deleted file mode 100644 index d898770fd4..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; - }; - } - { - goPackagePath = "github.com/pbnjay/memory"; - fetch = { - type = "git"; - url = "https://github.com/pbnjay/memory"; - rev = "974d429e7ae40c89e7dcd41cfcc22a0bfbe42510"; - sha256 = "0kazg5psdn90pqadrzma5chdwh0l2by9z31sspr47gx93fhjmkkq"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/dep2nix/deps.nix b/third_party/nixpkgs/pkgs/development/tools/dep2nix/deps.nix index fc9280e9df..ceedc50fc8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dep2nix/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dep2nix/deps.nix @@ -1,145 +1,129 @@ - - # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) - [ - - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"; - sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik"; - }; - } - - { - goPackagePath = "github.com/Masterminds/vcs"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/vcs"; - rev = "6f1c6d150500e452704e9863f68c2559f58616bf"; - sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j"; - }; - } - - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"; - sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic"; - }; - } - - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; - sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; - }; - } - - { - goPackagePath = "github.com/golang/dep"; - fetch = { - type = "git"; - url = "https://github.com/CrushedPixel/dep"; - rev = "fa9f32339c8855ebe7e7bc66e549036a7e06d37a"; - sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; - sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; - }; - } - - { - goPackagePath = "github.com/jmank88/nuts"; - fetch = { - type = "git"; - url = "https://github.com/jmank88/nuts"; - rev = "8b28145dffc87104e66d074f62ea8080edfad7c8"; - sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k"; - }; - } - - { - goPackagePath = "github.com/nightlyone/lockfile"; - fetch = { - type = "git"; - url = "https://github.com/nightlyone/lockfile"; - rev = "6a197d5ea61168f2ac821de2b7f011b250904900"; - sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl"; - }; - } - - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; - sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; - }; - } - - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - - { - goPackagePath = "github.com/sdboyer/constext"; - fetch = { - type = "git"; - url = "https://github.com/sdboyer/constext"; - rev = "836a144573533ea4da4e6929c235fd348aed1c80"; - sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "dc948dff8834a7fe1ca525f8d04e261c2b56e70d"; - sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg"; - }; - } - - { - 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"; - }; - } - +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/carolynvs/semver.git"; + rev = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"; + sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik"; + }; + } + { + goPackagePath = "github.com/Masterminds/vcs"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/vcs"; + rev = "6f1c6d150500e452704e9863f68c2559f58616bf"; + sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j"; + }; + } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"; + sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; + sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; + }; + } + { + goPackagePath = "github.com/golang/dep"; + fetch = { + type = "git"; + url = "https://github.com/CrushedPixel/dep"; + rev = "fa9f32339c8855ebe7e7bc66e549036a7e06d37a"; + sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; + sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; + }; + } + { + goPackagePath = "github.com/jmank88/nuts"; + fetch = { + type = "git"; + url = "https://github.com/jmank88/nuts"; + rev = "8b28145dffc87104e66d074f62ea8080edfad7c8"; + sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k"; + }; + } + { + goPackagePath = "github.com/nightlyone/lockfile"; + fetch = { + type = "git"; + url = "https://github.com/nightlyone/lockfile"; + rev = "6a197d5ea61168f2ac821de2b7f011b250904900"; + sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; + sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/sdboyer/constext"; + fetch = { + type = "git"; + url = "https://github.com/sdboyer/constext"; + rev = "836a144573533ea4da4e6929c235fd348aed1c80"; + sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "dc948dff8834a7fe1ca525f8d04e261c2b56e70d"; + sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg"; + }; + } + { + 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"; + }; + } ] diff --git a/third_party/nixpkgs/pkgs/development/tools/devd/default.nix b/third_party/nixpkgs/pkgs/development/tools/devd/default.nix index cd2f401ed2..2d5a38458d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devd/default.nix @@ -11,7 +11,6 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/devd"; subPackages = [ "cmd/devd" ]; - goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A local webserver for developers"; homepage = "https://github.com/cortesi/devd"; diff --git a/third_party/nixpkgs/pkgs/development/tools/devd/deps.nix b/third_party/nixpkgs/pkgs/development/tools/devd/deps.nix deleted file mode 100644 index 2cf6dd7eb2..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/devd/deps.nix +++ /dev/null @@ -1,201 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/GeertJohan/go.rice"; - fetch = { - type = "git"; - url = "https://github.com/GeertJohan/go.rice"; - rev = "c02ca9a983da5807ddf7d796784928f5be4afd09"; - sha256 = "1wzi3fprizg29dd4b4bmwz49x154k8cry9d7c08441y1i8w895yw"; - }; - } - { - 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/bmatcuk/doublestar"; - fetch = { - type = "git"; - url = "https://github.com/bmatcuk/doublestar"; - rev = "85a78806aa1b4707d1dbace9be592cf1ece91ab3"; - sha256 = "01fd5j142pgsj5gfba43646aa6vd09fzvjhhik2r30nj4lsyy3z8"; - }; - } - { - goPackagePath = "github.com/cortesi/moddwatch"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/moddwatch"; - rev = "0a1e0881aa8823d4dbec04c5b65a32a33f467e46"; - sha256 = "0f9gi2vvrhsbbvfqzlx2dcgn389qj1h77rvh2iffqhnsn3cxf5fr"; - }; - } - { - goPackagePath = "github.com/cortesi/termlog"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/termlog"; - rev = "87cefd5ac843f65364f70a1fd2477bb6437690e8"; - sha256 = "1mygv1bv6dkm5p1wsvzrsyq771k6apdcxlyfqdp5ay8vl75jxvmb"; - }; - } - { - goPackagePath = "github.com/daaku/go.zipexe"; - fetch = { - type = "git"; - url = "https://github.com/daaku/go.zipexe"; - rev = "a5fe2436ffcb3236e175e5149162b41cd28bd27d"; - sha256 = "0vi5pskhifb6zw78w2j97qbhs09zmrlk4b48mybgk5b3sswp6510"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; - }; - } - { - goPackagePath = "github.com/goji/httpauth"; - fetch = { - type = "git"; - url = "https://github.com/goji/httpauth"; - rev = "2da839ab0f4df05a6db5eb277995589dadbd4fb9"; - sha256 = "0rcz1qxdbc2gw0gaj81kag94k98izs9vmhcp5mzs7979s7q4kym1"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "59fac5042749a5afb9af70e813da1dd5474f0167"; - sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - { - 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 = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/rjeczalik/notify"; - fetch = { - type = "git"; - url = "https://github.com/rjeczalik/notify"; - rev = "629144ba06a1c6af28c1e42c228e3d42594ce081"; - sha256 = "0745w0mdr9xfr4rxw4pfr1sl8apc7wr7mvfykdl4wslq3mdj8a91"; - }; - } - { - goPackagePath = "github.com/toqueteos/webbrowser"; - fetch = { - type = "git"; - url = "https://github.com/toqueteos/webbrowser"; - rev = "43eedf9c266f511c55ef7eace9ee549e269b54b4"; - sha256 = "0wa8xv0gh9iq3dlwb48dx8w2awrsarqa900hszan8gaxgag7x7ih"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "927f97764cc334a6575f4b7a1584a147864d5723"; - sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b4a75ba826a64a70990f11a225237acd6ef35c9f"; - sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix index a8e5f17991..772b654df9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - name = "doxygen-1.8.18"; + name = "doxygen-1.8.19"; src = fetchurl { urls = [ "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. "http://doxygen.nl/files/${name}.src.tar.gz" ]; - sha256 = "0mh6s1ri1fs5yb27m0avnjsbcxpchgb9aaprq4bd3lj6vjg3s5qq"; + sha256 = "1lvqfw2yzba588c5ggl8yhw7aw4xkk44mrghsd9yqlajc48x25dc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/dot-http/default.nix b/third_party/nixpkgs/pkgs/development/tools/dot-http/default.nix new file mode 100644 index 0000000000..1c81a4145d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/dot-http/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "dot-http"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bayne"; + repo = pname; + rev = "v${version}"; + sha256 = "1s2q4kdldhb5gd14g2h6vzrbjgbbbs9zp2dgmna0rhk1h4qv0mml"; + }; + + cargoSha256 = "0an3hskq1k2j4gdn8wvhfb9pqsc34ibs5bv7sjznkp5jma6fdr9w"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "Text-based scriptable HTTP client"; + homepage = "https://github.com/bayne/dot-http"; + license = licenses.asl20; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/drip/default.nix b/third_party/nixpkgs/pkgs/development/tools/drip/default.nix index 2a7d2c6626..b4edf8ec08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/drip/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/drip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, which, makeWrapper }: +{ stdenv, fetchFromGitHub, jdk8, which, makeWrapper }: stdenv.mkDerivation rec { pname = "drip"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk ]; + buildInputs = [ jdk8 ]; postPatch = '' patchShebangs . diff --git a/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix b/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix new file mode 100644 index 0000000000..5cba13b668 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, git +, ruamel_yaml +, jsonschema +, rfc3987 +, setuptools +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "dtschema"; + version = "2020.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zdm0zbn1dfk02yqghfvd0nb26hmzivb6mln6bvxjfdcv6n7pdqf"; + }; + + nativeBuildInputs = [ setuptools_scm git ]; + propagatedBuildInputs = [ + setuptools + ruamel_yaml + jsonschema + rfc3987 + ]; + + meta = with lib; { + description = "Tooling for devicetree validation using YAML and jsonschema"; + homepage = "https://github.com/devicetree-org/dt-schema/"; + # all files have SPDX tags + license = with licenses; [ bsd2 gpl2 ]; + maintainers = with maintainers; [ sorki ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/easyjson/default.nix b/third_party/nixpkgs/pkgs/development/tools/easyjson/default.nix index f7bd4d2037..ef99bbd01c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/easyjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/easyjson/default.nix @@ -4,7 +4,6 @@ buildGoPackage { pname = "easyjson"; version = "unstable-2019-06-26"; goPackagePath = "github.com/mailru/easyjson"; - goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; diff --git a/third_party/nixpkgs/pkgs/development/tools/easyjson/deps.nix b/third_party/nixpkgs/pkgs/development/tools/easyjson/deps.nix deleted file mode 100644 index 0429d8876b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/easyjson/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ -] diff --git a/third_party/nixpkgs/pkgs/development/tools/ejson/default.nix b/third_party/nixpkgs/pkgs/development/tools/ejson/default.nix index a9481cbb30..17e3f5f7be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ejson/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ejson/default.nix @@ -16,8 +16,6 @@ in buildGoPackage rec { goPackagePath = "github.com/Shopify/ejson"; subPackages = [ "cmd/ejson" ]; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "Shopify"; repo = "ejson"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ejson/deps.nix b/third_party/nixpkgs/pkgs/development/tools/ejson/deps.nix deleted file mode 100644 index b0c7defc5d..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/ejson/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/codegangsta/cli"; - fetch = { - type = "git"; - url = "https://github.com/codegangsta/cli"; - rev = "9908e96513e5a94de37004098a3974a567f18111"; - sha256 = "0g6sihdb53nlf770dp3jc0qqxnlir5n2yjbp5p5vf7kcj3p54p34"; - }; - } - { - goPackagePath = "github.com/dustin/gojson"; - fetch = { - type = "git"; - url = "https://github.com/dustin/gojson"; - rev = "057ac0edc14e44d03df3bb03449e666ff50884c1"; - sha256 = "1kzzbi5yshcg1v99gab5ymd3psild3p0rbq9jf7mssjvh11yza6f"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "90f2eae17a8bdcbe3f6f654fc76af7f39e97d7b9"; - sha256 = "0s984ksmc8npf642nwwd1a81c2sfi613v7yia9jff710i5472fah"; - }; - } - { - 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 = "ca7e7f10cb9fd9c1a6ff7f60436c086d73714180"; - sha256 = "02wmfdq40fjszrd9l2w4c1g34zxnxyydwr4sqvp2blmw2s6ww4bx"; - }; - } -] \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index 14f9c20953..c9df28e5cd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -3,7 +3,10 @@ let mkElectron = import ./generic.nix args; in -{ +rec { + + electron = electron_10; + electron_3 = mkElectron "3.1.13" { x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; x86_64-darwin = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx"; @@ -36,27 +39,35 @@ in aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; }; - electron_7 = mkElectron "7.3.1" { - x86_64-linux = "66f37aadf65c0274cc6e46b09e52c38b2c8c5b2d6bbf1cd8196cd69b9f9ab737"; - x86_64-darwin = "351b30cab32539752ce5f9b53d2345352df922d57a152643c4eeb636a8941d23"; - i686-linux = "f80b8a684da13736d7614ca4ad5704812d12537111cb45010e5f42e7e4403554"; - armv7l-linux = "ef054696f4138e261b1310522d57bbdc5336e34488b3e273a8a794f8c26509c7"; - aarch64-linux = "f32376ca85c9017b7ab399e58fa176d882baacb048dd69d816831f8dde9054bb"; + electron_7 = mkElectron "7.3.3" { + x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; + x86_64-darwin = "e081436abef52212065f560ea6add1c0cd13d287a1b3cc76b28d2762f7651a4e"; + i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5"; + armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793"; + aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; }; - electron_8 = mkElectron "8.3.1" { - x86_64-linux = "d5ad2bd32f7bf88f869a401017b35be0ea71e6fc7798fe2397b21602573e2639"; - x86_64-darwin = "abe864d9e6327d499120f328e699f4819110d4245bce2f92b84e19d8cdc1c771"; - i686-linux = "e75692c062b15c7f664cf3ff30832a526f3f66080469f7f93befaa4e0860c011"; - armv7l-linux = "cfa0a14225b617492a311c21ad973f24708bc4013a992271368006cdb12ed488"; - aarch64-linux = "1b9cd3ed7eb53ed914ac04c82d736c2677af807e553c87f0698890c2a3dcfd57"; + electron_8 = mkElectron "8.5.1" { + x86_64-linux = "e58bf26ba52e43de77115b6e6844eba8a8cec2ac8aae500cf48fe862014202d9"; + x86_64-darwin = "cf0d42ecde7ca374ddf1b440aaaf441e16a02890112fcbffc03f37f8ec3b1958"; + i686-linux = "4c7ff6225b1ac4b710c454072d9fb8c04a66bb0353e7d6cffb89bcf6d4458d81"; + armv7l-linux = "13afd8b2e36eb8d1582687e16fac5394d6d3b9734d73f94d0d6ef843ba14cec2"; + aarch64-linux = "ff39e5e0e644cbf4ff1d29fc25e94b9eced7ea45d787d1b86fa4e50513336b7b"; }; - electron_9 = mkElectron "9.0.2" { - x86_64-linux = "08326f505692010d6c92f444a25f450cf19323cd98c5d94cab1057e80601caa1"; - x86_64-darwin = "8ab5b48f873582a9231bc85b0f73d9735fabca51364b8c505da8f8238d658da5"; - i686-linux = "2e950e4ab91453f7611fcfedbe90eff844677dbcc7df87a6fe0889bd3d82daaa"; - armv7l-linux = "cc098caebbed5022f26d12f9b5dc316a35dbae0bcf62b9fc72c3b385f93a32d5"; - aarch64-linux = "ee39854d8e9ee06e9b94c457a52b0556f570316bbd755d7022e3eade4b5974d5"; + electron_9 = mkElectron "9.3.0" { + x86_64-linux = "0c34fa1dbf7708bd4a3f08fde50eafb9903b1c467104dca3e3ced5e7f764b302"; + x86_64-darwin = "25057470c2f3a1c40fa1c25086256041fa70419378fa3d41eeb805ebd3919b20"; + i686-linux = "ea09d10e496450d2d7bb7a37cab7124cc5484117dd7d7d6c4106586ff675d1d5"; + armv7l-linux = "a8b46d6c98546d605a02850c906408dc11104e8ee4366c3d8a956896fafdfcd3"; + aarch64-linux = "791d898d02e45975657ed15f2d83af31d5688e7db0075a6e20021db3420eb320"; + }; + + electron_10 = mkElectron "10.1.1" { + x86_64-linux = "4147e88bdbec6893bf9927f0d4f3dd090d26705f5b7f688223bc65253a8b0220"; + x86_64-darwin = "5b6814ae1064cc337efcdb2ad01ab9daa003a6a1d6e05d79288ede0a3665b991"; + i686-linux = "d29682b7ea44dcdca5e7265bd1e28046275295a9ac23982af3d216a7f47a7a57"; + armv7l-linux = "341a2eacb0381c1f409b8e28cf2c0fe6f75a61410614baf80309f51dd4201a34"; + aarch64-linux = "d5e5b069f3173ed89f4cca7e9723f28a5f7a720637b7addac02972c5db042b6c"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix index 92dd72533a..f24358676d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -10,7 +10,7 @@ let license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; - knownVulnerabilities = optional (version < "6") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "6.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { @@ -34,7 +34,7 @@ let src = fetcher version (get tags platform) (get hashes platform); }; - electronLibPath = stdenv.lib.makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ stdenv.lib.optionals (version > "9") [ libdrm mesa ]); + electronLibPath = with stdenv.lib; makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]); linux = { buildInputs = [ glib gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index 78db979299..c89b7acc51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.5.4"; + version = "6.5.5"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1ga4qhydswalz02hz32p764zipn1lw63nhqlwqq96vjj9cwj1wii"; + sha256 = "0g40lgrm9cslkdr4yn0h737djdr9fdyrc4hkq7wsrj0wx6d819dn"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix index c9a462f183..8755466ec8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gauge"; - version = "1.1.1"; + version = "1.1.3"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "01x4838jljhhhcwfh6zbhy3g7l7nqvypv3g0ch9n2amsf2s16s3l"; + sha256 = "11qllg1alv9khkgjarpzlsqg5ygisjprg79n2jqhv1w6izx88cqc"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix new file mode 100644 index 0000000000..cf2e649962 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ginkgo"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "onsi"; + repo = "ginkgo"; + rev = "v${version}"; + sha256 = "01nn33r1rg210zv0qmck0b16545gzr057w1kz8ca86l64qrwbcxx"; + }; + vendorSha256 = "072amyw1ir18v9vk268j2y7dhw3lfwvxzvzsdqhnp50rxsa911bx"; + doCheck = false; + + meta = with stdenv.lib; { + description = "BDD Testing Framework for Go"; + homepage = "https://github.com/onsi/ginkgo"; + license = licenses.mit; + maintainers = with maintainers; [ saschagrunert ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix index a9fb671f4a..2f125d3ea8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, maven, makeWrapper, jre_headless, pcsclite }: +{ stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: +let jdk = jdk8; jre_headless = jre8_headless; in # TODO: This is quite a bit of duplicated logic with gephi. Factor it out? stdenv.mkDerivation rec { pname = "global-platform-pro"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix new file mode 100644 index 0000000000..ee942beb92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-migrate"; + version = "4.12.2"; + + src = fetchFromGitHub { + owner = "golang-migrate"; + repo = "migrate"; + rev = "v${version}"; + sha256 = "0vrc9y90aamj618sfipq2sgzllhdr4hmicj4yvl147klwb1rxlz6"; + }; + + vendorSha256 = "0jpz5xvwsw4l7nmi7s1grvbfy4xjp50hrjycwicgv2ll719gz5v0"; + + subPackages = [ "cmd/migrate" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/golang-migrate/migrate"; + description = "Database migrations. CLI and Golang library."; + maintainers = with maintainers; [ offline ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix new file mode 100644 index 0000000000..0a0eb41d61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "go-swag"; + version = "1.6.7"; + + src = fetchFromGitHub { + owner = "swaggo"; + repo = "swag"; + rev = "df209afeed2334a97c83aff34ea7abcad85c31f6"; + sha256 = "17pmcfkcmgjvs4drs0fyhp2m39gw83s0ck3rdzdkgdhrbhva9ksx"; + }; + + vendorSha256 = "1i2n2sz2hc89nf2fqfq3swldz0xwrnms4j9q0lrss5gm3bk49q7f"; + + subPackages = [ "cmd/swag" ]; + + meta = with lib; { + description = "Automatically generate RESTful API documentation with Swagger 2.0 for Go"; + homepage = "https://github.com/swaggo/swag"; + license = licenses.mit; + maintainers = with maintainers; [ stephenwithph ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/default.nix index 832d30ee8e..0d35ce253b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6"; + sha256 = "1libz83mbyrkbbsmmi8z2rydv3ls0w9r4vb5v6diqqwn7ka8z804"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch b/third_party/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch index 3782aced1a..b7c1d3d623 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch +++ b/third_party/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -1,16 +1,18 @@ -+++ build/SConstruct -@@ -63,10 +63,10 @@ elif platform_arg == 'javascript': - custom_tools = ['cc', 'c++', 'ar', 'link', 'textfile', 'zip'] - +diff --git a/SConstruct b/SConstruct +index b3d033dc90..04b8dcc832 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -62,10 +62,9 @@ elif platform_arg == "javascript": + custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"] + env_base = Environment(tools=custom_tools) --if 'TERM' in os.environ: -- env_base['ENV']['TERM'] = os.environ['TERM'] --env_base.AppendENVPath('PATH', os.getenv('PATH')) --env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH')) +-if "TERM" in os.environ: +- env_base["ENV"]["TERM"] = os.environ["TERM"] +-env_base.AppendENVPath("PATH", os.getenv("PATH")) +-env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) +for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): + if (k in os.environ): + env_base["ENV"][k] = os.environ[k] -+ env_base.disabled_modules = [] env_base.use_ptrcall = False env_base.module_version_string = "" diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/headless.nix b/third_party/nixpkgs/pkgs/development/tools/godot/headless.nix new file mode 100644 index 0000000000..0ae28b774f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/godot/headless.nix @@ -0,0 +1,18 @@ +{ godot, stdenv }: +godot.overrideAttrs (oldAttrs: rec { + pname = "godot-headless"; + sconsFlags = "target=release_debug platform=server tools=yes"; + installPhase = '' + mkdir -p "$out/bin" + cp bin/godot_server.* $out/bin/godot-headless + + mkdir "$dev" + cp -r modules/gdnative/include $dev + + mkdir -p "$man/share/man/man6" + cp misc/dist/linux/godot.6 "$man/share/man/man6/" + ''; + meta.description = + "Free and Open Source 2D and 3D game engine (headless build)"; + meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch b/third_party/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch index 409baaa6f2..9e2e5c3536 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/third_party/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,22 +1,25 @@ +diff --git a/platform/x11/detect.py b/platform/x11/detect.py +index 5674e78350..7051d8e73c 100644 +--- a/platform/x11/detect.py +++ b/platform/x11/detect.py -@@ -175,6 +175,11 @@ def configure(env): - env.ParseConfig('pkg-config xrender --cflags --libs') - env.ParseConfig('pkg-config xi --cflags --libs') +@@ -201,6 +201,11 @@ def configure(env): + env.ParseConfig("pkg-config xrender --cflags --libs") + env.ParseConfig("pkg-config xi --cflags --libs") -+ env.ParseConfig('pkg-config xext --cflags --libs') -+ env.ParseConfig('pkg-config xfixes --cflags --libs') -+ env.ParseConfig('pkg-config glu --cflags --libs') -+ env.ParseConfig('pkg-config zlib --cflags --libs') ++ env.ParseConfig("pkg-config xext --cflags --libs") ++ env.ParseConfig("pkg-config xfixes --cflags --libs") ++ env.ParseConfig("pkg-config glu --cflags --libs") ++ env.ParseConfig("pkg-config zlib --cflags --libs") + - if (env['touch']): - env.Append(CPPFLAGS=['-DTOUCH_ENABLED']) + if env["touch"]: + env.Append(CPPDEFINES=["TOUCH_ENABLED"]) -@@ -264,7 +269,7 @@ def configure(env): +@@ -299,7 +304,7 @@ def configure(env): print("Enabling ALSA") - env.Append(CPPFLAGS=["-DALSA_ENABLED", "-DALSAMIDI_ENABLED"]) - # Don't parse --cflags, we don't need to add /usr/include/alsa to include path -- env.ParseConfig('pkg-config alsa --libs') -+ env.ParseConfig('pkg-config alsa --cflags --libs') + env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"]) + # Don't parse --cflags, we don't need to add /usr/include/alsa to include path +- env.ParseConfig("pkg-config alsa --libs") ++ env.ParseConfig("pkg-config alsa --cflags --libs") else: print("ALSA libraries not found, disabling driver") diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/server.nix b/third_party/nixpkgs/pkgs/development/tools/godot/server.nix new file mode 100644 index 0000000000..48f21b796c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/godot/server.nix @@ -0,0 +1,18 @@ +{ godot, stdenv }: +godot.overrideAttrs (oldAttrs: rec { + pname = "godot-server"; + sconsFlags = "target=release platform=server tools=no"; + installPhase = '' + mkdir -p "$out/bin" + cp bin/godot_server.* $out/bin/godot-server + + mkdir "$dev" + cp -r modules/gdnative/include $dev + + mkdir -p "$man/share/man/man6" + cp misc/dist/linux/godot.6 "$man/share/man/man6/" + ''; + meta.description = + "Free and Open Source 2D and 3D game engine (server build)"; + meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index cddd16f945..1eaa00e808 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1a2dmjg7mlm908zlh5vibqv17dpn6hvdn8rx14pdm9kw1q51iish"; + sha256 = "10divgsc095jiw7n3gwzikbgvsd0hdwjyv469vq939zm7rqq3acy"; }; - vendorSha256 = "0y18ws2lc9bynb8fi8q6kcc1ngvzyfxlmpqn7gc0hvj3ribdpwrd"; + vendorSha256 = "1pa99jfz6i696x6v06aq56r0kmxmz4khb1hw7pvxds0bn16a4swr"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix index 85aab26e41..1e750a2dec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -1,17 +1,17 @@ -{ stdenv, go, buildGoModule, fetchgit }: +{ stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gopls"; - version = "0.4.4"; + version = "0.5.0"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "1h4ica6rwrdp5wg4ybpzvyvszj4m5l6w9hpvd9r2qcd9qdnqlykf"; + sha256 = "150jg1qmdszfvh1x5fagawgc24xy19xjg9y1hq3drwy7lfdnahmq"; }; modRoot = "gopls"; - vendorSha256 = "175051d858lsdir2hj5qcimp6hakbi9grpws1ssvk3r2jna27x1z"; + vendorSha256 = "1s3d4hnbw0mab7njck79qmgkjn87vs4ffk44zk2qdrzqjjlqq5iv"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 9046a2ef82..71bccc74ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "08bb865gl1ykqr7wm7a1jikjdlc2dqv1f3hllnwwr630c8y4k806"; + sha256 = "1jq529m788yp3b6j4dhxgcw7qm1lyxx1ir2vwr41vp7gh17fmwar"; }; vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan"; @@ -17,6 +17,8 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + subPackages = [ "." ]; + meta = with stdenv.lib; { homepage = "https://github.com/gotestyourself/gotestsum"; description = "A human friendly `go test` runner"; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix index 0ab1341113..11926b3b0c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -11,12 +11,16 @@ buildGoModule rec { sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; }; - # Build of golang.org/x/tools/gopls fails with: - # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls - # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. - # In order to fix this, we simply remove the module. - # Note that build of golang.org/x/tools/cmd/gopls provides identical binary as golang.org/x/tools/gopls. - # See https://github.com/NixOS/nixpkgs/pull/64335. + # The gopls folder contains a Go submodule which causes a build failure. + # Given that, we can't have the gopls binary be part of the gotools + # derivation. + # + # The attribute "gopls" provides the gopls binary. + # + # Related + # + # * https://github.com/NixOS/nixpkgs/pull/85868 + # * https://github.com/NixOS/nixpkgs/issues/88716 postPatch = '' rm -rf gopls ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 275aa7eb30..60b9ba3e0e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,13 +1,13 @@ -{ mkDerivation, base, containers, fetchgit, optparse-applicative -, parsec, stdenv, text +{ mkDerivation, base, containers, fetchgit, hedgehog +, optparse-applicative, parsec, stdenv, template-haskell, text }: mkDerivation { pname = "dconf2nix"; - version = "0.0.5"; + version = "0.0.6"; src = fetchgit { url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "0immbx4bgfq3xmbbrpw441nx0sdpm4cp64s7qbvcbvllp4gbivpg"; - rev = "848ff9966db21c66e61a19c04ab6dfc9270eb78e"; + sha256 = "0ql3xrr05kg1xrfxq86mhzh5ky33sngx57sahzck3rb8fv2g6amv"; + rev = "cf976e033c1a89f897924baa219c3b227fe68489"; fetchSubmodules = true; }; isLibrary = true; @@ -16,6 +16,9 @@ mkDerivation { base containers optparse-applicative parsec text ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hedgehog parsec template-haskell text + ]; description = "Convert dconf files to Nix, as expected by Home Manager"; license = stdenv.lib.licenses.asl20; } diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix index 15f944e713..10cfa57f91 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -1,30 +1,31 @@ { mkDerivation, aeson, base, binary, blaze-markup, brittany , bytestring, containers, data-default, deepseq, Diff, directory -, extra, fetchgit, filepath, floskell, ghc, ghc-paths, ghcide -, gitrev, hashable, haskell-lsp, haskell-lsp-types, hie-bios -, hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test -, optparse-applicative, optparse-simple, ormolu, process -, regex-tdfa, safe-exceptions, shake, stdenv, stm, stylish-haskell -, tasty, tasty-ant-xml, tasty-expected-failure, tasty-golden -, tasty-hunit, tasty-rerun, temporary, text, time, transformers -, unix, unordered-containers, yaml +, extra, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th +, ghc-paths, ghcide, gitrev, hashable, haskell-lsp +, haskell-lsp-types, hie-bios, hslogger, hspec, hspec-core, lens +, lsp-test, optparse-applicative, optparse-simple, ormolu, process +, regex-tdfa, retrie, safe-exceptions, shake, stdenv, stm +, stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure +, tasty-golden, tasty-hunit, tasty-rerun, temporary, text, time +, transformers, unix, unordered-containers, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "0.2.2.0"; + version = "0.4.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0g9g2gyb0fidx16l741ky12djxh4cid9akvxa48105iq1gdihd8l"; - rev = "12c0e4423263140e3d16e76681927ec69fe4929f"; + sha256 = "1fh9k9b3880m6ql4i10yn2yanskk9xhrakrrddqvainhcf2ik8hl"; + rev = "c4576992f443a9abe48ffcfa0e2d2b9bce15d7ae"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary brittany bytestring containers data-default - deepseq Diff directory extra filepath floskell ghc ghcide gitrev - hashable haskell-lsp hie-bios hslogger lens optparse-simple ormolu - process regex-tdfa shake stylish-haskell temporary text time + deepseq Diff directory extra filepath floskell fourmolu ghc + ghc-boot-th ghcide gitrev hashable haskell-lsp hie-bios hslogger + lens optparse-simple ormolu process regex-tdfa retrie + safe-exceptions shake stylish-haskell temporary text time transformers unix unordered-containers ]; executableHaskellDepends = [ @@ -36,9 +37,9 @@ mkDerivation { testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default directory filepath haskell-lsp haskell-lsp-types hie-bios hslogger - hspec hspec-core hspec-expectations lens lsp-test process stm tasty - tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit - tasty-rerun temporary text transformers unordered-containers yaml + hspec hspec-core lens lsp-test process stm tasty tasty-ant-xml + tasty-expected-failure tasty-golden tasty-hunit tasty-rerun + temporary text transformers unordered-containers yaml ]; testToolDepends = [ ghcide ]; homepage = "https://github.com/haskell/haskell-language-server#readme"; diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix new file mode 100644 index 0000000000..0519cf42dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix @@ -0,0 +1,36 @@ +{ mkDerivation, aeson, base, butcher, bytestring, cmdargs +, containers, czipwith, data-tree-print, deepseq, directory, extra +, fetchgit, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths +, hspec, monad-memo, mtl, multistate, parsec, pretty, random, safe +, semigroups, stdenv, strict, syb, text, transformers, uniplate +, unsafe, yaml +}: +mkDerivation { + pname = "brittany"; + version = "0.12.1.1"; + src = fetchgit { + url = "https://github.com/bubba/brittany"; + sha256 = "1rkk09f8750qykrmkqfqbh44dbx1p8aq1caznxxlw8zqfvx39cxl"; + rev = "c59655f10d5ad295c2481537fc8abf0a297d9d1c"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths monad-memo mtl multistate pretty random + safe semigroups strict syb text transformers uniplate unsafe yaml + ]; + executableHaskellDepends = [ base ]; + 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 parsec + pretty safe semigroups strict syb text transformers uniplate unsafe + yaml + ]; + homepage = "https://github.com/lspitzner/brittany/"; + description = "Haskell source code formatter"; + license = stdenv.lib.licenses.agpl3; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix index cafe01946a..af38312a36 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix @@ -5,21 +5,20 @@ , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev , haddock-library, hashable, haskell-lsp, haskell-lsp-types , hie-bios, hslogger, lens, lsp-test, mtl, network-uri -, opentelemetry, optparse-applicative, prettyprinter -, prettyprinter-ansi-terminal, process, QuickCheck -, quickcheck-instances, regex-tdfa, rope-utf16-splay -, safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty -, tasty-expected-failure, tasty-hunit, tasty-quickcheck -, tasty-rerun, text, time, transformers, unix, unordered-containers -, utf8-string, yaml +, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal +, process, QuickCheck, quickcheck-instances, regex-tdfa +, rope-utf16-splay, safe, safe-exceptions, shake, sorted-list +, stdenv, stm, syb, tasty, tasty-expected-failure, tasty-hunit +, tasty-quickcheck, tasty-rerun, text, time, transformers, unix +, unordered-containers, utf8-string, yaml }: mkDerivation { pname = "ghcide"; - version = "0.2.0"; + version = "0.3.0"; src = fetchgit { - url = "https://github.com/bubba/ghcide"; - sha256 = "1kj2i86mkaxgxlrbmv2d24mch7hywgcy2n61z8paj21chncs1j5w"; - rev = "7e895cfa53260b41996df707baec496a8f2c75dc"; + url = "https://github.com/haskell/ghcide"; + sha256 = "15v3g3i5v0xbq50lfvl4bv3rx01nixiqx02sddqi5lj2idgmg24g"; + rev = "96cf8c53d0bdc16d3d2cd0559b74962593ce6dc5"; fetchSubmodules = true; }; isLibrary = true; @@ -29,30 +28,30 @@ mkDerivation { containers cryptohash-sha1 data-default deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths haddock-library hashable haskell-lsp haskell-lsp-types hie-bios - hslogger mtl network-uri opentelemetry prettyprinter - prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay - safe-exceptions shake sorted-list stm syb text time transformers - unix unordered-containers utf8-string + hslogger mtl network-uri prettyprinter prettyprinter-ansi-terminal + regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list + stm syb text time transformers unix unordered-containers + utf8-string ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios - lsp-test optparse-applicative process safe-exceptions text + lens lsp-test optparse-applicative process safe-exceptions text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring containers directory extra filepath ghc - ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types - lens lsp-test network-uri optparse-applicative process QuickCheck - quickcheck-instances rope-utf16-splay safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text + aeson base binary bytestring containers directory extra filepath + ghc ghc-typelits-knownnat haddock-library haskell-lsp + haskell-lsp-types lens lsp-test network-uri optparse-applicative + process QuickCheck quickcheck-instances rope-utf16-splay safe + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text ]; benchmarkHaskellDepends = [ aeson base Chart Chart-diagrams diagrams diagrams-svg directory extra filepath shake text yaml ]; - homepage = "https://github.com/digital-asset/ghcide#readme"; + homepage = "https://github.com/haskell/ghcide#readme"; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; } diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh index 6cf2996833..fd22a80126 100755 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -7,6 +7,8 @@ # Note that you should always try building haskell-language-server after updating it here, since # some of the overrides in pkgs/development/haskell/configuration-nix.nix may # need to be updated/changed. +# +# Remember to split out different updates into multiple commits set -eo pipefail @@ -26,11 +28,27 @@ ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivati # This is the revision of ghcide used by hls on GitHub. ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/contents/ghcide" | jq '.sha' --raw-output) -echo "Updating haskell-language-server from old version $ghcide_old_version to new version $ghcide_new_version." +echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version." echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." -cabal2nix --revision "$ghcide_new_version" "https://github.com/bubba/ghcide" > "$ghcide_derivation_file" +cabal2nix --revision "$ghcide_new_version" "https://github.com/haskell/ghcide" > "$ghcide_derivation_file" +# =========================== +# HLS maintainer's Brittany fork +# =========================== + +# brittany derivation created with cabal2nix. +brittany_derivation_file="${script_dir}/hls-brittany.nix" + +# This is the current revision of the brittany fork in Nixpkgs. +brittany_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$brittany_derivation_file")" + +brittany_new_version=$(curl --silent "https://api.github.com/repos/bubba/brittany/commits/ghc-8.10.1" | jq '.sha' --raw-output) + +echo "Updating haskell-language-server's brittany from old version $brittany_old_version to new version $brittany_new_version." +echo "Running cabal2nix and outputting to ${brittany_derivation_file}..." + +cabal2nix --revision "$brittany_new_version" "https://github.com/bubba/brittany" > "$brittany_derivation_file" # =========================== # HLS diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index 0044426b4d..704477421c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "hcloud"; - version = "1.17.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1brqqcyyljkdd24ljx2qbr648ihhhmr8mq6gs90n63r59ci6ksch"; + sha256 = "0iq04jfqvmwlm6947kzz4c3a33lvwxvj42z179rc3126b5v7bq54"; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "1m96j9cwqz2b67byf53qhgl3s0vfwaklj2pm8364qih0ilvifppj"; + vendorSha256 = "1svwrb5wyz5d8fgx36bpypnfq4hmpfxyd197cla9wnqpbkia7n5r"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix b/third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix index 091a463843..15ca059a88 100644 --- a/third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/icestorm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "icestorm"; - version = "2020.07.08"; + version = "2020.08.19"; passthru = rec { pythonPkg = if usePyPy then pypy3 else python3; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; src = fetchFromGitHub { - owner = "cliffordwolf"; + owner = "YosysHQ"; repo = "icestorm"; - rev = "d12308775684cf43ab923227235b4ad43060015e"; - sha256 = "18ykv6np8sp7rb7c1cm3ha3qnj280gpkyn476faahb15jh0nbjmw"; + rev = "da52117ccd5b4147f64dc7345357ec5439cd7543"; + sha256 = "072bl3vmvb06ry0ci3b1sfjpm3iigb874khzja4azcai969ybp4k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index ab90cbea83..6cf97277bb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.3"; + version = "2.0.4"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1pwgsasja30xbm1ma0kp4nami2nwyy6aizam8nfl6jd7jkz4d7mk"; + sha256 = "1ic6gjsw90j7pr1yyplmk1zc319ld49i6d4zlgs7mlz1m4bn5jv3"; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/development/tools/kexpand/default.nix b/third_party/nixpkgs/pkgs/development/tools/kexpand/default.nix index e6c562721c..8e45eb2654 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kexpand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kexpand/default.nix @@ -13,6 +13,4 @@ buildGoPackage { rev = "c508a43a4e84410dfd30827603e902148c5c1f3c"; sha256 = "0946h74lsqnr1106j7i2w2a5jg2bbk831d7prlws4bb2kigfm38p"; }; - - goDeps = ./deps.nix; } diff --git a/third_party/nixpkgs/pkgs/development/tools/kexpand/deps.nix b/third_party/nixpkgs/pkgs/development/tools/kexpand/deps.nix deleted file mode 100644 index c049d9683c..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/kexpand/deps.nix +++ /dev/null @@ -1,63 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix new file mode 100644 index 0000000000..49851dd0c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, bison, flex, boost }: + +stdenv.mkDerivation rec { + pname = "kcc"; + + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kcc"; + rev = version; + sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4"; + }; + + nativeBuildInputs = [ cmake bison flex ]; + + buildInputs = [ boost ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "KnightOS C compiler"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix new file mode 100644 index 0000000000..b6f490e1d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }: + +stdenv.mkDerivation rec { + pname = "kimg"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kimg"; + rev = version; + sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk"; + }; + + nativeBuildInputs = [ cmake asciidoc pkg-config ]; + + buildInputs = [ imagemagick ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Converts image formats supported by ImageMagick to the KnightOS image format"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix new file mode 100644 index 0000000000..96af43e616 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: + +stdenv.mkDerivation rec { + pname = "kpack"; + + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kpack"; + rev = version; + sha256 = "0kakfbzdvq5ldv1gdzl473j73c9nfdyx4xzfkriglkrqmksqc329"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ asciidoc libxslt.bin docbook_xsl ]; + + hardeningDisable = [ "fortify" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "A tool to create or extract KnightOS packages"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix new file mode 100644 index 0000000000..380bdc58d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc }: + +stdenv.mkDerivation rec { + pname = "mkrom"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "mkrom"; + rev = version; + sha256 = "1nx3787gvs04xdvvamzkjkn9nmy2w70ja8dnh4szk420mvpc85na"; + }; + + nativeBuildInputs = [ + asciidoc + cmake + ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Packages KnightOS distribution files into a ROM"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/scas/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/compilers/scas/default.nix rename to third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix index e80724c8a4..ad21e68eed 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/scas/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { pname = "scas"; - + version = "0.4.6"; - + src = fetchFromGitHub { owner = "KnightOS"; repo = "scas"; rev = version; sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h"; }; - + nativeBuildInputs = [ cmake ]; - + hardeningDisable = [ "format" ]; - + meta = with stdenv.lib; { homepage = "https://knightos.org/"; description = "Assembler and linker for the Z80."; diff --git a/third_party/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix b/third_party/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix index 1dea144011..6720603b2e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lattice-diamond/default.nix @@ -1,5 +1,5 @@ { stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, - freetype, fontconfig, xorg }: + freetype, fontconfig, xorg, libusb-compat-0_1 }: stdenv.mkDerivation { name = "diamond-3.10"; @@ -98,6 +98,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ glib zlib freetype fontconfig xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt + libusb-compat-0_1 ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index 7425357536..02b4d8abf2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -1,20 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "lazygit"; - version = "0.20.9"; - - goPackagePath = "github.com/jesseduffield/lazygit"; - - subPackages = [ "." ]; + version = "0.22.8"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "1jmg2z8yza8cy6xcyam4pvk0sp6zvw6b8vbn3b3h0pklfa7wz9pg"; + sha256 = "1jq093nsfh7xqvsjvaad9wvqd3rjrpyp5fl8qxwbhaj3sxx19v7g"; }; + vendorSha256 = null; + subPackages = [ "." ]; + + buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ]; + meta = with stdenv.lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; diff --git a/third_party/nixpkgs/pkgs/development/tools/leaps/deps.nix b/third_party/nixpkgs/pkgs/development/tools/leaps/deps.nix index afaf42779b..ee06659c72 100644 --- a/third_party/nixpkgs/pkgs/development/tools/leaps/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/leaps/deps.nix @@ -1,185 +1,165 @@ - - # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) - [ - - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722"; - sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r"; - }; - } - - { - goPackagePath = "github.com/Jeffail/gabs"; - fetch = { - type = "git"; - url = "https://github.com/Jeffail/gabs"; - rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c"; - sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr"; - }; - } - - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; - sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; - }; - } - - { - goPackagePath = "github.com/azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/azure/azure-sdk-for-go"; - rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f"; - sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq"; - }; - } - - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "61153c768f31ee5f130071d08fc82b85208528de"; - sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; - }; - } - - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; - sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; - }; - } - - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; - sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; - }; - } - - { - goPackagePath = "github.com/garyburd/redigo"; - fetch = { - type = "git"; - url = "https://github.com/garyburd/redigo"; - rev = "d1ed5c67e5794de818ea85e6b522fda02623a484"; - sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24"; - }; - } - - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "a0583e0143b1624142adab07e0e97fe106d99561"; - sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "925541529c1fa6821df4e44ce2723319eb2be768"; - sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; - }; - } - - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; - sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; - }; - } - - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "88edab0803230a3898347e77b474f8c1820a1f20"; - sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; - }; - } - - { - goPackagePath = "github.com/marstr/guid"; - fetch = { - type = "git"; - url = "https://github.com/marstr/guid"; - rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca"; - sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x"; - }; - } - - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; - sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; - }; - } - - { - goPackagePath = "gopkg.in/alexcesaro/statsd.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alexcesaro/statsd.v2"; - rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90"; - sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; - }; - } - -] \ No newline at end of file +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722"; + sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r"; + }; + } + { + goPackagePath = "github.com/Jeffail/gabs"; + fetch = { + type = "git"; + url = "https://github.com/Jeffail/gabs"; + rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c"; + sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr"; + }; + } + { + goPackagePath = "github.com/amir/raidman"; + fetch = { + type = "git"; + url = "https://github.com/amir/raidman"; + rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; + sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; + }; + } + { + goPackagePath = "github.com/azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/azure/azure-sdk-for-go"; + rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f"; + sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "61153c768f31ee5f130071d08fc82b85208528de"; + sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; + sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "d1ed5c67e5794de818ea85e6b522fda02623a484"; + sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "a0583e0143b1624142adab07e0e97fe106d99561"; + sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "88edab0803230a3898347e77b474f8c1820a1f20"; + sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; + }; + } + { + goPackagePath = "github.com/marstr/guid"; + fetch = { + type = "git"; + url = "https://github.com/marstr/guid"; + rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca"; + sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; + sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; + }; + } + { + goPackagePath = "gopkg.in/alexcesaro/statsd.v2"; + fetch = { + type = "git"; + url = "https://github.com/alexcesaro/statsd"; + rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90"; + sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } +] diff --git a/third_party/nixpkgs/pkgs/development/tools/manul/default.nix b/third_party/nixpkgs/pkgs/development/tools/manul/default.nix index b789a99578..71010149a9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/manul/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/manul/default.nix @@ -13,6 +13,7 @@ buildGoPackage { sha256 = "06kglxdgj1dfpc9bdnvhsh8z0c1pdbmwmfx4km01wpppzk06dnvm"; }; + deleteVendor = true; goDeps = ./deps.nix; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix index e5046d1d1d..55125fbeff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.2"; + version = "0.9.4"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1gnf2p578nk1ygx3cc4mb7fa690c51nbdwvc2qz2805m4xg3x7zv"; + outputHash = "1k07gg13z3kambvvrxsc27781cd5npb2a50ahdbj7x6j6h67k0pg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index c1c915cb8e..3864337bad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.10"; + version = "0.2.13"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0xmrb8wbxkb52l2c7fxxy5wa9lsl591fl65zicv0nrbil36q4wfd"; + sha256 = "112vmq9wg31alw9lw1jmsdvkd7kz1d9ak4p9dli7vgr9rhdf0hnb"; }; - vendorSha256 = "0qf26g0a2j1mbzlc7xjackww22w9bl1x0iw3q1x6kq7fp8xiwhdn"; + vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/argbash/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/argbash/default.nix index fc1d3550e8..0c0511ec79 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/argbash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/argbash/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "argbash"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; rev = "${version}"; - sha256 = "1h6kw510r43b6d6rjhkhw4d67nc7grak4mgqs9ngjjv07qj3qfqc"; + sha256 = "1xdhpbnc0xjv6ydcm122hhdjcl77jhiqnccjfqjp3cd1lfmzvg8v"; }; sourceRoot = "source/resources"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix index 6999eb3e47..5b53456dea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/asls/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "asls"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz"; - sha256 = "14dcms0xl6dncwf16vixvf7rq7g15iwq8h4vja0dsiisyfm08aks"; + sha256 = "1h6r2lbf54aylzmbiy74ys42fhjv9q824bdrcp40gxx1v2yjc5h5"; }; buildInputs = [ erlangR22 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 881516cf25..b434358e1d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.9321"; + version = "0.1.9454"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0n0is4aradlx0jbzs819swidi2x1gnpca9f2b0lkxrxgqcm7viix"; + sha256 = "0ld7lb69wmhyrpqjaj1pddx93x529qk2fzyrwlipglwn3mbala5a"; }; vendorSha256 = "1zd95n9k2fags0qh3wvjinxv1ahygr958mmiax2kz117yipaz4rb"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index d632c756c5..65f12bfbb0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200806T150857"; + version = "20200828T065654"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "132w60p10ffr3vcykgw8rzxs54i6ynmw13p9nd59pqbn5adblrsp"; + sha256 = "1399xjcnnb7vazy1jv3h7lnh1dyn81yk2bwi6ai991a9fsinjnf2"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix new file mode 100644 index 0000000000..61aeea9967 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/fujprog/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkgconfig +, libftdi1 +, libusb-compat-0_1 +}: + +stdenv.mkDerivation rec { + pname = "fujprog"; + version = "4.6"; + + src = fetchFromGitHub { + owner = "kost"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "04l5rrfrp3pflwz5ncwvb4ibbsqib2259m23bzfi8m80aj216shd"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + buildInputs = [ + libftdi1 + libusb-compat-0_1 + ]; + + meta = with stdenv.lib; { + description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards."; + homepage = "https://github.com/kost/fujprog"; + license = licenses.bsd2; + maintainers = with maintainers; [ trepetti ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index 7702df423b..a480663443 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -17,20 +17,19 @@ }: let - basename = "gdb-${version}"; - version = "9.2"; + basename = "gdb"; + targetPrefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + "${stdenv.targetPlatform.config}-"; in assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { - name = - stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (stdenv.targetPlatform.config + "-") - + basename; + pname = targetPrefix + basename; + version = "9.2"; src = fetchurl { - url = "mirror://gnu/gdb/${basename}.tar.xz"; + url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix index 6f24fc7251..36798fe4fc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/global/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "global"; - version = "6.6.4"; + version = "6.6.5"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "1515642wsjz7x3rsgaqk4sc7n0z2znl7idsk8jz8wgy5aswqqzlq"; + sha256 = "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww"; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix index 2d7431f9e8..4e817251bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix @@ -22,8 +22,6 @@ buildGoPackage rec { sha256 = "0g6nvgqjabprcl9z5ci5frhbam1dzq978h1d6aanf8vvzslfgdpq"; }; - goDeps = ./deps.nix; - postInstall = with stdenv; let binPath = lib.makeBinPath [ mercurial git ]; in '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hound/deps.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hound/deps.nix deleted file mode 100644 index fe51488c70..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hound/deps.nix +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 716a305878..a6b0383d54 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -24,12 +24,12 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-08-04"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "77c33c1d71a8c303f53ccad577eb0a3799e87bda"; - sha256 = "10pwiww96dbbszzvnj7abn851h89n30ziahjj2zm3liyzyvbylyf"; + rev = "e707990e2d6afab203c7ef1d769d49c564eff151"; + sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa"; }; nix = nixFlakes; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix index 0a04e5786f..20f880938c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/intltool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, gettext, perlPackages }: +{ stdenv, fetchurl, fetchpatch, gettext, perlPackages, buildPackages }: stdenv.mkDerivation rec { pname = "intltool"; @@ -19,8 +19,14 @@ stdenv.mkDerivation rec { sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45"; })]; + nativeBuildInputs = with perlPackages; [ perl XMLParser ]; propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]); + postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + for f in $out/bin/*; do + substituteInPlace $f --replace "${buildPackages.perl}" "${perlPackages.perl}" + done + ''; meta = with stdenv.lib; { description = "Translation helper tool"; homepage = "https://launchpad.net/intltool/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/cargo-lock.patch b/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/cargo-lock.patch new file mode 100644 index 0000000000..1559510cd9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/cargo-lock.patch @@ -0,0 +1,321 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..d9d39e5 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,315 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.12.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler32" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "backtrace" ++version = "0.3.49" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" ++dependencies = [ ++ "addr2line", ++ "cfg-if", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "clap" ++version = "2.33.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" ++ ++[[package]] ++name = "exitfailure" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515" ++dependencies = [ ++ "failure", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" ++dependencies = [ ++ "backtrace", ++ "failure_derive", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.21.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "itm" ++version = "0.4.0" ++source = "git+https://github.com/rust-embedded/itm#5dd476d03de0738062a876fd3845900ab04833a4" ++dependencies = [ ++ "byteorder", ++ "either", ++ "thiserror", ++] ++ ++[[package]] ++name = "itm-tools" ++version = "0.1.0" ++dependencies = [ ++ "clap", ++ "exitfailure", ++ "failure", ++ "itm", ++ "rustc-demangle", ++ "xmas-elf", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" ++dependencies = [ ++ "adler32", ++] ++ ++[[package]] ++name = "object" ++version = "0.20.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "syn" ++version = "1.0.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "xmas-elf" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58" ++dependencies = [ ++ "zero", ++] ++ ++[[package]] ++name = "zero" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix new file mode 100644 index 0000000000..6fb2569511 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/itm-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "itm-tools"; + version = "unstable-2019-11-15"; + + src = fetchFromGitHub { + owner = "japaric"; + repo = pname; + rev = "e94155e44019d893ac8e6dab51cc282d344ab700"; + sha256 = "19xkjym0i7y52cfhvis49c59nzvgw4906cd8bkz8ka38mbgfqgiy"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "0rl2ph5igwjl7rwpwcf6afnxly5av7cd6va6wn82lxm606giyq75"; + + nativeBuildInputs = [ pkg-config ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Tools for analyzing ITM traces"; + homepage = "https://github.com/japaric/itm-tools"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ hh sb0 ]; + }; +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix index 9bff7acc81..eca2dc9666 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, nix, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: buildGoModule rec { pname = "nix-build-uncached"; @@ -17,11 +17,6 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/nix-build-uncached \ - --prefix PATH ":" ${lib.makeBinPath [ nix ]} - ''; - meta = with lib; { description = "A CI friendly wrapper around nix-build"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/objconv/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/objconv/default.nix index 9fdaca52ca..52cc1b2d5c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/objconv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/objconv/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "objconv"; - version = "2.51"; + version = "2.52"; src = fetchurl { # Versioned archive of objconv sources maintained by orivej. url = "https://archive.org/download/objconv/${pname}-${version}.zip"; - sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"; + sha256 = "0r117r7yvqvvdgwgwxpkyzi6p5nm0xb6p67wvkmvggm9fdyl3z8v"; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix index 0d6bcd959e..47212e9967 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix @@ -1,24 +1,17 @@ -{ stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }: +{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }: stdenv.mkDerivation rec { pname = "openocd"; - version = "0.10.0"; + version = "2020-09-02"; - src = fetchurl { - url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; + src = fetchgit { + url = "https://git.code.sf.net/p/openocd/code"; + rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3"; + sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9"; + fetchSubmodules = true; }; - patches = [ - # Fix FTDI channel configuration for SheevaPlug - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837989 - (fetchpatch { - url = "https://salsa.debian.org/electronics-team/openocd/raw/9a94335daa332a37a51920f87afbad4d36fad2d5/debian/patches/fix-sheeva.patch"; - sha256 = "01x021fagwvgxdpzk7psap7ryqiya4m4mi4nqr27asbmb3q46g5r"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libftdi1 libusb1 hidapi ]; configureFlags = [ @@ -34,14 +27,9 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - "-Wno-implicit-fallthrough" - "-Wno-format-truncation" - "-Wno-format-overflow" - "-Wno-error=tautological-compare" - "-Wno-error=array-bounds" + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" - ]); + ]; postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" @@ -64,7 +52,7 @@ stdenv.mkDerivation rec { "remote target" for source-level debugging of embedded systems using the GNU GDB program. ''; - homepage = "http://openocd.sourceforge.net/"; + homepage = "https://openocd.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix index 5d2309333a..1d31709ccf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix @@ -6,11 +6,12 @@ # files. stdenv.mkDerivation rec { - name = "patchelf-0.11"; + pname = "patchelf"; + version = "0.12"; src = fetchurl { - url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; - sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx"; + url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2"; + sha256 = "14npmdxppmh0ci140w8i8cy7zg1pnqg81a1mdsnza711ab7k36k9"; }; setupHook = [ ./setup-hook.sh ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix new file mode 100644 index 0000000000..3d0218ffab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "replacement"; + version = "0.4.4"; + + disabled = python3Packages.isPy27; + + src = fetchFromGitHub { + owner = "siriobalmelli"; + repo = "replacement"; + rev = "v${version}"; + sha256 = "0j4lvn3rx1kqvxcsd8nhc2lgk48jyyl7qffhlkvakhy60f9lymj3"; + }; + + propagatedBuildInputs = with python3Packages; [ + ruamel_yaml + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + sh + ]; + + meta = with lib; { + homepage = "https://github.com/siriobalmelli/replacement"; + description = "A tool to execute yaml templates and output text"; + longDescription = '' + Replacement is a python utility + that parses a yaml template and outputs text. + + A 'template' is a YAML file containing a 'replacement' object. + + A 'replacement' object contains a list of blocks, + each of which is executed in sequence. + + This tool is useful in generating configuration files, + static websites and the like. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix index 47596789de..8a6a1471d0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "scc"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - sha256 = "0hbcq5qn97kr9d4q9m2p1mj3ijn8zmwycrs5bgf1kfiwr09wg2yh"; + sha256 = "16p5g20n5jsbisbgikk9xny94xx6c0dxf19saa686ghh31jr2hh3"; }; - goPackagePath = "github.com/boyter/scc"; + vendorSha256 = null; # scc has a scripts/ sub-package that's for testing. - subPackages = [ "./" ]; + excludedPackages = [ "scripts" ]; meta = with stdenv.lib; { homepage = "https://github.com/boyter/scc"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix new file mode 100644 index 0000000000..f04c93e7a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "svls"; + version = "0.1.17"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = "svls"; + rev = "v${version}"; + sha256 = "0qcd9pkshk94c6skzld8cyzppl05hk4vcmmaya8r9l6kdi1f4b5m"; + }; + + cargoSha256 = "0dqa7iw0sffzh07qysznh7ma3d3vl5fhd0i2qmz7a3dvw8mvyvsm"; + + meta = with lib; { + description = "SystemVerilog language server"; + homepage = "https://github.com/dalance/svls"; + license = licenses.mit; + maintainers = with maintainers; [ trepetti ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix b/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix index a35a9a3528..4096b7353f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "swig"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; rev = "rel-${version}"; - sha256 = "1i1gl5gd6b5i1hiazq7m4nvlq86zd0fhk052xhwlnb596pjhgyhf"; + sha256 = "12vlps766xvwck8q0i280s8yx21qm2dxl34710ybpmz3c1cfdjsc"; }; PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index fe928bd393..4d999f3244 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "terraform-ls"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "0bb6bpdjp9yzbxvc6mz22lawn41ay0frdpgbd7zrm8nkvspc0rl7"; + sha256 = "1afdd1zs242nh1cync5ip1fbah34wc3gbsx3hwwiisc8yziwiq18"; }; goPackagePath = "github.com/hashicorp/terraform-ls"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix new file mode 100644 index 0000000000..6ff0dd77aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraformer"; + version = "0.8.8"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = pname; + rev = version; + sha256 = "1lzf30vpa0blbkz4ngnhrn3hpbqflqd4sni4bly9yqh4fnc44nvi"; + }; + + vendorSha256 = "087448wkaw6jxv9d26hck4w3vdh06vcgywna6ydkqvxr0hp011b6"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "CLI tool to generate terraform files from existing infrastructure (reverse Terraform). Infrastructure to Code"; + homepage = "https://github.com/GoogleCloudPlatform/terraformer"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix new file mode 100644 index 0000000000..7915d6e3c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "6.7"; + sha256 = "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q"; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix index ec51dc2259..f0f4c269fa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -12,7 +12,7 @@ # files. let - crossBuildTools = interactive && stdenv.hostPlatform != stdenv.buildPlatform; + crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform; in with stdenv.lib; @@ -26,8 +26,7 @@ stdenv.mkDerivation { inherit sha256; }; - patches = optional (version == "6.5") ./perl.patch - ++ optional crossBuildTools ./cross-tools-flags.patch; + patches = optional crossBuildTools ./cross-tools-flags.patch; # ncurses is required to build `makedoc' # this feature is introduced by the ./cross-tools-flags.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch deleted file mode 100644 index e651b37371..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/perl.patch +++ /dev/null @@ -1,43 +0,0 @@ -Adapted from http://svn.savannah.gnu.org/viewvc/texinfo/ -Author: gavin ---- trunk/tp/Texinfo/Parser.pm 2018-06-04 19:51:36 UTC (rev 8006) -+++ trunk/tp/Texinfo/Parser.pm 2018-07-13 15:31:28 UTC (rev 8007) -@@ -5531,11 +5531,11 @@ - } - } elsif ($command eq 'clickstyle') { - # REMACRO -- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { -+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) { - $args = ['@'.$1]; - $self->{'clickstyle'} = $1; - $remaining = $line; -- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; -+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//; - $has_comment = 1 if (defined($4)); - } else { - $self->line_error (sprintf($self->__( ---- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:31:28 UTC (rev 8007) -+++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:39:29 UTC (rev 8008) -@@ -248,6 +248,11 @@ - - dTHX; - -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ switch_to_global_locale(); -+#endif -+ - if (setlocale (LC_CTYPE, "en_US.UTF-8") - || setlocale (LC_CTYPE, "en_US.utf8")) - goto success; -@@ -320,6 +325,10 @@ - { - success: ; - free (utf8_locale); -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ sync_locale(); -+#endif - /* - fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n"); - fprintf (stderr, "character encoding is: %s\n", diff --git a/third_party/nixpkgs/pkgs/development/tools/modd/default.nix b/third_party/nixpkgs/pkgs/development/tools/modd/default.nix index a9172d7927..5c63447fdc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/modd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/modd/default.nix @@ -11,7 +11,6 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/modd"; subPackages = [ "cmd/modd" ]; - goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A flexible developer tool that runs processes and responds to filesystem changes"; homepage = "https://github.com/cortesi/modd"; diff --git a/third_party/nixpkgs/pkgs/development/tools/modd/deps.nix b/third_party/nixpkgs/pkgs/development/tools/modd/deps.nix deleted file mode 100644 index 42190e6557..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/modd/deps.nix +++ /dev/null @@ -1,138 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - 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/bmatcuk/doublestar"; - fetch = { - type = "git"; - url = "https://github.com/bmatcuk/doublestar"; - rev = "85a78806aa1b4707d1dbace9be592cf1ece91ab3"; - sha256 = "01fd5j142pgsj5gfba43646aa6vd09fzvjhhik2r30nj4lsyy3z8"; - }; - } - { - goPackagePath = "github.com/cortesi/moddwatch"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/moddwatch"; - rev = "d27f53de245eb09b9e475d498cc01c91ba8e89c8"; - sha256 = "1ivxk6zxrc5rhd0p5kqi8jg58ql2mwdvrxvfzz8fkj1lxz975p9p"; - }; - } - { - goPackagePath = "github.com/cortesi/termlog"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/termlog"; - rev = "87cefd5ac843f65364f70a1fd2477bb6437690e8"; - sha256 = "1mygv1bv6dkm5p1wsvzrsyq771k6apdcxlyfqdp5ay8vl75jxvmb"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; - }; - } - { - 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 = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/rjeczalik/notify"; - fetch = { - type = "git"; - url = "https://github.com/rjeczalik/notify"; - rev = "629144ba06a1c6af28c1e42c228e3d42594ce081"; - sha256 = "0745w0mdr9xfr4rxw4pfr1sl8apc7wr7mvfykdl4wslq3mdj8a91"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "927f97764cc334a6575f4b7a1584a147864d5723"; - sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4c64e13b10787722085407fe5d15f"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b4a75ba826a64a70990f11a225237acd6ef35c9f"; - sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "mvdan.cc/sh"; - fetch = { - type = "git"; - url = "https://github.com/mvdan/sh"; - rev = "8aeb0734cd0f08b7a473c9ac816be8687ca909cc"; - sha256 = "1mj8qfkyb6k490qjy3riq6pm440qajf5lc8m74x7xhq5059qkgxx"; - }; - } -] \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix b/third_party/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix index 307e123bf7..ffd2a78f50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix +++ b/third_party/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper +{ stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc - ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc diff --git a/third_party/nixpkgs/pkgs/development/tools/nsis/default.nix b/third_party/nixpkgs/pkgs/development/tools/nsis/default.nix index bb29bcfdc0..33be56c539 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nsis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nsis/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, fetchzip, sconsPackages, zlib }: +{ stdenv +, fetchurl +, fetchzip +, sconsPackages +, zlib +}: stdenv.mkDerivation rec { pname = "nsis"; - version = "3.05"; + version = "3.06.1"; src = fetchurl { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; - sha256 = "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn"; + sha256 = "1w1z2m982l6j8lw8hy91c3979wbnqglcf4148f9v79vl32znhpcv"; }; srcWinDistributable = fetchzip { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; - sha256 = "0i3pzdilyy5g0r2c92pd2jl92ji9f75vv98mndzq8vw03a34yh3q"; + sha256 = "04qm9jqbcybpwcrjlksggffdyafzwxxcaz9xhjw8w5rb95x7lw5q"; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix b/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix index ab16d95115..4eedc00327 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper +{ stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw - ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 libpath="$out/share/nwjs/lib/" for f in "$libpath"/*.so; do diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix index ea1b396509..73228655cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { dontAddPrefix = true; preConfigure = '' + # increase stack space for spacetime variant of the compiler + # https://github.com/ocaml/ocaml/issues/7435 + # but disallowed by darwin sandbox + ulimit -s unlimited || true + configureFlagsArray=( --bindir=$out/bin --libdir=$out/lib/ocaml/${ocaml.version}/site-lib diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index d785302ebb..177fa96f5b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, fetchpatch }: -if stdenv.lib.versionOlder ocaml.version "4.07" +if stdenv.lib.versionOlder ocaml.version "4.08" then throw "dune is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "dune"; - version = "2.6.2"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1sc8ax198z42vhc3l6i04kknm9g44whifjivs19qgi3sybrw2vjg"; + sha256 = "0pcjf209gynjwipnpplaqyvyivnawqiwhvqnivhkybisicpqyln3"; }; buildInputs = [ ocaml findlib ]; buildFlags = "release"; + patches = [ + # Fix setup.ml configure path. Remove with the next release. + (fetchpatch { + url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch"; + sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28"; + }) + ]; + dontAddPrefix = true; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix index 4b11dd1398..54712be2b6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.6"; + version = "3.3.9"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ"; + sha256 = "00ng8299l5rzpak8ljxzr6dgxw6z52ivm91159ahv09xk4d0y5x3"; }; buildInputs = [ yojson ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index 069f047159..5b607d3d6c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,19 +1,49 @@ -{ lib, fetchurl, ocamlPackages }: +{ lib, fetchurl, fetchzip, ocamlPackages }: -with ocamlPackages; buildDunePackage rec { - pname = "ocamlformat"; - version = "0.15.0"; +with ocamlPackages; - minimumOCamlVersion = "4.06"; +let + mkOCamlformat = { + version, + sha256, + buildInputs, + useDune2 ? true, + tarballName ? "ocamlformat-${version}.tbz", + # The 'src' argument can be removed when 0.11.0 is pruned + src ? fetchurl { + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; + inherit sha256; + } + }: + buildDunePackage rec { + pname = "ocamlformat"; - useDune2 = true; + minimumOCamlVersion = "4.06"; - src = fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; - }; + inherit src version useDune2 buildInputs; - buildInputs = [ + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code"; + maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; + license = lib.licenses.mit; + }; + }; + + post_0_11_buildInputs = [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + ]; + + post_0_14_buildInputs = [ + base cmdliner fpath ocaml-migrate-parsetree @@ -25,11 +55,62 @@ with ocamlPackages; buildDunePackage rec { fix menhir ]; +in - meta = { - homepage = "https://github.com/ocaml-ppx/ocamlformat"; - description = "Auto-formatter for OCaml code"; - maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; - license = lib.licenses.mit; +# Older versions should be removed when their usage decrease +# This script scraps Github looking for OCamlformat's options and versions usage: +# https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 + +rec { + ocamlformat_0_11_0 = mkOCamlformat rec { + version = "0.11.0"; + src = fetchzip { + url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; + inherit sha256; + }; + sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; + useDune2 = false; + buildInputs = post_0_11_buildInputs; }; + + ocamlformat_0_12 = mkOCamlformat { + version = "0.12"; + sha256 = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; + useDune2 = false; + buildInputs = post_0_11_buildInputs; + }; + + ocamlformat_0_13_0 = mkOCamlformat rec { + version = "0.13.0"; + sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; + tarballName = "ocamlformat-${version}-2.tbz"; + useDune2 = false; + buildInputs = post_0_11_buildInputs; + }; + + ocamlformat_0_14_0 = mkOCamlformat { + version = "0.14.0"; + sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; + buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_14_1 = mkOCamlformat { + version = "0.14.1"; + sha256 = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; + buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_14_2 = mkOCamlformat { + version = "0.14.2"; + sha256 = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; + buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_15_0 = mkOCamlformat { + version = "0.15.0"; + sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + buildInputs = post_0_14_buildInputs; + }; + + ocamlformat = ocamlformat_0_15_0; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index b9404016b4..9c888e284f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchurl, buildDunePackage, ocp-build, ocp-indent, cmdliner, re }: +{ lib, fetchzip, buildDunePackage, cppo, ocp-indent, cmdliner, re }: buildDunePackage rec { pname = "ocp-index"; - version = "1.2"; + version = "1.2.1"; - src = fetchurl { - url = "https://github.com/OCamlPro/ocp-index/releases/download/${version}/ocp-index-${version}.tbz"; - sha256 = "1lchw02sakjjppmzr0rzlarwbg1lc2bl7pwcfpsiycnaz46x6gmr"; + src = fetchzip { + url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; + sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8"; }; - buildInputs = [ ocp-build cmdliner re ]; + buildInputs = [ cppo cmdliner re ]; propagatedBuildInputs = [ ocp-indent ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 3c51779c56..c435d80b08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.35.2"; + version = "1.37.1"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0k4crybddqpcg1vi1ax1s85w4hlknz6kaqn4cvv279dkm9aqxbp8"; + sha256 = "04pyychzwhhcv0js0qyramz6nd0wz03qqqgvz1j9m9wxyiz0dv3c"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index c91727d6f1..d3fd81a0f9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { pname = "open-policy-agent"; - version = "0.22.0"; + version = "0.23.2"; goPackagePath = "github.com/open-policy-agent/opa"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "1kndiiqf6b4j8zhv0ypjr9dfjgck25qiqa2bb0pmpm3j9460zzjs"; + sha256 = "18hpanfrzg6xnq1g0yws6g0lw4y191pnrqphccv13j6kqk3k10ps"; }; - goDeps = ./deps.nix; buildFlagsArray = '' -ldflags= diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/deps.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/deps.nix deleted file mode 100644 index b12502f5e9..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/deps.nix +++ /dev/null @@ -1,399 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.7"; - sha256 = "0fqknn2gnicsixm43czd2r6p99ckf9i1b63i11wsbi4lqggwrp0m"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.10"; - sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "c7ce16629ff4"; - sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "v0.2.3"; - sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.3.0"; - sha256 = "0slfyrmbpdcppf0z3waar90bpszdhi2gv705ys1b0zx5x6ax8f1a"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "d3de96c4c28e"; - sha256 = "0k41z9dybs3fvgb1jzgnxr91qad9rnf9a269l95jics58m3kn7f5"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "521ea7b17d02"; - sha256 = "0bd83nd6jc2vsddwnb8w6gpw6qpfg449n6wb4dmk12ybmdhkwrvf"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.2.0"; - sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "b20a3daf6a39"; - sha256 = "0crivpncmh22696d5cy7k15ll5yqfjcigk0xy73wb6g1q6vnfxs7"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "v0.0.1"; - sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "bf27d3ba8e1d"; - sha256 = "0xx9923l4a46kjd1wpscqw31p4am28xrhd17xgw1cnx06bznb36v"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "059132a15dd0"; - sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "f30f42803563"; - sha256 = "0d3a9igvpdx516wpvj3b1ki1c4n2lvp5ghvzpqk95j2fxzyyzcxg"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "7e9e6cabbd39"; - sha256 = "00nmyp6k6x53gl7csca6bja010wnxf2p2pxfph3y0l2ap44qb38w"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "185b4288413d"; - sha256 = "0d85429kdw5dgj5zhyiz1sq3i5691vj2gjnda93nnxxzx9acg8cv"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "3113b8401b8a"; - sha256 = "1m5q5dsvkqz809aag6dyan74wdrp69g2mb9killbv7z4ls2mlfr3"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.2"; - sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.1"; - sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "fe5e611709b0"; - sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "082b515c9490"; - sha256 = "03jil8szw5hsp0x4pgzdxas2njqij2466p20q1ag18lmgncjl50m"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/yashtewari/glob-intersection"; - fetch = { - type = "git"; - url = "https://github.com/yashtewari/glob-intersection"; - rev = "5c77d914dd0b"; - sha256 = "1mfdk6iwqbhikcccds81knqlrj1phf9pad39fs2y8bzr6n7nqfzz"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "1baf3a9d7d67"; - sha256 = "0aql4lb9cf2kcb9jx90bvpp9chrmic2y3fwfvdq76hq2qvr4818d"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "3b0461eec859"; - sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "5eefd052ad72"; - sha256 = "1bgpq8j3a1mwsd9cbp9hqmb5ms6vp4b0a2xsrlpwrfpyswnyagi0"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a985d3407aa7"; - sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "11092d34479b"; - sha256 = "12qcrjq658zga5fj4n0wgm11pzpr3gafwg25cinl5qcq4p9cnl0r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix index a867e3850e..6924ec9e37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "unstable-2019-07-25"; + version = "unstable-2020-08-02"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; - rev = "18810b7e0bb1d8e0d25b6c2565a065cf66bce5d7"; - sha256 = "02jnbr3xdsb5dpll3k65080ryrfr7agawmjavwxd0v40w0an5yq8"; + rev = "01b3fb5b542ed0b41e3860aeee7a85b735491ff2"; + sha256 = "03ynm1ycbi86blglma3xiwadck8kc5yb0gawjzlhyv90jidn680l"; }; nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mtrojnar/osslsigncode"; description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files"; license = licenses.gpl3Plus; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; platforms = platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix index 2cfe95152a..909e821a6d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.6.1"; + version = "1.6.2"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0jm8950rk0cdf84z0yxm8ic3pm353cgmxr1akn6kq1bwg2w0vsrq"; + sha256 = "0kr9whv3s0f8866yjmwg311j3kcj29bp5xwpnv43ama4m1mq3bm7"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix index 357c8ea17c..ca422f931d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.6.4"; + version = "3.7.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1s8kmfhg7a58vm65fc977ckp8zspy8diayrcjhs3cgrqnmjdx0w1"; + sha256 = "04vx6sah3bnr3a5n9knw306sb3y41pjfl7k9ihbsimghkj1m5n8x"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 51af3acdac..b91acdca68 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -55,13 +55,16 @@ in rustPlatform.buildRustPackage { # needed for the tests rm -rf test/fixtures/grammars ln -s ${grammars} test/fixtures/grammars + + # These functions do not appear in the source code + sed -i /_ts_query_context/d lib/binding_web/exports.json + sed -i /___assert_fail/d lib/binding_web/exports.json ''; # Compile web assembly with emscripten. The --debug flag prevents us from # minifying the JavaScript; passing it allows us to side-step more Node # JS dependencies for installation. preBuild = '' - HOME=/tmp bash ./script/build-wasm --debug ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix index c1cb8cea8a..1cd9f9ea17 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "0n8ydj01nmnkd8glzjb0yrsyax1pmdfvaxb5xj4pkb2mf6zm94qy"; + sha256 = "1sqjw6q005lws7qhkd26jqyb1xqmpcklzw5hk8paxxi8mzyjn0jp"; }; outputs = [ "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix index 5f9e122c16..3a6ea879e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -6,7 +6,7 @@ with python3.pkgs; let - runtimeDeps = [ + runtimeDeps = ps: with ps; [ certifi setuptools pip @@ -14,15 +14,15 @@ let virtualenv-clone ]; - pythonEnv = python3.withPackages(ps: with ps; runtimeDeps); + pythonEnv = python3.withPackages runtimeDeps; in buildPythonApplication rec { pname = "pipenv"; - version = "2020.6.2"; + version = "2020.8.13"; src = fetchPypi { inherit pname version; - sha256 = "12s7c3f3k5v1szdhklsxwisf9v3dk4mb9fh7762afpgs8mrrmm3x"; + sha256 = "eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035"; }; LC_ALL = "en_US.UTF-8"; @@ -36,7 +36,7 @@ in buildPythonApplication rec { --replace "sys.executable" "'${pythonEnv.interpreter}'" ''; - propagatedBuildInputs = runtimeDeps; + propagatedBuildInputs = runtimeDeps python3.pkgs; doCheck = true; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 5fb646fae8..cca876ca1e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -24,7 +24,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.11.0"; + version = "1.12.0"; /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. @@ -114,7 +114,7 @@ lib.makeScope pkgs.newScope (self: { __toPluginAble = toPluginAble self; - inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook; + inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook; } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs @@ -159,13 +159,28 @@ lib.makeScope pkgs.newScope (self: { } ); + inherit (py) pyProject; + + # Add executables from tool.poetry.scripts + scripts = pyProject.tool.poetry.scripts or { }; + hasScripts = scripts != { }; + scriptsPackage = import ./shell-scripts.nix { + inherit scripts lib; + inherit (py) python; + }; + + hasEditable = editablePackageSources != { }; editablePackage = import ./editable.nix { inherit pkgs lib poetryLib editablePackageSources; inherit (py) pyProject python; }; in - py.python.withPackages (_: py.poetryPackages ++ lib.optional (editablePackageSources != { }) editablePackage); + py.python.withPackages ( + _: py.poetryPackages + ++ lib.optional hasEditable editablePackage + ++ lib.optional hasScripts scriptsPackage + ); /* Creates a Python application from pyproject.toml and poetry.lock diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index 001a3d09c6..e248a5e223 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -49,4 +49,16 @@ in } ./fixup-hook.sh ) { }; + # When the "wheel" package itself is a wheel the nixpkgs hook (which pulls in "wheel") leads to infinite recursion + # It doesn't _really_ depend on wheel though, it just copies the wheel. + wheelUnpackHook = callPackage + ({}: + makeSetupHook + { + name = "wheel-unpack-hook.sh"; + deps = [ ]; + } ./wheel-unpack-hook.sh + ) { }; + + } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh new file mode 100644 index 0000000000..fca808a933 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh @@ -0,0 +1,18 @@ +# Setup hook to use in case a wheel is fetched +echo "Sourcing wheel setup hook" + +wheelUnpackPhase(){ + echo "Executing wheelUnpackPhase" + runHook preUnpack + + mkdir -p dist + cp "$src" "dist/$(stripHash "$src")" + +# runHook postUnpack # Calls find...? + echo "Finished executing wheelUnpackPhase" +} + +if [ -z "${dontUseWheelUnpack-}" ] && [ -z "${unpackPhase-}" ]; then + echo "Using wheelUnpackPhase" + unpackPhase=wheelUnpackPhase +fi diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 6b784fd8fc..2791d7dfcb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -47,10 +47,16 @@ pythonPackages.callPackage isGit = isSource && source.type == "git"; isLocal = isSource && source.type == "directory"; localDepPath = toPath source.url; - pyProject = poetryLib.readTOML (localDepPath + "/pyproject.toml"); - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pythonPackages pyProject; - }; + + buildSystemPkgs = + let + pyProjectPath = localDepPath + "/pyproject.toml"; + pyProject = poetryLib.readTOML pyProjectPath; + in + if builtins.pathExists pyProjectPath then poetryLib.getBuildSystemPkgs { + inherit pythonPackages pyProject; + } else [ ]; + fileInfo = let isBdist = f: lib.strings.hasSuffix "whl" f.file; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 202261ecdb..d722ec71b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -12,6 +12,40 @@ self: super: } ); + ansible = super.ansible.overridePythonAttrs ( + old: { + + prePatch = pkgs.python.pkgs.ansible.prePatch or ""; + + postInstall = pkgs.python.pkgs.ansible.postInstall or ""; + + # Inputs copied from nixpkgs as ansible doesn't specify it's dependencies + # in a correct manner. + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.pycrypto + self.paramiko + self.jinja2 + self.pyyaml + self.httplib2 + self.six + self.netaddr + self.dnspython + self.jmespath + self.dopy + self.ncclient + ]; + } + ); + + ansible-lint = super.ansible-lint.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + preBuild = '' + export HOME=$(mktemp -d) + ''; + } + ); + astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; @@ -135,6 +169,15 @@ self: super: } ); + h3 = super.h3.overridePythonAttrs ( + old: { + preBuild = (old.preBuild or "") + '' + substituteInPlace h3/h3.py \ + --replace "'{}/{}'.format(_dirname, libh3_path)" '"${pkgs.h3}/lib/libh3${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}"' + ''; + } + ); + h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { @@ -324,6 +367,13 @@ self: super: pkgs.pkgconfig ]; + postPatch = '' + cat > setup.cfg <> $out/bin/${bin} + #!${python.interpreter} + import sys + import re + + # Insert "" to add CWD to import path + sys.path.insert(0, "") + + from ${module} import ${fn} + + if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', "", sys.argv[0]) + sys.exit(${fn}()) + EOF + chmod +x $out/bin/${bin} + ''; +in +python.pkgs.buildPythonPackage { + name = "poetry2nix-env-scripts"; + dontUnpack = true; + dontUseSetuptoolsBuild = true; + dontConfigure = true; + dontUseSetuptoolsCheck = true; + + installPhase = '' + mkdir -p $out/bin + ${lib.concatStringsSep "\n" (lib.mapAttrsToList mkScript scripts)} + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix index 817bb11717..ed31f438a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "heaptrack"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; rev = "v${version}"; - sha256 = "0vgwldl5n41r4y3pv8w29gmyln0k2w6m59zrfw9psm4hkxvivzlx"; + sha256 = "0pw82c26da014i1qxnaib3fqa52ijhf0m4swhjc3qq4hm2dx9bxj"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index 620bce7a0f..ce73130988 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , desktop-file-utils , fetchurl , fetchpatch @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { wrapGAppsHook gnome3.adwaita-icon-theme ]; - buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib libdazzle ]; + buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ]; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" diff --git a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix index 20a1f53f67..b36bc26433 100644 --- a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix +++ b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix @@ -11,11 +11,11 @@ }: mkDerivation { pname = "spago"; - version = "0.15.3"; + version = "0.16.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "0spc7r531kmh9magaxzy4jls3bzfazwf8sq3qzk6f292d7ky6n8y"; - rev = "da6d91c19b23f06f3ede793f78599a6589c9e7cd"; + sha256 = "0z4s0z14n1v9wajs7mj2b295rrrw24gdca79drzlv6x1y6dj7sxh"; + rev = "71b093cdf5e48ded645303281ab4a3ea5b730f5d"; fetchSubmodules = true; }; isLibrary = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index f4cf500c2f..3cb5ae2b93 100644 --- a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib -, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem +{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core +, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: let @@ -10,7 +10,7 @@ let fontconfig pango atk - gtk2 + gtk3 glib freetype dbus @@ -20,8 +20,8 @@ let cups expat udev - - gnome2.GConf + at-spi2-atk + at-spi2-core xorg.libX11 xorg.libXcursor @@ -38,11 +38,10 @@ let ]; in stdenv.mkDerivation rec { pname = "react-native-debugger"; - version = "0.9.10"; - + version = "0.11.4"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "158275sp37smc8lnrcbj56lp7aa6fj9gzb6fzjgz9r980qgzhia6"; + sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698"; }; buildInputs = [ unzip ]; @@ -52,15 +51,15 @@ in stdenv.mkDerivation rec { unzip $src -d $out mkdir $out/{lib,bin,share} - mv $out/lib{node,ffmpeg}.so $out/lib + mv $out/{libEGL,libGLESv2,libvk_swiftshader,libffmpeg}.so $out/lib mv $out/!(lib|share|bin) $out/share patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${rpath}:$out/lib \ - $out/share/React\ Native\ Debugger + $out/share/react-native-debugger - ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger + ln -s $out/share/react-native-debugger $out/bin/react-native-debugger install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -68,10 +67,10 @@ in stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "rndebugger"; - exec = "React\\ Native\\ Debugger"; + exec = "react-native-debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; - categories = "Development;Tools;"; + categories = "Development;Debugger;"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix new file mode 100644 index 0000000000..73a58ee100 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix @@ -0,0 +1,21 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + pname = "rebazel"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "meetup"; + repo = "rebazel"; + rev = "v${version}"; + hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME="; + }; + + cargoSha256 = "sha256-2FmtbvtNfNoocj3Ly553KBLfOgBAa/eAxOrfZ3NGzzw="; + + meta = with lib; { + description = "tool for expediting bazel build workflows"; + homepage = "https://github.com/meetup/rebazel"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix index dea0512b7d..8c3da159d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix @@ -13,16 +13,20 @@ , libXi , ncurses5 , qtbase +, qtdeclarative , zlib }: +let + buildNum = "2020-09-11-26"; +in stdenv.mkDerivation rec { pname = "rgp"; - version = "1.7.0.29"; + version = "1.8"; src = fetchurl { - url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonGPUProfiler_${version}.tgz"; - sha256 = "d7d4aa92231796a509dfcf92e9618cac98ae6572c12efd0871eb43afa4e8240a"; + url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonDeveloperTools-${buildNum}.tgz"; + sha256 = "1lpkh7sfpq697lm4xnkpjfchh8zpy49f4mb3c5qcn7brav5iqwfh"; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -38,6 +42,7 @@ stdenv.mkDerivation rec { libXi ncurses5 qtbase + qtdeclarative zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 44ebcc63c8..ce01fc1f00 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.6.7"; + version = "0.6.13"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "0n52xh4qg12bvvp2dgx5wfj5f31qijdqahasa3qfa3c3aqq7cvvg"; + sha256 = "0ks2w3gclahidv6r6i0d0d6sli7r8wabxzgmhq03czy5w7kr0x56"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "0296187hsaxxmqhsrrva4qf313jwh3z08j1vxcbislxdq8xg32qb"; + sha256 = "0czy5q8hkjqyn53p7cjxnxfgwygx2a6casjb4nj5gxss2x3haih6"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1gwyszpcmss2d0lm5hvf3b48jy7b0fm7xizhrl3wd6rzw7pg06zd"; + cargoSha256 = "0jjkcawcz6wacx22zir9ay1qsi5ffk7c4gwa6jpky4a94zr1h690"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix new file mode 100644 index 0000000000..0f3571045d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-cache"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "matthiaskrgr"; + repo = pname; + rev = version; + sha256 = "02d593w1x8160p4m3jwm1dyvv383cy7njijlcaw49jczxv5isqbi"; + }; + + cargoSha256 = "150ifd7gq6csrasqw91z4nsaj6w7kf69j0w6wydr3z7bdahmlgqw"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + checkFlagsArray = [ "offline_tests" ]; + + meta = with stdenv.lib; { + description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively"; + homepage = "https://github.com/matthiaskrgr/cargo-cache"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix new file mode 100644 index 0000000000..dafcd1ded2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib +, rustPlatform, fetchFromGitHub +, libusb1, pkg-config, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-embed"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "probe-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35"; + }; + + cargoSha256 = "0w21q2fpr077m8jr24ld3qjimwk1m4fy9dh14fq9nv5xd4f5s8n8"; + + nativeBuildInputs = [ pkg-config rustfmt ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "A cargo extension for working with microcontrollers."; + homepage = "http://probe.rs/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fooker ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix new file mode 100644 index 0000000000..d4844de21a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib +, rustPlatform, fetchFromGitHub +, libusb1, pkg-config, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-flash"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "probe-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "1bcpv1r4pdpp22w7za7kdy7jl487x3nlwxiz6sqq3iq6wq3j9zj0"; + }; + + cargoSha256 = "1pf117fgw9x9diksqv58cw7i0kzmp25yj73y5ll69sk46b6z4j90"; + + nativeBuildInputs = [ pkg-config rustfmt ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "A cargo extension for working with microcontrollers."; + homepage = "http://probe.rs/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fooker ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix index ecdd2409ab..14c849ac0a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr"; + doCheck = false; + meta = with stdenv.lib; { description = "Command line helpers for fuzzing"; homepage = "https://github.com/rust-fuzz/cargo-fuzz"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock deleted file mode 100644 index 191e96f021..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ /dev/null @@ -1,1323 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "adler" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10" - -[[package]] -name = "aho-corasick" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" -dependencies = [ - "memchr 0.1.11", -] - -[[package]] -name = "aho-corasick" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" -dependencies = [ - "memchr 2.3.3", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" - -[[package]] -name = "attohttpc" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe174d1b67f7b2bafed829c09db039301eb5841f66e43be2cf60b326e7f8e2cc" -dependencies = [ - "flate2", - "http", - "log", - "native-tls", - "openssl", - "url", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "blake2b_simd" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "bytes" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b" -dependencies = [ - "loom", -] - -[[package]] -name = "cargo-make" -version = "0.32.0" -dependencies = [ - "ci_info", - "clap", - "colored", - "dirs", - "duckscript", - "duckscriptsdk", - "envmnt", - "fern", - "fsio", - "git_info", - "glob", - "home", - "indexmap", - "log", - "run_script", - "rust_info", - "rusty-hook", - "semver 0.10.0", - "serde", - "serde_derive", - "serde_json", - "shell2batch", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe" - -[[package]] -name = "cfg-if" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" - -[[package]] -name = "chrono" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" -dependencies = [ - "num", - "time", -] - -[[package]] -name = "ci_info" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f638c70e8c5753795cc9a8c07c44da91554a09e4cf11a7326e8161b0a3c45e" -dependencies = [ - "envmnt", -] - -[[package]] -name = "clap" -version = "2.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "colored" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" -dependencies = [ - "atty", - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "crc32fast" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if", - "lazy_static 1.4.0", -] - -[[package]] -name = "dirs" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fddc3610d8f9552384e06ebc87f714e1d0b2b64a99194d2faf36d7ae5f48549" -dependencies = [ - "cfg-if", - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "duckscript" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4c3da85470786f086bd14c0b299092715a99f8d8bb0ac2b787cbaab71e6ba6" -dependencies = [ - "fsio", -] - -[[package]] -name = "duckscriptsdk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0033c9c694e0a358f42316e3517442ca9039de8b3838d8320fb129da5dbec28b" -dependencies = [ - "attohttpc", - "base64 0.12.3", - "cfg-if", - "duckscript", - "fs_extra", - "fsio", - "ftp", - "glob", - "home", - "java-properties", - "meval", - "num_cpus", - "rand", - "uname", - "walkdir", - "which", - "whoami", -] - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "envmnt" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dad160daebf530422640d9496277681d6a2caa3172ec8fd2a315a122829319b" -dependencies = [ - "fsio", - "indexmap", -] - -[[package]] -name = "fern" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065" -dependencies = [ - "log", -] - -[[package]] -name = "flate2" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" -dependencies = [ - "cfg-if", - "crc32fast", - "libc", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "fs_extra" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" - -[[package]] -name = "fsio" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2131cb03096f67334dfba2f0bc46afc5564b08a919d042c6e217e2665741fc54" -dependencies = [ - "rand", - "users", -] - -[[package]] -name = "ftp" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542951aad0071952c27409e3bd7cb62d1a3ad419c4e7314106bf994e0083ad5d" -dependencies = [ - "chrono", - "lazy_static 0.1.16", - "regex 0.1.80", -] - -[[package]] -name = "generator" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68" -dependencies = [ - "cc", - "libc", - "log", - "rustc_version", - "winapi 0.3.9", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "git_info" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641b847f0375f4b2c595438eefc17a9c0fbf47b400cbdd1ad9332bf1e16b779d" - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hermit-abi" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" -dependencies = [ - "libc", -] - -[[package]] -name = "home" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "http" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" -dependencies = [ - "autocfg", - "serde", -] - -[[package]] -name = "itoa" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - -[[package]] -name = "java-properties" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" -dependencies = [ - "encoding", - "regex 1.3.9", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" - -[[package]] -name = "log" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "loom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", -] - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "memchr" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - -[[package]] -name = "meval" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" -dependencies = [ - "fnv", - "nom", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" -dependencies = [ - "adler", -] - -[[package]] -name = "native-tls" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" -dependencies = [ - "lazy_static 1.4.0", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nias" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" - -[[package]] -name = "nom" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-integer", - "num-iter", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "openssl" -version = "0.10.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "lazy_static 1.4.0", - "libc", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - -[[package]] -name = "openssl-sys" -version = "0.9.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pkg-config" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" - -[[package]] -name = "ppv-lite86" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" - -[[package]] -name = "proc-macro2" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - -[[package]] -name = "redox_users" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -dependencies = [ - "getrandom", - "redox_syscall", - "rust-argon2", -] - -[[package]] -name = "regex" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" -dependencies = [ - "aho-corasick 0.5.3", - "memchr 0.1.11", - "regex-syntax 0.3.9", - "thread_local 0.2.7", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -dependencies = [ - "aho-corasick 0.7.13", - "memchr 2.3.3", - "regex-syntax 0.6.18", - "thread_local 1.0.1", -] - -[[package]] -name = "regex-syntax" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" - -[[package]] -name = "regex-syntax" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "run_script" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e8fc35067815a04a35fe2144361e1257b0f1041f0d413664f38e44d1a73cb4" -dependencies = [ - "fsio", -] - -[[package]] -name = "rust-argon2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -dependencies = [ - "base64 0.11.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - -[[package]] -name = "rust_info" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b506bd796703b88d74a3edb529acde6c71d81bb078c392eecd60a745cb1d2f" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rusty-hook" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cee9be61be7e1cbadd851e58ed7449c29c620f00b23df937cb9cbc04ac21a3" -dependencies = [ - "ci_info", - "getopts", - "nias", - "toml", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "scoped-tls" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" - -[[package]] -name = "security-framework" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" - -[[package]] -name = "serde_derive" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shell2batch" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" -dependencies = [ - "regex 1.3.9", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "syn" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -dependencies = [ - "cfg-if", - "libc", - "rand", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread-id" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" -dependencies = [ - "kernel32-sys", - "libc", -] - -[[package]] -name = "thread_local" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" -dependencies = [ - "thread-id", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static 1.4.0", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "tinyvec" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" - -[[package]] -name = "toml" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -dependencies = [ - "serde", -] - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "url" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -dependencies = [ - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "users" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" -dependencies = [ - "libc", -] - -[[package]] -name = "utf8-ranges" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" - -[[package]] -name = "vcpkg" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "walkdir" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "which" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5fe1a9cb33fe7cf77d431070d0223e544b1e4e7f7764bad0a3e691a6678a131" -dependencies = [ - "libc", - "thiserror", -] - -[[package]] -name = "whoami" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884773ab69074615cb8f8425d0e53f11710786158704fca70f53e71b0e05504" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 2e502251a6..a1e9f7971f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,32 +1,22 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config +{ stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.0"; + version = "0.32.4"; - src = - let - source = fetchFromGitHub { - owner = "sagiegurari"; - repo = pname; - rev = version; - sha256 = "1bkc3z1w9gbjymmr5lk322kn0rd6b57v92a32jf7nckllxf43807"; - }; - in - runCommand "source" {} '' - cp -R ${source} $out - chmod +w $out - cp ${./Cargo.lock} $out/Cargo.lock - ''; + src = fetchCrate { + inherit pname version; + sha256 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq"; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "0l7krag7n4kjvh3d4zhkk1jdswsrkag5z664fm1zwvf6rw6sfdmi"; + cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix new file mode 100644 index 0000000000..f42868826d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -0,0 +1,22 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-sync-readme"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "phaazon"; + repo = pname; + rev = version; + sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc"; + }; + + cargoSha256 = "1x15q6wv5278hm3ns2wmw4i8602g35y1jyv1b8wa5i4dnh52dj83"; + + meta = with stdenv.lib; { + description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation"; + homepage = "https://github.com/phaazon/cargo-sync-readme"; + license = licenses.bsd3; + maintainers = with maintainers; [ b4dm4n ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index 40e172972b..b7879adcc3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "0wxpzrcrdxlihzxzqmrhii5bfxknliqb4d5mka4k42x5vim8pq2f"; + sha256 = "0imvq63i3s9qmm0x8cbaknjap2yfmpzva3y0sxmgkcm8ajkvp114"; }; - cargoSha256 = "0q1q7x1205a8dp35d4dds3mizl6y4d3rfc5gkarri1g189nrk5pl"; + cargoSha256 = "196w9rgz4pwqvkiy839kqz765ljqx1k129w4nvxgxv3rcmy4lbzm"; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 655d726e66..62b9a61664 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0pw55334i10k75qkig8bgcnlsy613zw2p5j4xyz8v71s4vh1a58j"; + sha256 = "06bis9kk3r0gishzmsq5wk3vv8r78ggk4m800562q2yhnhc37lfd"; }; - cargoSha256 = "0088ijnjhqfvdb1wxy9jc7hq8c0yxgj5brlg68n9vws1mz9rilpy"; + cargoSha256 = "0x8lxlik4n8rmlydcp0vqyiqwqm98cgwvw3h5hm2zviv8v0y8jnr"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 8ddbbcc820..723ea94152 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1y6bxqbv7k8xvqjzgpf6n2n3yad4qxr2dwwlw8cb0knd7cfl2a2n"; + sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z"; }; - cargoSha256 = "1f12k6n58ycv79bv416566fnsnsng8jk3f6fy5j78py1qgy30swm"; + cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n"; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 515ff94ac7..5d66f6e210 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-08-17"; + rev = "2020-09-21"; version = "unstable-${rev}"; - sha256 = "1lkqhaygl6wak3hypmn3zb2h0v4n082xbpaywmzqr53vhw678sp0"; - cargoSha256 = "00a2fxq1kwybng3gp33lkad4c7wrz0gypigxkalqkyy4nbg3qil4"; + sha256 = "1wjm69r1c6s8a4rd91csg7c48bp8jamxsrm5m6rg3bk2gqp8yzz8"; + cargoSha256 = "089w2i6lvpjxkxghkb2mij9sxfxlcc1zv4iq4qmzq8gnc6ddz12d"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index 7092f5291d..3bd6d1ccee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -1,9 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin -, useJemalloc ? false +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, cmake +, useMimalloc ? false , doCheck ? true # Version specific args -, rev, version, sha256, cargoSha256 }: +, rev, version, sha256, cargoSha256 +}: rustPlatform.buildRustPackage { pname = "rust-analyzer-unwrapped"; @@ -15,11 +16,17 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; + patches = [ + # FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0 + ./no-loop-in-const-fn.patch + ./no-option-zip.patch + ]; + buildAndTestSubdir = "crates/rust-analyzer"; - cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc"; + cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; - nativeBuildInputs = lib.optionals doCheck [ rustPlatform.rustcSrc ]; + nativeBuildInputs = lib.optional useMimalloc cmake; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; @@ -27,16 +34,11 @@ rustPlatform.buildRustPackage { RUST_ANALYZER_REV = rev; inherit doCheck; - # Skip tests running `rustup` for `cargo fmt`. - preCheck = '' - fakeRustup=$(mktemp -d) - ln -s $(command -v true) $fakeRustup/rustup - export PATH=$PATH''${PATH:+:}$fakeRustup + preCheck = lib.optionalString doCheck '' export RUST_SRC_PATH=${rustPlatform.rustcSrc} ''; - # Temporary disabled until #93119 is fixed. - doInstallCheck = false; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck versionOutput="$($out/bin/rust-analyzer --version)" diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch new file mode 100644 index 0000000000..e750b3c4e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch @@ -0,0 +1,223 @@ +This patch revert 4b989009e3839cfc6f021d1552a46561cee6cde2 (CONST LOOPS ARE HERE). + +diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs +index 5f885edfd..e72929f8c 100644 +--- a/crates/parser/src/grammar/expressions.rs ++++ b/crates/parser/src/grammar/expressions.rs +@@ -316,7 +316,7 @@ fn expr_bp(p: &mut Parser, mut r: Restrictions, bp: u8) -> (Option Option<(CompletedMarker, BlockLike)> { + let m; +diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs +index 66a92a4e1..ba6dd2fbc 100644 +--- a/crates/parser/src/grammar/expressions/atom.rs ++++ b/crates/parser/src/grammar/expressions/atom.rs +@@ -15,7 +15,7 @@ use super::*; + // let _ = b"e"; + // let _ = br"f"; + // } +-pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ ++pub(crate) const LITERAL_FIRST: TokenSet = token_set![ + TRUE_KW, + FALSE_KW, + INT_NUMBER, +@@ -25,8 +25,8 @@ pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ + STRING, + RAW_STRING, + BYTE_STRING, +- RAW_BYTE_STRING, +-]); ++ RAW_BYTE_STRING ++]; + + pub(crate) fn literal(p: &mut Parser) -> Option { + if !p.at_ts(LITERAL_FIRST) { +@@ -39,7 +39,7 @@ pub(crate) fn literal(p: &mut Parser) -> Option { + + // E.g. for after the break in `if break {}`, this should not match + pub(super) const ATOM_EXPR_FIRST: TokenSet = +- LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ ++ LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![ + T!['('], + T!['{'], + T!['['], +@@ -59,9 +59,9 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = + T![loop], + T![for], + LIFETIME, +- ])); ++ ]); + +-const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[LET_KW, R_DOLLAR]); ++const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW, R_DOLLAR]; + + pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { + if let Some(m) = literal(p) { +diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs +index 22810e6fb..8fd8f3b80 100644 +--- a/crates/parser/src/grammar/items.rs ++++ b/crates/parser/src/grammar/items.rs +@@ -26,7 +26,7 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { + } + } + +-pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ ++pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![ + FN_KW, + STRUCT_KW, + ENUM_KW, +@@ -41,7 +41,7 @@ pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ + USE_KW, + MACRO_KW, + T![;], +-]); ++]; + + pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) { + let m = p.start(); +diff --git a/crates/parser/src/grammar/paths.rs b/crates/parser/src/grammar/paths.rs +index 5d297e2d6..52562afa4 100644 +--- a/crates/parser/src/grammar/paths.rs ++++ b/crates/parser/src/grammar/paths.rs +@@ -3,7 +3,7 @@ + use super::*; + + pub(super) const PATH_FIRST: TokenSet = +- TokenSet::new(&[IDENT, T![self], T![super], T![crate], T![:], T![<]]); ++ token_set![IDENT, T![self], T![super], T![crate], T![:], T![<]]; + + pub(super) fn is_path_start(p: &Parser) -> bool { + is_use_path_start(p) || p.at(T![<]) +diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs +index 796f206e1..07b1d6dd5 100644 +--- a/crates/parser/src/grammar/patterns.rs ++++ b/crates/parser/src/grammar/patterns.rs +@@ -2,18 +2,9 @@ + + use super::*; + +-pub(super) const PATTERN_FIRST: TokenSet = +- expressions::LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ +- T![box], +- T![ref], +- T![mut], +- T!['('], +- T!['['], +- T![&], +- T![_], +- T![-], +- T![.], +- ])); ++pub(super) const PATTERN_FIRST: TokenSet = expressions::LITERAL_FIRST ++ .union(paths::PATH_FIRST) ++ .union(token_set![T![box], T![ref], T![mut], T!['('], T!['['], T![&], T![_], T![-], T![.]]); + + pub(crate) fn pattern(p: &mut Parser) { + pattern_r(p, PAT_RECOVERY_SET); +@@ -83,7 +74,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) { + } + + const PAT_RECOVERY_SET: TokenSet = +- TokenSet::new(&[LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]); ++ token_set![LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]; + + fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option { + let m = match p.nth(0) { +diff --git a/crates/parser/src/grammar/types.rs b/crates/parser/src/grammar/types.rs +index 1ea130ac5..9d00eb9b9 100644 +--- a/crates/parser/src/grammar/types.rs ++++ b/crates/parser/src/grammar/types.rs +@@ -2,7 +2,7 @@ + + use super::*; + +-pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ ++pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(token_set![ + T!['('], + T!['['], + T![<], +@@ -16,16 +16,16 @@ pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ + T![for], + T![impl], + T![dyn], +-])); ++]); + +-const TYPE_RECOVERY_SET: TokenSet = TokenSet::new(&[ ++const TYPE_RECOVERY_SET: TokenSet = token_set![ + T![')'], + T![,], + L_DOLLAR, + // test_err struct_field_recover + // struct S { f pub g: () } + T![pub], +-]); ++]; + + pub(crate) fn type_(p: &mut Parser) { + type_with_bounds_cond(p, true); +diff --git a/crates/parser/src/token_set.rs b/crates/parser/src/token_set.rs +index a68f0144e..994017acf 100644 +--- a/crates/parser/src/token_set.rs ++++ b/crates/parser/src/token_set.rs +@@ -9,21 +9,15 @@ pub(crate) struct TokenSet(u128); + impl TokenSet { + pub(crate) const EMPTY: TokenSet = TokenSet(0); + +- pub(crate) const fn new(kinds: &[SyntaxKind]) -> TokenSet { +- let mut res = 0u128; +- let mut i = 0; +- while i < kinds.len() { +- res |= mask(kinds[i]); +- i += 1 +- } +- TokenSet(res) ++ pub(crate) const fn singleton(kind: SyntaxKind) -> TokenSet { ++ TokenSet(mask(kind)) + } + + pub(crate) const fn union(self, other: TokenSet) -> TokenSet { + TokenSet(self.0 | other.0) + } + +- pub(crate) const fn contains(&self, kind: SyntaxKind) -> bool { ++ pub(crate) fn contains(&self, kind: SyntaxKind) -> bool { + self.0 & mask(kind) != 0 + } + } +@@ -32,10 +26,16 @@ const fn mask(kind: SyntaxKind) -> u128 { + 1u128 << (kind as usize) + } + ++#[macro_export] ++macro_rules! token_set { ++ ($($t:expr),*) => { TokenSet::EMPTY$(.union(TokenSet::singleton($t)))* }; ++ ($($t:expr),* ,) => { token_set!($($t),*) }; ++} ++ + #[test] + fn token_set_works_for_tokens() { + use crate::SyntaxKind::*; +- let ts = TokenSet::new(&[EOF, SHEBANG]); ++ let ts = token_set![EOF, SHEBANG]; + assert!(ts.contains(EOF)); + assert!(ts.contains(SHEBANG)); + assert!(!ts.contains(PLUS)); +diff --git a/xtask/src/install.rs b/xtask/src/install.rs +index d829790d7..b25a6e301 100644 +--- a/xtask/src/install.rs ++++ b/xtask/src/install.rs +@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result}; + use crate::not_bash::{pushd, run}; + + // Latest stable, feel free to send a PR if this lags behind. +-const REQUIRED_RUST_VERSION: u32 = 46; ++const REQUIRED_RUST_VERSION: u32 = 43; + + pub struct InstallCmd { + pub client: Option, diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch new file mode 100644 index 0000000000..b2cf679cee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch @@ -0,0 +1,72 @@ +diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs +index fe33cee53..2184a4154 100644 +--- a/crates/assists/src/handlers/merge_imports.rs ++++ b/crates/assists/src/handlers/merge_imports.rs +@@ -32,7 +32,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() + if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) { + let (merged, to_delete) = + next_prev().filter_map(|dir| neighbor(&use_item, dir)).find_map(|use_item2| { +- try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full).zip(Some(use_item2)) ++ Some((try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full)?, use_item2)) + })?; + + rewriter.replace_ast(&use_item, &merged); +@@ -44,7 +44,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() + } else { + let (merged, to_delete) = + next_prev().filter_map(|dir| neighbor(&tree, dir)).find_map(|use_tree| { +- try_merge_trees(&tree, &use_tree, MergeBehaviour::Full).zip(Some(use_tree)) ++ Some((try_merge_trees(&tree, &use_tree, MergeBehaviour::Full)?, use_tree)) + })?; + + rewriter.replace_ast(&tree, &merged); +diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs +index 09f4a2224..2c3a0ca0b 100644 +--- a/crates/assists/src/utils/insert_use.rs ++++ b/crates/assists/src/utils/insert_use.rs +@@ -280,7 +280,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa + } + res = Some((lhs_curr.clone(), rhs_curr.clone())); + +- match lhs_curr.parent_path().zip(rhs_curr.parent_path()) { ++ match zip(lhs_curr.parent_path(), rhs_curr.parent_path()) { + Some((lhs, rhs)) => { + lhs_curr = lhs; + rhs_curr = rhs; +@@ -324,7 +324,7 @@ fn path_cmp(a: &ast::Path, b: &ast::Path) -> Ordering { + // cmp_by would be useful for us here but that is currently unstable + // cmp doesnt work due the lifetimes on text's return type + a.zip(b) +- .flat_map(|(seg, seg2)| seg.name_ref().zip(seg2.name_ref())) ++ .flat_map(|(seg, seg2)| zip(seg.name_ref(), seg2.name_ref())) + .find_map(|(a, b)| match a.text().cmp(b.text()) { + ord @ Ordering::Greater | ord @ Ordering::Less => Some(ord), + Ordering::Equal => None, +@@ -404,8 +404,8 @@ fn find_insert_position( + let path_node_iter = scope + .as_syntax_node() + .children() +- .filter_map(|node| ast::Use::cast(node.clone()).zip(Some(node))) +- .flat_map(|(use_, node)| use_.use_tree().and_then(|tree| tree.path()).zip(Some(node))); ++ .filter_map(|node| zip(ast::Use::cast(node.clone()), Some(node))) ++ .flat_map(|(use_, node)| zip(use_.use_tree().and_then(|tree| tree.path()), Some(node))); + // Iterator that discards anything thats not in the required grouping + // This implementation allows the user to rearrange their import groups as this only takes the first group that fits + let group_iter = path_node_iter +@@ -423,7 +423,7 @@ fn find_insert_position( + segments + .clone() + .zip(check_segments) +- .flat_map(|(seg, seg2)| seg.name_ref().zip(seg2.name_ref())) ++ .flat_map(|(seg, seg2)| zip(seg.name_ref(), seg2.name_ref())) + .all(|(l, r)| l.text() <= r.text()) + }); + match post_insert { +@@ -931,3 +931,7 @@ use foo::bar::baz::Qux;", + assert_eq!(result.map(|u| u.to_string()), None); + } + } ++ ++fn zip(x: Option, y: Option) -> Option<(T, U)> { ++ Some((x?, y?)) ++} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix index a51975b85c..e5ef80b87e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix @@ -1,7 +1,13 @@ { stdenv, lib, runCommand, patchelf -, fetchFromGitHub, rustPlatform +, fetchFromGitHub, rustPlatform, makeWrapper , pkgconfig, curl, zlib, Security, CoreServices }: +let + libPath = lib.makeLibraryPath [ + zlib # libz.so.1 + ]; +in + rustPlatform.buildRustPackage rec { pname = "rustup"; version = "1.22.1"; @@ -15,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0ghjrx7y25s6rjp06h0iyv4195x7daj57bqza01i1j4hm5nkhqhi"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ curl zlib @@ -24,19 +30,13 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (let - libPath = lib.makeLibraryPath [ - zlib # libz.so.1 - ]; - in - (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' - export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ - --subst-var patchelf \ - --subst-var dynamicLinker \ - --subst-var libPath + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker \ + --subst-var libPath '') - ) ]; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; @@ -53,6 +53,8 @@ rustPlatform.buildRustPackage rec { done popd + wrapProgram $out/bin/rustup --prefix "LD_LIBRARY_PATH" : "${libPath}" + # tries to create .rustup export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index 8aad323000..fc743d5601 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk-pixbuf, glib , glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf -, libXi, libXrender, libXext +, libxcb, libXi, libXrender, libXext }: let allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = "149p43zaz45malmff1274r2bwjcyjwsdickivk3pd0mvnjbfid2r"; + sha256 = "0absr1fp2h87gpyw6jxj2f08sbhkkh3pf13145hfyzdvajj5rfjy"; }; x86_64-darwin = { system = "mac64"; - sha256 = "1xpyqxpsz3r653ls67s6alv4g2vr4lxf29gyxc162ikywyrx80nr"; + sha256 = "1p9k92fgyx0xis6r50vhcpx3iws2gaspq3dnpigglv3bj9yg8zvi"; }; }; @@ -23,12 +23,12 @@ let cairo fontconfig freetype gdk-pixbuf glib gtk2 gconf libX11 nspr nss pango libXrender - gconf libXext libXi + gconf libxcb libXext libXi ]; in stdenv.mkDerivation rec { pname = "chromedriver"; - version = "83.0.4103.39"; + version = "85.0.4183.87"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index 032f64bc34..f397348416 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.13.1"; + version = "1.14.0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1v6napcpx8k45s8w55lbxahfc1p0qlvl597zgb4dzyg9w67fwnqk"; + sha256 = "18wk8cnp0sc47drgjc0iis4dkqwr9h5yxi40c1gjsiscrvy5akvc"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/so/default.nix b/third_party/nixpkgs/pkgs/development/tools/so/default.nix new file mode 100644 index 0000000000..0ee2359c84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/so/default.nix @@ -0,0 +1,27 @@ +{ stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "so"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "samtay"; + repo = pname; + rev = "v${version}"; + sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck"; + }; + + cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "A TUI interface to the StackExchange network"; + homepage = "https://github.com/samtay/so"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix index 15d6553bbb..38573e0751 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spring-boot-cli"; - version = "2.3.1"; + version = "2.3.2"; src = fetchzip { url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "0ddmwcifrmw197vc49b0x8vfampj3n947r4vv4nni5vjclqqfds5"; + sha256 = "1zqfnxz57234227rp303iwis0mjkkjkpcqnj9jgw78gykjnqdmmq"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/statik/default.nix b/third_party/nixpkgs/pkgs/development/tools/statik/default.nix index 8152dda2b5..f535fa055e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/statik/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/statik/default.nix @@ -4,7 +4,6 @@ buildGoPackage { pname = "statik"; version = "unstable-2019-07-31"; goPackagePath = "github.com/rakyll/statik"; - goDeps = ./deps.nix; src = fetchFromGitHub { owner = "rakyll"; diff --git a/third_party/nixpkgs/pkgs/development/tools/statik/deps.nix b/third_party/nixpkgs/pkgs/development/tools/statik/deps.nix deleted file mode 100644 index 0429d8876b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/statik/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ -] diff --git a/third_party/nixpkgs/pkgs/development/tools/summon/default.nix b/third_party/nixpkgs/pkgs/development/tools/summon/default.nix new file mode 100644 index 0000000000..e01c60e3a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/summon/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: + +with stdenv.lib; + +buildGoModule rec { + pname = "summon"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "cyberark"; + repo = "summon"; + rev = "v${version}"; + sha256 = "1z4xnrncwvp3rfm97zvc0ivvw2fh1hrjhj3rplvidzxjfyasbvwv"; + }; + + vendorSha256 = "1597vrs4b7k6gkmkvf7xnd38rvjixmlcz0j7npmik9nbkm57l74m"; + + subPackages = [ "cmd" ]; + + # Patches provider resolver to support resolving unqualified names + # from $PATH, e.g. `summon -p gopass` instead of `summon -p $(which gopass)` + patches = optional patchResolver [ ./resolve-paths.patch ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/summon + ''; + + meta = with lib; { + description = + "CLI that provides on-demand secrets access for common DevOps tools"; + homepage = "https://cyberark.github.io/summon"; + license = lib.licenses.mit; + maintainers = with maintainers; [ quentini ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/summon/resolve-paths.patch b/third_party/nixpkgs/pkgs/development/tools/summon/resolve-paths.patch new file mode 100644 index 0000000000..cd49c50e2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/summon/resolve-paths.patch @@ -0,0 +1,39 @@ +From dd34727ebfbd59738084eeb7c2a020e40a4d0abe Mon Sep 17 00:00:00 2001 +From: Quentin +Date: Mon, 29 Jun 2020 17:35:04 +0300 +Subject: [PATCH] Patch for + +--- + provider/provider.go | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/provider/provider.go b/provider/provider.go +index c1e28d9..f20fdaa 100644 +--- a/provider/provider.go ++++ b/provider/provider.go +@@ -78,7 +78,22 @@ func expandPath(provider string) string { + if path.Base(provider) != provider { + return provider + } ++ ++ var ( ++ stdOut bytes.Buffer ++ stdErr bytes.Buffer ++ ) ++ cmd := exec.Command("which", provider) ++ cmd.Stdout = &stdOut ++ cmd.Stderr = &stdErr ++ err := cmd.Run() ++ ++ if err == nil { ++ return strings.TrimSpace(stdOut.String()) ++ } ++ + return path.Join(DefaultPath, provider) ++ + } + + func getDefaultPath() string { +-- +2.27.0 + diff --git a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix index 3ee200a1a1..6042f5f891 100644 --- a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix @@ -1,18 +1,31 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "0q7yg90yxnpaafg6sg7mqkh86qkn43kxy73p9nqkkgrikdnrjh5a"; + sha256 = "1whmvzpqm8x1q45mzrp4p40nj251drcryj9z4qjxgjlfsd5d1fxq"; }; - cargoSha256 = "1a747bmc6s007ram0w4xf1y2nb3pphvqnlx59098lr3v7gllp7x3"; - checkFlags = "--test-threads=1"; + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + + cargoSha256 = "0adhgp6blwx7s1hlwqzzsgkzc43q9avxx8a9ykvvv2s1w7m9ql78"; + checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ]; + cargoParallelTestThreads = false; + + postInstall = '' + $out/bin/the-way config default tmp.toml + for shell in bash fish zsh; do + THE_WAY_CONFIG=tmp.toml $out/bin/the-way complete $shell > the-way.$shell + installShellCompletion the-way.$shell + done + ''; meta = with stdenv.lib; { description = "Terminal code snippets manager"; diff --git a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix index a5087b3b52..96f232304a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7"; + version = "0.7.1"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "07cmz2w7iv10f9i9q3fhg80s6riy9bxnk9xvc3q4lw47mc150skp"; + sha256 = "13zg3ijzhh7qkhgqff2ca23nd4gj7ac8jr0bp9w1gjf2cpgqkm40"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] - ++ lib.optionals stdenv.isLinux [ gtk2 tbb ]; + ++ lib.optionals stdenv.isLinux [ gtk3 tbb ]; NIX_CFLAGS_COMPILE = [ ] ++ lib.optional stdenv.isLinux "-ltbb" @@ -35,11 +35,15 @@ stdenv.mkDerivation rec { install -D ./update/build/unix/update-release $out/bin/update ''; + fixupPhase = lib.optionalString stdenv.isDarwin '' + install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy + ''; + meta = with stdenv.lib; { description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications."; homepage = "https://github.com/wolfpld/tracy"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; - maintainers = with maintainers; [ mpickering ]; + maintainers = with maintainers; [ mpickering nagisa ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix b/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix index 6fc18fabe7..21f14adc2f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -8,18 +8,18 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.06.29"; + version = "2020.07.27"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-176-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-182-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "f93243b000c52b755c70829768d2ae6bcf7bb91a"; - sha256 = "0f7xv99bxmidk7byahc821yzy8mln29gknz3w239i9xbwxzc6wc4"; + rev = "8c0a6382e11b160ed88d17af8493c12a897617ed"; + sha256 = "1g0ppjfw8dq5cg5kl2p1p87grb0i88apaim4f5b6wj4sfqz8iln8"; name = "trellis"; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix index 7e62aaf408..85b7a704b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let - version = "2.3.1"; + version = "2.3.2"; in appimageTools.wrapType2 rec { name = "unityhub"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb - libselinux pciutils libpulseaudio + libselinux pciutils libpulseaudio libxml2 ]); profile = '' @@ -23,7 +23,7 @@ in appimageTools.wrapType2 rec { src = fetchurl { # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage"; - sha256 = "09nrgjlknl3hgrrl7rc79bmbrq6r6sl49dw0cmvs37vjqnvlr8ny"; + sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/third_party/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch index f87ff5135b..fa6555c594 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch @@ -1,7 +1,7 @@ From: Antonio Terceiro Date: Wed, 27 May 2015 09:36:17 -0300 Subject: Support system-installed plugins -Source: https://salsa.debian.org/ruby-team/vagrant/blob/cb672c6dc0c63f6552c5ec4d6d7d22929d353503/debian/patches/0004-Support-system-installed-plugins.patch +Source: https://salsa.debian.org/ruby-team/vagrant/-/blob/9d86f222/debian/patches/0004-Support-system-installed-plugins.patch Plugins must be installed as regular Ruby libraries, and they must contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the @@ -22,7 +22,7 @@ following content: 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb -index 567347d..d9d76a0 100644 +index 9058e68..2772131 100644 --- a/lib/vagrant/plugin/manager.rb +++ b/lib/vagrant/plugin/manager.rb @@ -18,7 +18,7 @@ module Vagrant @@ -80,17 +80,13 @@ index c6872d4..935d431 100644 end # Add a plugin that is installed to the state file. -@@ -107,6 +123,14 @@ module Vagrant +@@ -107,6 +123,10 @@ module Vagrant f.close FileUtils.mv(f.path, @path) end + rescue Errno::EACCES + # Ignore permission denied against system-installed plugins; regular + # users are not supposed to write there. -+ raise unless @system -+ rescue Errno::EROFS -+ # Ignore read-only filesystem against system-installed plugins; regular -+ # users are not supposed to write there. + raise unless @system end diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix index 338e8f68d3..4e2930f97a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.9"; + version = "2.2.10"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "0fbickjjliaw3cpkh3pl9bp56b2gcqn87c5ag67amc450ah43rdq"; + sha256 = "07wlj4m79m9li3za1jkk4imdhqwpca86qz3c0h706s0w8cmv4bbj"; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -54,13 +54,6 @@ in buildRubyGem rec { ./unofficial-installation-nowarn.patch ./use-system-bundler-version.patch ./0004-Support-system-installed-plugins.patch - - # fix deprecation warning on ruby 2.6.5. - # See also https://github.com/hashicorp/vagrant/pull/11307 - (fetchpatch { - url = "https://github.com/hashicorp/vagrant/commit/d18ed567aaa5da23c9e91ab87f360e7bf6760f13.patch"; - sha256 = "0f61qj41rc3fdggmnha4jrqg4pzmfiriwpsz4fcgf7c0bx6qha7q"; - }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix index 00838c6e0c..3c22b74efe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix @@ -24,20 +24,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; + sha256 = "08hd3d2lfi19cns4d6wkq51scasn17l83fgbzbjjk3dqccz4rg3j"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.0"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.7"; }; domain_name = { dependencies = ["unf"]; @@ -149,21 +149,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.5"; }; listen = { - dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + dependencies = ["rb-fsevent" "rb-inotify"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; type = "gem"; }; - version = "3.1.5"; + version = "3.2.1"; }; little-plugger = { groups = ["default"]; @@ -191,10 +191,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; + }; + mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr"; + type = "gem"; + }; + version = "0.4.4"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -222,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.14.1"; + version = "1.15.0"; }; net-scp = { dependencies = ["net-ssh"]; @@ -244,20 +254,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + sha256 = "185vsybznqgqbb4i2qnxvf1gam8lb634nqcrq7r3i2zy1g6xd8mi"; type = "gem"; }; - version = "2.1.2"; + version = "3.0.0"; }; net-ssh = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; + sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; type = "gem"; }; - version = "5.2.0"; + version = "6.1.0"; }; netrc = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/third_party/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch index c386acf4a1..8262220140 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/use-system-bundler-version.patch @@ -1,8 +1,8 @@ -diff --git i/lib/vagrant/bundler.rb w/lib/vagrant/bundler.rb -index 301e40e37..e361ab510 100644 ---- i/lib/vagrant/bundler.rb -+++ w/lib/vagrant/bundler.rb -@@ -217,7 +217,7 @@ module Vagrant +diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb +index 336ac1e05..1bfd84c0d 100644 +--- a/lib/vagrant/bundler.rb ++++ b/lib/vagrant/bundler.rb +@@ -470,7 +470,7 @@ module Vagrant source_list = {} system_plugins = plugins.map do |plugin_name, plugin_info| plugin_name if plugin_info["system"] diff --git a/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix b/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix index c4a1cf7398..9657543e0c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.2.7"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "1mq8lmb1wh55cqdj7javq7qia4217h6vf5ljc99gsjyibi7g7d3k"; + sha256 = "1lb0j120sj76swi702ah6ryn770m1y7gh69237zxpyh897pn5paa"; }; propagatedBuildInputs = [ pyyaml setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index a6da5f6cdc..c0b34fe3ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "1gqc4w5j9x7vxvxah6hmqd5i1lxyybpml7yfzzcbngwgwm3y5ym0"; + sha256 = "0gp1v62iqh3hk46cc5sh8a1nw5nf98m969fdhgxdppwr5dhj9isp"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr/default.nix index 9b53c28c60..7c396f69f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "vultr"; - version = "2.0.1"; + version = "2.0.2"; goPackagePath = "github.com/JamesClonk/vultr"; src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; rev = "v${version}"; - sha256 = "16wlncf0wax5jhpbfif5k16knigxy89vcby0b821klv6hlm6cc58"; + sha256 = "0br8nxi9syraarp4hzav9a3p4zxhyi45cq5dsclzxi3fga2l6mqg"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/ws/default.nix b/third_party/nixpkgs/pkgs/development/tools/ws/default.nix index 9525389564..4a6d889220 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ws/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ws/default.nix @@ -14,8 +14,6 @@ buildGoPackage rec { sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "websocket command line tool"; homepage = "https://github.com/hashrocket/ws"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ws/deps.nix b/third_party/nixpkgs/pkgs/development/tools/ws/deps.nix deleted file mode 100644 index 8298843714..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/ws/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5df930a27be2502f99b292b7cc09ebad4d0891f4"; - sha256 = "1xqwvpn5jkp1xqvv9hx4h7cxrsnamryhy2pszcqpbm28dpd3airb"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix b/third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix new file mode 100644 index 0000000000..a3f8196b12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/wxformbuilder/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, wxGTK31 +, meson +, ninja +}: + +stdenv.mkDerivation { + pname = "wxFormBuilder"; + version = "unstable-2020-08-18"; + + src = fetchFromGitHub { + owner = "wxFormBuilder"; + repo = "wxFormBuilder"; + rev = "d053665cc33a79dd935b518b5e7aea6baf493c92"; + sha256 = "sha256-hTO7Fyp5ZWpq2CfIYEXB85oOkNrqr6Njfh8h0t9B6wU="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + ninja + meson + ]; + + buildInputs = [ + wxGTK31 + ]; + + meta = with stdenv.lib; { + description = "RAD tool for wxWidgets GUI design"; + homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; + license = licenses.gpl2; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix index dfdd921fd0..22ce355335 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.4"; + version = "1.22.5"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1s054c9cmlmzy6cfkawhaxvaxhqcq0a17n4sb12p0bp2lzkax9lm"; + sha256 = "1yb1pb80jhw6mx1r28hf7zd54dygmnrf30r3fz7kn9nrgdpl5in8"; }; buildInputs = [ nodejs ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ydiff/default.nix b/third_party/nixpkgs/pkgs/development/tools/ydiff/default.nix index f3ecbb451f..510808fc41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ydiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ydiff/default.nix @@ -5,11 +5,11 @@ with pythonPackages; buildPythonApplication rec { pname = "ydiff"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index 036e824393..e11a5e1805 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: +{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cypress"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nss gtk2 alsaLib gnome2.GConf gtk3 unzip ]; - runtimeDependencies = [ udev.lib ]; + runtimeDependencies = [ (lib.getLib udev) ]; installPhase = '' mkdir -p $out/bin $out/opt/cypress diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 7749249695..45606151e2 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.3.0"; + version = "1.3.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "163qvxggdv4mr1r1nab4s5n2b74bji0iil4r4nmp6n2ghssyf01h"; + sha256 = "0jbnx23f1323sh1rfx8rza2pzr4li4199wblrl4vw4zp5hj4qnkm"; fetchSubmodules = true; }; - cargoSha256 = "11i00a92i2d6y2vj04wa6qbpsd351qcdy6a9ansq6n3928m9f2pk"; + cargoSha256 = "08zi3ynbi44rdgid9qalgsb5g8dcwclr6ynwxvhi8r0v5i7swwrx"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/deps.nix b/third_party/nixpkgs/pkgs/development/web/deno/deps.nix index 2fd88235a8..f6baca6fb0 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/deps.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/deps.nix @@ -2,11 +2,11 @@ {}: rec { rustyV8Lib = { - version = "0.8.1"; + version = "0.9.1"; sha256s = { - x86_64-linux = "0nwssdbwscwkh2w9zhlvaj562z19g5icg2yi00fyw8glws69cd6p"; - aarch64-linux = "0mwd4ix511dzxpah1p2c47a1qhvff0d3kyilc3yra99fa1s0gyxy"; - x86_64-darwin = "04s4x0n85rxnncy4jsl1ak3rdgb4a3lhqg8h53mvvjmsazsj1q70"; + x86_64-linux = "07zph4x3k659ywld27b60as7j06bdbab2ws1pf67iwg7w6h7iash"; + aarch64-linux = "0w9mbsdpkrla3ayaswpdjhiqs74h23qi2sv9355h138pw431ymnx"; + x86_64-darwin = "091kzdg431lvkvcy0401di3if53pii0isk5ipfpsvic82kr7vaqk"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/common.ts b/third_party/nixpkgs/pkgs/development/web/deno/update/common.ts index 71e4d638f8..d8956b21d1 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/update/common.ts +++ b/third_party/nixpkgs/pkgs/development/web/deno/update/common.ts @@ -8,7 +8,20 @@ const run = async (command: string, args: string[]) => { { cmd: [command, ...args], stdout: "piped", stderr: "piped" }, ); if (!(await cmd.status()).success) { - throw await cmd.stderrOutput().then((b) => decode(b)); + const error = await cmd.stderrOutput().then((b) => decode(b).trimEnd()); + // Known error we can ignore + if (error.includes("'allow-unsafe-native-code-during-evaluation'")) { + // Extract the target sha256 out of the error + const target = " got: sha256:"; + const match = error + .split("\n") + .find((l) => l.includes(target)) + ?.split(target)[1]; + if (typeof match !== "undefined") { + return match; + } + } + throw new Error(error); } return cmd.output().then((b) => decode(b).trimEnd()); }; diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 53e9400e49..8a2cbbe385 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.137"; + version = "0.0.140"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0zlcfmraf5v1crfkgxjgdjshkasyngmq1jqh7kzy3csm0p1a4sxx"; + sha256 = "19yap6n3fw8cf9y6bb6yzl24m4f49jv38j7dj4hs09a5qwh85rz4"; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "1gxz9pp4zl8q7pmwg9z261fjrjfr658k1sn5nq1xzz51wrlzg9ag"; + vendorSha256 = "0vxfnq9ng7ybkw1xla7m2in2sg6hzvghczqnjrj96n07fln0s9rs"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/grails/default.nix b/third_party/nixpkgs/pkgs/development/web/grails/default.nix index fc68fa5324..55ec74eb17 100644 --- a/third_party/nixpkgs/pkgs/development/web/grails/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.0.3"; + version = "4.1.0.M1"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "107dvgwv2ldpdr99q1nvb1i93jj635p1n7md6q14v9m4a6a226sa"; + sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr"; }; buildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix index f2f6ab0f35..8add66bf99 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.21.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "0g0arf13brh6g0hynxs8bsp8jh3dd66rmf2d3qh2qjvk10101g0r"; + sha256 = "0xj7mcmz1rxv3ff530q8c5y1y7hccsmr8azk9nhmrk1q355vnxfw"; }; # the integration tests will try to clone a remote repos diff --git a/third_party/nixpkgs/pkgs/development/web/newman/default.nix b/third_party/nixpkgs/pkgs/development/web/newman/default.nix new file mode 100644 index 0000000000..ed4041ab76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/newman/default.nix @@ -0,0 +1,19 @@ +{ pkgs, nodejs, stdenv, lib, ... }: + +let + + packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json)); + + nodePackages = import ./node-composition.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; +in +nodePackages.newman.override { + meta = with lib; { + homepage = "https://www.getpostman.com"; + description = "Newman is a command-line collection runner for Postman"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/web/newman/generate-dependencies.sh b/third_party/nixpkgs/pkgs/development/web/newman/generate-dependencies.sh new file mode 100755 index 0000000000..7111289d29 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/newman/generate-dependencies.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +node2nix \ + --node-env node-env.nix \ + --development \ + --input package.json \ + --output node-packages.nix \ + --composition node-composition.nix diff --git a/third_party/nixpkgs/pkgs/development/web/newman/node-composition.nix b/third_party/nixpkgs/pkgs/development/web/newman/node-composition.nix new file mode 100644 index 0000000000..c970861a86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/newman/node-composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_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.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/web/newman/node-env.nix b/third_party/nixpkgs/pkgs/development/web/newman/node-env.nix new file mode 100644 index 0000000000..e1abf53049 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/newman/node-env.nix @@ -0,0 +1,542 @@ +# This file originates from node2nix + +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: + +let + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + stdenv.lib.optionalString (dependencies != []) + (stdenv.lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${stdenv.lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(packageLock.lockfileVersion !== 1) { + process.stderr.write("Sorry, I only understand lock file version 1!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${stdenv.lib.optionalString bypassCache '' + ${stdenv.lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + 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 = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + 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 + ++ 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" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${stdenv.lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + 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.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell < # if defined(USE_SOUND) && !defined(WINMM_PLAY_SOUNDS) # include - # endif \ No newline at end of file + # endif diff --git a/third_party/nixpkgs/pkgs/games/crawl/default.nix b/third_party/nixpkgs/pkgs/games/crawl/default.nix index 8fe3b20419..20e31c979e 100644 --- a/third_party/nixpkgs/pkgs/games/crawl/default.nix +++ b/third_party/nixpkgs/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "1fiizkigmbrw0nb1l1m3syl2mw4a4r36l1y0n4z8z7slp79bsbv4"; + sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b"; }; # Patch hard-coded paths and remove force library builds diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix index 0664af117e..2a4df9bf7c 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix @@ -86,6 +86,8 @@ let twbt = twbt; dfhack = dfhack; dwarf-therapist = dwarf-therapist; + + jdk = pkgs.jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; }) (lib.attrNames self.df-hashes)); @@ -104,7 +106,9 @@ let soundSense = callPackage ./soundsense.nix { }; - legends-browser = callPackage ./legends-browser {}; + legends-browser = callPackage ./legends-browser { + jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; themes = recurseIntoAttrs (callPackage ./themes { stdenv = stdenvNoCC; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix index bd37f6180b..11c21b82c2 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,5 +1,5 @@ { stdenv, buildEnv, lib, fetchFromGitHub, cmake, writeScriptBin -, perl, XMLLibXML, XMLLibXSLT, zlib +, perl, XMLLibXML, XMLLibXSLT, zlib, ruby , enableStoneSense ? false, allegro5, libGLU, libGL , enableTWBT ? true, twbt , SDL @@ -53,10 +53,10 @@ let prerelease = true; }; "0.47.04" = { - dfHackRelease = "0.47.04-alpha0"; - sha256 = "07056k6717mqim9skwjprqplj8jmmli6g4p2c72c8000jwnn2hjy"; - xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd50aa"; - prerelease = true; + dfHackRelease = "0.47.04-r2"; + sha256 = "18ppn1dqaxi6ahjzsvb9kw70rvca106a1hibhzc4rxmraypnqb89"; + xmlRev = "036b662a1bbc96b4911f3cbe74dfa1243b6459bc"; + prerelease = false; }; }; @@ -109,6 +109,19 @@ let }; patches = [ ./fix-stonesense.patch ]; + + # As of + # https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4, + # dfhack gets its goodies from the directory above the Dwarf_Fortress + # executable, which leads to stock Dwarf Fortress and not the built + # environment where all the dfhack resources are symlinked to (typically + # ~/.local/share/df_linux). This causes errors like `tweak is not a + # recognized command` to be reported and dfhack to lose some of its + # functionality. + postPatch = '' + sed -i 's@cached_path = path_string.*@cached_path = getenv("DF_DIR");@' library/Process-linux.cpp + ''; + nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib SDL ] @@ -127,6 +140,12 @@ let cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; + # dfhack expects an unversioned libruby.so to be present in the hack + # subdirectory for ruby plugins to function. + postInstall = '' + ln -s ${ruby}/lib/libruby-*.so $out/hack/libruby.so + ''; + enableParallelBuilding = true; }; in diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/themes/themes.json b/third_party/nixpkgs/pkgs/games/dwarf-fortress/themes/themes.json index 48f47c4fbb..8b0b9127d5 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/themes/themes.json +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/themes/themes.json @@ -1,8 +1,8 @@ [ { "name": "afro-graphics", - "version": "47.02", - "sha256": "0np4jc05905q3bjplbrfi09q4rq3pjbf2vmbrmazfagj2mp8m7z5" + "version": "47.04", + "sha256": "1x1ir0qi3g8wgzwm1pnrkrqb6lhnjq87vs30l8kva6y5wr4sz7q0" }, { "name": "autoreiv", @@ -21,57 +21,67 @@ }, { "name": "gemset", - "version": "47.02", - "sha256": "0gz6cfx9kyldh5dxicyw0yl9lq4qw51vvlpzl767ml0bx3w38bwy" + "version": "47.04", + "sha256": "015nkkdnpykhz6a1n8qi3wgap19a4wavz4n2xbvfa4g770lcjd92" }, { "name": "ironhand", - "version": "47.02", - "sha256": "0j612xxz8g91zslw3a6yls3bzzmz0xdi2n0zx9zkmpzcl67f39ry" + "version": "47.04", + "sha256": "0x3hi1isgc2cv7c3qz87rm7ik0kbd748djpnghvjdqpj3a0n1ih2" }, { "name": "jolly-bastion", - "version": "47.02", - "sha256": "1df2hvm72lklmhhphcwsqm1m3dnaqxd8qvpygg5x71cfgkjd41ic" + "version": "47.04", + "sha256": "0799ad90g62nvpdcl6zq3vr2nvfc62lprm4br9n2hbs8wgrra6rq" }, { "name": "mayday", - "version": "47.01", - "sha256": "02fby7y4zzq8qgq2wsdvzp1k6zgfhdkm768zp0zzj9byi6gmnaq6" + "version": "47.04a", + "sha256": "1hpj40762n81grsddg3nc5jxc0bqmy2xamxvsgxzb2bx0b7akz0w" + }, + { + "name": "meph", + "version": "47.04_v5.5.0_V1.1.2", + "sha256": "0q8hfm66rag61qd2hab7lsr4nyg52bn1hvy6bl7z6kv4yj5cra50" }, { "name": "obsidian", - "version": "47.02", - "sha256": "03b26z557099k0l44lizagh17pz1y6apy496ivzv426xy0mzz684" + "version": "47.04a", + "sha256": "0y5kmj362i9y8w1n5d1nx80yq88c0xqps9i02gvnls6r421a4nms" }, { "name": "phoebus", - "version": "47.02a", - "sha256": "16zllnkrxi2365rd5m392xv72a9wvai0l3pz8xwkb8nlws8f58lb" + "version": "47.04a", + "sha256": "1ihbqs5a3b8pydbcynblvgw2bxkgr9hhpmgjlji7a7zvz8m6h6pw" }, { "name": "rally-ho", - "version": "47.02", - "sha256": "0xw2psmfjrgab0267scc7frgl9h1ypc0mbymn8z3x06m5wc3hbdh" + "version": "47.04", + "sha256": "0pmvpfbj07ll674lw7mjgkb4kgjk4mxr82fjq4ppvwrnzx6vi2g0" }, { "name": "spacefox", - "version": "47.02", - "sha256": "180fp2s489m2arc2z11j1qjnpcadjjkyami13yr3zd0v7msg64h8" + "version": "47.04", + "sha256": "0sk3k5bcpfl2xind4vfrgzbcqqbw0mg47pm3d3h44vi6hl3bdaqj" }, { "name": "taffer", - "version": "47.01b", - "sha256": "0b5hnli3gg32r7yvb3x1fqrmpxlk33j1hila2wiihybkkfnvxy5f" + "version": "47.04", + "sha256": "1ly2sc0pb2kybb8grj19zx372whblmd0bj8p64akpi2rrywi13sy" }, { "name": "tergel", "version": "47.01", "sha256": "142sd1i11vvirn68rp4gqzl67ww597df1lc57ycnpnz0n3q39kxy" }, + { + "name": "vettlingr", + "version": "1.4a", + "sha256": "1p4y0dm52rb49dnmcnivddlsd94m4gr1pxn04fpjbrvck22klgpj" + }, { "name": "wanderlust", - "version": "47.02", - "sha256": "0c36nxry189qdyinjk03wwm3j7q9q7b2sabkv7glx8yz2i61j5q9" + "version": "47.04", + "sha256": "1z56m8zplq5d18sbkwg5lwcy8iwfa5hbxixsm3hdxm04qyld1z89" } ] diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix index b5bff0e9b7..a0990e04f9 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/twbt/default.nix @@ -42,9 +42,10 @@ let prerelease = false; }; "0.47.04" = { - twbtRelease = "6.61"; - sha256 = "07bqy9rkd64h033sxdpigp5zq4xrr0xd36wdr1b21g649mv8j6yw"; - prerelease = false; + twbtRelease = "6.xx"; + dfhackRelease = "0.47.04-r2"; + sha256 = "092dgp8fh1j4nqr9wbzn89ib1nhscclr8m91lfxsvg0mgn7j8xlv"; + prerelease = true; }; }; @@ -58,7 +59,11 @@ stdenvNoCC.mkDerivation rec { version = release.twbtRelease; src = fetchurl { - url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip"; + url = + if version == "6.xx" then + "https://github.com/thurin/df-twbt/releases/download/${release.dfhackRelease}/twbt-${version}-linux64-${release.dfhackRelease}.zip" + else + "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip"; sha256 = release.sha256; }; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in index 054935af01..b041067d89 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in @@ -1,6 +1,6 @@ shopt -s extglob -[ -z "$DF_DIR" ] && DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux" +[ -z "$DF_DIR" ] && export DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux" env_dir="@env@" exe="$env_dir/@exe@" diff --git a/third_party/nixpkgs/pkgs/games/exult/arch.patch b/third_party/nixpkgs/pkgs/games/exult/arch.patch deleted file mode 100644 index 70de34184a..0000000000 --- a/third_party/nixpkgs/pkgs/games/exult/arch.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -aur exult-1.4.9rc1.orig/desktop/exult.desktop exult-1.4.9rc1/desktop/exult.desktop ---- exult-1.4.9rc1.orig/desktop/exult.desktop 2008-07-11 05:41:06.000000000 +0600 -+++ exult-1.4.9rc1/desktop/exult.desktop 2012-05-19 13:15:30.616084585 +0600 -@@ -1,9 +1,8 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=Exult - Comment=Exult Ultima 7 Engine - Exec=exult --Icon=exult.png -+Icon=exult - Terminal=false - Type=Application --Categories=Application;Game;RolePlaying; -+Categories=Game;RolePlaying; -diff -aur exult-1.4.9rc1.orig/files/databuf.h exult-1.4.9rc1/files/databuf.h ---- exult-1.4.9rc1.orig/files/databuf.h 2010-03-10 09:07:05.000000000 +0500 -+++ exult-1.4.9rc1/files/databuf.h 2012-05-19 12:50:16.856076030 +0600 -@@ -18,6 +18,7 @@ - #define DATA_H - - #include -+#include - #include - #include - #include -diff -aur exult-1.4.9rc1.orig/files/U7obj.h exult-1.4.9rc1/files/U7obj.h ---- exult-1.4.9rc1.orig/files/U7obj.h 2010-02-25 07:52:07.000000000 +0500 -+++ exult-1.4.9rc1/files/U7obj.h 2012-05-19 12:50:35.916076137 +0600 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include "common_types.h" - #include "utils.h" - -diff -aur exult-1.4.9rc1.orig/imagewin/manip.h exult-1.4.9rc1/imagewin/manip.h ---- exult-1.4.9rc1.orig/imagewin/manip.h 2010-08-29 20:26:00.000000000 +0600 -+++ exult-1.4.9rc1/imagewin/manip.h 2012-05-19 13:02:45.159413596 +0600 -@@ -319,7 +319,7 @@ - static uintD copy(uintS src) - { - unsigned int r, g, b; -- split_source(src,r,g,b); -+ ManipBaseSrc::split_source(src,r,g,b); - return ManipBaseDest::rgb(r,g,b); - } - static void copy(uintD& dest, uintS src) -diff -aur exult-1.4.9rc1.orig/istring.h exult-1.4.9rc1/istring.h ---- exult-1.4.9rc1.orig/istring.h 2005-06-07 15:55:39.000000000 +0600 -+++ exult-1.4.9rc1/istring.h 2012-05-19 13:01:14.886079750 +0600 -@@ -162,19 +162,19 @@ - - _Myt& operator+=(const _Myt& _Right) - { // append _Right -- append(_Right); -+ this->append(_Right); - return (*this); - } - - _Myt& operator+=(const _Elem *_Ptr) - { // append [_Ptr, ) -- append(_Ptr); -+ this->append(_Ptr); - return (*this); - } - - _Myt& operator+=(_Elem _Ch) - { // append 1 * _Ch -- append(static_cast(1), _Ch); -+ this->append(static_cast(1), _Ch); - return (*this); - } - -diff -aur exult-1.4.9rc1.orig/shapes/pngio.cc exult-1.4.9rc1/shapes/pngio.cc ---- exult-1.4.9rc1.orig/shapes/pngio.cc 2010-02-15 18:48:11.000000000 -0200 -+++ exult-1.4.9rc1/shapes/pngio.cc 2013-09-22 20:56:37.809763588 -0300 -@@ -26,6 +26,7 @@ - #ifdef HAVE_CONFIG_H - # include - #endif -+#include - - #ifdef HAVE_PNG_H - -@@ -79,7 +80,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -208,7 +209,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_write_struct(&png, &info); - fclose(fp); -@@ -306,7 +307,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -395,7 +396,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_write_struct(&png, &info); - fclose(fp); - diff --git a/third_party/nixpkgs/pkgs/games/exult/default.nix b/third_party/nixpkgs/pkgs/games/exult/default.nix index e735c9c581..adbf4dd070 100644 --- a/third_party/nixpkgs/pkgs/games/exult/default.nix +++ b/third_party/nixpkgs/pkgs/games/exult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, SDL, libogg, libvorbis, zlib, unzip }: +{ stdenv, fetchurl, pkgconfig, SDL2, libogg, libvorbis, zlib, unzip }: let @@ -12,27 +12,20 @@ let in stdenv.mkDerivation rec { - name = "exult-1.4.9rc1"; + name = "exult-1.6"; src = fetchurl { url = "mirror://sourceforge/exult/${name}.tar.gz"; - sha256 = "0a03a2l3ji6h48n106d4w55l8v6lni1axniafnvvv5c5n3nz5bgd"; + sha256 = "1dm27qkxj30567zb70q4acddsizn0xyi3z87hg7lysxdkyv49s3s"; }; configureFlags = [ "--disable-tools" ]; - patches = - [ # Arch Linux patch set. - ./arch.patch - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL libogg libvorbis zlib unzip ]; + buildInputs = [ SDL2 libogg libvorbis zlib unzip ]; enableParallelBuilding = true; - makeFlags = [ "DESTDIR=$(out)" ]; - NIX_LDFLAGS = "-lX11"; postInstall = diff --git a/third_party/nixpkgs/pkgs/games/gambatte/default.nix b/third_party/nixpkgs/pkgs/games/gambatte/default.nix index ac099e21d5..b2a2f0a3f9 100644 --- a/third_party/nixpkgs/pkgs/games/gambatte/default.nix +++ b/third_party/nixpkgs/pkgs/games/gambatte/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, scons, qt4 }: +{ stdenv, fetchFromGitHub, scons, qt4, alsaLib }: stdenv.mkDerivation { pname = "gambatte"; - version = "2016-05-03"; + version = "2020-03-14"; src = fetchFromGitHub { owner = "sinamas"; repo = "gambatte"; - rev = "f8a810b103c4549f66035dd2be4279c8f0d95e77"; - sha256 = "1arv4zkh3fhrghsykl4blazc9diw09m44pyff1059z5b98smxy3v"; + rev = "56e3371151b5ee86dcdcf4868324ebc6de220bc9"; + sha256 = "0cc6zcvxpvi5hgcssb1zy0fkj9nk7n0d2xm88a4v05kpm5zw7sh2"; }; - buildInputs = [ scons qt4 ]; + buildInputs = [ scons qt4 alsaLib ]; patches = [ ./fix-scons-paths.patch ]; diff --git a/third_party/nixpkgs/pkgs/games/gemrb/default.nix b/third_party/nixpkgs/pkgs/games/gemrb/default.nix index 4f7d1cb375..91b841f6c5 100644 --- a/third_party/nixpkgs/pkgs/games/gemrb/default.nix +++ b/third_party/nixpkgs/pkgs/games/gemrb/default.nix @@ -4,24 +4,27 @@ stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { - owner = "gemrb"; - repo = "gemrb"; - rev = "v${version}"; - sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4"; + owner = "gemrb"; + repo = "gemrb"; + rev = "v${version}"; + sha256 = "14j9mhrbi4gnrbv25nlsvcxzkylijzrnwbqqnrg7pr452lb3srpb"; }; - # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional + # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl + # reqs) optional buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - + # TODO: add proper OpenGL support. We are currently (0.8.7) getting a shader + # error on execution when enabled. cmakeFlags = [ "-DLAYOUT=opt" + # "-DOPENGL_BACKEND=GLES" + # "-DOpenGL_GL_PREFERENCE=GLVND" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix index 00df6f3382..f31a44e97c 100644 --- a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix +++ b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix @@ -2,6 +2,7 @@ , lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools +, llvm , withServer ? true }: @@ -27,6 +28,7 @@ mkDerivation rec { buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image fpc lua5_1 + llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 ffmpeg_3 freeglut physfs qtbase ] ++ lib.optional withServer ghc; @@ -34,6 +36,10 @@ mkDerivation rec { postPatch = '' substituteInPlace gameServer/CMakeLists.txt \ --replace mask evaluate + + # compile with fpc >= 3.2.0 + # https://github.com/archlinux/svntogit-community/blob/75a1b3900fb3dd553d5114bbc8474d85fd6abb02/trunk/PKGBUILD#L26 + sed -i 's/procedure ShiftWorld(Dir: LongInt); inline;/procedure ShiftWorld(Dir: LongInt);/' hedgewars/uWorld.pas ''; cmakeFlags = [ @@ -42,7 +48,7 @@ mkDerivation rec { ]; - # hslogger brings network-3 and network-bsd which conflict with + # hslogger brings network-3 and network-bsd which conflict with # network-2.6.3.1 preConfigure = '' substituteInPlace gameServer/CMakeLists.txt \ @@ -97,6 +103,5 @@ mkDerivation rec { all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; inherit (ghc.meta) platforms; - hydraPlatforms = []; }; } diff --git a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix index 1ef0fd147d..32882f1689 100644 --- a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix +++ b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "11.3l"; + version = "11.3o"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "0fniyaf9mgg99s03wbdc36zg909kshpdfk9pn8pkai0x99lghkwb"; + sha256 = "0bijgbqpc867pq8lbwwvcnc713gm51mmz625xb5br0q2qw09nkyh"; }; CPPFLAGS = "-I${SDL.dev}/include/SDL"; diff --git a/third_party/nixpkgs/pkgs/games/instead/default.nix b/third_party/nixpkgs/pkgs/games/instead/default.nix index f131b92099..34a31fee72 100644 --- a/third_party/nixpkgs/pkgs/games/instead/default.nix +++ b/third_party/nixpkgs/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }: let - version = "3.3.1"; + version = "3.3.2"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "10bppcdjnd0all71l5akdvy7fx0c8s8x0za9qxszs8cjmlv9z1q0"; + sha256 = "u5j2kDKRvMQPsG8iA6uOBScuyE/e1BJIK2+qVL6jqQs="; }; NIX_LDFLAGS = "-llua -lgcc_s"; @@ -41,6 +41,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig unzip ]; buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ]; + postPatch = '' + substituteInPlace configure.sh \ + --replace "/tmp/sdl-test" $(mktemp) + ''; + configurePhase = '' { echo 2; echo $out; } | ./configure.sh ''; diff --git a/third_party/nixpkgs/pkgs/games/katago/default.nix b/third_party/nixpkgs/pkgs/games/katago/default.nix index 492ccbb63a..20ad47d3e0 100644 --- a/third_party/nixpkgs/pkgs/games/katago/default.nix +++ b/third_party/nixpkgs/pkgs/games/katago/default.nix @@ -13,35 +13,44 @@ , opencl-headers ? null , ocl-icd ? null , gperftools ? null -, cudaSupport ? false -, useTcmalloc ? true}: +, eigen ? null +, enableAVX2 ? false +, enableBigBoards ? false +, enableCuda ? false +, enableGPU ? true +, enableTcmalloc ? true}: -assert cudaSupport -> ( +assert !enableGPU -> ( + eigen != null && + !enableCuda); + +assert enableCuda -> ( libGL_driver != null && cudatoolkit != null && cudnn != null); -assert !cudaSupport -> ( - opencl-headers != null && - ocl-icd != null); +assert !enableCuda -> ( + !enableGPU || ( + opencl-headers != null && + ocl-icd != null)); -assert useTcmalloc -> ( +assert enableTcmalloc -> ( gperftools != null); let - env = if cudaSupport + env = if enableCuda then gcc8Stdenv else stdenv; in env.mkDerivation rec { pname = "katago"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; - rev = "${version}"; - sha256 = "0ajdjdmlzwh7zwk5v0k9zzjawgkf7w30pzqp5bhcsdqz4svvyll2"; + rev = "v${version}"; + sha256 = "030ff9prnvpadgcb4x4hx6b6ggg10bwqcj8vd8nwrdz9sjq67yf7"; }; nativeBuildInputs = [ @@ -52,36 +61,44 @@ in env.mkDerivation rec { buildInputs = [ libzip boost - ] ++ lib.optionals cudaSupport [ + ] ++ lib.optionals (!enableGPU) [ + eigen + ] ++ lib.optionals (enableGPU && enableCuda) [ cudnn libGL_driver - ] ++ lib.optionals (!cudaSupport) [ + ] ++ lib.optionals (enableGPU && !enableCuda) [ opencl-headers ocl-icd - ] ++ lib.optionals useTcmalloc [ + ] ++ lib.optionals enableTcmalloc [ gperftools ]; cmakeFlags = [ "-DNO_GIT_REVISION=ON" - ] ++ lib.optionals cudaSupport [ + ] ++ lib.optionals (!enableGPU) [ + "-DUSE_BACKEND=EIGEN" + ] ++ lib.optionals enableAVX2 [ + "-DUSE_AVX2=ON" + ] ++ lib.optionals (enableGPU && enableCuda) [ "-DUSE_BACKEND=CUDA" - ] ++ lib.optionals (!cudaSupport) [ + ] ++ lib.optionals (enableGPU && !enableCuda) [ "-DUSE_BACKEND=OPENCL" - ] ++ lib.optionals useTcmalloc [ + ] ++ lib.optionals enableTcmalloc [ "-DUSE_TCMALLOC=ON" + ] ++ lib.optionals enableBigBoards [ + "-DUSE_BIGGER_BOARDS_EXPENSIVE=ON" ]; preConfigure = '' cd cpp/ - '' + lib.optionalString cudaSupport '' + '' + lib.optionalString enableCuda '' export CUDA_PATH="${cudatoolkit}" export EXTRA_LDFLAGS="-L/run/opengl-driver/lib" ''; installPhase = '' mkdir -p $out/bin; cp katago $out/bin; - '' + lib.optionalString cudaSupport '' + '' + lib.optionalString enableCuda '' wrapProgram $out/bin/katago \ --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" ''; diff --git a/third_party/nixpkgs/pkgs/games/klavaro/default.nix b/third_party/nixpkgs/pkgs/games/klavaro/default.nix index 557f75580c..ac2c787d3f 100644 --- a/third_party/nixpkgs/pkgs/games/klavaro/default.nix +++ b/third_party/nixpkgs/pkgs/games/klavaro/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "klavaro"; - version = "3.10"; + version = "3.11"; src = fetchurl { url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2"; - sha256 = "0jnzdrndiq6m0bwgid977z5ghp4q61clwdlzfpx4fd2ml5x3iq95"; + sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free touch typing tutor program"; homepage = "http://klavaro.sourceforge.net/"; + changelog = "https://sourceforge.net/p/klavaro/code/HEAD/tree/trunk/ChangeLog"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ mimame davidak ]; diff --git a/third_party/nixpkgs/pkgs/games/koboredux/default.nix b/third_party/nixpkgs/pkgs/games/koboredux/default.nix new file mode 100644 index 0000000000..746e9d6bbe --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/koboredux/default.nix @@ -0,0 +1,87 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, requireFile +, cmake +, pkg-config +, SDL2 +, SDL2_image +, audiality2 +, useProprietaryAssets ? true +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "koboredux"; + version = "0.7.5.1"; + + src = + [(fetchFromGitHub { + owner = "olofson"; + repo = "koboredux"; + rev = "v${version}"; + sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig"; + })] + ++ + (optional useProprietaryAssets (requireFile { + name = "koboredux-${version}-Linux.tar.bz2"; + sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav"; + message = '' + Please purchase the game on https://olofson.itch.io/kobo-redux + and download the Linux build. + + Once you have downloaded the file, please use the following command + and re-run the installation: + + nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2 + + Alternatively, install the "koboredux-free" package, which replaces the + proprietary assets with a placeholder theme. + ''; + })); + + sourceRoot = "source"; # needed when we have the assets source + + # Fix clang build + patches = [(fetchpatch { + url = "https://github.com/olofson/koboredux/commit/cf92b8a61d002ccaa9fbcda7a96dab08a681dee4.patch"; + sha256 = "0dwhvis7ghf3mgzjd2rwn8hk3ndlgfwwcqaq581yc5rwd73v6vw4"; + })]; + + postPatch = optionalString useProprietaryAssets '' + cp -r ../koboredux-${version}-Linux/sfx/redux data/sfx/ + cp -r ../koboredux-${version}-Linux/gfx/redux data/gfx/ + cp -r ../koboredux-${version}-Linux/gfx/redux_fullscreen data/gfx/ + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + SDL2_image + audiality2 + ]; + + meta = { + description = "A frantic 80's style 2D shooter, similar to XKobo and Kobo Deluxe" + + optionalString (!useProprietaryAssets) " (built without proprietary assets)"; + longDescription = '' + Kobo Redux is a frantic 80's style 2D shooter, inspired by the look and + feel of 90's arcade cabinets. The gameplay is fast and unforgiving, + although with less of the frustrating quirkiness of the actual games + of the 80's. A true challenge in the spirit of the arcade era! + '' + optionalString (!useProprietaryAssets) '' + + This version replaces the official proprietary assets with placeholders. + For the full experience, consider installing "koboredux" instead. + ''; + homepage = "https://olofson.itch.io/kobo-redux"; + license = with licenses; if useProprietaryAssets then unfree else gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/games/left4gore/default.nix b/third_party/nixpkgs/pkgs/games/left4gore/default.nix new file mode 100644 index 0000000000..597f7da2b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/left4gore/default.nix @@ -0,0 +1,48 @@ +{ stdenvNoCC, lib, fetchurl, buildFHSUserEnv }: + +let + version = "2.3"; + + # Unwrapped package, for putting into the FHS env + left4gore-unwrapped = stdenvNoCC.mkDerivation { + pname = "left4gore-unwrapped"; + inherit version; + + src = fetchurl { + url = "http://www.left4gore.com/dist/left4gore-${version}-linux.tar.gz"; + sha256 = "1n57nh32ybn6kirn8djh0nsjx6m84c0jfi1x8r4w2qr0qky3z7p0"; + }; + + installPhase = '' + mkdir -p $out/bin + cp left4gore $out/bin + ''; + }; + + # FHS env, as patchelf will not work + env = buildFHSUserEnv { + name = "left4gore-env-${version}"; + targetPkgs = _: [ left4gore-unwrapped ]; + runScript = "left4gore"; + }; + +in stdenvNoCC.mkDerivation { + pname = "left4gore"; + inherit version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + ln -s ${env}/bin/* $out/bin/left4gore + ''; + + meta = with lib; { + homepage = "http://www.left4gore.com"; + description = "Memory patcher which adds the gore back into Left 4 Dead 2"; + license = licenses.unfree; # Probably the best choice + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix new file mode 100644 index 0000000000..114aa6ab12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildPythonApplication +, pythonOlder +, requests +}: + +buildPythonApplication rec { + pname = "legendary-gl"; # Name in pypi + version = "0.0.14"; + + src = fetchFromGitHub { + owner = "derrod"; + repo = "legendary"; + rev = version; + sha256 = "05r88qi8mmbj07wxcpb3fhbl40qscbq1aqb0mnj9bpmi9gf5zll5"; + }; + + propagatedBuildInputs = [ requests ]; + + disabled = pythonOlder "3.8"; + + meta = with lib; { + description = "A free and open-source Epic Games Launcher alternative"; + homepage = "https://github.com/derrod/legendary"; + license = licenses.gpl3; + maintainers = with maintainers; [ wchresta ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix index 5ba4b4de2f..7216a42b00 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.16.1"; + version = "1.16.3"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar"; + url = "https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar"; # sha1 because that comes from mojang via api - sha1 = "a412fd69db1f81db3f511c1463fd304675244077"; + sha1 = "f02f4473dbf152c23d7d484952121db0b36698cb"; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix index 9d23515c03..9bdf979d7d 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix @@ -59,7 +59,6 @@ let freetype gdk-pixbuf glib - gnome2.GConf gnome2.pango gtk3-x11 gtk2-x11 @@ -87,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.16102"; + version = "2.1.17627"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "17zgxmijk9mq651h7ymkr7h2099cw23kc0r7jyfkdccp60dfd60i"; + sha256 = "04zjjyy0psfxfibzbac9w0kkgqwfpf1qmbj5gspyvhaib7k8may0"; }; icon = fetchurl { diff --git a/third_party/nixpkgs/pkgs/games/multimc/default.nix b/third_party/nixpkgs/pkgs/games/multimc/default.nix index bcdd950de4..472a8b2966 100644 --- a/third_party/nixpkgs/pkgs/games/multimc/default.nix +++ b/third_party/nixpkgs/pkgs/games/multimc/default.nix @@ -1,6 +1,7 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: let + jdk = jdk8; libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in mkDerivation rec { pname = "multimc"; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 59e044b482..fa27eab275 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.806.0"; + version = "2020.903.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "BelmqcDnrGH84fTs6M0krwWz6SHn2hOm7y+PNEOOOZM="; + sha256 = "01apjgi2r8jaihp7sp1y69fmplkiy383zxxdbjn1m797f0ls37ca"; }; patches = [ ./bypass-tamper-detection.patch ]; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { mkdir -p $HOME/.nuget/NuGet cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - dotnet restore --source nixos osu.Desktop + dotnet restore --source "$PWD/nixos" osu.Desktop runHook postConfigure ''; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index c29035e572..6c8aa4bd18 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -281,8 +281,8 @@ }) (fetchNuGet { name = "Markdig"; - version = "0.20.0"; - sha256 = "19qhvyj59i8zcxblpl4vqabb55y5xrk3iipmb656mid1b1m4jfkn"; + version = "0.21.1"; + sha256 = "119v22rvg51ifg54r1ndf2bw7hv1lf5wn3cd04ccg8d7r8c0yhbk"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; @@ -306,23 +306,23 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; - version = "3.0.0"; - sha256 = "19zfz84c1860na8qpkzv6va6d7dh1md9wkrb7c6x3brhjnj859hk"; + version = "3.3.0"; + sha256 = "04z03ir9sal5h9ha97isbh660jijslb8zfiaa48w2r2l6pabz5kd"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; - version = "3.6.0"; - sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7"; + version = "3.7.0"; + sha256 = "0882492nx6x68b0pkh3q5xaawz0b2l5x35r40722ignyjnvjydph"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; - version = "3.6.0"; - sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn"; + version = "3.7.0"; + sha256 = "0adw6rcag8wxydzyiyhls2mxaqkay5qlz25z1fxrlv5qnchqn0n5"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; - version = "3.6.0"; - sha256 = "1zc9328invqqpisdljw5vpm1kk416prfczakakw1vwkv9r54sd73"; + version = "3.7.0"; + sha256 = "15rlz65wbky0yq7b9s8xwk68dgrhgsk4rj88q9pyjxbm5938vrav"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; @@ -336,13 +336,13 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; - version = "3.6.0"; - sha256 = "176faadh1k9xcc8cc2qpkka9j1n426fdff1ax5ikmz2hbrspmigz"; + version = "3.7.0"; + sha256 = "00nm453w4n6kjsicmz5izvkf1ki9rp3xnc9n3y7a9b1g5sxg36fs"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.MSBuild"; - version = "3.6.0"; - sha256 = "0hxs9x5gpi7yvqf46bxh9niipb0jif7ak5baxw5l920787vysdhc"; + version = "3.7.0"; + sha256 = "1sh8s7b16j06p3gmzsgwd8690vagah4908bpa3gyz2fxgfnj46ax"; }) (fetchNuGet { name = "Microsoft.CodeQuality.Analyzers"; @@ -371,8 +371,8 @@ }) (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; - version = "2.0.137201"; - sha256 = "0cfsd8nn6y30bqzx1pf9xi29jnxap1fgk720zdpz93kqzqv8r0vc"; + version = "2.0.142701"; + sha256 = "114ivn09zlxkna78hyxa3h40k5iaivapws755i0aiys7nxhdn3mw"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -586,8 +586,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.806.0"; - sha256 = "1d4aprz81xbhk5addl1n7jwj8xxny51s6nvpn37alld0x6n7k8nv"; + version = "2020.903.0"; + sha256 = "0g15yw8c21m2g0lpca4f519dgj2phccz15nqdbaq49736akr4qzm"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -596,8 +596,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2020.731.0"; - sha256 = "1q58c627p0yz6b2y4c1hrrr4l9hii418y1vk6hv24x1csdsf3x8p"; + version = "2020.903.0"; + sha256 = "0f94kms4xyjl9xwf26j6n6k5zfbx61a6bkd3vljfmbmr88advssy"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; @@ -721,8 +721,8 @@ }) (fetchNuGet { name = "Sentry"; - version = "2.1.5"; - sha256 = "094rhsn5rfk7f2ygk6jgv3cq01gv3a8lnqa85l593ys3957j0qhs"; + version = "2.1.6"; + sha256 = "0vc45p1arxwifv5fb6lzkqqxlsvm4i0xmpq2vc73vbjqzydd2phm"; }) (fetchNuGet { name = "Sentry.PlatformAbstractions"; @@ -731,8 +731,8 @@ }) (fetchNuGet { name = "Sentry.Protocol"; - version = "2.1.5"; - sha256 = "1yjgn6na14rr6crmm886x597h9gdjyasgxx3n9m3zn7ig8726mpg"; + version = "2.1.6"; + sha256 = "0qc18kc9d7f0s6hmnpji3sbz0z09kdgg4fwh55rrmpfgr3w851s7"; }) (fetchNuGet { name = "SharpCompress"; diff --git a/third_party/nixpkgs/pkgs/games/papermc/default.nix b/third_party/nixpkgs/pkgs/games/papermc/default.nix index 9695a35005..c5f7dc3792 100644 --- a/third_party/nixpkgs/pkgs/games/papermc/default.nix +++ b/third_party/nixpkgs/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, bash, jre }: let - mcVersion = "1.15.2"; - buildNum = "161"; + mcVersion = "1.16.2"; + buildNum = "141"; jar = fetchurl { url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "1jngj5djs1fjdj25wg9iszw0dsp56f386j8ydms7x4ky8s8kxyms"; + sha256 = "1qhhnaysw9r73fpvj9qcmjah722a6a4s6g4cblna56n1hpz4lw1s"; }; in stdenv.mkDerivation { pname = "papermc"; @@ -13,22 +13,23 @@ in stdenv.mkDerivation { preferLocalBuild = true; dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - cp ${jar} $out/papermc.jar - cat > $out/bin/minecraft-server << EOF - #!/bin/sh - exec ${jre}/bin/java \$@ -jar $out/papermc.jar nogui - EOF - chmod +x $out/bin/minecraft-server + dontConfigure = true; + + buildPhase = '' + cat > minecraft-server << EOF + #!${bash}/bin/sh + exec ${jre}/bin/java \$@ -jar $out/share/papermc/papermc.jar nogui ''; - phases = "installPhase"; + installPhase = '' + install -Dm444 ${jar} $out/share/papermc/papermc.jar + install -Dm555 -t $out/bin minecraft-server + ''; meta = { description = "High-performance Minecraft Server"; homepage = "https://papermc.io/"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Only; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ aaronjanse ]; }; diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix index 76f6ecfb81..f3808102bd 100644 --- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,13 +10,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.2"; + version = "0.8.2d"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "1ra697237vnpx8nsy7dzk958vlyf6jpx1k5dpbr8ybg6vgc3kqx3"; + sha256 = "11lgalam1aacw01ar7nawiim4pbxqzrdrnxvj6wq9mg83hgsz65l"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/games/sm64ex/default.nix b/third_party/nixpkgs/pkgs/games/sm64ex/default.nix new file mode 100644 index 0000000000..e5aeb84fbf --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/sm64ex/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, fetchFromGitHub +, python3 +, pkg-config +, audiofile +, SDL2 +, hexdump +, requireFile +, compileFlags ? [ ] +, region ? "us" +, baseRom ? requireFile { + name = "baserom.${region}.z64"; + message = '' + This nix expression requires that baserom.${region}.z64 is + already part of the store. To get this file you can dump your Super Mario 64 cartridge's contents + and add it to the nix store with nix-store --add-fixed sha256 . + Note that if you are not using a US baserom, you must overwrite the "region" attribute with either "eu" or "jp". + ''; + sha256 = { + "us" = "17ce077343c6133f8c9f2d6d6d9a4ab62c8cd2aa57c40aea1f490b4c8bb21d91"; + "eu" = "c792e5ebcba34c8d98c0c44cf29747c8ee67e7b907fcc77887f9ff2523f80572"; + "jp" = "9cf7a80db321b07a8d461fe536c02c87b7412433953891cdec9191bfad2db317"; + }.${region}; + } +}: + +stdenv.mkDerivation rec { + pname = "sm64ex"; + version = "unstable-2020-06-19"; + + src = fetchFromGitHub { + owner = "sm64pc"; + repo = "sm64ex"; + rev = "f5005418348cf1a53bfa75ff415a513ef0b9b273"; + sha256 = "0adyshkqk5c4lxhdxc3j6ax4svfka26486qpa5q2gl2nixwg9zxn"; + }; + + nativeBuildInputs = [ python3 pkg-config ]; + buildInputs = [ audiofile SDL2 hexdump ]; + + makeFlags = [ "VERSION=${region}" ] ++ compileFlags + ++ stdenv.lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; + + inherit baseRom; + + preBuild = '' + patchShebangs extract_assets.py + cp $baseRom ./baserom.${region}.z64 + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/sm64pc/sm64ex"; + description = "Super Mario 64 port based off of decompilation"; + longDescription = '' + Super Mario 64 port based off of decompilation. + Note that you must supply a baserom yourself to extract assets from. + If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp". + If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute. + ''; + license = licenses.unfree; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 2c7cde78c4..32acef9757 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -35,7 +35,7 @@ let # Steam VR procps usbutils - ] ++ lib.optional withJava jdk + ] ++ lib.optional withJava jdk8 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 ++ lib.optional withPrimus primus ++ extraPkgs pkgs; @@ -44,7 +44,7 @@ let # Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present exportLDPath = '' - export LD_LIBRARY_PATH=/lib32:/lib64:${lib.concatStringsSep ":" ldPath}\''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=/lib32:/lib64:${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; @@ -89,6 +89,7 @@ in buildFHSUserEnv rec { at-spi2-core # CrossCode gst_all_1.gstreamer gst_all_1.gst-plugins-ugly + gst_all_1.gst-plugins-base libdrm mono xorg.xkeyboardconfig @@ -193,8 +194,6 @@ in buildFHSUserEnv rec { SDL_mixer SDL2_ttf SDL2_mixer - gstreamer - gst-plugins-base libappindicator-gtk2 libcaca libcanberra diff --git a/third_party/nixpkgs/pkgs/games/stockfish/default.nix b/third_party/nixpkgs/pkgs/games/stockfish/default.nix index 5e8429f033..bdea1db9b3 100644 --- a/third_party/nixpkgs/pkgs/games/stockfish/default.nix +++ b/third_party/nixpkgs/pkgs/games/stockfish/default.nix @@ -4,20 +4,31 @@ let arch = if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else "unknown"; - version = "11"; + version = "12"; + + nnueFile = "nn-82215d0fd0df.nnue"; + nnue = fetchurl { + name = nnueFile; + url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; + sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2"; + }; in stdenv.mkDerivation { - pname = "stockfish"; inherit version; src = fetchurl { url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz"; - sha256 = "16di83s79gf9kzdhcal5y0q9d59544gd5xqf1k8bwrqvc36628l0"; + sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i"; }; - postUnpack = "sourceRoot+=/src"; + postUnpack = '' + sourceRoot+=/src + echo ${nnue} + cp "${nnue}" "$sourceRoot/${nnueFile}" + ''; + makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ]; buildFlags = [ "build" ]; diff --git a/third_party/nixpkgs/pkgs/games/tdm/default.nix b/third_party/nixpkgs/pkgs/games/tdm/default.nix index d0133df59d..055ab9d38e 100644 --- a/third_party/nixpkgs/pkgs/games/tdm/default.nix +++ b/third_party/nixpkgs/pkgs/games/tdm/default.nix @@ -4,7 +4,7 @@ let pname = "tdm"; - version = "2.07"; + version = "2.08"; desktop = makeDesktopItem { desktopName = pname; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "https://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z"; - sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6"; + sha256 = "0bmv07j6s6q3m7hnpx7cwrycjkbvlf0y9sg9migakni0jg9yz5ps"; }; nativeBuildInputs = [ p7zip sconsPackages.scons_3_1_2 gnum4 makeWrapper @@ -39,13 +39,15 @@ in stdenv.mkDerivation { preBuild = '' pushd tdm_update scons BUILD=release TARGET_ARCH=x64 - install -Dm755 tdm_update.linux $out/share/libexec/tdm_update.linux + install -Dm755 bin/tdm_update.linux64 $out/share/libexec/tdm_update.linux popd ''; # why oh why can it find ld but not strip? postPatch = '' sed -i 's!strip \$!${binutils-unwrapped}/bin/strip $!' SConstruct + # This adds math.h needed for math::floor + sed -i 's|#include "Util.h"|#include "Util.h"\n#include |' tdm_update/ConsoleUpdater.cpp ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/games/tome2/default.nix b/third_party/nixpkgs/pkgs/games/tome2/default.nix index a632e523aa..fa73697ab4 100644 --- a/third_party/nixpkgs/pkgs/games/tome2/default.nix +++ b/third_party/nixpkgs/pkgs/games/tome2/default.nix @@ -9,7 +9,7 @@ let name = pname; exec = "${pname}-x11"; icon = pname; - terminal = "False"; + terminal = "false"; comment = description; type = "Application"; categories = "Game;RolePlaying;"; diff --git a/third_party/nixpkgs/pkgs/games/ultrastardx/default.nix b/third_party/nixpkgs/pkgs/games/ultrastardx/default.nix index b2d601df34..b6e1da204e 100644 --- a/third_party/nixpkgs/pkgs/games/ultrastardx/default.nix +++ b/third_party/nixpkgs/pkgs/games/ultrastardx/default.nix @@ -1,7 +1,26 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig -, lua, fpc, pcre, portaudio, freetype, libpng -, SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf -, ffmpeg, sqlite, zlib, libX11, libGLU, libGL }: +{ stdenv +, autoreconfHook +, fetchFromGitHub +, fetchpatch +, pkgconfig +, lua +, fpc +, pcre +, portaudio +, freetype +, libpng +, SDL2 +, SDL2_image +, SDL2_gfx +, SDL2_mixer +, SDL2_net, SDL2_ttf +, ffmpeg +, sqlite +, zlib +, libX11 +, libGLU +, libGL +}: let sharedLibs = [ @@ -12,17 +31,25 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "unstable-2019-01-07"; + version = "2020.4.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; - rev = "3df142590f29db1505cc58746af9f8cf7cb4a6a5"; - sha256 = "0853rg7vppkmw37wm9xm0m0wab3r09ws6w04xs2wgwj1mwl0d70j"; + rev = "v${version}"; + sha256 = "0vmfv8zpyf8ymx3rjydpd7iqis080lni94vb316vfxkgvjmqbhym"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ fpc libpng ] ++ sharedLibs; + patches = [ + (fetchpatch { + name = "fpc-3.2-support.patch"; + url = "https://github.com/UltraStar-Deluxe/USDX/commit/1b8e8714c1523ef49c2fd689a1545d097a3d76d7.patch"; + sha256 = "02zmjymj9w1mkpf7armdpf067byvml6lprs1ca4lhpkv45abddp4"; + }) + ]; + postPatch = '' substituteInPlace src/config.inc.in \ --subst-var-by libpcre_LIBNAME libpcre.so.1 diff --git a/third_party/nixpkgs/pkgs/games/unnethack/default.nix b/third_party/nixpkgs/pkgs/games/unnethack/default.nix index 1ac87c1d41..2dde86297e 100644 --- a/third_party/nixpkgs/pkgs/games/unnethack/default.nix +++ b/third_party/nixpkgs/pkgs/games/unnethack/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchgit, utillinux, ncurses, flex, bison }: +{ stdenv, fetchFromGitHub, fetchpatch, utillinux, ncurses, flex, bison }: stdenv.mkDerivation rec { pname = "unnethack"; - version = "5.2.0"; + version = "5.3.2"; - src = fetchgit { - url = "https://github.com/UnNetHack/UnNetHack"; - rev = "refs/tags/${version}"; - sha256 = "088gd2c7v95f2pm9ky38i28sz73mnsksr2p2hhhflkchxncd21f1"; + src = fetchFromGitHub { + name = "UnNetHack"; + owner = "UnNetHack"; + repo = "UnNetHack"; + rev = version; + sha256 = "1rg0mqyplgn3dfh3wz09a600qxk7aidqw4d84kyiincljvhyb7ps"; }; buildInputs = [ ncurses ]; @@ -22,6 +24,14 @@ stdenv.mkDerivation rec { ]; makeFlags = [ "GAMEPERM=744" ]; + patches = [ + # fix regression with bison, merged in master + (fetchpatch { + name = "fix-bison.patch"; + url = "https://github.com/UnNetHack/UnNetHack/commit/04f0a3a850a94eb8837ddcef31303968240d1c31.patch"; + sha256 = "1zblbwqqz9nx16k6n31wi2hdvz775lvzmkjblmrx18nbm4ylj0n9"; + }) + ]; enableParallelBuilding = true; @@ -54,5 +64,5 @@ stdenv.mkDerivation rec { license = "nethack"; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; - }; + }; } diff --git a/third_party/nixpkgs/pkgs/games/uqm/default.nix b/third_party/nixpkgs/pkgs/games/uqm/default.nix index 523ae354b7..bce8fde3ac 100644 --- a/third_party/nixpkgs/pkgs/games/uqm/default.nix +++ b/third_party/nixpkgs/pkgs/games/uqm/default.nix @@ -65,9 +65,11 @@ in stdenv.mkDerivation rec { ln -s "${videos}" "uqm-${version}/content/addons/3dovideo" ''; - # Using _STRINGS_H as include guard conflicts with glibc. postPatch = '' + # Using _STRINGS_H as include guard conflicts with glibc. sed -i -e '/^#/s/_STRINGS_H/_UQM_STRINGS_H/g' src/uqm/comm/*/strings.h + # See https://github.com/NixOS/nixpkgs/pull/93560 + sed -i -e 's,/tmp/,$TMPDIR/,' build/unix/config_functions ''; # uqm has a 'unique' build system with a root script incidentally called diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index 55848d91fa..413d98d26a 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "VASSAL-3.2.17"; + name = "VASSAL-3.3.2"; src = fetchurl { url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2"; - sha256 = "0nxskr46janxnb31c03zv61kr46vy98l7cwxha3vll81l4ij1sjb"; + sha256 = "1abhlkl27gyfa1lghvv76xa6ks5hiwv2s9wb9ddadm0m07f87n1w"; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/wyvern/cargo-lock.patch b/third_party/nixpkgs/pkgs/games/wyvern/cargo-lock.patch new file mode 100644 index 0000000000..89b2517e26 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/wyvern/cargo-lock.patch @@ -0,0 +1,2514 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..8be5b39 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,2508 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "adler32" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "argon2rs" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.34" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "base64" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bit-set" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bit-vec" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bitflags" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2-rfc" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "build_const" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "butlerd" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bytes" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bzip2" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bzip2-sys" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clap-verbosity-flag" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clicolors-control" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "confy" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "directories 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "console" ++version = "0.7.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cookie" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cookie" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cookie_store" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cookie_store" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "crc" ++version = "1.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crc32fast" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-queue" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "curl" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "curl-sys 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "curl-sys" ++version = "0.4.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dialoguer" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "directories" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dtoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "eidolon" ++version = "1.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "butlerd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "encode_unicode" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "encoding_rs" ++version = "0.8.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.5.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "error-chain" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "futf" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "futures" ++version = "0.1.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "futures-cpupool" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gog" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", ++ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "select 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "user_agent 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "h2" ++version = "0.1.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "html5ever" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "http" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "http-body" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "httparse" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "human-panic" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hyper" ++version = "0.12.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hyper-tls" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "indicatif" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "inflate" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libflate" ++version = "0.1.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rle-decode-fast 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.0.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "markup5ever" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memoffset" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mime" ++version = "0.3.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mime_guess" ++version = "2.0.0-alpha.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miniz_oxide_c_api" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mio" ++version = "0.6.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "new_debug_unreachable" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nodrop" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num-traits" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "number_prefix" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl" ++version = "0.10.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.48" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "os_type" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "owning_ref" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "phf" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_codegen" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "podio" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "precomputed-hash" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "publicsuffix" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quote" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.3.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_core" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "reqwest" ++version = "0.9.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rle-decode-fast" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "same-file" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "schannel" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scoped_threadpool" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "security-framework" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "select" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.98" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.98" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_urlencoded" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "siphasher" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "socket2" ++version = "0.3.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "string" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "string_cache" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "string_cache_codegen" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "string_cache_shared" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "structopt" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "take_mut" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "tempdir" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tendril" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termios" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio" ++version = "0.1.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-buf" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-current-thread" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-executor" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-io" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-reactor" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-sync" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-tcp" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-threadpool" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-timer" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "try-lock" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "try_from" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicase" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicase" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "url" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "user_agent" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cookie_store 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf-8" ++version = "0.7.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "uuid" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "walkdir" ++version = "2.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "want" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wincolor" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wincolor" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winreg" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wyvern" ++version = "1.4.1" ++dependencies = [ ++ "clap-verbosity-flag 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "confy 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dialoguer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "eidolon 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gog 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indicatif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "zip 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "zip" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libflate 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" ++"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" ++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" ++"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" ++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" ++"checksum backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)" = "b5164d292487f037ece34ec0de2fcede2faa162f085dd96d2385ab81b12765ba" ++"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" ++"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80" ++"checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" ++"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" ++"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" ++"checksum butlerd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "095899eb6b69e0a1c98215e51a44c67b8e3c902ebb9440afaafe2eb45e650a09" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" ++"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" ++"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" ++"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" ++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" ++"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum clap-verbosity-flag 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bda14f5323b2b747f52908c5b7b8af7790784088bc7c2957a11695e39ad476dc" ++"checksum clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73abfd4c73d003a674ce5d2933fca6ce6c42480ea84a5ffe0a2dc39ed56300f9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum confy 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4b1400cd0dae7f27d2c7ced9492e1398d2e2df614570092a4936c73b416dedea" ++"checksum console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ca57c2c14b8a2bf3105bc9d15574aad80babf6a9c44b1058034cdf8bd169628" ++"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" ++"checksum cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "99be24cfcf40d56ed37fd11c2123be833959bbc5bddecb46e1c2e442e15fa3e0" ++"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" ++"checksum cookie_store 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b0d2f2ecb21dce00e2453268370312978af9b8024020c7a37ae2cc6dbbe64685" ++"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" ++"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" ++"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" ++"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" ++"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" ++"checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13" ++"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" ++"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" ++"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" ++"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" ++"checksum curl 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)" = "f8ed9a22aa8c4e49ac0c896279ef532a43a7df2f54fcd19fa36960de029f965f" ++"checksum curl-sys 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "5e90ae10f635645cba9cad1023535f54915a95c58c44751c6ed70dbaeb17a408" ++"checksum dialoguer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "116f66c4e7b19af0d52857aa4ff710cc3b4781d9c16616e31540bc55ec57ba8c" ++"checksum directories 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2561db021b6f1321d0f16b67ed28ce843ef4610dfaa432e3ffa2e8a3050ebf" ++"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" ++"checksum eidolon 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8a501eef266fdb28e1414b6104ca799a216bce6dc4ae1217ad0f40d591351671" ++"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" ++"checksum encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd" ++"checksum encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed" ++"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" ++"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"checksum flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "550934ad4808d5d39365e5d61727309bf18b3b02c6c56b729cb92e7dd84bc3d8" ++"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" ++"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++"checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" ++"checksum futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" ++"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" ++"checksum getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8e190892c840661957ba9f32dacfb3eb405e657f9f9f60485605f0bb37d6f8" ++"checksum gog 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "19bfb6c45ea1fba86f5880b4f239ef8034230387d90a0dfea70e094caeabf0be" ++"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" ++"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++"checksum html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ce65ac8028cf5a287a7dbf6c4e0a6cf2dcf022ed5b167a81bae66ebf599a8b7" ++"checksum http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "372bcb56f939e449117fb0869c2e8fd8753a8223d92a172c6e808cf123a5b6e4" ++"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" ++"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" ++"checksum human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21638c5955a6daf3ecc42cae702335fc37a72a4abcc6959ce457b31a7d43bbdd" ++"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" ++"checksum hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)" = "7cb44cbce9d8ee4fb36e4c0ad7b794ac44ebaad924b9c8291a63215bb44c2c8f" ++"checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" ++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" ++"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" ++"checksum indicatif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "40ecd1e2ee08e6c255ce890f5a99d17000850e664e7acf119fb03b25b0575bfe" ++"checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" ++"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" ++"checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb" ++"checksum libflate 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "90c6f86f4b0caa347206f916f8b687b51d77c6ef8ff18d52dd007491fd580529" ++"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" ++"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" ++"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" ++"checksum markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f1af46a727284117e09780d05038b1ce6fc9c76cc6df183c3dae5a8955a25e21" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" ++"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" ++"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" ++"checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed" ++"checksum miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c061edee74a88eb35d876ce88b94d77a0448a201de111c244b70d047f5820516" ++"checksum miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c675792957b0d19933816c4e1d56663c341dd9bfa31cb2140ff2267c1d8ecf4" ++"checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" ++"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" ++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++"checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30" ++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" ++"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" ++"checksum number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee" ++"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)" = "b5ba300217253bcc5dc68bed23d782affa45000193866e025329aa8a7a9f05b8" ++"checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" ++"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" ++"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" ++"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" ++"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" ++"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" ++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" ++"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" ++"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" ++"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" ++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" ++"checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" ++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" ++"checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++"checksum publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d" ++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" ++"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" ++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4b0186e22767d5b9738a05eab7c6ac90b15db17e5b5f9bd87976dd7d89a10a4" ++"checksum rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe0df8435ac0c397d467b6cad6d25543d06e8a019ef3f6af3c384597515bd2" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828" ++"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" ++"checksum regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26" ++"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" ++"checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" ++"checksum reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0777154c2c3eb54f5c480db01de845652d941e47191277cc673634c3853939" ++"checksum rle-decode-fast 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" ++"checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" ++"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" ++"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" ++"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" ++"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" ++"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" ++"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" ++"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" ++"checksum select 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ac645958c62108d11f90f8d34e4dc2799c838fc995ed4c2075867a2a8d5be76b" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113" ++"checksum serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "01e69e1b8a631f245467ee275b8c757b818653c6d704cdbcaeb56b56767b529c" ++"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" ++"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" ++"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" ++"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" ++"checksum socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df028e0e632c2a1823d920ad74895e7f9128e6438cbc4bc6fd1f180e644767b9" ++"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" ++"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" ++"checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423" ++"checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da" ++"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" ++"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" ++"checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e" ++"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" ++"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" ++"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++"checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" ++"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" ++"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" ++"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" ++"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" ++"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" ++"checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" ++"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" ++"checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce" ++"checksum tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2162248ff317e2bc713b261f242b69dbb838b85248ed20bb21df56d60ea4cae7" ++"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" ++"checksum tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca01319dea1e376a001e8dc192d42ebde6dd532532a5bad988ac37db365b19" ++"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" ++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" ++"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" ++"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874" ++"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" ++"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" ++"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" ++"checksum user_agent 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "970a778e2284bd68e55ca4e93b858da333cd85c3d5d8b4eab2c6e729cd6f47c4" ++"checksum utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" ++"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" ++"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" ++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" ++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" ++"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" ++"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" ++"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" ++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++"checksum zip 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c18fc320faf909036e46ac785ea827f72e485304877faf1a3a39538d3714dbc3" diff --git a/third_party/nixpkgs/pkgs/games/wyvern/default.nix b/third_party/nixpkgs/pkgs/games/wyvern/default.nix new file mode 100644 index 0000000000..4723a6c52f --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/wyvern/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchgit +, rustPlatform +, unzip +, rsync +, innoextract +, curl +, cmake +, pkgconfig +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "wyvern"; + version = "1.4.1"; + + src = fetchgit { + url = "https://git.sr.ht/~nicohman/wyvern"; + rev = "${version}"; + sha256 = "1sl3yhash1527amc8rs4374fd7jbgnkyy7qpw94ms2gs80sdv3s5"; + }; + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "sha256:1nd5qla3p1jrssg5fqal8m3jcbxax0wsfc8cp97jdrpqlcgqfmrx"; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ openssl ]; + + meta = with stdenv.lib; { + description = "A simple CLI client for installing and maintaining linux GOG games"; + homepage = "https://git.sr.ht/~nicohman/wyvern"; + license = licenses.gpl3; + maintainers = with maintainers;[ _0x4A6F ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/xcowsay/default.nix b/third_party/nixpkgs/pkgs/games/xcowsay/default.nix new file mode 100644 index 0000000000..dd95bf1e5a --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/xcowsay/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, makeWrapper, pkg-config +, dbus, dbus-glib, gtk3, gdk-pixbuf, librsvg +, fortune +}: + +stdenv.mkDerivation rec { + pname = "xcowsay"; + version = "1.5"; + + src = fetchurl { + url = "http://www.nickg.me.uk/files/xcowsay-${version}.tar.gz"; + sha256 = "0pyaa062z1ag26dhkm1yzp2hivnlmhlpqn5xg7mx9r1m652mm91y"; + }; + + buildInputs = [ + dbus + dbus-glib + gtk3 + gdk-pixbuf # loading cow images + librsvg # dreaming SVG images + ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; + + configureFlags = [ "--enable-dbus" ]; + + postInstall = '' + for tool in xcowdream xcowsay xcowthink xcowfortune; do + wrapProgram $out/bin/$tool \ + --prefix PATH : $out/bin:${fortune}/bin + done + ''; + + meta = with stdenv.lib; { + homepage = "http://www.doof.me.uk/xcowsay"; + description = + "A program based on cowsay that displays a cute cow and message on your desktop"; + license = licenses.gpl3; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/zandronum/default.nix b/third_party/nixpkgs/pkgs/games/zandronum/default.nix index e7200ff22e..bdafff9924 100644 --- a/third_party/nixpkgs/pkgs/games/zandronum/default.nix +++ b/third_party/nixpkgs/pkgs/games/zandronum/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { version = "3.0.1"; src = fetchhg { - url = "https://bitbucket.org/Torr_Samaho/zandronum-stable"; + url = "https://hg.osdn.net/view/zandronum/zandronum-stable"; rev = "ZA_${version}"; sha256 = "16v5b6wfrmabs3ky6isbfhlrqdjrr1pvfxlxwk0im02kcpxxw9qw"; }; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1210w/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1210w/default.nix new file mode 100644 index 0000000000..88947ed333 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -0,0 +1,62 @@ +{stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: + +let + version = "3.0.1-1"; + cupsdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101546/hl1210wcupswrapper-${version}.i386.deb"; + sha256 = "0395mnw6c7qpjgjch9in5q9p2fjdqvz9bwfwp6q1hzhs08ryk7w0"; + }; + lprdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101547/hl1210wlpr-${version}.i386.deb"; + sha256 = "1sl3g2cd4a2gygryrr27ax3qaa65cbirz3kzskd8afkwqpmjyv7j"; + }; +in +stdenv.mkDerivation { + name = "cups-brother-hl1210W"; + + srcs = [ lprdeb cupsdeb ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + dontUnpack = true; + + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \ + --replace /opt "$out/opt" + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1210W/lpd/psconvert2 + + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/lpd/brprintconflsr3 + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/lpd/rawtobr3 + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/inf/braddprinter + + wrapProgram $out/opt/brother/Printers/HL1210W/lpd/psconvert2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + wrapProgram $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + # install cups + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W $out/lib/cups/filter/brother_lpdwrapper_HL1210W + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/lib/cups/filter/brother-HL1210W-cups-en.ppd + # cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 + + wrapProgram $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + ''; + + meta = { + homepage = "http://www.brother.com/"; + description = "Brother HL1210W printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=hl1210w_eu_as&os=128"; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index 2e587cbd04..040ac00085 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.15"; + version = "1.1.17"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/11/56/43/b1a6f1193e073c4c049da9404806c61052b62419/epson-inkjet-printer-escpr2-1.1.15-1lsb3.2.src.rpm" - "https://web.archive.org/web/20200726093746if_/https://download3.ebz.epson.net/dsc/f/03/00/11/56/43/b1a6f1193e073c4c049da9404806c61052b62419/epson-inkjet-printer-escpr2-1.1.15-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/11/79/08/18185180910529f498f629f5fc08d3d479cdf5c3/epson-inkjet-printer-escpr2-1.1.17-1lsb3.2.src.rpm" + "https://web.archive.org/web/20200726093746if_/https://download3.ebz.epson.net/dsc/f/03/00/11/79/08/18185180910529f498f629f5fc08d3d479cdf5c3/epson-inkjet-printer-escpr2-1.1.17-1lsb3.2.src.rpm" ]; - sha256 = "0a6pzpx281dv9g148jp60l5z0brf260zb54dq6g1ixz4bmjz3f1f"; + sha256 = "0bqqc04z9gayas5p7410la5nad7waykqyw1z1imcqimfl4qrz1m6"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix index 4de6e54cd5..29264b4f61 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix @@ -34,9 +34,6 @@ buildPythonApplication rec { preFixup = '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") - # gdk-pixbuf setup hook can not choose between propagated librsvg - # and our librsvg with GObject introspection. - GDK_PIXBUF_MODULE_FILE=$(echo ${librsvg}/lib/gdk-pixbuf-2.0/*/loaders.cache) ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix index ea5e977622..f83e26c28c 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/mame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "223"; + minorVersion = "224"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1lh5cmz4f6km2d8fn3m9ns7fc4wzbdp71v0s6vjcynycpyhy3yl1"; + sha256 = "1z012fk7nlvxxixxcavmzc9443xli6i7xzz7fdf755g7v1cys7im"; }; hardeningDisable = [ "fortify" ]; @@ -51,7 +51,15 @@ in mkDerivation { # by default MAME assumes that paths with stock resources # are relative and that you run MAME changing to # install directory, so we add absolute paths here - patches = [ ./emuopts.patch ]; + patches = [ + ./emuopts.patch + # Make the parallel build reliable -- see https://github.com/mamedev/mame/pull/7279 + (fetchpatch { + name = "fix-mame-parallel-build.patch"; + url = "https://github.com/mamedev/mame/commit/13a54fd4e8b8b1a4aad77671562b2d9ef3d82e1f.patch"; + sha256 = "1p4bszir9hcdjx6am58p48zh17rhjzlhx2baiacas7fnig61i02n"; + }) + ]; postPatch = '' substituteInPlace src/emu/emuopts.cpp \ diff --git a/third_party/nixpkgs/pkgs/misc/emulators/openmsx/custom-nixos.mk b/third_party/nixpkgs/pkgs/misc/emulators/openmsx/custom-nix.mk similarity index 100% rename from third_party/nixpkgs/pkgs/misc/emulators/openmsx/custom-nixos.mk rename to third_party/nixpkgs/pkgs/misc/emulators/openmsx/custom-nix.mk diff --git a/third_party/nixpkgs/pkgs/misc/emulators/openmsx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/openmsx/default.nix index f0ab48aa62..dc533c4f17 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/openmsx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/openmsx/default.nix @@ -2,21 +2,19 @@ , python , alsaLib, glew, libGL, libpng , libogg, libtheora, libvorbis -, SDL, SDL_image, SDL_ttf +, SDL2, SDL2_image, SDL2_ttf , freetype, tcl, zlib }: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "openmsx"; - version = "0.15.0"; + version = "16.0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; - rev = "RELEASE_0_15_0"; - sha256 = "1lv5kdw0812mkf7k20z2djzk0pbs792xq2mibbnz9rfjf02whi7l"; + rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "04sphn9ph378r0qv881riv90cgz58650jcqcwmi1mv6gbcb3img5"; fetchSubmodules = true; }; @@ -24,10 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib glew libGL libpng libogg libtheora libvorbis freetype - SDL SDL_image SDL_ttf tcl zlib ]; + SDL2 SDL2_image SDL2_ttf tcl zlib ]; postPatch = '' - cp ${./custom-nixos.mk} build/custom.mk + cp ${./custom-nix.mk} build/custom.mk ''; dontAddPrefix = true; @@ -36,8 +34,8 @@ stdenv.mkDerivation rec { # for providing support to Nixpkgs :) TCL_CONFIG="${tcl}/lib/"; - meta = { - description = "A MSX emulator"; + meta = with stdenv.lib;{ + description = "The MSX emulator that aims for perfection"; longDescription = '' OpenMSX is an emulator for the MSX home computer system. Its goal is to emulate all aspects of the MSX with 100% accuracy. diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index 568af317d2..d1fa038982 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -13,13 +13,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.5160"; + version = "1.0.5346"; src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "58f65b6523fb25d989b011c51f963520c811f9f0"; - sha256 = "19fizqmcr8i3axi3j5hg8p6dxr1pxnl5l58z4pws6nj1xbq8z5mi"; + rev = "2ce59c44bcb2d789f4d6312b26cf41f36915d73c"; + sha256 = "0hk8jdacg8ryhh0mpnfjbzrrpy8gv87f4hp0hybyypglmaxz8grm"; }; nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ]; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { mkdir -p $HOME/.nuget/NuGet cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - dotnet restore --source nixos Ryujinx.sln + dotnet restore --source "$PWD/nixos" Ryujinx.sln runHook postConfigure ''; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix index cb25865f21..94093e1e29 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix @@ -56,33 +56,28 @@ }) (fetchNuGet { name = "LibHac"; - version = "0.11.3"; - sha256 = "0xj2ip3bjy29xwy4fn5fncjadwbbg59sa3580cmkj47aab9cddyn"; + version = "0.12.0"; + sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "3.1.2"; - sha256 = "1v7i4f1k3j8xavbfwb7qr5f680gg5nblrmx5zcsj7l07q4wbnmwl"; + version = "3.1.8"; + sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "3.1.2"; - sha256 = "1gciv56vzfpl86lb9gzvyfj8w2qd7jhdrbxph6l1aykwzqbxf7bd"; + version = "3.1.8"; + sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.2.0"; - sha256 = "07h1ylca2j7a4hznq4m4b8nrzv1lw7gcf848k2a3nbm6rapv61ki"; - }) - (fetchNuGet { - name = "Microsoft.CodeCoverage"; - version = "16.5.0"; - sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; + version = "16.7.0"; + sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -96,28 +91,28 @@ }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; - version = "3.1.2"; - sha256 = "0sy1h7ffq8s3bkvf1carf4rn9qf7hn0yv6dcjklgh3g9jhlsq34f"; + version = "3.1.8"; + sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; - version = "3.1.2"; - sha256 = "1yqsnl4my2q1ps666162kn0h34wyfajiwqs6snhrww195b59msdv"; + version = "3.1.8"; + sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "3.1.2"; - sha256 = "1wb8h30di1mix8liz937snl1w8hbblixrpiazjskxclp3i7m1rg3"; + version = "3.1.8"; + sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "3.1.2"; - sha256 = "0aj005mh57ynscf87cpfshc3ff22l4svf6lqz0hpqsi0hlidqwqx"; + version = "3.1.8"; + sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -151,33 +146,18 @@ }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.2.0"; - sha256 = "1nr5jxchdy3p7jm4fm73d5yivghjisdsyafma8fs5d1v49bhgckq"; - }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.5.0"; - sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; + version = "16.7.0"; + sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy"; }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.2.0"; - sha256 = "1ywzyx75d61wm75l7wglxzglg5k9nq66wd56m52hmmg8mf253z57"; - }) - (fetchNuGet { - name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.5.0"; - sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw"; + version = "16.7.0"; + sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.2.0"; - sha256 = "05dx9nv1skc5ji79ji5vz6c93b09w9xh70iyy6j5ca978ga92i6g"; - }) - (fetchNuGet { - name = "Microsoft.TestPlatform.TestHost"; - version = "16.5.0"; - sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v"; + version = "16.7.0"; + sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -189,11 +169,6 @@ version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.0.0"; - sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; - }) (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.3.0"; @@ -256,13 +231,8 @@ }) (fetchNuGet { name = "NUnit3TestAdapter"; - version = "3.15.1"; - sha256 = "1nhpvzxbxgymmkb3bd5ci40rg8k71bfx2ghbgc99znvnvhf2034y"; - }) - (fetchNuGet { - name = "NUnit3TestAdapter"; - version = "3.16.1"; - sha256 = "1pzhmapfdszsfza7zjr3zrlz4fssdxsyiwmlj76a40mbhxhfa4q9"; + version = "3.17.0"; + sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) (fetchNuGet { name = "OpenTK.NetStandard"; @@ -274,21 +244,11 @@ version = "3.22.25.56"; sha256 = "12b0761nfsci4rvzcba4hrh5rcn6q24qaxwwz66myb82c999qj8w"; }) - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.0.11"; - sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; - }) (fetchNuGet { name = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "0qcpm90hrm9gx9pmxlvfml65jm0bwpr5dg3r7l7xm9nvmibvc7n7"; - }) (fetchNuGet { name = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; @@ -299,11 +259,6 @@ version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.0.11"; - sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; - }) (fetchNuGet { name = "runtime.any.System.Globalization"; version = "4.3.0"; @@ -314,111 +269,56 @@ version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.1.0"; - sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; - }) (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.1.0"; - sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; - }) (fetchNuGet { name = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr"; - }) (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; - }) (fetchNuGet { name = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; - }) (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.1.0"; - sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; - }) (fetchNuGet { name = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; - }) (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; - }) (fetchNuGet { name = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.0.11"; - sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; - }) (fetchNuGet { name = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "0d1rxxpvg9v7wlibsfgz0r4hwigpadas822qf8m8fs1gma9gs877"; - }) (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; - }) (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; @@ -519,21 +419,11 @@ version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; - }) (fetchNuGet { name = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "02wnlydnbhai0zy7c3kihg0cis0l1b2z78kyi1ci47c5v0jklwha"; - }) (fetchNuGet { name = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; @@ -549,21 +439,11 @@ version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.0.1"; - sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; - }) (fetchNuGet { name = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; - }) (fetchNuGet { name = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; @@ -579,21 +459,11 @@ version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; }) - (fetchNuGet { - name = "runtime.win.System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "1ylkj4v7aq00svij7aq82d86afpwqgrqf2kpikabxl26p19ry9wm"; - }) (fetchNuGet { name = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) - (fetchNuGet { - name = "runtime.win.System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "1dn9k6x8h27b6vbqh72hsfxax4fwf30jj8lc5328rg52lw29cyn1"; - }) (fetchNuGet { name = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; @@ -609,11 +479,6 @@ version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) - (fetchNuGet { - name = "runtime.win.System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "1zmx2msa04ka8mgh8viahi4pqpp86vdhzij2rg1jg131bwlv59yw"; - }) (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; @@ -624,26 +489,6 @@ version = "4.3.0"; sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; }) - (fetchNuGet { - name = "SkiaSharp"; - version = "1.68.1.1"; - sha256 = "013yzsk798dwxdf2y5yx675x96nagfapkri5k3pgsjnmyfp1lvzk"; - }) - (fetchNuGet { - name = "SkiaSharp.NativeAssets.Linux"; - version = "1.68.1.1"; - sha256 = "07448kn9x56pxlnkxp2dpr5jmwj62k48y5m4608mwci32vs675hn"; - }) - (fetchNuGet { - name = "SkiaSharp.Views.Desktop.Common"; - version = "1.68.1.1"; - sha256 = "0wkj952iha7w2i8mvl0mksz2wqkx7vi7xylh10xgddld8kkm03r7"; - }) - (fetchNuGet { - name = "SkiaSharp.Views.Gtk3"; - version = "1.68.1.1"; - sha256 = "19fgshim2i60p55j4jcr0biq6k2xwal5dsmbgvyrrajnssaj3r95"; - }) (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; @@ -684,66 +529,31 @@ version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.2.0"; - sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.0.1"; - sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; - }) (fetchNuGet { name = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { - name = "System.Collections.Specialized"; - version = "4.0.1"; - sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; - }) (fetchNuGet { name = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { - name = "System.ComponentModel"; - version = "4.0.1"; - sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; - }) (fetchNuGet { name = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { - name = "System.ComponentModel.EventBasedAsync"; - version = "4.0.11"; - sha256 = "07r5i7xwban347nsfw28hhjwpr78ywksjyhywvhj1yr0s7sr00wh"; - }) (fetchNuGet { name = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) - (fetchNuGet { - name = "System.ComponentModel.Primitives"; - version = "4.1.0"; - sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; - }) (fetchNuGet { name = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; - version = "4.1.0"; - sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; - }) (fetchNuGet { name = "System.ComponentModel.TypeConverter"; version = "4.3.0"; @@ -769,31 +579,16 @@ version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) - (fetchNuGet { - name = "System.Diagnostics.Process"; - version = "4.1.0"; - sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; - }) (fetchNuGet { name = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) - (fetchNuGet { - name = "System.Diagnostics.TextWriterTraceListener"; - version = "4.0.0"; - sha256 = "1xigiwkwyxak0dhm0p8i2zb7a9syly9cdb5s9zkr9rbad4f2fqhs"; - }) (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { - name = "System.Diagnostics.TraceSource"; - version = "4.0.0"; - sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; - }) (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.1.0"; @@ -929,16 +724,6 @@ version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { - name = "System.Private.DataContractSerialization"; - version = "4.1.1"; - sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; - }) - (fetchNuGet { - name = "System.Private.Uri"; - version = "4.0.1"; - sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; - }) (fetchNuGet { name = "System.Private.Uri"; version = "4.3.0"; @@ -994,11 +779,6 @@ version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "1.3.0"; - sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; - }) (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; @@ -1039,6 +819,16 @@ version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0-preview.7.20364.11"; + sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; + }) (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; @@ -1079,21 +869,11 @@ version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { - name = "System.Runtime.Loader"; - version = "4.0.0"; - sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; - }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Json"; - version = "4.0.2"; - sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; - }) (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; @@ -1209,11 +989,6 @@ version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { - name = "System.Threading.Overlapped"; - version = "4.0.1"; - sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; - }) (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.3.0"; @@ -1239,21 +1014,11 @@ version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { - name = "System.Threading.Thread"; - version = "4.0.0"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; - }) (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.0.10"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; - }) (fetchNuGet { name = "System.Threading.ThreadPool"; version = "4.3.0"; @@ -1279,36 +1044,16 @@ version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.0.1"; - sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; - }) (fetchNuGet { name = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "System.Xml.XmlSerializer"; - version = "4.0.11"; - sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; - }) - (fetchNuGet { - name = "System.Xml.XPath"; - version = "4.0.1"; - sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; - }) (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; - version = "4.0.1"; - sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; - }) (fetchNuGet { name = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix new file mode 100644 index 0000000000..e90cc5a00f --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: + +stdenv.mkDerivation rec { + pname = "sameboy"; + version = "0.13.6"; + + src = fetchFromGitHub { + owner = "LIJI32"; + repo = "SameBoy"; + rev = "v${version}"; + sha256 = "04w8lybi7ssnax37ka4qw7pmcm7cgnmk90p9m73zbyp5chgpqqzc"; + }; + + enableParallelBuilding = true; + # glib and wrapGAppsHook are needed to make the Open ROM menu work. + nativeBuildInputs = [ rgbds glib wrapGAppsHook ]; + buildInputs = [ SDL2 ]; + + makeFlags = "CONF=release DATA_DIR=$(out)/share/sameboy/"; + + patchPhase = '' + sed 's/-Werror //g' -i Makefile + sed 's@"libgtk-3.so"@"${gtk3}/lib/libgtk-3.so"@g' -i OpenDialog/gtk.c + ''; + + installPhase = '' + pushd build/bin/SDL + install -Dm755 sameboy $out/bin/sameboy + rm sameboy + mkdir -p $out/share/sameboy + cp -r * $out/share/sameboy + popd + ''; + + meta = with stdenv.lib; { + homepage = "https://sameboy.github.io"; + description = "Game Boy, Game Boy Color, and Super Game Boy emulator"; + + longDescription = '' + SameBoy is a user friendly Game Boy, Game Boy Color and Super + Game Boy emulator for macOS, Windows and Unix-like platforms. + SameBoy is extremely accurate and includes a wide range of + powerful debugging features, making it ideal for both casual + players and developers. In addition to accuracy and developer + capabilities, SameBoy has all the features one would expect from + an emulator – from save states to scaling filters. + ''; + + license = licenses.mit; + maintainers = with maintainers; [ NieDzejkob ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix index f669c71c67..bb61872f7c 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -39,22 +39,22 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.14"; + version = "5.16"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "1vy9gyvf05vkysgvp4kq4qd116nvif69di55x3dnf3p96wsn2hpl"; + sha256 = "0j9268s1dy4cjvhcf4igbg54gaws4a1l3pda449qy2p2i4psdncq"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0cvsasnidbg77dc2vjrw708rpy2jqdir9imqjcjppa4h1k8a2wcs"; + sha256 = "1rrw15mrygv9zcbqz0c3s7q7971wqj89ys2bvvm4b0d2h4j0k6wq"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; # Just keep list empty, if current release haven't broken patchsets - disabledPatchsets = [ "xactengine-initial" ]; + disabledPatchsets = [ ]; }; winetricks = fetchFromGitHub rec { diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix index eca15faf1a..d3d06d98cb 100644 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation rec { }; patches = [ + (fetchpatch { + name = "CVE-2020-15900.patch"; + url = "https://github.com/ArtifexSoftware/ghostpdl/commit/5d499272b95a6b890a1397e11d20937de000d31b.patch"; + sha256 = "1nnnrn8q33x7nc8227ygc60f3mj4bjzrhj40sxp6dah58rb5x5jz"; + }) ./urw-font-files.patch ./doc-no-ref.diff # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, diff --git a/third_party/nixpkgs/pkgs/misc/hdt/default.nix b/third_party/nixpkgs/pkgs/misc/hdt/default.nix new file mode 100644 index 0000000000..8a4c7c3e6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/hdt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig, zlib, serd }: + +stdenv.mkDerivation rec { + pname = "hdt"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "rdfhdt"; + repo = "hdt-cpp"; + rev = "v${version}"; + sha256 = "1vsq80jnix6cy78ayag7v8ajyw7h8dqyad1q6xkf2hzz3skvr34z"; + }; + + buildInputs = [ zlib serd ]; + + nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "http://www.rdfhdt.org/"; + description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns."; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.koslambrou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/logging/beats/6.x.nix b/third_party/nixpkgs/pkgs/misc/logging/beats/6.x.nix index c3bca18a9a..2d01ea6226 100644 --- a/third_party/nixpkgs/pkgs/misc/logging/beats/6.x.nix +++ b/third_party/nixpkgs/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -46,7 +46,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix index 61c89339fe..465051d372 100644 --- a/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -45,7 +45,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix index 211b7614f3..94d6299d38 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, fetchurl, makeWrapper, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "pipes"; @@ -9,11 +9,14 @@ stdenv.mkDerivation rec { sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; }; - buildInputs = with pkgs; [ bash ]; + buildInputs = [ makeWrapper ]; installPhase = '' mkdir $out -p make PREFIX=$out/ install + + wrapProgram $out/bin/pipes.sh \ + --set PATH "${stdenv.lib.makeBinPath [ coreutils ncurses ]}" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index 01ee818f25..b59ed85f6b 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libXdmcp, libXt }: stdenv.mkDerivation rec { - name = "xlockmore-5.64"; + name = "xlockmore-5.65"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0fbh6avdzsm1prafglr2xdd8c4ibkddi6xxywvqgvzp0zb2kqimr"; + sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix b/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix index 7546c7626e..21a89e5f5f 100644 --- a/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix +++ b/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.7"; + version = "7.0.8"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "0vgzb923x2q2w1zgbc56d50a5qj9xm77lg7czfzg3va7vd921gy8"; + sha256 = "0q0zylv8hkhnfw0084bj1wmqwqvpflmdy1njxvvkjsbnflh8kc2y"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/sndio/default.nix b/third_party/nixpkgs/pkgs/misc/sndio/default.nix index c415714f57..46c505ed43 100644 --- a/third_party/nixpkgs/pkgs/misc/sndio/default.nix +++ b/third_party/nixpkgs/pkgs/misc/sndio/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchurl, alsaLib }: +{ stdenv, fetchurl, alsaLib, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "sndio"; - version = "1.6.0"; + version = "1.7.0"; enableParallelBuilding = true; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "1havdx3q4mipgddmd2bnygr1yh6y64567m1yqwjapkhsq550dq4r"; + sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x"; }; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libsndio.7.0.dylib $out/lib/libsndio.7.0.dylib - for file in $out/bin/*; do - install_name_tool -change libsndio.7.0.dylib $out/lib/libsndio.dylib $file - done - ''; - meta = with stdenv.lib; { homepage = "http://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; diff --git a/third_party/nixpkgs/pkgs/misc/solfege/default.nix b/third_party/nixpkgs/pkgs/misc/solfege/default.nix index 05e13f3c9a..21615b0c2b 100644 --- a/third_party/nixpkgs/pkgs/misc/solfege/default.nix +++ b/third_party/nixpkgs/pkgs/misc/solfege/default.nix @@ -15,6 +15,7 @@ buildPythonApplication rec { patches = [ ./css.patch ./menubar.patch + ./texinfo.patch ./webbrowser.patch ]; diff --git a/third_party/nixpkgs/pkgs/misc/solfege/texinfo.patch b/third_party/nixpkgs/pkgs/misc/solfege/texinfo.patch new file mode 100644 index 0000000000..d681b3e901 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/solfege/texinfo.patch @@ -0,0 +1,20 @@ +Fix build with texinfo 6.7. Otherwise + + makeinfo -I topdocs --no-split --no-headers --output AUTHORS topdocs/AUTHORS.texi + +fails with + + utf8 "\xC1" does not map to Unicode at /nix/store/...-texinfo-6.7/share/texinfo/Texinfo/ParserNonXS.pm line 1796, line 38. + +--- a/topdocs/AUTHORS.texi ++++ b/topdocs/AUTHORS.texi +@@ -1,2 +1,3 @@ + \input texinfo ++@documentencoding ISO-8859-1 + @setfilename AUTHORS.info +--- a/topdocs/README.texi ++++ b/topdocs/README.texi +@@ -1,2 +1,3 @@ + \input texinfo ++@documentencoding ISO-8859-1 + @setfilename README.info diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index dd05bb4aa3..8efa0000da 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -89,12 +89,12 @@ in rec { cpu = mkDerivation { pluginName = "cpu"; - version = "unstable-2020-04-05"; + version = "unstable-2020-07-25"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-cpu"; - rev = "8858050756e1fc3c081d37894b441f05ea893a67"; - sha256 = "1bydzrnd9y5y46hjr844p4ylx2dpijn6pv3w94yyvwbyswmirhff"; + rev = "20120a38ade17057441482b43eb5390e6ea2c1c1"; + sha256 = "1gdz2awyd9icvyiw2p40gwymh6ngjhb9mkiv63ix53snp9ii794i"; }; }; @@ -184,6 +184,17 @@ in rec { }; }; + nord = mkDerivation rec { + pluginName = "nord"; + version = "0.3.0"; + src = pkgs.fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-tmux"; + rev = "v${version}"; + sha256 = "14xhh49izvjw4ycwq5gx4if7a0bcnvgsf3irywc3qps6jjcf5ymk"; + }; + }; + maildir-counter = mkDerivation { pluginName = "maildir-counter"; version = "unstable-2016-11-25"; diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 85df90a9fe..59f73b4243 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -176,7 +176,7 @@ in { ubootNovena = buildUBoot { defconfig = "novena_defconfig"; extraMeta.platforms = ["armv7l-linux"]; - filesToInstall = ["u-boot.bin" "SPL"]; + filesToInstall = ["u-boot-dtb.img" "SPL"]; }; # Flashing instructions: @@ -271,6 +271,13 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPinebookPro = buildUBoot { + defconfig = "pinebook-pro-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + }; + ubootQemuAarch64 = buildUBoot { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json b/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json index 218a1ab622..b95e91a19b 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json @@ -3,6 +3,10 @@ "date": "2020-03-27", "new": "vim-gist" }, + "nvim-lsp": { + "date": "2020-08-31", + "new": "nvim-lspconfig" + }, "vim-jade": { "date": "2020-03-27", "new": "vim-pug" diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 56a49061e3..f1b2b6d638 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-08-14"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5ceda0164c5fae0d61fd51d4c9e083b27abdc9d2"; - sha256 = "1bq3q6sqxb6ihipnm1hv8yyj78yl9wygv6xr9xafy0zk338sg7ph"; + rev = "08295ce17405cb5f6c80d2f726262493bfd21210"; + sha256 = "1jyxxn6j7jkcr1yky6p1y798rza04q3pivsddig8qk85kg6dkgy5"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -135,14 +135,26 @@ let meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + asyncomplete-vim = buildVimPluginFrom2Nix { + pname = "asyncomplete-vim"; + version = "2020-09-17"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "asyncomplete.vim"; + rev = "20a279b079452dba6e841755f8e9cc5aed75d05e"; + sha256 = "0fsafx0h3nmsrsscg233cyfhm2vj6n1k0n37l2mg0kbv77pzicga"; + }; + meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; + }; + ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; - version = "2020-03-24"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "vmchale"; repo = "ats-vim"; - rev = "a17576687217a2e8066356cc211afb99b5de65e8"; - sha256 = "0dv60za39v2w5d9mbk1r263fqpv11bdfyqp39b0snw40f0kh92z0"; + rev = "8e3e722b6d09ed81313573b4e7b108b265628ff1"; + sha256 = "1jj4q8dmal7rgizqm59dbgjf8by8lxjwnbg39gkbmjiwhdj8q67h"; }; meta.homepage = "https://github.com/vmchale/ats-vim/"; }; @@ -185,12 +197,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-08-15"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "0e04854da7695854e7df7c3c771e72ac55a60040"; - sha256 = "1i6y0p7fcvzgxkm82xrypwh7xgp1ywyvqlpglf93bgq8ygsll0v9"; + rev = "41a0d9ea4dac077c2050ceaf144f9ed72d6849d8"; + sha256 = "12ivlzyw0iq9jsj3ll2wwbya0ssl4vdk1vvjpg7v4xhxgh96s3jr"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -329,12 +341,12 @@ let clang_complete = buildVimPluginFrom2Nix { pname = "clang_complete"; - version = "2020-05-06"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "10e5102af5d1b16ba7aa3fb51d67153041f82ed7"; - sha256 = "0crynvmdp9a5rws5hfnsn19kxqviyp29n8fz40wq7k1g5vrhvdl7"; + rev = "293a1062274a06be61797612034bd8d87851406e"; + sha256 = "1whipcrr4pcg1bkivq3l753v3f3glbhkdd6wp6f9czspr7hx2h2d"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; @@ -363,210 +375,54 @@ let meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; - coc-css = buildVimPluginFrom2Nix { - pname = "coc-css"; - version = "2020-06-28"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-css"; - rev = "a8cde12697de70dddf235ada61dc3601a6c04b57"; - sha256 = "03n7czxiraa9pjcdfigmxgwyprpijbs0vhmzccxx0nwm038291y6"; - }; - meta.homepage = "https://github.com/neoclide/coc-css/"; - }; - coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2019-01-19"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "f0cf609724249e662fef54169b484b7d089032f9"; - sha256 = "0jknvcf1cf53bwyhf1rhm5fa7nsp0l7sihns1qybph8hayb5rwvp"; + rev = "8ff425faab53e8bb8c53eec1afdf19a29c8086f6"; + sha256 = "06ddv9brb4zy8ylas36dkmblr93n6c5dp6vpp3c7asxc1kx58gc5"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; - coc-emmet = buildVimPluginFrom2Nix { - pname = "coc-emmet"; - version = "2020-07-16"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-emmet"; - rev = "8f25e0b7deb1cd54ce096cf713147662c43781f6"; - sha256 = "0z9y8nxzjqf78l7hmq59by559f178jxhadn82h1hwqmdjpq72jcm"; - }; - meta.homepage = "https://github.com/neoclide/coc-emmet/"; - }; - - coc-eslint = buildVimPluginFrom2Nix { - pname = "coc-eslint"; - version = "2020-05-21"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-eslint"; - rev = "eed42192dab175bbf249e21c18c85cbd5afdd92a"; - sha256 = "1a9csiyj7abksar917acfjgypmc28rcfsqga0p1550mjxvkjr2ia"; - }; - meta.homepage = "https://github.com/neoclide/coc-eslint/"; - }; - coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-08-12"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "b05b60c9e53a657f4a7c4dcf064032ce806cd0f4"; - sha256 = "10z3xrkkj0140a8cbix7yrky7nsczjcdflnl7a8b0ywwq16jd3hp"; + rev = "810fa85761f44519116d4c8020f163e4ec76ad01"; + sha256 = "04gnz214gkb3hsxb2xwisbmmjf6njka6yvaf8xcwzplzxxnl2zxg"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-08-15"; + version = "2020-09-03"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "294ee401d81656ff9e383e98b9d963a6c0edaf44"; - sha256 = "0s8fnzimk26rzrkky13si2iacw0nahyvcvicv3g8xc28sppddvd4"; + rev = "2047783c1c9f7bcc020612a719d932e848a2d39d"; + sha256 = "15fxpip9zz5z8np3qrsgadh7p8y8446bxb9vbcr80fcq3j8fmq0v"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; - coc-git = buildVimPluginFrom2Nix { - pname = "coc-git"; - version = "2020-08-08"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-git"; - rev = "eef63ac3807ff32fe60743b4041dc293f76401bf"; - sha256 = "1m1nzrzy7c5ggl87adbla9zcnaqr3dvx72sd3mcfxq5g9qglr2gk"; - }; - meta.homepage = "https://github.com/neoclide/coc-git/"; - }; - - coc-go = buildVimPluginFrom2Nix { - pname = "coc-go"; - version = "2020-08-12"; - src = fetchFromGitHub { - owner = "josa42"; - repo = "coc-go"; - rev = "b068394634189ede2fb96b742cadcaa852bf46b0"; - sha256 = "099dgk3kc814hgnpd0jhc6sz3d7512i86i99n6hq6yswsg7n1d51"; - }; - meta.homepage = "https://github.com/josa42/coc-go/"; - }; - - coc-highlight = buildVimPluginFrom2Nix { - pname = "coc-highlight"; - version = "2019-10-18"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-highlight"; - rev = "b4e82ebd5fe855d004dd481e2ecf2fa88faed284"; - sha256 = "06h64jq8cgj5hc19inidns046kkb76750179jsw7xv5zbp93ygap"; - }; - meta.homepage = "https://github.com/neoclide/coc-highlight/"; - }; - - coc-html = buildVimPluginFrom2Nix { - pname = "coc-html"; - version = "2020-07-28"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-html"; - rev = "36aaa65d5ee7d998727776739d03affcc26bbe5b"; - sha256 = "07vb9jgy9bpq5k1gymr2ys8smafcrybf0nmpkfsq8scqxsydnnq9"; - }; - meta.homepage = "https://github.com/neoclide/coc-html/"; - }; - - coc-imselect = buildVimPluginFrom2Nix { - pname = "coc-imselect"; - version = "2020-02-18"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-imselect"; - rev = "01442d2fb7d344122e59755f59782a0e1bf7d294"; - sha256 = "1vqx9yna66njdw1my15ac6djr3yvnb6das96nx12mpingnw85kky"; - }; - meta.homepage = "https://github.com/neoclide/coc-imselect/"; - }; - - coc-java = buildVimPluginFrom2Nix { - pname = "coc-java"; - version = "2020-08-11"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-java"; - rev = "aed8ccb10acf1863fb0fe622f21c3a0be18e362f"; - sha256 = "1hrwj4x09gnqnwv43bxx9w2y3nrhqbjc3yl2q8ck22212s66wkpi"; - }; - meta.homepage = "https://github.com/neoclide/coc-java/"; - }; - - coc-jest = buildVimPluginFrom2Nix { - pname = "coc-jest"; - version = "2020-05-27"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-jest"; - rev = "431471caa9011868327fff0f9f7e0a944b7ca33b"; - sha256 = "0vcri3kp8njsp4zgl74vc6ydhxq5spzx6pm798jh2lvrid2byvg9"; - }; - meta.homepage = "https://github.com/neoclide/coc-jest/"; - }; - - coc-json = buildVimPluginFrom2Nix { - pname = "coc-json"; - version = "2020-05-12"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-json"; - rev = "66b482dbc8008b9a111e6141aa2e63baa16fb2d4"; - sha256 = "0ixqk417ba1yz7lnjkir5h9h8qm5jc9sh2190vmddxr8wgxhjhbb"; - }; - meta.homepage = "https://github.com/neoclide/coc-json/"; - }; - - coc-lists = buildVimPluginFrom2Nix { - pname = "coc-lists"; - version = "2020-07-23"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-lists"; - rev = "bf352d6befd23804897a08b50fa6edcea676a7b3"; - sha256 = "0r8sbw4pgaay2zjh2rv1x926hs8jixznanc2dxjvicjnmgbg1nmn"; - }; - meta.homepage = "https://github.com/neoclide/coc-lists/"; - }; - coc-markdownlint = buildVimPluginFrom2Nix { pname = "coc-markdownlint"; - version = "2020-08-02"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "a1d6162a898b1538eb061675a63251cbd4eb8470"; - sha256 = "0gmci9x7kppv14lr8x8fnmkq1rp5lm8x66904fy419jipnl96g6g"; + rev = "3da74c203bf9db5c702142791338c1fdeec3310d"; + sha256 = "09zh0pchv0iirr7hfig1x6zai90fzg33ap9n6dhd3fa2yrd8qgci"; }; meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; }; - coc-metals = buildVimPluginFrom2Nix { - pname = "coc-metals"; - version = "2020-08-15"; - src = fetchFromGitHub { - owner = "ckipp01"; - repo = "coc-metals"; - rev = "b2d58e9e352afcc324bc23a0359fed390e069307"; - sha256 = "0hsqb71w9ypgd2w8zwv4vmjcjyxjpk4qb67k9cwfp589nrfkw6xb"; - }; - meta.homepage = "https://github.com/ckipp01/coc-metals/"; - }; - coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2020-04-07"; @@ -579,198 +435,18 @@ let meta.homepage = "https://github.com/neoclide/coc-neco/"; }; - coc-pairs = buildVimPluginFrom2Nix { - pname = "coc-pairs"; - version = "2020-03-09"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-pairs"; - rev = "79deeaabdc4f091c22f3dd67d439a0a336e8aa7e"; - sha256 = "1w6p2dk7yj8ldxg1qxh9zpn9ypm6gn66gi0vbax33wf5c0dmp0v9"; - }; - meta.homepage = "https://github.com/neoclide/coc-pairs/"; - }; - - coc-prettier = buildVimPluginFrom2Nix { - pname = "coc-prettier"; - version = "2020-07-23"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-prettier"; - rev = "4857302b60bb0c9db20fa8db71b0eac4696c9254"; - sha256 = "114yn1sc457jc9jp5hvw3k0dvm0i9bcn6v2dqvb9dgwskq78ca7f"; - }; - meta.homepage = "https://github.com/neoclide/coc-prettier/"; - }; - - coc-python = buildVimPluginFrom2Nix { - pname = "coc-python"; - version = "2020-06-15"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-python"; - rev = "241c6b39e6618279b619926269431ef45de87840"; - sha256 = "1x3lrk4x7qhp9pg8x11k36pcgd5f45la4r77fq82jy307s5dny20"; - }; - meta.homepage = "https://github.com/neoclide/coc-python/"; - }; - - coc-r-lsp = buildVimPluginFrom2Nix { - pname = "coc-r-lsp"; - version = "2019-12-07"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-r-lsp"; - rev = "a1b97e36c601975a8d730b6965f25592b1ecd1e7"; - sha256 = "04g1kbgm8p0asrsibmg4w6wj8i2xzwc70g7rkcs2bj3pakbkvws6"; - }; - meta.homepage = "https://github.com/neoclide/coc-r-lsp/"; - }; - - coc-rls = buildVimPluginFrom2Nix { - pname = "coc-rls"; - version = "2020-08-11"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-rls"; - rev = "49ed83bb6d6bc01142ba18774575987b12857aee"; - sha256 = "05lbfl60ka9zx8s6ack92v3vk3zj47w1fscdfkdqafcaqizlgia1"; - }; - meta.homepage = "https://github.com/neoclide/coc-rls/"; - }; - - coc-rust-analyzer = buildVimPluginFrom2Nix { - pname = "coc-rust-analyzer"; - version = "2020-08-15"; - src = fetchFromGitHub { - owner = "fannheyward"; - repo = "coc-rust-analyzer"; - rev = "60b75af3c86ce5c310cc39007cefcac6f36bc02a"; - sha256 = "1j4mmh45s5rchw3wf76gph4wm95kpzyql8i1dlqc7qndf06wwq37"; - }; - meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; - }; - - coc-smartf = buildVimPluginFrom2Nix { - pname = "coc-smartf"; - version = "2019-07-26"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-smartf"; - rev = "d40714eab8e5fe26fac492ffd30e98cd1bfbdec5"; - sha256 = "0kfrq5hk8zn24cl7fiy48nyvd30a2dva93c61079axkdg9912yd7"; - }; - meta.homepage = "https://github.com/neoclide/coc-smartf/"; - }; - - coc-snippets = buildVimPluginFrom2Nix { - pname = "coc-snippets"; - version = "2020-06-10"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-snippets"; - rev = "a36f36afe7094562756202d1bb88c1f80597393e"; - sha256 = "117idj29gk8psj27zmwazanwxf4br08mlkcpnkxyw6blm5aibzpp"; - }; - meta.homepage = "https://github.com/neoclide/coc-snippets/"; - }; - - coc-solargraph = buildVimPluginFrom2Nix { - pname = "coc-solargraph"; - version = "2020-08-08"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-solargraph"; - rev = "66d1ca9d5fd10927d618561b81447a22f6929a6a"; - sha256 = "0i48hzgsnn9ghk41c885nslwv8hi98ym6yzcsayncs2vasv7gcnl"; - }; - meta.homepage = "https://github.com/neoclide/coc-solargraph/"; - }; - coc-spell-checker = buildVimPluginFrom2Nix { pname = "coc-spell-checker"; - version = "2020-08-01"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "iamcco"; repo = "coc-spell-checker"; - rev = "c1fe3de47f6ba93d4c44b514e530517c19a75880"; - sha256 = "1yvcbfrd5lxgmxbvphpbzcw8ni6zjqmg2flkrvnz59b9rmafn8dg"; + rev = "a76ebbff41fec61bb7a3c2556a670720db3f9ff9"; + sha256 = "0i2znngg8jyxgns1kqi5168c4899wj2b8h8n14yy6pxgidhgqvzp"; }; meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; - coc-stylelint = buildVimPluginFrom2Nix { - pname = "coc-stylelint"; - version = "2019-08-20"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-stylelint"; - rev = "288a372261cbc23ae4a6e26b1621c6e3218d00ad"; - sha256 = "1qir8diqnv1a78lzw9p3jsbni52gdg38rx1lj5i4iyff9282ir2x"; - }; - meta.homepage = "https://github.com/neoclide/coc-stylelint/"; - }; - - coc-tabnine = buildVimPluginFrom2Nix { - pname = "coc-tabnine"; - version = "2020-01-06"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tabnine"; - rev = "442c829185ecab2268d1b9fd076c5286bbd39562"; - sha256 = "0as4b33nnp7anqbxkkja8lp37y4a74b3507zyk3gmmna0my1ca3r"; - }; - meta.homepage = "https://github.com/neoclide/coc-tabnine/"; - }; - - coc-tslint = buildVimPluginFrom2Nix { - pname = "coc-tslint"; - version = "2019-07-03"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tslint"; - rev = "6128761577806d7047fa05d1a527945490d6316c"; - sha256 = "1vi4vrawknkd5wjyb0j143jbfis9vaanl219a7argirwjs057vpd"; - }; - meta.homepage = "https://github.com/neoclide/coc-tslint/"; - }; - - coc-tslint-plugin = buildVimPluginFrom2Nix { - pname = "coc-tslint-plugin"; - version = "2019-07-18"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tslint-plugin"; - rev = "acc1356253a5088f630d9910b5fc13dc5d108bbc"; - sha256 = "1cjgimqgd70x5zhw641z6g4hc54vrkg3r4sscg092gkrdpkq3969"; - }; - meta.homepage = "https://github.com/neoclide/coc-tslint-plugin/"; - }; - - coc-tsserver = buildVimPluginFrom2Nix { - pname = "coc-tsserver"; - version = "2020-08-08"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tsserver"; - rev = "47d3dba90a52eb1126cda486fb788e76404dc668"; - sha256 = "1s0xnk0f1hqp9nkcqzn31wfjl5sq9qpwriim946wbjg0cfng1xh2"; - }; - meta.homepage = "https://github.com/neoclide/coc-tsserver/"; - }; - - coc-vetur = buildVimPluginFrom2Nix { - pname = "coc-vetur"; - version = "2020-06-28"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-vetur"; - rev = "37c70071a93aeacf23ac651cd6e9f7ed11582033"; - sha256 = "037p3zkavfyh75wclibd2iwd1ds8kzi72q8zy7rwdchwxw57xwhj"; - }; - meta.homepage = "https://github.com/neoclide/coc-vetur/"; - }; - coc-vimlsp = buildVimPluginFrom2Nix { pname = "coc-vimlsp"; version = "2020-08-01"; @@ -783,62 +459,14 @@ let meta.homepage = "https://github.com/iamcco/coc-vimlsp/"; }; - coc-vimtex = buildVimPluginFrom2Nix { - pname = "coc-vimtex"; - version = "2020-07-22"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-vimtex"; - rev = "4c88459c1ccf0c0e1935b73f216d974a3c89f4e5"; - sha256 = "0gk38r8060linhbcsqfhv7bxggz4fqi4chsfpxf6b0rnmca851pa"; - }; - meta.homepage = "https://github.com/neoclide/coc-vimtex/"; - }; - - coc-wxml = buildVimPluginFrom2Nix { - pname = "coc-wxml"; - version = "2019-06-20"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-wxml"; - rev = "f02550939d33a0175c34186904c376bbae878e60"; - sha256 = "1448019dzdy55j4plhzlnp2qkfzk0zkqqs7kn94ndn60hn1x889m"; - }; - meta.homepage = "https://github.com/neoclide/coc-wxml/"; - }; - - coc-yaml = buildVimPluginFrom2Nix { - pname = "coc-yaml"; - version = "2020-06-26"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-yaml"; - rev = "e3db99f415a1439b44548473fbaa3f79df4f383e"; - sha256 = "0aij94s5jak5g2myd6xmcwx5aclpvgcbg9nwxqzkij5m24wpi23n"; - }; - meta.homepage = "https://github.com/neoclide/coc-yaml/"; - }; - - coc-yank = buildVimPluginFrom2Nix { - pname = "coc-yank"; - version = "2020-06-02"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-yank"; - rev = "7983c28509a61a7eb014e178525845797f5779ed"; - sha256 = "1mjdd1kqvc5hzygjs2gv8vrpr3wc2a9590cr6vq0pfllxbkyqjng"; - }; - meta.homepage = "https://github.com/neoclide/coc-yank/"; - }; - coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-08-08"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "806ce47583d66d0b574a3c993526033971e700cf"; - sha256 = "1v29l7jrp1n141q8lywas5jflbjid6rryym732ga41yjqkrmlvip"; + rev = "12a5c97ef43d7f6865b5e51d6238a3a0bf1e8847"; + sha256 = "0l6dbjadwn4kmpyqjj6r4imn2i6zjqriskpp5m87krhj513516aw"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -882,24 +510,24 @@ let committia-vim = buildVimPluginFrom2Nix { pname = "committia-vim"; - version = "2020-05-14"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "rhysd"; repo = "committia.vim"; - rev = "2cded48477a5e308c77a0d289cc9b540669b701f"; - sha256 = "1g6ykdh7d16q6nvpvmxx4ss8w7cisx5r8qmbrrvhpwmbb3894pxp"; + rev = "1d288281586d1e6b52646a4c412df3dd3a2fe231"; + sha256 = "11ik72qi7fvxkz7fnyisaa0xscy4pksq8l2pvclywzg3lcclhxp1"; }; meta.homepage = "https://github.com/rhysd/committia.vim/"; }; completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-08-13"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "43cb0b123544b602bd31747a3d8cf52ef0660723"; - sha256 = "0qllj4zqbw2fhp17lqk0xmbraq86gl9gjp9vszpd9jbw7h4lh168"; + rev = "5c153f8ae094867a414cb2a7c0f59454299f17b3"; + sha256 = "0jm39f4qrm5sgrq1q70wx9674zw1gh7kb0vhi57r42m3jivvxvjy"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -930,28 +558,40 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-08-12"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "db0de94cc2c4fe1bf1a8fe5c78fcc774097d1e90"; - sha256 = "1vcp2hzp5kg1rpdbl8sil16zqc1qawxfchwbq4c4kwyr2kxkavhh"; + rev = "a9431410d74f2281ae626727342a5d23d4a12552"; + sha256 = "00b73dxirn3m0rvagskgc00vyrkkcnbxfkn22jnzv84fjvvcj375"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2020-04-27"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "a96f74ac35b77ebe2c5788ca31e66d87ab239adb"; - sha256 = "1pgb86cpv4649qnxfw4280sqghldm66s572pg610giqjxda4a52s"; + rev = "cf25d744ac35872364c49fac3cb6a546e8af92ce"; + sha256 = "0mq0wh6kihmn5izaz81zl274yxc1x4gr9qmz9sjdhh122i9gbfs8"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; + Coqtail = buildVimPluginFrom2Nix { + pname = "Coqtail"; + version = "2020-09-16"; + src = fetchFromGitHub { + owner = "whonore"; + repo = "Coqtail"; + rev = "7ea2fd5f42910dcd10eaaccddedcc33f2edd2ef1"; + sha256 = "1f14sg9v80ir9f1zk4xqjbqqd0cv2pxpipbflzwafmwcs5chz6rv"; + }; + meta.homepage = "https://github.com/whonore/Coqtail/"; + }; + cosco-vim = buildVimPluginFrom2Nix { pname = "cosco-vim"; version = "2018-08-07"; @@ -990,12 +630,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-07-11"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "528766a549dc5022f3d89e84cbb80c7b911994f1"; - sha256 = "160h9b59znbb0i6c7lh132mn5bl4njazfqsadz3p995vb9yc0sa6"; + rev = "e23f03632ad2544f0232b824dd5520fd0b58d235"; + sha256 = "12b127v6yxwik7q2wbyqag4082yzp44sm0x4xwnv55xhlz4w6xws"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -1038,12 +678,12 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2020-05-26"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "d93d97813dc839ef0782302a0debd7c4877f09f3"; - sha256 = "0lgw839xnmdsbaiflqp3i2liqhg4lp01iaz0jv380kbw9g6k666k"; + rev = "ae5237f8eb9bbc1ad7f8903738e0dc2af194f740"; + sha256 = "18inmxhqzw40sm5ixybbliikbhs10zrqp58qjcd8qc4grj8z6lcp"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -1086,12 +726,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-08-14"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c533595c435e776297e84ff739eb6bf84523cf22"; - sha256 = "1y6fwy6hrdpf3znkrcbfj1gk0agdcl80a6i2027qlsar1k7w2pyp"; + rev = "a84cb7f88afc904123858b226240c3339b7ca814"; + sha256 = "1ryc0ahrjjc20344jbvxz9miyrqdjs7gz6r2awkf0ayyz6nx5gch"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1122,36 +762,36 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-08-15"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "6992366697e5509c405c0ae8386cca91a186fd0b"; - sha256 = "1iqlf7669qxf80g30j5zjyx6w7hjvmylnlwcmq3rdcsyk1b0iiwy"; + rev = "2c80ef41fa56bbb4a0d48c4153404be694368141"; + sha256 = "08kdhn4kry8sc8gyffp8zl609nlajhd1x6qi50n5216r9dk03jlk"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-08-03"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7df7851826a1e8417a9b242d4ce3bd09ae1c6298"; - sha256 = "1rf5qir9ybk1l7bb63xkprssa8jpsiap26yn6k3xy2drfvbrlika"; + rev = "cb06d89aaded0bc2418d03a8fbb263ca0ef70406"; + sha256 = "0dk4w6yljnhf4qwhgamnw2bnmqikgqb8nshifn5l767sm3hk7d2h"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-07-11"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "d620b34fe5035807ad680004812080edc0f2a794"; - sha256 = "09s86h14nrscpn16xppyz8nnjchyfv91z2cx4p0a2m46hqx962jj"; + rev = "2c4d9117186a6cf86030d213ef2de60b5dbced19"; + sha256 = "1aka5zg7jihy1958xp4j2z3kdzmb2d4w5cbl95na4hik5rz4hyxj"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1268,24 +908,24 @@ let deoplete-khard = buildVimPluginFrom2Nix { pname = "deoplete-khard"; - version = "2020-04-30"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "nicoe"; repo = "deoplete-khard"; - rev = "7f81116b1c68d49f189a2aca62a31729fb7bb0e7"; - sha256 = "0jnpv0lpli9qjqwkzfl66fyhywa6q586q44d26q3h7sllxpz0066"; + rev = "dc2b519e8da0df10c3954946285caf484d376497"; + sha256 = "126mhnn4dqwm3aw6v4c3s3fnz40lki4cbb8xfrmxfbnbnjw1yx4x"; }; meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-07-13"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "ae0b7d023a33f0692652a21f532051e8718e1800"; - sha256 = "00008andpp08l6fm8qadp8ycm59s8gx2m1vskmzg3lw905fk0gra"; + rev = "17cd3fae3044eb8148bc22167257d4ae13165eb1"; + sha256 = "1xag51j71ifjn64xyaz7whml796pdl8vsw0ad22wndwzb95kyxdm"; }; meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; @@ -1304,12 +944,12 @@ let deoplete-phpactor = buildVimPluginFrom2Nix { pname = "deoplete-phpactor"; - version = "2019-02-22"; + version = "2020-09-12"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "deoplete-phpactor"; - rev = "53e239effb8ff20fc0a192206e96d98d4f9001ad"; - sha256 = "14097r9fmyp9zxfgv0fj2s52qd1v5cxdckfg4zph7lg3yri1hx9p"; + rev = "3668d35d8ea8177bb70cfb239169d3c12bc54f6a"; + sha256 = "1cjdr8py7brxz419vf125jkyfjrx3n5z65ranj23z20ifc945g6b"; }; meta.homepage = "https://github.com/kristijanhusak/deoplete-phpactor/"; }; @@ -1350,6 +990,18 @@ let meta.homepage = "https://github.com/carlitux/deoplete-ternjs/"; }; + deoplete-vim-lsp = buildVimPluginFrom2Nix { + pname = "deoplete-vim-lsp"; + version = "2020-07-24"; + src = fetchFromGitHub { + owner = "lighttiger2505"; + repo = "deoplete-vim-lsp"; + rev = "2ea06074dc07c67ccffc24b976b92e17e9d795d1"; + sha256 = "03rpw1z5fgglba7vymi3ln810nh5x3x9hjqlm41shdik9pgmg867"; + }; + meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; + }; + deoplete-zsh = buildVimPluginFrom2Nix { pname = "deoplete-zsh"; version = "2019-11-10"; @@ -1364,36 +1016,48 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-08-10"; + version = "2020-09-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "ba3913cc52b457877836f7423b0929b770dda42b"; - sha256 = "16hn83ns278x9p280b0gpk4b4vhg50004bpnff7d3inf3x6pli4j"; + rev = "895fafe572585b807a31d4ba2835188d7b38cc41"; + sha256 = "1irhdp1bdwpyj9g40mb4n1mjw2f1hxswhgf2f1nkv1cx0j8pvkzd"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; + devdocs-vim = buildVimPluginFrom2Nix { + pname = "devdocs-vim"; + version = "2018-08-27"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "devdocs.vim"; + rev = "1c91c619874f11f2062f80e6ca4b49456f21ae91"; + sha256 = "1nxww2mjabl2g2wchxc4h3a58j64acls24zb5jmfi71b8sai8a9b"; + }; + meta.homepage = "https://github.com/rhysd/devdocs.vim/"; + }; + dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2020-07-15"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "2b89ae34b07fc305741a58ba2c584a4cfc3377fc"; - sha256 = "0jnxy5wy2mf4j01rgxjirqp3pyjwhsf3z2zxdzwz1bykhlwp7xhl"; + rev = "77d1c165bcbe6bb7f9eedbeafe390c2107d3c52e"; + sha256 = "03x55x0gvf7n4i8hh6s5453mf5h43pf7kdy817q6w1149bd90vxy"; }; meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; diagnostic-nvim = buildVimPluginFrom2Nix { pname = "diagnostic-nvim"; - version = "2020-07-25"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "diagnostic-nvim"; - rev = "03670688e70fc65eff70abb3cefe1a086ee95bf8"; - sha256 = "02nci7n9lpz1axpwzpv34r6720iycfh43n1910ryhm4f7cxs2x61"; + rev = "49abd2e71772f6976b7e1360782570535069bc94"; + sha256 = "16i99j76j1s8p7kjyr49pwj9jlqiq0krzwyxxk1z16shfymvav88"; }; meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; @@ -1422,6 +1086,18 @@ let meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/"; }; + dracula-vim = buildVimPluginFrom2Nix { + pname = "dracula-vim"; + version = "2020-07-19"; + src = fetchFromGitHub { + owner = "dracula"; + repo = "vim"; + rev = "b64b22affafca7d3831a20949115b91031d596ec"; + sha256 = "1f5hwfcrsfq3yk53kkn4syaxmri8wh8h6rpq867468b8rdcnhq01"; + }; + meta.homepage = "https://github.com/dracula/vim/"; + }; + echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; version = "2020-06-08"; @@ -1449,12 +1125,12 @@ let elm-vim = buildVimPluginFrom2Nix { pname = "elm-vim"; - version = "2019-04-05"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "elmcast"; repo = "elm-vim"; - rev = "165107a9fd2b20c8f050fc4f977b4e41c790b1e7"; - sha256 = "0gf7b49by0ybx3ndz7sz5dwcfnps4sz6wsr02lyarj8f8116ysy5"; + rev = "4b71facd77297cb33bbb3b14894676cff0a9bd1d"; + sha256 = "1kxkjm6fzmircg5gh7w2bmvjgk8ly5vvq9l31m4p6ql48azg2ilc"; }; meta.homepage = "https://github.com/elmcast/elm-vim/"; }; @@ -1619,12 +1295,12 @@ let fruzzy = buildVimPluginFrom2Nix { pname = "fruzzy"; - version = "2019-10-28"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "raghur"; repo = "fruzzy"; - rev = "b312ae79db98cf6939c8319f2511efa06889e8e3"; - sha256 = "01iisbawq2w7yw866qvv109amnvyaymzyz9nqal3cjrrcwk6mmdk"; + rev = "4cdfee7b828a5cace22bfd93cf23fee0b2b233c4"; + sha256 = "1dmxz283ypz1klcmdf4jk699aifr3dywkh9y8v8v8vyflampqwwp"; }; meta.homepage = "https://github.com/raghur/fruzzy/"; }; @@ -1643,12 +1319,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-08-12"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "4145f53f3d343c389ff974b1f1a68eeb39fba18b"; - sha256 = "07fb52c8bmmpfin24pqqh04q157qx52xjri2wjm004yq69b44hx7"; + rev = "3348aef05d02828cd8b071ab29476af2029ea3d3"; + sha256 = "0jyk9c3ksxss8zjk0qqkm95074glbf31a5w78sdzwn352xm8nakp"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1703,12 +1379,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2020-08-03"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "2069a081cb83aab8ed5e275a97aa178a30cf47a0"; - sha256 = "1xj95c2hhlalf2zjp2qh414dr50cp3gly8zk4bsk82v65rdwcqv1"; + rev = "c16b0d43ca57e77081f1f23f67552efe37110b39"; + sha256 = "171w3dv3jl4mw1ikh5p688v0a8nf85h862d9zvsmdzs2v6ajigpw"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1763,12 +1439,12 @@ let goyo-vim = buildVimPluginFrom2Nix { pname = "goyo-vim"; - version = "2020-06-08"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "3e129198bba7d6b50406902002ad7d213a6cccaa"; - sha256 = "1b2wsxbg27nmwxrncwddkl2ck8hbiqdqi821vl9d1fl5nx042y2b"; + rev = "a865dec7ca7616dbbd69315ad1417b84d0c411f8"; + sha256 = "09mqmcz79dwcc5mv0p2wc84jc20ipa0vv2yckp4la4xh909ph4hm"; }; meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; @@ -1857,6 +1533,18 @@ let meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; + hoon-vim = buildVimPluginFrom2Nix { + pname = "hoon-vim"; + version = "2020-02-19"; + src = fetchFromGitHub { + owner = "urbit"; + repo = "hoon.vim"; + rev = "116f29971a2fbec8e484daeba8afd9d60f85800f"; + sha256 = "029rm8njpsa0lhhh504975lmw7yr2bkvxi2gag1l9279r629vp2r"; + }; + meta.homepage = "https://github.com/urbit/hoon.vim/"; + }; + i3config-vim = buildVimPluginFrom2Nix { pname = "i3config-vim"; version = "2020-03-28"; @@ -1943,12 +1631,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-05-29"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "43dbd7092801637972b1d9fcecaaeee11f8e00cf"; - sha256 = "0qnzi19vb5qk773pc9v75wqm2ipdkcscljblla6gq05srm1h8x9d"; + rev = "5bf49035522dea94b72638d039828c6f84b7ae34"; + sha256 = "098ng8f2dv29pgvai4nsm2d5qyw44gd9dxjmdc3mdznzmn0clvvf"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -2064,12 +1752,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-07-31"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "ead61b0ff9e26365a977280298b22bad40c9fba5"; - sha256 = "05p5kxkdh4y1s8532d1d8zilq9hy098bwx3lyrsqpxj0n2kr2q0d"; + rev = "33116e1135ffa0c09997c111785beb5232efc7cf"; + sha256 = "1qx1xpnnzvb5h86mrywx56yqw5lbma9xmwdgi6dh6x8mzald7agw"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2196,12 +1884,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-08-12"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "70237012f9be89d0ce4c0ea728f5ca8bba9818fd"; - sha256 = "18faws5vhh0v78c8xs68iklsmd9mddg2s0ha4z5adhfa6ddhbks6"; + rev = "b9024dcb4204437452b84dfd83bd39748bfc7cd3"; + sha256 = "1m896054kz44k8kfmp4pmashin85n41gddnhsv1657dgd2dyzply"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2220,40 +1908,52 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-08-04"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "deac5994a0bf6795b743d444dde11a407416ddc7"; - sha256 = "0y6cill4pwck6ajm55br2prhgj928yb94dq2wxxsrk6xw2mn0y79"; + rev = "6417dd8c864ccd6fb2b79882d30ca0227bfd2204"; + sha256 = "0aars37arix00l63kn5p4gq3dvzpmrzxz1ap20k1mr2dy7pmval5"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-08-15"; + version = "2020-09-05"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "c1883dbf23632e6c3ba0a26ba2bd8f92f5690fb3"; - sha256 = "0lkix2dbmmdp40qp5mlcmqscxs7sjg57mjjrvlsr9gg8r05dv6fq"; + rev = "f5f870e0ac67542fd83cb6ff99632940fe8795f9"; + sha256 = "1al9yvwn3rfw22351p221nx68hhqynh9cq1flyalkvr46cda48cz"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; limelight-vim = buildVimPluginFrom2Nix { pname = "limelight-vim"; - version = "2019-07-09"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "26e913a2e061195245bc62d24009ab67143a3c32"; - sha256 = "0bxmihv9i96k6pl37pzgri03vbvjwlp34rl4gkj8w2ajhhi6nsnn"; + rev = "815c6122504361d52e10172601471b416d040ca8"; + sha256 = "1af9jz05iphp6738vvfchnvhfxw7wx2hxqs0iyjkmi7w43hsw0sy"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lsp_extensions-nvim = buildVimPluginFrom2Nix { + pname = "lsp_extensions-nvim"; + version = "2020-09-06"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "lsp_extensions.nvim"; + rev = "7c3f907c3cf94d5797dcdaf5a72c5364a91e6bd2"; + sha256 = "0c9glx0hn28m5jzz52ny1rcp63s9fdlznvywy4gzwwqi9rscqznz"; + }; + meta.homepage = "https://github.com/tjdevries/lsp_extensions.nvim/"; + }; + lushtags = buildVimPluginFrom2Nix { pname = "lushtags"; version = "2017-04-19"; @@ -2532,24 +2232,24 @@ let neco-syntax = buildVimPluginFrom2Nix { pname = "neco-syntax"; - version = "2019-11-10"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-syntax"; - rev = "6c3862ac82d2c917fa8b4126832de7d3a909f1fe"; - sha256 = "1kmzlz6c5bs7f4dxgrdn4azwh55k6ghhyzy8jjdgj0wsb309y92k"; + rev = "f8d7b748b022aac8ce73458574da5616f1c5fb65"; + sha256 = "12h8qm6l40a2dgbimn579bdyar0dq88hk7mdd0vhyj15c1305kda"; }; meta.homepage = "https://github.com/Shougo/neco-syntax/"; }; neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2020-04-08"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "4fbc3f5f3a2b2d5299c388e2f1ffef04fcaf87ba"; - sha256 = "0lk5p2aihalcarsjnvn1yidgv0xqp1bk29wywsbp8ni964s0si39"; + rev = "e7b5a73cba668a351b0953063b6e18e1dc1773b2"; + sha256 = "0mfli085rpr5assb4n21wnd59fnnsbfilim7impcwr9imvrw6ymf"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -2580,24 +2280,24 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-08-02"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "2721992fa64b0c26031f514f7cce4f6b1399427f"; - sha256 = "0fp6r5zw3hn0wg6fhk1f90qcmamnxx18rwjx173d7rqap375pfgg"; + rev = "4f259033bfbc1465c3a8348fcf632260d96a3e6f"; + sha256 = "09grfx66m5wasqy8blhqhfcqnsh3b4gfyyi09l1zda1vr2hhvz15"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neoinclude-vim = buildVimPluginFrom2Nix { pname = "neoinclude-vim"; - version = "2019-05-11"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoinclude.vim"; - rev = "5125e73de0a8b4f2c399e4896e21be1b8f7b3d39"; - sha256 = "0qw63xyvrxvdzx01k5nnsv3p8zmnd77cwbkk24pikqrscxw3ypsz"; + rev = "954cfc9dfdb303f2c2fa867b9cf949dd74512628"; + sha256 = "0slp6mz8ds5raqhbi9gpr1ilgw745lfzjygyd58r6jcg2givsiik"; }; meta.homepage = "https://github.com/Shougo/neoinclude.vim/"; }; @@ -2628,24 +2328,24 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-07-28"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "06f8fdc40262f5f6b0cec19f0e572f0477ecc022"; - sha256 = "0mdf0qpnly4y7fh02zdpx59gvvj33nd5p90cc5620y6qfld0y13y"; + rev = "886a414e339fe40a47f30da8aa6012a6e0906018"; + sha256 = "0rnqa2cc7imapizg52r5dxzq2x2m8sxvds2q27ablzcvvghsjh96"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-08-03"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "b4c470b7e720fa061ac118a09420bc2da16610bd"; - sha256 = "1d27rhyd5db0vd72gi6dl34g4axsz66d0l0fgw5g6grawlpf8w6l"; + rev = "30b6b53b7a86b84371714b4a0f092d5d303c4a35"; + sha256 = "0q06a0wq2aqgkjc5jndccffibr85hf33w2igcah3x6dl203p4ips"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -2664,24 +2364,24 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-08-06"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "48bc5d0bddd3debb9bdf73ee1d1153d7cafa693e"; - sha256 = "0495n0l9isi7pgfgc2axkk0v4g7r4dpbzxg5dl4hg7qkw6la7l5k"; + rev = "807a94f746bac2ab328dc22e6ca88bd411283cc8"; + sha256 = "0wrz8kghnb52i2sxnnkx74kpj1ibp956707x5zlx0gqipvbqdvs8"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2020-07-21"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "a076c5828182afe03109ead9ca6863d3d0bd47f3"; - sha256 = "0h3ak79kw26wpiw4q9vgjmdp5vdrnhqimlayfjixbqmq4p7nldcj"; + rev = "78f4d79f703aff49c9bcee5d527234c2f64425d5"; + sha256 = "1dq79jabyyyphgigqac9jf7hhadfh336fm8hklh1d64xlzyrfp6s"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -2724,26 +2424,26 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-08-14"; + version = "2020-08-18"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "23000acd7f9744667abc840dd10dd07a16e18fc6"; - sha256 = "1sapl458rrswgyqlm2pg8wxjqplryn3qnb1qqsh727ihfq5vfqjr"; + rev = "577ddc73f0a1d2fd6166ed3268ab8536111037e0"; + sha256 = "0bccr18nr42vwbb4i765yxjw18piyiyd12sm4snbkkxahp9yswf7"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2019-01-09"; + version = "2020-09-20"; src = fetchFromGitHub { - owner = "albfan"; + owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "95e20577cd442ad6256aff9bb2e9c80db05c13f0"; - sha256 = "15i66mxvygs6xa2jvk7bqdagxx1lcvynmyb9g75whgbv7is80qn7"; + rev = "97eeaee46308a39cadfd2273280fcc4906988dd0"; + sha256 = "1s4mldcyq88mqnw3h4cq41w4217n6wmh1p4cwhqfz0caihb06jfb"; }; - meta.homepage = "https://github.com/albfan/nerdtree-git-plugin/"; + meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; neuron-vim = buildVimPluginFrom2Nix { @@ -2820,38 +2520,38 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-05-20"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "67c37060deba03d123c4654c1b3da426c92d6f61"; - sha256 = "0rsgpnl20pxfqcwd5gr89mkqv3im4s7v4d1cvxvi9wj0ix06pxm1"; + rev = "db06dcbdc480b936b2da3028addb80807fdc8ed6"; + sha256 = "1d3jg75l8zgwxigmyy274rhn8ldfx003qzmfj2abd9lncqcs43va"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-hs-vim = buildVimPluginFrom2Nix { pname = "nvim-hs-vim"; - version = "2019-04-14"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "neovimhaskell"; repo = "nvim-hs.vim"; - rev = "5bc177a87c9575c4995df90a098d330fe6e02f75"; - sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q"; + rev = "30baacd3c7a10625cb2d4dd64ae3bbfc4fe3f8c6"; + sha256 = "1w6cr6j77nwxszm1d0y4phvjsz9q4aw214xkscw6izakfmk06h1x"; }; meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; - nvim-lsp = buildVimPluginFrom2Nix { - pname = "nvim-lsp"; - version = "2020-08-10"; + nvim-lspconfig = buildVimPluginFrom2Nix { + pname = "nvim-lspconfig"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "neovim"; - repo = "nvim-lsp"; - rev = "fc9d94ef006e082596c2e8724eb3f1c92ff203c7"; - sha256 = "1byji4p0xigyp8y71s00fs2vrhgz3xkf51mmyz489pp52c7nfx4v"; + repo = "nvim-lspconfig"; + rev = "60133c47e0fd82556d7ca092546ebfa8d047466e"; + sha256 = "15ysbbvxlgy1qx8rjv2i9pgjshldcs3m1ff0my2y5mnr3cpqb3s6"; }; - meta.homepage = "https://github.com/neovim/nvim-lsp/"; + meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-terminal-lua = buildVimPluginFrom2Nix { @@ -2868,12 +2568,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-08-15"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "83210fa412b5b63a6e7717ae576536b7a10f6aef"; - sha256 = "14lkzdkkkzk8xp7ambzz688mh9cvibka82gqy063w75hrnz8y8yy"; + rev = "98c12ec23a6df2f2f505304b61c4b2eefc0a568f"; + sha256 = "138rsbk2kx929cih6r3rqmgrygamnc1l9kh62pqsrphi28jh5178"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2964,12 +2664,12 @@ let palenight-vim = buildVimPluginFrom2Nix { pname = "palenight-vim"; - version = "2020-08-10"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "drewtempelmeyer"; repo = "palenight.vim"; - rev = "9637fc4b6dc8ba852d5ec21c2c54851d81576490"; - sha256 = "1im9iggwiz86h0rydaz73482q8ildhd81hscq8czwigb03pslyxg"; + rev = "294f190da3bd50a7c91fed1b94c92fd0930791ec"; + sha256 = "0s9mna0dcpszz3wyz1qmmrm76rxkjlmyxn7697k5vz4l49zzyi39"; }; meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; @@ -3276,12 +2976,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-08-15"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "f5eb7b04ee2746cbed4067e0cf9dd19185529a34"; - sha256 = "0549r64350cr17gg1lm1fwz0wb1w9jsbs8qi8ddcsgrk1bc3gqf5"; + rev = "96e79e397126be1a64fb53d8e3656842fe1a4532"; + sha256 = "0siml7vqiq5nvymyw8az48rv5dsf9dad8y8hy22j57lknd67b8h3"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -3312,12 +3012,12 @@ let semantic-highlight-vim = buildVimPluginFrom2Nix { pname = "semantic-highlight-vim"; - version = "2019-09-01"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "jaxbot"; repo = "semantic-highlight.vim"; - rev = "7cf0aabbd0f9cb531b0045ac2148dff1131616de"; - sha256 = "16dnqrdpxf6322az1rn67ay2a4clqz410xn6zqzr1w2y6x4yly1a"; + rev = "7e141c2b7be0f2600276004fd2e7382a3fa0f690"; + sha256 = "04975ly6zd58zhs2v07dw6m1dha0gkmfm0pvhlrgcrf2qp8n4m3v"; }; meta.homepage = "https://github.com/jaxbot/semantic-highlight.vim/"; }; @@ -3370,14 +3070,26 @@ let meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; }; + sideways-vim = buildVimPluginFrom2Nix { + pname = "sideways-vim"; + version = "2020-09-21"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "sideways.vim"; + rev = "19c5a21206b6c9f999004256a10e7381450ea83f"; + sha256 = "14h8lf70wccafapifzf9c6cjprik9n1a1wmv5gpajyqqbvzh1yv6"; + }; + meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; + }; + SimpylFold = buildVimPluginFrom2Nix { pname = "SimpylFold"; - version = "2017-06-13"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "tmhedberg"; repo = "SimpylFold"; - rev = "aa0371d9d708388f3ba385ccc67a7504586a20d9"; - sha256 = "1gjv78x2cgh79a04l411kdhkm53f93czs54p07kadpa9659z93ss"; + rev = "0459df8a0bbfc8ef1bfd88db889e881626f65914"; + sha256 = "1lydkm86d84fsmbklwcgnlb95vczri9a8d898hrnfvskyx050y2w"; }; meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; @@ -3444,12 +3156,12 @@ let Spacegray-vim = buildVimPluginFrom2Nix { pname = "Spacegray-vim"; - version = "2019-02-23"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "ajh17"; repo = "Spacegray.vim"; - rev = "69e8fefce04e2aff6a01cc4c295493359b0e4fa1"; - sha256 = "0ks5yd1vmpjw8ml7hqd2zz2d8mqkqhfw2ya73y1igf6as70za896"; + rev = "338b319da09b5e62744a54c79148262ba0f24bf3"; + sha256 = "0jkv0sg1sc7d8br32zmwr5m1iwbvzi43f4gvshfi71c6k2fyhwlb"; }; meta.homepage = "https://github.com/ajh17/Spacegray.vim/"; }; @@ -3504,12 +3216,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-07-21"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "46efa9796716fe645d43f6018de3e06296978c7b"; - sha256 = "126a9v4j217g1kflfabqx0bz02k0xkwqfagzhk51n7drh2r2m7k6"; + rev = "7148cbc3b9c4f70cea9fdccb72ae246b6d499c20"; + sha256 = "0smaghrigmr8jmw919pmlcvv6a7w7rw2j12gnbks30pi45y547jm"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3553,24 +3265,24 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2020-02-21"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "c4053da88208cef5a32a5862694d36b73f6ce310"; - sha256 = "0awz0pf3awrwhay40wngfllpmmh24zwm02ra530x4n1hk74iwf2v"; + rev = "bfc662d11b3a006815d0b6972c1c0c2ebbc3b16e"; + sha256 = "1qf5f9p0kfi6bq2qi9izarva6r711vzlbrbdax8nq9g0pxa1bj3f"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-08-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "25b816d9b0016eff68e7025fe52fb67ef253920e"; - sha256 = "1hb9f1p7sqpb7kc0rih9kaixwg4s9a6z86ycnc6kxp1iz97d6ai1"; + rev = "20fb41cb3ee7efd041866fad7384668d131a0029"; + sha256 = "1gmk9hlyz8k5880gzs0pqbpmscjzfj3cwfdkg950w5ky2lm0i7n2"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3613,14 +3325,14 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-08-03"; + version = "2020-09-23"; src = fetchFromGitHub { - owner = "majutsushi"; + owner = "preservim"; repo = "tagbar"; - rev = "a5090717dd8862be0a47a96731c6120ace544fe1"; - sha256 = "1iz26xj3mrshj0n6gpqa9xbk0i3lr0383bqdrq0yk0lp32ys5gh0"; + rev = "6099093050d84094001f2f226ddc09d7c2edcdd6"; + sha256 = "1gvyq1gra9k3fjjzr4lh9kwf0h2a5di242kxlwyj78p9606cdf9g"; }; - meta.homepage = "https://github.com/majutsushi/tagbar/"; + meta.homepage = "https://github.com/preservim/tagbar/"; }; taglist-vim = buildVimPluginFrom2Nix { @@ -3649,12 +3361,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-06-18"; + version = "2020-08-23"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "920d465b56bcf96c976fa22e9558d51aa55dcd9c"; - sha256 = "0n7gwdyzim4f92mxnjz4zwfiyapyjhbf21b1l3dq9b07x9m40365"; + rev = "25bdb50a6c5934d4ac9313cef0d7d2168d84803b"; + sha256 = "04dmdydrc4v055qkjn5gfvibyzd30fg00abnk8ijvabfcmhvlh40"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -3746,24 +3458,24 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-07-13"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "d8ff43209d6464d5239db724207d588e4153767d"; - sha256 = "0gf7jdisll5cz9myh67947xwh0v8513n64jxbsh2fbxh8rq5wb21"; + rev = "b38bdda4378b17888f5132787c49d79722c25752"; + sha256 = "0q29h348pgqxqw1pqq1nsj0nxccnb2x6jd92bpsqnjf452wsh2f2"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; tslime-vim = buildVimPluginFrom2Nix { pname = "tslime-vim"; - version = "2018-07-23"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "jgdavey"; repo = "tslime.vim"; - rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; - sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; + rev = "9b2b99e409336584103b83c597fdb6234875ae25"; + sha256 = "048ycam0awcf98zhha6c5n1fk366w559bmjcanik2sqlqw1f74as"; }; meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; @@ -3782,24 +3494,24 @@ let typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; - version = "2020-02-13"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "17d85d8051ba21283e62a9101734981e10b732fd"; - sha256 = "17z8ygns97wlnm4vq7kgkx3ymnbb2f6imxn02fc0iywkrhdqv7mj"; + rev = "9f247d7693cd12171239c56c355ba863f559f424"; + sha256 = "1m16rhvmymxps41s7f6nh6gnbfiw5qwkvl23jr9z91xsq58jzj9l"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-05-19"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e83c82099d9bd43dc7895e3cb5b114ee5a2a07c6"; - sha256 = "0a9fqgg8sg8s19q9inxyzl6lqdsnxs22csqs2rss1qz9dsic4yrh"; + rev = "7941f98337564d4e86cf2b7467b64def4d212794"; + sha256 = "0miihbj9h3ay6iq1ld13ixij3l4h02yrmc7bq8iarw776l89gin0"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -3888,18 +3600,6 @@ let meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; - vim = buildVimPluginFrom2Nix { - pname = "vim"; - version = "2020-07-19"; - src = fetchFromGitHub { - owner = "dracula"; - repo = "vim"; - rev = "b64b22affafca7d3831a20949115b91031d596ec"; - sha256 = "1f5hwfcrsfq3yk53kkn4syaxmri8wh8h6rpq867468b8rdcnhq01"; - }; - meta.homepage = "https://github.com/dracula/vim/"; - }; - vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; version = "2019-11-13"; @@ -4140,26 +3840,38 @@ let meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; + vim-after-object = buildVimPluginFrom2Nix { + pname = "vim-after-object"; + version = "2018-09-17"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-after-object"; + rev = "7f52106df8a05e9bc1c53960c31a55f77e303903"; + sha256 = "13726m0c73n5pw9gil4ahbg71ibklrwkw9yvbr6qxxvn6qyijpdy"; + }; + meta.homepage = "https://github.com/junegunn/vim-after-object/"; + }; + vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-08-12"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "19d1990f8613fa29fccbec60aa58101faf7549c1"; - sha256 = "14wbhgarwhq4akknv79vnqvl5q2pfx6pqpb42wf6d079j54x4ay1"; + rev = "3740312de0be5200286260816e2563e77c0be0c5"; + sha256 = "0ia4h37gnxqagjz3yb2r6awp016iyc6dr0n84k2205g5pqck5b2x"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-06-26"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "04fa4fc40f21d9490954213c1ee06c7fdea66a6d"; - sha256 = "0dzckj0449rw37v5kwmfm5wa9spfhsbfr56i30mb063zmv8wk551"; + rev = "155bce6665ab8c83447102e8402cc9d3b7c3b3f3"; + sha256 = "1qavi386va4wnalaf03b19lfxypbkjcjdiiasbdzfnlqpz7d4rwy"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4238,12 +3950,12 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2019-08-14"; + version = "2020-08-22"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8"; - sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg"; + rev = "85a044d854e5e48f72414726c255112be31e2cac"; + sha256 = "1hcfbl958v39w00kyfg75rcxs9xzaqnd98i4y322ayqfgrhd95n8"; }; meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; @@ -4358,12 +4070,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-08-13"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "b51fdf94f4dec9c0e32b2a07ccd157aa3dfa6d57"; - sha256 = "0v4j192jixd8akiw4iclwkrjqix3ms5mb17gwhkcjksw4205r5zv"; + rev = "f5f9f60558c7bc1bfe6a577f1fd9f91ff9ab55bf"; + sha256 = "0l55j2vb4l76jlamwxvd1l38irzfvyqlqwi2s13iy8xx4i54vsfx"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4406,12 +4118,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-07-29"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "a43392a7c4d73b91835e7bd993889646c8a907fd"; - sha256 = "1b850c36xgydn2ibdxzqprzsi65hz9sfhvcj69zm3rqbh47hqi98"; + rev = "9346c381c94c0f9312c6e7970a4ab15419935464"; + sha256 = "03nymldw5ifc57z5vr0xaz00vml6v854zp2fnzm4q9v9n295kh66"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -4538,12 +4250,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2020-08-15"; + version = "2020-08-16"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "d2ccb376ebfeeef842456a7883164ef2c0d1656c"; - sha256 = "0260h5yhghyaxsbmx3imnjq1rfz5f5w60ypzr4y8p5a0bh8kvwmq"; + rev = "4694c6ea03a065a3f6ddbebce56797a21e8241ef"; + sha256 = "12bzxrdvb9s0d8llkq6h63g86qxs0gv9x7401apl6qrs79prrb4a"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -4610,12 +4322,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-08-14"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "308526367703698554d19f15f692ee3c45a598cb"; - sha256 = "0b6ng6qgwx4fb9fs7b7m5k3dj7ycq0zw5y0jaqqqn6asp8wmf51b"; + rev = "7d1c3aeb3b26c7fb7bcd7cb2bee67beb3e538db3"; + sha256 = "0yrc17pq713b86z71ad0zy8lm1cd2psyzbw8yb62d1prjc17hp77"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4646,12 +4358,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-06-30"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "7c4dc5945b15a6b97ebef860070d30e36da01788"; - sha256 = "0mg8fdfsr59015m309kr9v5akwc3zfwfygn36x47c8q2bwjjr052"; + rev = "9c0dc32af9235d42715751b30cf04fa0584c1798"; + sha256 = "1xl655mnhjn1mbqzvxblsbqyg3yq50ri2a7szvqmpywq8rr0ymq9"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -4862,12 +4574,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-08-04"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "8963dd3b385410e27752fb859bd5cecdd22b5f71"; - sha256 = "0ax42ilx24cagy0m6ryda6h0fn7l8g1ckry24vfz2zp7d8y14hah"; + rev = "f936a7671888638dec54b86f2e49001a0e5e6005"; + sha256 = "0yvvwi4kf6frrgdwd86p2bpcgh4x2lrhav1yl58q6mrdp2qjl446"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4922,24 +4634,24 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-08-11"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "268a0744b9959d78a54b1257d0462e5f34fc52c5"; - sha256 = "1gk3jk8iqj41sw4wn4kqr66gxp75bs8c1fxc47n33gca8mpnr8l0"; + rev = "dfaecd8d3fede970a1e4c38e2287e0fa5a264253"; + sha256 = "0wkhib4cawh6hq1ihq851afdj6chkxw4a4dqgjkvz2f6krhpblj5"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; - version = "2020-07-08"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "thosakwe"; repo = "vim-flutter"; - rev = "359052369690541a9ede6e897fde4dca867a5109"; - sha256 = "1303dskqbg1c5n3hczzw7x3gn5kl7hlfha824klwlkx91ga2jhck"; + rev = "5a6de53adcc72742138b666b305869999fc8066e"; + sha256 = "1zxa1gz47qpkcrzniax6q1bq9a953rypj1cfbcjb62h5ggx2rr5n"; }; meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; @@ -4970,12 +4682,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-07-31"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "260182c65cae653ac20e6a69ba8cc6124e7ba6c2"; - sha256 = "14dmar7d9qajjk2vy223mw7gwdcz548lcj5jg8pg7j4cyc6ffbyp"; + rev = "49315d0c74acb983f2902260ebc9d86f85758ea4"; + sha256 = "0i2lhfw542c7xm7d10b0q5isw3398ycyn06mnp429nwb7fldv1ww"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5006,12 +4718,12 @@ let vim-gista = buildVimPluginFrom2Nix { pname = "vim-gista"; - version = "2020-01-04"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-gista"; - rev = "af13c0062a46d73384f15abee5a54e164fcaad8e"; - sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd"; + rev = "c046de1b9d4cf97ff6f80cf3bdbb75b1094f2aaf"; + sha256 = "0q08hs4y9d4c4zdd0lh4k054133y0455fkn47gi7h16m01g92imc"; }; meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; @@ -5030,12 +4742,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-08-07"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "8005f71aabef13f5872b3ef4802f36503a16c451"; - sha256 = "0ns33dbkw8lc6rj6mvkgymdsl3i4g8slbh06g8h4rfn8qq5wjxbw"; + rev = "ea79bc01c2efc84cf8e71fbe5fd8adbf4242739d"; + sha256 = "0dv69ganm4rv2909yy9w13y82bik4maa5x1z3kpv0hrd55qay40z"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5066,36 +4778,36 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-08-13"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "bd56f5690807d4a92652fe7a4d10dc08f260564e"; - sha256 = "1gd30pnmrg4422dg7g14r9z539bz8vzssyfmm6ml6kgzn0pagzi0"; + rev = "0a9792612fb87c5581906a9cc410b472c25a0d78"; + sha256 = "1gwswqmxd29hpj8rvf2v866877xc4fz3jhymkf0whhw62ya5gr9v"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; vim-grammarous = buildVimPluginFrom2Nix { pname = "vim-grammarous"; - version = "2019-03-30"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-grammarous"; - rev = "083cbee6094c9ec347d7c75af421be27d2ec7e70"; - sha256 = "1cxycr2ijzxn9d5xgp9ri4f2i4d87a3100nsc11iwa2bzir4xsiz"; + rev = "a3d67402099ca3554dc06eb7cb514865e39ec0ea"; + sha256 = "0w1qicka7g386qg7iyfg7fh30hmdx5yvmh3qza6ifj5x4w99l0ri"; }; meta.homepage = "https://github.com/rhysd/vim-grammarous/"; }; vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-03-30"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "a3ff39f955e60baeddd8c3c4d1cab291ce37d66e"; - sha256 = "0d98b0zpbyjcafp0q25c3qsx13q74nszxsi5jxxjnpz1wv6s83x1"; + rev = "b06a6e62db170f085aa4af7f2439ae7e453eb1d3"; + sha256 = "12qwz7m652jgn86210mbbg1glcmshm67wdhrsb36bxqrx39g1ghh"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -5246,12 +4958,12 @@ let vim-html-template-literals = buildVimPluginFrom2Nix { pname = "vim-html-template-literals"; - version = "2020-05-17"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "jonsmithers"; repo = "vim-html-template-literals"; - rev = "0959db06cd74408935a589fb59ec63af91a1557b"; - sha256 = "0vq0y9adx2023p0nqv020921r474216msrkm0lkb5v776xm4mks2"; + rev = "602dba70bdcfc2e280e0c0503e74a8a92519db49"; + sha256 = "0x0sbmcig3r058sg78bfj8dv0lwlgdcwvw9kxviynyhk2qkg9zl9"; }; meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; @@ -5306,12 +5018,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2020-06-09"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "0778289e391c419f7a3af9de8229f798ee292013"; - sha256 = "1l5s5f4fw96w437rdf85lym7g75hnz8sb2fdj9hygyg0sp42r0cf"; + rev = "56e7df8f402a8302fa7f6cb21760d366a105d94c"; + sha256 = "0j4986pdh06q5d0bq4k6lq0b6bgi1fazng106ykhg3aaxjqqhs37"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5463,12 +5175,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-07-23"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "ed31c776d1da96ed8d950aef5ffba3f767f2acb4"; - sha256 = "1qp5n04igirkqzqh7vfw0jnb31p36h356nc4n1kzna4zyqndzk9s"; + rev = "5bbe872ee41e50bd5b99bf6204d6147dab39cdc5"; + sha256 = "0jmmkqzan5mkc0j05243f5layqj7fny92rl1vlj32ipv8wgdmczn"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5499,12 +5211,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-06-22"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "c665d5ca4247b696f478f91b7c97b9e44442e4b6"; - sha256 = "1p1461rh3yp0ldg4x1cb2nj9xng6scdlrkzj1q8ykspi98qnz0mm"; + rev = "58b9a4dd48ee28488a6772fc6bb04abb0d083092"; + sha256 = "0gw5l1i7crsflrl3si1ymlpjh9yj5l5d23jj9irwyfkc8c6zqvbn"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; @@ -5523,12 +5235,12 @@ let vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2019-11-04"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "c32357892f10117291461631d51a6bfd20e72b9a"; - sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; + rev = "ebdf6988bac3d1ebc45b3e51a86f3c065cf60c24"; + sha256 = "0zw24lhgs37lpbbdv2ir9s7g0fd3gjhjx2kvv54cs6mjszg2qmsm"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -5547,12 +5259,12 @@ let vim-latex-live-preview = buildVimPluginFrom2Nix { pname = "vim-latex-live-preview"; - version = "2020-06-25"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "32d1a911641e08c11b3f82ba886540cbae0b7513"; - sha256 = "0hnjc1jpjr6fdy9b5j85didi97f6w8p8ad5cn6b0fnxxlkykymjg"; + rev = "afdf3f4778119f0bfacb07629d0155d58eb5562a"; + sha256 = "0zihnphc021alqbn1f84n233r6a31n499046yw1yspkcnpz7mcxm"; }; meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; @@ -5655,24 +5367,36 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-07-12"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "632d49bf7a227e13bea6ef341de35f89e45c55b0"; - sha256 = "1an37vkr9di0abxfnidlbij37xxy5z1cwnvpcnink4gman1msyzy"; + rev = "8262f528ca50832826efd0605ddc17a3830b53d1"; + sha256 = "0s1ayrprv59dki7xhzzlzxdfrkm3i70p8wh8sf48higvcrsjjylv"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; + vim-lsp = buildVimPluginFrom2Nix { + pname = "vim-lsp"; + version = "2020-09-24"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "vim-lsp"; + rev = "9755ec0c99e3cc4f3b4e0171c0fba02c132d6800"; + sha256 = "17ahwyjyb6w9504301hjc7nlsgnn7y5mjp0a1akj4dh8wb4hhzg6"; + }; + meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; + }; + vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-08-06"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "f60443777137a0f91e489b1757c6602c63fb3731"; - sha256 = "1r6raxhwg78azcqv7brvas3w4xr7aja1gmcapm7j6mv69izf1fzw"; + rev = "cdf8247c0abd251475be26a044b2e95698df6c09"; + sha256 = "0i4926gw06m8pqqn8a8k2xsxxg0pm3q8q1k3xd0imxi3gkyvz1fq"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -5689,6 +5413,18 @@ let meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; + vim-markbar = buildVimPluginFrom2Nix { + pname = "vim-markbar"; + version = "2020-08-31"; + src = fetchFromGitHub { + owner = "Yilin-Yang"; + repo = "vim-markbar"; + rev = "df13c3abe88c01a716b1099de953dcfa1679e663"; + sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9"; + }; + meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; + }; + vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; version = "2020-07-14"; @@ -5703,12 +5439,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2020-08-16"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "b1af5a28242ae58ece98d833a2bf28e030d57230"; - sha256 = "1nnn0cxvpgmgi8xpqmhxr3vi42s3g1d0rn683hyizdn4i0l888k3"; + rev = "9e0b6f37113e21fecd42ef6b04762de4aafe2cf3"; + sha256 = "0cy7k96458qk5fn7fbvki42b2pgrrk803shixs4ww43iipya6m5b"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -5725,6 +5461,18 @@ let meta.homepage = "https://github.com/samoshkin/vim-mergetool/"; }; + vim-merginal = buildVimPluginFrom2Nix { + pname = "vim-merginal"; + version = "2020-01-29"; + src = fetchFromGitHub { + owner = "idanarye"; + repo = "vim-merginal"; + rev = "02ac69b0468b7aec437df48df07f939558e85c9a"; + sha256 = "0m5lym56xzp1gnwb79vjmigfi6ar0iqbzaydv2r8c47jj7xyxiz6"; + }; + meta.homepage = "https://github.com/idanarye/vim-merginal/"; + }; + vim-metamath = buildVimPluginFrom2Nix { pname = "vim-metamath"; version = "2017-02-10"; @@ -5751,12 +5499,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-08-08"; + version = "2020-09-12"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "85b18e98a22b17f9e01867988c18cf396316c20f"; - sha256 = "1vzllvq1ncq4qyqbkp8z26sr4n9kpqv35zkfjas3r2jqbn958a93"; + rev = "39a3bd877c26792838ed58c1b8b3e0a5daa11402"; + sha256 = "01cmbrzbvsdl8946rwdz8jhnpfr5fapgvpx65vnqq2bisc901dz3"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -5821,6 +5569,18 @@ let meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; + vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { + pname = "vim-nerdtree-syntax-highlight"; + version = "2020-07-19"; + src = fetchFromGitHub { + owner = "tiagofumo"; + repo = "vim-nerdtree-syntax-highlight"; + rev = "1acc12aa7f773ede38538293332905f1ba3fea6a"; + sha256 = "0zm023mhi1si9g5r46md1v4rlls6z2m6kyn1jcfxjqyrgba67899"; + }; + meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; + }; + vim-nerdtree-tabs = buildVimPluginFrom2Nix { pname = "vim-nerdtree-tabs"; version = "2018-12-21"; @@ -5905,6 +5665,18 @@ let meta.homepage = "https://github.com/tpope/vim-obsession/"; }; + vim-ocaml = buildVimPluginFrom2Nix { + pname = "vim-ocaml"; + version = "2020-09-14"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "vim-ocaml"; + rev = "acee4ad4d65ddaf81895cca9e28baea4c13fa76a"; + sha256 = "0rrjcc5i1isia74nrrik5avkd0casbjhgyqb2ph2176gywz6h5y5"; + }; + meta.homepage = "https://github.com/ocaml/vim-ocaml/"; + }; + vim-one = buildVimPluginFrom2Nix { pname = "vim-one"; version = "2020-08-09"; @@ -5967,12 +5739,12 @@ let vim-osc52 = buildVimPluginFrom2Nix { pname = "vim-osc52"; - version = "2017-06-23"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "fcpg"; repo = "vim-osc52"; - rev = "01a311169b2678d853c87b371201205daf8fdf1a"; - sha256 = "1nxla8r4036shbmyx6wpxy9ncy1s2c5ghi5n5ip22b01lcv6lnv5"; + rev = "551f20e62e68684a5b745ae08b0c4236d86e4c2b"; + sha256 = "0yxjs32ab27l3kmh5lpinj15m11winqsnmykjq7lizs15v7gd2s9"; }; meta.homepage = "https://github.com/fcpg/vim-osc52/"; }; @@ -6111,12 +5883,12 @@ let vim-phabricator = buildVimPluginFrom2Nix { pname = "vim-phabricator"; - version = "2020-01-23"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-phabricator"; - rev = "065c7e3f2d92a6792b50f087393b2c9a10a1e825"; - sha256 = "0yhf347fhrs0aqsq1swqihyav32442lv2chzjr3mzqcym8zbzsh6"; + rev = "d5c0571f44f2c44ba32df2d12e52b4dfcd4921ed"; + sha256 = "003zi8dvyyhvlb30zz8ah7iai8pmwmsk2jwa38386ff0jfm6dkpq"; }; meta.homepage = "https://github.com/jparise/vim-phabricator/"; }; @@ -6135,12 +5907,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-08-08"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "13ea184015c30be5160ae285aedc0eaec0c72e6c"; - sha256 = "19vd5cmshlwrrf5ncgkny9p478d7bhjjwwjv71xb2adyfc9r1rv6"; + rev = "d16273e07231260e02412625f98651bc6ceebb56"; + sha256 = "0ckglxbnxq50jfigbmgjwaj2vj1g6xjwyipzxbph2b64yi2kklg5"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -6159,12 +5931,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-08-14"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "a3bdbcdb3c60a9563fb90e02b28ae46cee5ef974"; - sha256 = "1h9993j9w8883hi4fllykim261srphlzv7lfww0bvr0whi77hv1r"; + rev = "e2bbed8acc1f1cf498a0085cf771cf9bf40fb709"; + sha256 = "1cg0lfpjrzp7wajmdggwy56vjymrvhlmvmg3j7z67avvck8n2fn9"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6291,12 +6063,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2020-07-25"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "3f49e05fb6072d6b7bc7fe20d0356cf15ef3b9de"; - sha256 = "02kyp6l6m1nybfqx3d88yi34isrid355wiln6cskvxz2hpx532g8"; + rev = "c688f336a4aeb002319994f4fb4a8873f204f0ab"; + sha256 = "1wzcvshwn4gvjbcmni1r473001m5ipamggkcpwsa7xr74sj4rn73"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -6327,12 +6099,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2020-06-19"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "187742a3c18d93e6968f024d7db0f4fc5548408e"; - sha256 = "132rvyn5pwg5xkm6q64k33vm6q9hfpng0wq25387l8l8a7hvj3az"; + rev = "3cc34304643abf8d28d2482e74119d0d5f4b5302"; + sha256 = "1j2a3kwcff4avniph4z8g4im59z8fs2kj7vkwzgalj828nncx5g6"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -6363,12 +6135,12 @@ let vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2020-07-23"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "be83e5bcbe30888b88359fc875ade9c54562411d"; - sha256 = "1qz3fqixl25x8b70y6kw9lgjxciv9bbzqx9dimvypmhqwx09pnjb"; + rev = "45ea40da3f223fff83fce0a643875e560ed20aae"; + sha256 = "1bm8hpnm02pbivcvjn20qr6hk3yyb3flfkv7pk66sffhiyj44rh2"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -6387,24 +6159,24 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-08-03"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "fe2e520c62dfe10b9bc192b6c2651ef0519b1070"; - sha256 = "1xh6h5wg242mzqshka5m3693r25www46p29cr92yi995a2izm2fw"; + rev = "e367f7b33fe9159c943963f3f839e4d08b74090e"; + sha256 = "1pngmr6ww4fmn71rshi1npyswp48dq3p7m02s6s703bg83smvmc8"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; vim-salve = buildVimPluginFrom2Nix { pname = "vim-salve"; - version = "2019-11-13"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-salve"; - rev = "876104d364420a7a11a2d97729dd4ab0a2f8a72e"; - sha256 = "1hj0qg182jv3cwg85rg4z0f8f8hr409is71z7sxhnhjq9fn1h6xj"; + rev = "5958a99c4ac783cec668380917ac1f62b27466fe"; + sha256 = "1vs2rfhcxm9v4ndnsx85b1i29h67qv748k3nvdxc145v1hjcnapm"; }; meta.homepage = "https://github.com/tpope/vim-salve/"; }; @@ -6603,12 +6375,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-06-29"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "afe94543bb3bb95ef9ae2a58eebcbc17d69eb304"; - sha256 = "0iaksyh77xahg5cp0q9x5c14jdklsrgy9400jp4xjb83qgg6d7qq"; + rev = "65e5e4668371152c6ef7a6269c6a6b960cef21b4"; + sha256 = "0bfibshqqa17n9vbdd2g8kalnc78v1ag3hzws9pdacrcsxhsh0ry"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -6627,12 +6399,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-08-14"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "a7486b266a5e1dc92228e575969e10b5b95efad8"; - sha256 = "05di0x6a0cd9w02l3aybixin2yidpla2js0pyx4v4as595izl10q"; + rev = "06fbadd9b3c8e4be1e1343addb51cd0582c047f7"; + sha256 = "14v5p1khr56pdy0x0pn540cjbvwxr6782pvsdwwbfdq9p2hmhnq1"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6771,24 +6543,24 @@ let vim-SyntaxRange = buildVimPluginFrom2Nix { pname = "vim-SyntaxRange"; - version = "2020-06-17"; + version = "2020-08-18"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-SyntaxRange"; - rev = "63c382eabfb5dd0b1e837dc6a42b14f3fe000ff9"; - sha256 = "1c62m2k08vnla3zd3rb716y6vp5ijn8b36fv48jw77y579k9l6pk"; + rev = "602316468bc044e047db88f50157b61fa00b65cb"; + sha256 = "0zrrvd9xrivx61fiz799mdbwdzl7damdgm6i9h0sl1v95hclhi3i"; }; meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-08-02"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "88cb2e44b60f4fa7d2e242c43ee90c5f6079e82c"; - sha256 = "1ny17d30pk8z96zr8qh9g04n57ix4pjm3sg0a80b2qq82anxkmvs"; + rev = "3476c4e517aa86bc131c707d32f2e508bd5be468"; + sha256 = "0vglazxlsg7ai4c5znxaddpjnfhz6a9slzs0kzzqvmhd3xr7vfg1"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -6819,12 +6591,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-08-07"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "85402fc0f05c103da9d3416e34fb88237ca1de3c"; - sha256 = "1g8802wmhg5zjk51qfiqcvdclqwg8rfizfpz5jlskcayh82gxvg0"; + rev = "f77a07617a649684148de97e5a9115e659166f6a"; + sha256 = "01rgbiddczyx56b6fha6jgxmr0kfhjz8d9rmbfnqlnynmy5545ic"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -6844,12 +6616,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-08-12"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "edacfbe57fdbba4788e8c280d37606470b9b70ca"; - sha256 = "1bi2rsszdpv7vj1xk536lzm54dzk1z41hfp0qr1pzz9lv8fa4sgv"; + rev = "795f16430c568fc13266be9239bf70f19b8ae50f"; + sha256 = "06j24di1r2p1qpiy86h75ghfsf0lqkfllf7kf64gjas89gbc9i89"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -6928,12 +6700,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-07-29"; + version = "2020-08-23"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "47bc9855d7c2b1452d8a0abda91bda35837f8552"; - sha256 = "083k1v9gmmmhmll61kywgd1cn1l2qkfk6sqjjkcv6az01rkrm521"; + rev = "51bec3386b661d28fda7736006475b8b2ebe343d"; + sha256 = "05988ila63kj1r62v7ii76972fgw2300h4dbaml81i643yw0p81p"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -6976,12 +6748,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2020-04-23"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "44ba6fbe45895cd541ebfc87606add5c76e3829b"; - sha256 = "075cncr53w9xc1kqm50zl8yl18aspn3zdr6qjqyslf7gkw8yk38d"; + rev = "2fd76aa930e34838335c1aa125b88e7ea671e6c0"; + sha256 = "1xy0vp9sgqjm6qpfic2bbla4mxihw7j41gvi8cn0wsira6qcwda0"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -7046,6 +6818,18 @@ let meta.homepage = "https://github.com/lumiliet/vim-twig/"; }; + vim-twiggy = buildVimPluginFrom2Nix { + pname = "vim-twiggy"; + version = "2020-09-07"; + src = fetchFromGitHub { + owner = "sodapopcan"; + repo = "vim-twiggy"; + rev = "c0edb8a684f624d6f177c2625fc9db617a3d539f"; + sha256 = "13fm3mgnvbhm93cn0jglnqm8hhmwvh5xg088pn5wmwrn9bjj00gz"; + }; + meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; + }; + vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; version = "2020-04-26"; @@ -7096,12 +6880,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-08-15"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "038065ed8d1b43972f8993df41f07aa00848a47f"; - sha256 = "137pcqp96xgak9ghr5829dq39525n0x2p56lcbh2njf3crgvmnl0"; + rev = "68c9570285f067020f0358623cafe63dbc2bd63f"; + sha256 = "1dpv6v449bcn6n72jjgvlnc9mnq3cpfy9b8m6mmjgvzgzkc1wj10"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7120,24 +6904,24 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-08-15"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "fa412d7ad3d98446bfd3c14cf2e279226161de9d"; - sha256 = "1kpi2ygj1b7n93md66awrg9jna9q4iqzgjm95695b6403ljkpvnv"; + rev = "ec25ffcdf793dd5af6d73ce75d21709a60a4689f"; + sha256 = "07gkygdspxn0fwlgcyhli85nlgg8g4y4v991n80vmk0rhsxqdh90"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2020-07-07"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "b3188a81a753a5274809a99c1550d7c981560b1b"; - sha256 = "03cqz9rnv9fwjygrr3iflcbcvr0mjdjx0l32cdr9lkaddavlwqkz"; + rev = "4a076bea73e307738ac5d08f60a0936cab391efd"; + sha256 = "1jx6ijmj48ffymfn20d0syp1ywv19gmjvf3hb6rdwsk421y58chv"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -7180,12 +6964,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-08-10"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "c940b147c3098278f9c14b85eef9cfdbf82a7f09"; - sha256 = "19qh7lmpb093hnxga2jk6s47bjsdjqj4zrb3lrkrjn2qyyasi194"; + rev = "89644adb8cc75ea96b4ab8e8218f22f1cc0deb23"; + sha256 = "1cyzfj86qizqnqi3ypf0cx4pvl9bsas77pxd1jpb5f3lslh2xhh8"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -7370,14 +7154,27 @@ let meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; + vimspector = buildVimPluginFrom2Nix { + pname = "vimspector"; + version = "2020-09-19"; + src = fetchFromGitHub { + owner = "puremourning"; + repo = "vimspector"; + rev = "6a5c0cf63e9414bfbf627999f9859259a01d9d2c"; + sha256 = "1bwdnhsa5lrid21pz5byhvc5d3vfsrzq7laqxpcq0h67cch154m3"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/puremourning/vimspector/"; + }; + vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-08-13"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ebb422c3c87c9f2cb333fac2b42b8e45ecc7f441"; - sha256 = "04vzv73bdiqdj1f1k62yzrdrb3qlql62sxpyq8hwc8sz1gc1kh8h"; + rev = "a19c398b1e7876694ff5f6c65d95b23d5b8aadde"; + sha256 = "1mrlafqh1y6yc1m3gybwsi8400gyvnvbwzbmpxdizlx87iiz3bpq"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7420,12 +7217,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-08-14"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "7f97d30914daea5b542a90eed747d5bd00afbb19"; - sha256 = "1ghpkyh9ga759v065yvn4xr8ccwamyr87jkq3av9fslxzfzhwdpm"; + rev = "9c9adf16db3445005181751f0d3db143d58fe24d"; + sha256 = "0d1c2p63kkvhgwcrj97qc4yahnx7z9q14qwadbj924w8qlvylmff"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7553,12 +7350,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-08-05"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "bcfd153813ac1f99947b706991eba2861f54a8a2"; - sha256 = "1mqgqzfx6v7ps8gk7qgs8mihb35i3q100m39sd8wl1ihgcsq3w1r"; + rev = "4891999f055167cf845671c231d7740c104074bd"; + sha256 = "0cgbrgw1ppk7a8vwg0j2zf123clczkf9qv6gaaqmm8kz9j2n4pkb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7590,24 +7387,24 @@ let zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2020-01-23"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "ec6f369a000602e37e7c066b725f9d6bd12538f4"; - sha256 = "1ff5ac8lp7fq854kgf03c5h695lm60giw0qda5z428mmzwq0xask"; + rev = "4ec3795d81fc83b6f43389a6291bfa99394473a8"; + sha256 = "148s2szjx61rp93nxa95552m87mn4n4ga00dlbvvv7sm607mvxd8"; }; meta.homepage = "https://github.com/jnurmine/zenburn/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-07-20"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "079985534a5f2795bfaf549f276d4a1c213bfcb1"; - sha256 = "173yx5nv9pnjm1qxcfkgbf4yfbjyifqjn5qvk8ibdvdxrhyvbrdn"; + rev = "9979e503e675b432c55a83891238c631f7f16a01"; + sha256 = "05cmc3173yscmk2r976280z53z3z7v8ysyy4i0z4v998l804hq5c"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index db1fd71d2f..1851529365 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -14,9 +14,6 @@ , nodePackages , dasht -# coc-go dependency -, go - # deoplete-khard dependency , khard @@ -125,199 +122,6 @@ self: super: { ''; }); - coc-go = super.coc-go.overrideAttrs(old: { - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/coc-go/src/utils/tools.ts \ - --replace 'const cmd = `GOPATH=''${gopath}; go ''${args}`' 'const cmd = `GOPATH=''${gopath}; ${go}/bin/go ''${args}`' - ''; - }); - - coc-css = buildVimPluginFrom2Nix { - pname = "coc-css"; - version = nodePackages.coc-css.version; - src = "${nodePackages.coc-css}/lib/node_modules/coc-css"; - }; - - coc-emmet = buildVimPluginFrom2Nix { - pname = "coc-emmet"; - version = nodePackages.coc-emmet.version; - src = "${nodePackages.coc-emmet}/lib/node_modules/coc-emmet"; - }; - - coc-eslint = buildVimPluginFrom2Nix { - pname = "coc-eslint"; - version = nodePackages.coc-eslint.version; - src = "${nodePackages.coc-eslint}/lib/node_modules/coc-eslint"; - }; - - coc-git = buildVimPluginFrom2Nix { - pname = "coc-git"; - version = nodePackages.coc-git.version; - src = "${nodePackages.coc-git}/lib/node_modules/coc-git"; - }; - - coc-highlight = buildVimPluginFrom2Nix { - pname = "coc-highlight"; - version = nodePackages.coc-highlight.version; - src = "${nodePackages.coc-highlight}/lib/node_modules/coc-highlight"; - }; - - coc-html = buildVimPluginFrom2Nix { - pname = "coc-html"; - version = nodePackages.coc-html.version; - src = "${nodePackages.coc-html}/lib/node_modules/coc-html"; - }; - - coc-imselect = buildVimPluginFrom2Nix { - pname = "coc-imselect"; - version = nodePackages.coc-imselect.version; - src = "${nodePackages.coc-imselect}/lib/node_modules/coc-imselect"; - }; - - coc-java = buildVimPluginFrom2Nix { - pname = "coc-java"; - version = nodePackages.coc-java.version; - src = "${nodePackages.coc-java}/lib/node_modules/coc-java"; - }; - - coc-jest = buildVimPluginFrom2Nix { - pname = "coc-jest"; - version = nodePackages.coc-jest.version; - src = "${nodePackages.coc-jest}/lib/node_modules/coc-jest"; - }; - - coc-json = buildVimPluginFrom2Nix { - pname = "coc-json"; - version = nodePackages.coc-json.version; - src = "${nodePackages.coc-json}/lib/node_modules/coc-json"; - }; - - coc-lists = buildVimPluginFrom2Nix { - pname = "coc-lists"; - version = nodePackages.coc-lists.version; - src = "${nodePackages.coc-lists}/lib/node_modules/coc-lists"; - }; - - coc-metals = buildVimPluginFrom2Nix { - pname = "coc-metals"; - version = nodePackages.coc-metals.version; - src = "${nodePackages.coc-metals}/lib/node_modules/coc-metals"; - }; - - coc-pairs = buildVimPluginFrom2Nix { - pname = "coc-pairs"; - version = nodePackages.coc-pairs.version; - src = "${nodePackages.coc-pairs}/lib/node_modules/coc-pairs"; - }; - - coc-prettier = buildVimPluginFrom2Nix { - pname = "coc-prettier"; - version = nodePackages.coc-prettier.version; - src = "${nodePackages.coc-prettier}/lib/node_modules/coc-prettier"; - }; - - coc-python = buildVimPluginFrom2Nix { - pname = "coc-python"; - version = nodePackages.coc-python.version; - src = "${nodePackages.coc-python}/lib/node_modules/coc-python"; - }; - - coc-r-lsp = buildVimPluginFrom2Nix { - pname = "coc-r-lsp"; - version = nodePackages.coc-r-lsp.version; - src = "${nodePackages.coc-r-lsp}/lib/node_modules/coc-r-lsp"; - }; - - coc-rls = buildVimPluginFrom2Nix { - pname = "coc-rls"; - version = nodePackages.coc-rls.version; - src = "${nodePackages.coc-rls}/lib/node_modules/coc-rls"; - }; - - coc-rust-analyzer = buildVimPluginFrom2Nix { - pname = "coc-rust-analyzer"; - version = nodePackages.coc-rust-analyzer.version; - src = "${nodePackages.coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer"; - }; - - coc-smartf = buildVimPluginFrom2Nix { - pname = "coc-smartf"; - version = nodePackages.coc-smartf.version; - src = "${nodePackages.coc-smartf}/lib/node_modules/coc-smartf"; - }; - - coc-snippets = buildVimPluginFrom2Nix { - pname = "coc-snippets"; - version = nodePackages.coc-snippets.version; - src = "${nodePackages.coc-snippets}/lib/node_modules/coc-snippets"; - }; - - coc-solargraph = buildVimPluginFrom2Nix { - pname = "coc-solargraph"; - version = nodePackages.coc-solargraph.version; - src = "${nodePackages.coc-solargraph}/lib/node_modules/coc-solargraph"; - }; - - coc-stylelint = buildVimPluginFrom2Nix { - pname = "coc-stylelint"; - version = nodePackages.coc-stylelint.version; - src = "${nodePackages.coc-stylelint}/lib/node_modules/coc-stylelint"; - }; - - coc-tabnine = buildVimPluginFrom2Nix { - pname = "coc-tabnine"; - version = nodePackages.coc-tabnine.version; - src = "${nodePackages.coc-tabnine}/lib/node_modules/coc-tabnine"; - }; - - coc-tslint = buildVimPluginFrom2Nix { - pname = "coc-tslint"; - version = nodePackages.coc-tslint.version; - src = "${nodePackages.coc-tslint}/lib/node_modules/coc-tslint"; - }; - - coc-tslint-plugin = buildVimPluginFrom2Nix { - pname = "coc-tslint-plugin"; - version = nodePackages.coc-tslint-plugin.version; - src = "${nodePackages.coc-tslint-plugin}/lib/node_modules/coc-tslint-plugin"; - }; - - coc-tsserver = buildVimPluginFrom2Nix { - pname = "coc-tsserver"; - version = nodePackages.coc-tsserver.version; - src = "${nodePackages.coc-tsserver}/lib/node_modules/coc-tsserver"; - }; - - coc-vetur = buildVimPluginFrom2Nix { - pname = "coc-vetur"; - version = nodePackages.coc-vetur.version; - src = "${nodePackages.coc-vetur}/lib/node_modules/coc-vetur"; - }; - - coc-vimtex = buildVimPluginFrom2Nix { - pname = "coc-vimtex"; - version = nodePackages.coc-vimtex.version; - src = "${nodePackages.coc-vimtex}/lib/node_modules/coc-vimtex"; - }; - - coc-wxml = buildVimPluginFrom2Nix { - pname = "coc-wxml"; - version = nodePackages.coc-wxml.version; - src = "${nodePackages.coc-wxml}/lib/node_modules/coc-wxml"; - }; - - coc-yaml = buildVimPluginFrom2Nix { - pname = "coc-yaml"; - version = nodePackages.coc-yaml.version; - src = "${nodePackages.coc-yaml}/lib/node_modules/coc-yaml"; - }; - - coc-yank = buildVimPluginFrom2Nix { - pname = "coc-yank"; - version = nodePackages.coc-yank.version; - src = "${nodePackages.coc-yank}/lib/node_modules/coc-yank"; - }; - command-t = super.command-t.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' @@ -791,4 +595,47 @@ self: super: { ln -s ${maple-bin}/bin/maple $target/bin/maple ''; }); -} +} // ( + let + nodePackageNames = [ + "coc-go" + "coc-css" + "coc-emmet" + "coc-eslint" + "coc-git" + "coc-highlight" + "coc-html" + "coc-imselect" + "coc-java" + "coc-jest" + "coc-json" + "coc-lists" + "coc-metals" + "coc-pairs" + "coc-prettier" + "coc-python" + "coc-r-lsp" + "coc-rls" + "coc-rust-analyzer" + "coc-smartf" + "coc-snippets" + "coc-solargraph" + "coc-stylelint" + "coc-tabnine" + "coc-tslint" + "coc-tslint-plugin" + "coc-tsserver" + "coc-vetur" + "coc-vimtex" + "coc-wxml" + "coc-yaml" + "coc-yank" + ]; + nodePackage2VimPackage = name: buildVimPluginFrom2Nix { + pname = name; + inherit (nodePackages.${name}) version meta; + src = "${nodePackages.${name}}/lib/node_modules/${name}"; + }; + in + lib.genAttrs nodePackageNames nodePackage2VimPackage +) diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index bbe0bf273d..f328d0505f 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -3,7 +3,6 @@ airblade/vim-gitgutter airblade/vim-rooter ajh17/Spacegray.vim aklt/plantuml-syntax -albfan/nerdtree-git-plugin altercation/vim-colors-solarized alvan/vim-closetag alx741/vim-hindent @@ -11,6 +10,7 @@ alx741/vim-stylishask amiorin/ctrlp-z andrep/vimacs andreshazard/vim-logreview +AndrewRadev/sideways.vim AndrewRadev/splitjoin.vim andsild/peskcolor.vim andviro/flake8-vim @@ -53,7 +53,6 @@ chriskempson/base16-vim christoomey/vim-sort-motion christoomey/vim-tmux-navigator ckarnell/antonys-macro-repeater -ckipp01/coc-metals cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim @@ -83,7 +82,7 @@ digitaltoad/vim-pug direnv/direnv.vim dleonard0/pony-vim-syntax dmix/elvish.vim -dracula/vim +dracula/vim as dracula-vim drewtempelmeyer/palenight.vim drmingdrmer/xptemplate dylanaraps/wal.vim @@ -102,7 +101,6 @@ ensime/ensime-vim ervandew/supertab esneider/YUNOcommit.vim fannheyward/coc-markdownlint -fannheyward/coc-rust-analyzer farmergreg/vim-lastplace fatih/vim-go fcpg/vim-osc52 @@ -155,6 +153,7 @@ hsitz/VimOrganizer iamcco/coc-spell-checker iamcco/coc-vimlsp ianks/vim-tsx +idanarye/vim-merginal idris-hackers/idris-vim ihsanturk/neuron.vim Inazuma110/deoplete-greek @@ -188,7 +187,6 @@ jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug -josa42/coc-go joshdick/onedark.vim jpalardy/vim-slime jparise/vim-graphql @@ -205,6 +203,7 @@ junegunn/gv.vim junegunn/limelight.vim junegunn/seoul256.vim junegunn/vader.vim +junegunn/vim-after-object junegunn/vim-easy-align junegunn/vim-github-dashboard junegunn/vim-peekaboo @@ -249,6 +248,7 @@ lepture/vim-jinja lervag/vimtex lfilho/cosco.vim lifepillar/vim-mucomplete +lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer liuchengxu/vim-clap liuchengxu/vim-which-key @@ -266,7 +266,6 @@ lyokha/vim-xkbswitch machakann/vim-highlightedyank machakann/vim-sandwich machakann/vim-swap -majutsushi/tagbar maksimr/vim-jsbeautify MarcWeber/vim-addon-actions MarcWeber/vim-addon-async @@ -344,43 +343,14 @@ ncm2/ncm2-tmux ncm2/ncm2-ultisnips ncm2/ncm2-vim ndmitchell/ghcid -neoclide/coc-css neoclide/coc-denite -neoclide/coc-emmet -neoclide/coc-eslint -neoclide/coc-git -neoclide/coc-highlight -neoclide/coc-html -neoclide/coc-imselect -neoclide/coc-java -neoclide/coc-jest -neoclide/coc-json -neoclide/coc-lists neoclide/coc-neco -neoclide/coc-pairs -neoclide/coc-prettier -neoclide/coc-python -neoclide/coc-r-lsp -neoclide/coc-rls -neoclide/coc-smartf -neoclide/coc-snippets -neoclide/coc-solargraph -neoclide/coc-stylelint -neoclide/coc-tabnine -neoclide/coc-tslint -neoclide/coc-tslint-plugin -neoclide/coc-tsserver -neoclide/coc-vetur -neoclide/coc-vimtex -neoclide/coc-wxml -neoclide/coc-yaml -neoclide/coc-yank neoclide/coc.nvim@release neoclide/denite-extra neoclide/denite-git neoclide/vim-easygit neomake/neomake -neovim/nvim-lsp +neovim/nvim-lspconfig neovim/nvimdev.nvim neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim @@ -399,6 +369,7 @@ nvim-lua/completion-nvim nvim-lua/diagnostic-nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter +ocaml/vim-ocaml octol/vim-cpp-enhanced-highlight Olical/conjure OrangeT/vim-csharp @@ -420,10 +391,14 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +prabirshrestha/asyncomplete.vim +prabirshrestha/vim-lsp preservim/nerdcommenter preservim/nerdtree +preservim/tagbar psliwka/vim-smoothie ptzz/lf.vim +puremourning/vimspector purescript-contrib/purescript-vim python-mode/python-mode qnighy/lalrpop.vim @@ -440,6 +415,7 @@ rbgrouleff/bclose.vim reedes/vim-pencil reedes/vim-wordy rhysd/committia.vim +rhysd/devdocs.vim rhysd/git-messenger.vim rhysd/vim-clang-format rhysd/vim-grammarous @@ -491,6 +467,7 @@ sjl/gundo.vim sjl/splice.vim sk1418/last256 slashmili/alchemist.vim +sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf stefandtw/quickfix-reflector.vim @@ -513,7 +490,9 @@ thinca/vim-themis thinca/vim-visualstar thirtythreeforty/lessspace.vim thosakwe/vim-flutter +tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl +tjdevries/lsp_extensions.nvim tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux @@ -566,6 +545,7 @@ uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look unblevable/quick-scope +urbit/hoon.vim Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim vim-airline/vim-airline @@ -619,6 +599,7 @@ wannesm/wmgraphviz.vim weirongxu/coc-explorer wellle/targets.vim wellle/tmux-complete.vim +whonore/Coqtail will133/vim-dirdiff wincent/command-t wincent/ferret @@ -627,8 +608,10 @@ xavierd/clang_complete xolox/vim-easytags xolox/vim-misc xuhdev/vim-latex-live-preview +Xuyuanp/nerdtree-git-plugin ycm-core/YouCompleteMe Yggdroot/indentLine +Yilin-Yang/vim-markbar yuki-ycino/ncm2-dictionary zah/nim.vim ziglang/zig.vim diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 04eabef9ec..a914d70f17 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, vscode-utils, llvmPackages_8 }: +{ stdenv, callPackage, vscode-utils, llvmPackages_8, llvmPackages_latest }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -60,6 +60,18 @@ in }; }; + haskell.haskell = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "haskell"; + publisher = "haskell"; + version = "1.1.0"; + sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; @@ -178,6 +190,10 @@ in }; }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { + lldb = llvmPackages_latest.lldb; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix index 7dea679452..f5dbadd689 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix @@ -41,13 +41,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.7.96456"; + version = "2020.8.103604"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "0bk2wnbjcraxilzxszl00r799xf3apkfyzpy88xxv87j7787dsm8"; + sha256 = "1gncnhmwjipaf7hzpimwzqdzyqyy4sznkq4qr2mn1ndjl6s1hh58"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index ac2da521c2..4af15f4619 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -2,25 +2,25 @@ "name": "rust-analyzer", "version": "0.4.0-dev", "dependencies": { - "node-fetch": "^2.6.0", - "vscode-languageclient": "7.0.0-next.1", - "@rollup/plugin-commonjs": "^13.0.0", - "@rollup/plugin-node-resolve": "^8.1.0", - "@types/glob": "^7.1.2", + "node-fetch": "^2.6.1", + "vscode-languageclient": "7.0.0-next.9", + "@rollup/plugin-commonjs": "^13.0.2", + "@rollup/plugin-node-resolve": "^8.4.0", + "@types/glob": "^7.1.3", "@types/mocha": "^7.0.2", "@types/node": "~12.7.0", "@types/node-fetch": "^2.5.7", - "@types/vscode": "^1.44.1", - "@typescript-eslint/eslint-plugin": "^3.4.0", - "@typescript-eslint/parser": "^3.4.0", - "eslint": "^7.3.1", + "@types/vscode": "^1.47.1", + "@typescript-eslint/eslint-plugin": "^3.10.1", + "@typescript-eslint/parser": "^3.10.1", + "eslint": "^7.8.0", "glob": "^7.1.6", - "mocha": "^8.0.1", - "rollup": "^2.18.1", - "tslib": "^2.0.0", - "typescript": "^3.9.5", + "mocha": "^8.1.3", + "rollup": "^2.26.9", + "tslib": "^2.0.1", + "typescript": "^3.9.7", "typescript-formatter": "^7.2.2", - "vsce": "^1.75.0", + "vsce": "^1.79.5", "vscode-test": "^1.4.0" } } diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix index a033229c58..c7fecf0807 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix @@ -16,7 +16,7 @@ let updateVSCodeSettingsCmd = '' ( - echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' + echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' oldSettings=$(cat ${vscodeSettingsFile}) echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} )''; @@ -25,10 +25,10 @@ let fileName = builtins.baseNameOf vscodeSettingsFile; symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting '' && mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; -in +in writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' - (lib.optionalString (settings != {}) + (lib.optionalString (settings != {}) (if createIfDoesNotExists then '' [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json new file mode 100644 index 0000000000..6e73ee446d --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -0,0 +1,24 @@ +{ + "name": "vscode-lldb", + "version": "1.5.3", + "dependencies": { + "@types/json5": "^0.0.30", + "@types/mocha": "^7.0.1", + "@types/node": "^8.10.50", + "@types/vscode": "^1.31.0", + "@types/yauzl": "^2.9.0", + "json5": "^2.1.0", + "memory-streams": "^0.1.3", + "mocha": "^7.0.1", + "source-map-support": "^0.5.12", + "string-argv": "^0.3.1", + "ts-loader": "^6.2.1", + "typescript": "^3.7.0", + "vsce": "^1.73.0", + "vscode-debugadapter-testsupport": "^1.35.0", + "vscode-debugprotocol": "^1.35.0", + "webpack": "^4.39.1", + "webpack-cli": "^3.3.7", + "yauzl": "^2.10.0" + } +} diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch new file mode 100644 index 0000000000..db62552b91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch @@ -0,0 +1,45 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,13 +9,6 @@ include(cmake/CopyFiles.cmake) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_INSTALL_PREFIX $ENV{HOME}/.vscode/extensions/vscode-lldb CACHE PATH "Install location") + +-set(LLDB_ROOT $ENV{LLDB_ROOT} CACHE PATH "Root of LLDB build directory") +-if (LLDB_ROOT) +- message("Using LLDB from ${LLDB_ROOT}") +-else() +- message(FATAL_ERROR "LLDB_ROOT not set." ) +-endif() +- + # General OS-specific definitions + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(DylibPrefix lib) +@@ -64,8 +57,9 @@ set(UpdateFile ${CMAKE_COMMAND} -E copy_if_different) + + # Adapter + +-add_subdirectory(adapter) +-add_subdirectory(lldb) ++add_custom_target(adapter) ++add_custom_target(lldb) ++add_custom_target(codelldb) + + # Extension package content + +@@ -74,16 +68,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) + configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) + file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +-# Run 'npm install' +-execute_process( +- COMMAND ${NPM} install +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +- RESULT_VARIABLE Result +-) +-if (NOT ${Result} EQUAL 0) +- message(FATAL_ERROR "npm intall failed: ${Result}") +-endif() +- + # Copy it back, so we can commit the lock file. + file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) + \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix new file mode 100644 index 0000000000..f22c9df36a --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -0,0 +1,106 @@ +{ lib, stdenv, vscode-utils, fetchFromGitHub, rustPlatform, makeWrapper, jq +, nodePackages, cmake, nodejs, unzip, python3, lldb, breakpointHook +, setDefaultLldbPath ? true +}: +assert lib.versionAtLeast python3.version "3.5"; +let + publisher = "vadimcn"; + name = "vscode-lldb"; + version = "1.5.3"; + + dylibExt = stdenv.hostPlatform.extensions.sharedLibrary; + + src = fetchFromGitHub { + owner = "vadimcn"; + repo = "vscode-lldb"; + rev = "v${version}"; + sha256 = "1139945j3z0fxc3nlyvd81k0ypymqsj051idrbgbibwshpi86y93"; + fetchSubmodules = true; + }; + + adapter = rustPlatform.buildRustPackage { + pname = "${name}-adapter"; + inherit version src; + + cargoSha256 = "0jl4msf2jcjxddwqkx8fr0c35wg4vwvg5c19mihri1v34i09zc5r"; + + # It will pollute the build environment of `buildRustPackage`. + cargoPatches = [ ./reset-cargo-config.patch ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildAndTestSubdir = "adapter"; + + # Hack: Need a nightly compiler. + RUSTC_BOOTSTRAP = 1; + + # `adapter` expects a special hierarchy to resolve everything well. + postInstall = '' + mkdir -p $out/adapter + mv -t $out/adapter \ + $out/bin/* \ + $out/lib/* \ + ./adapter/*.py \ + ./formatters/*.py + rmdir $out/{bin,lib} + ''; + + postFixup = '' + wrapProgram $out/adapter/codelldb \ + --prefix PATH : "${python3}/bin" \ + --prefix LD_LIBRARY_PATH : "${python3}/lib" + ''; + }; + + build-deps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + + vsix = stdenv.mkDerivation { + name = "${name}-${version}-vsix"; + inherit src; + + # Only build the extension. We handle `adapter` and `lldb` with nix. + patches = [ ./cmake-build-extension-only.patch ]; + + nativeBuildInputs = [ cmake nodejs unzip breakpointHook ]; + + postConfigure = '' + cp -r ${build-deps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . + ''; + + makeFlags = [ "vsix_bootstrap" ]; + + installPhase = '' + unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted + mv vsix-extracted/extension $out + + ln -s ${adapter}/adapter $out + # Mark that adapter and lldb are installed. + touch $out/platform.ok + ''; + + dontStrip = true; + dontPatchELF = true; + }; + +in vscode-utils.buildVscodeExtension { + inherit name; + src = vsix; + + nativeBuildInputs = lib.optional setDefaultLldbPath jq; + postUnpack = lib.optionalString setDefaultLldbPath '' + jq '.contributes.configuration.properties."lldb.library".default = $s' \ + --arg s "${lldb}/lib/liblldb.so" \ + $sourceRoot/package.json >$sourceRoot/package.json.new + mv $sourceRoot/package.json.new $sourceRoot/package.json + ''; + + vscodeExtUniqueId = "${publisher}.${name}"; + + meta = with lib; { + description = "A native debugger extension for VSCode based on LLDB"; + homepage = "https://github.com/vadimcn/vscode-lldb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ oxalica ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch new file mode 100644 index 0000000000..300f8cd96e --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch @@ -0,0 +1,11 @@ +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,8 +0,0 @@ +-[build] +-target-dir = "build/target" +- +-[target.armv7-unknown-linux-gnueabihf] +-linker = "arm-linux-gnueabihf-gcc" +- +-[target.aarch64-unknown-linux-gnu] +-linker = "aarch64-linux-gnu-gcc" diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix index 6e4bb7b3ea..7c58a4bdfb 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix @@ -21,13 +21,13 @@ , user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir'' # if file exists will use it and import the extensions in it into this dervation else will use empty extensions list # this file will be created/updated by vscodeExts2nix when vscode exists -, mutableExtensionsFile +, mutableExtensionsFile }: -let +let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = if builtins.pathExists mutableExtensionsFile + mutableExtensions = if builtins.pathExists mutableExtensionsFile then import mutableExtensionsFilePath else []; - vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { + vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; vscodeDefault = vscode; } @@ -63,19 +63,19 @@ let symlinkFromUserSetting = (user-data-dir != ""); }; - vscodeExts2nix = import ./vscodeExts2nix.nix { + vscodeExts2nix = import ./vscodeExts2nix.nix { inherit lib writeShellScriptBin; vscodeDefault = vscodeWithConfiguration; } { extensionsToIgnore = nixExtensions; - extensions = mutableExtensions; + extensions = mutableExtensions; }; code = writeShellScriptBin "code" '' ${updateSettingsCmd}/bin/vscodeNixUpdate-settings ${updateLaunchCmd}/bin/vscodeNixUpdate-launch ${updateKeybindingsCmd}/bin/vscodeNixUpdate-keybindings - ${vscodeWithConfiguration}/bin/code --wait "$@" + ${vscodeWithConfiguration}/bin/code --wait "$@" echo 'running vscodeExts2nix to update ${mutableExtensionsFilePath}...' ${vscodeExts2nix}/bin/vscodeExts2nix > ${mutableExtensionsFilePath} ''; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnvTest.nix index d7e586cab6..19a9edbf1a 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnvTest.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnvTest.nix @@ -1,5 +1,5 @@ with import {}; -callPackage (import ./vscodeEnv.nix) { +callPackage (import ./vscodeEnv.nix) { extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace; vscodeDefault = vscode; } { @@ -9,4 +9,3 @@ callPackage (import ./vscodeEnv.nix) { t = "test"; }; } - diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeExts2nix.nix index afd176b4c5..58ad5866c9 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeExts2nix.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeExts2nix.nix @@ -1,24 +1,24 @@ -# based on the passed vscode will stdout a nix expression with the installed vscode extensions +# based on the passed vscode will stdout a nix expression with the installed vscode extensions { lib , vscodeDefault , writeShellScriptBin }: ##User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault , extensionsToIgnore ? [] # will use those extensions to get sha256 if still exists when executed. -, extensions ? [] +, extensions ? [] }: -let +let mktplcExtRefToFetchArgs = import ./mktplcExtRefToFetchArgs.nix; in writeShellScriptBin "vscodeExts2nix" '' - echo '[' + echo '[' for line in $(${vscode}/bin/code --list-extensions --show-versions \ ${lib.optionalString (extensionsToIgnore != []) '' - | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' + | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' ''} ) ; do [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]] diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix index f15d14c744..e20c631f8c 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix @@ -1,22 +1,22 @@ # wrapper over vscode to control extensions per project (extensions folder will be created in execution path) -{ lib -, writeShellScriptBin -, extensionsFromVscodeMarketplace +{ lib +, writeShellScriptBin +, extensionsFromVscodeMarketplace , vscodeDefault }: ## User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault # extensions to be symlinked into the project's extensions folder -, nixExtensions ? [] +, nixExtensions ? [] # extensions to be copied into the project's extensions folder -, mutableExtensions ? [] -, vscodeExtsFolderName ? ".vscode-exts" +, mutableExtensions ? [] +, vscodeExtsFolderName ? ".vscode-exts" , user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"'' }: -let +let nixExtsDrvs = extensionsFromVscodeMarketplace nixExtensions; mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; - mutableExtsPaths = lib.forEach mutExtsDrvs ( e: + mutableExtsPaths = lib.forEach mutExtsDrvs ( e: { origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}''; target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; @@ -39,16 +39,16 @@ let cp -a ${ePath.origin} ${ePath.target} chmod -R u+rwx ${ePath.target} fi - '') mutableExtsPaths} + '') mutableExtsPaths} ''; in writeShellScriptBin "code" '' - if ! [[ "$@" =~ "--list-extension" ]]; then - mkdir -p "${vscodeExtsFolderName}" + if ! [[ "$@" =~ "--list-extension" ]]; then + mkdir -p "${vscodeExtsFolderName}" ${rmExtensions} ${cpExtensions} fi - ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ + ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }'' } "$@" '' diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/discrete-scroll/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/discrete-scroll/default.nix new file mode 100644 index 0000000000..e72402b779 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/discrete-scroll/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, Cocoa }: + +## after launching for the first time, grant access for parent application (e.g. Terminal.app) +## from 'system preferences >> security & privacy >> accessibility' +## and then launch again + +stdenv.mkDerivation rec { + pname = "discrete-scroll"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "emreyolcu"; + repo = "discrete-scroll"; + rev = "v${version}"; + sha256 = "0aqkp4kkwjlkll91xbqwf8asjww8ylsdgqvdk8d06bwdvg2cgvhg"; + }; + + buildInputs = [ Cocoa ]; + + buildPhase = '' + cc -std=c99 -O3 -Wall -framework Cocoa -o dc DiscreteScroll/main.m + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./dc $out/bin/discretescroll + ''; + + meta = with lib; { + description = "Fix for OS X's scroll wheel problem"; + homepage = "https://github.com/emreyolcu/discrete-scroll"; + platforms = platforms.darwin; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix index 448e6865e1..742a394870 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yabai"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "11rsi6z2z7ynfqs1xq3bvf187k5xnwm0d45a8ai9hrqdsf3f1j19"; + sha256 = "0y4idivqkmi3xsc8yjdzh1b15qzgyqlw7ifs26v3dc91lkjhfc4x"; }; buildInputs = [ Carbon Cocoa ScriptingBridge xxd ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix index 470536db4b..91d7e05a88 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}: +{stdenv, fetchurl, alsaLib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: stdenv.mkDerivation rec { pname = "alsa-utils"; @@ -9,18 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1ai1z4kf91b1m3qrpwqkc1af5vm2fkdkknqv95xdwf19q94aw6gz"; }; - patchPhase = '' - substituteInPlace alsa-info/alsa-info.sh \ - --replace "which" "type -p" \ - --replace "lspci" "${pciutils}/bin/lspci" - ''; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext makeWrapper ]; buildInputs = [ alsaLib ncurses libsamplerate fftw ]; configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; + postFixup = '' + wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${stdenv.lib.makeBinPath [ which pciutils ]}" + ''; + meta = with stdenv.lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture utils"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index 807ab4fa44..0e10add556 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -130,7 +130,11 @@ let libapparmor.python ]; - prePatch = prePatchCommon; + prePatch = prePatchCommon + '' + substituteInPlace ./utils/apparmor/easyprof.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" + substituteInPlace ./utils/apparmor/aa.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" + substituteInPlace ./utils/logprof.conf --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" + ''; inherit patches; postPatch = "cd ./utils"; makeFlags = [ "LANGS=" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix index f9f3013e1f..e617881a57 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2019.5"; + version = "2020.3"; sha256 = { - batman-adv = "1v18zvvg12jgywncbhxshgjc93r72ajpxgw22zp0zx22g2q13z99"; - alfred = "09npizg89ks1wm19l5xz0pq1ljpsbwy030xnprqnd0p53976wywa"; - batctl = "1b9w4636dq8m38nzr8j0v0j3b0vdsw84c58c2isc33h66dx8brgz"; + batman-adv = "0wrzh0k44zzjx2s5zj65hjkh4jm9y38qpis1s5cbx9cyj756slb5"; + alfred = "13bvccz90pkjl09jyw68gj23pbrw9b05w1vhds9sjggwf3jkj5w2"; + batctl = "0r2w2v4sy6wgr7mp9lc7yj9k4ldsbsm3425rjil7p0b17zmzf4rm"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix index 98de3ed1b1..de02ffb30a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel +{ stdenv, fetchurl, fetchpatch +, makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash }: python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "1k00xbhdzdvqp4hfxpgg34bbhnx597jjhpg1x6dz2w80r7xzsj28"; + sha256 = "sha256-ekVRyugpZOU1nr0N9kWCSoJTmtD2qGsn/DmWgK7XZ/c="; }; format = "other"; @@ -23,6 +24,12 @@ python.pkgs.buildPythonApplication rec { # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch + + # This is already upstream; remove it on the next release + (fetchpatch { + url = "https://github.com/iovisor/bcc/commit/60de17161fe7f44b534a8da343edbad2427220e3.patch"; + sha256 = "0pd5b4vgpdxbsrjwrw2kmn4l9hpj0rwdm3hvwvk7dsr3raz7w4b3"; + }) ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix index 0c360e60b7..fc7c8ecba2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub , cmake, pkgconfig, flex, bison -, llvmPackages, kernel, elfutils, libelf, bcc +, llvmPackages, kernel, elfutils +, libelf, libbfd, libbpf, libopcodes, bcc }: stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.9.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "00fvkq3razwacnpb82zkpv63dgyigbqx3gj6g0ka94nwa74i5i77"; + sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y"; }; enableParallelBuilding = true; @@ -19,6 +20,7 @@ stdenv.mkDerivation rec { buildInputs = with llvmPackages; [ llvm clang-unwrapped kernel elfutils libelf bcc + libbpf libbfd libopcodes ]; nativeBuildInputs = [ cmake pkgconfig flex bison ] @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { # cmakeFlags = [ "-DBUILD_TESTING=FALSE" - "-DLIBBCC_INCLUDE_DIRS=${bcc}/include/bcc" + "-DLIBBCC_INCLUDE_DIRS=${bcc}/include" ]; # nuke the example/reference output .txt files, for the included tools, diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix index 728d2d4911..599754129b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, fetchzip +{ stdenv, lib, buildPackages, fetchurl, fetchFromGitLab , enableStatic ? false , enableMinimal ? false # Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: @@ -32,12 +32,18 @@ let CONFIG_FEATURE_WTMP n ''; - debianName = "busybox_1.30.1-5"; - debianTarball = fetchzip { - url = "http://deb.debian.org/debian/pool/main/b/busybox/${debianName}.debian.tar.xz"; - sha256 = "03m4rvs2pd0hj0mdkdm3r4m1gh0bgwr0cvnqds297xnkfi5s01nx"; + # The debian version lacks behind the upstream version and also contains + # a debian-specific suffix. We only fetch the debian repository to get the + # default.script + debianVersion = "1.30.1-6"; + debianSource = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "installer-team"; + repo = "busybox"; + rev = "debian/1%${debianVersion}"; + sha256 = "sha256-6r0RXtmqGXtJbvLSD1Ma1xpqR8oXL2bBKaUE/cSENL8="; }; - debianDispatcherScript = "${debianTarball}/tree/udhcpc/etc/udhcpc/default.script"; + debianDispatcherScript = "${debianSource}/debian/tree/udhcpc/etc/udhcpc/default.script"; outDispatchPath = "$out/default.script"; in diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix index 7f16ecb9e6..cccc7550fb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation { pname = "can-isotp"; - version = "20180629"; + version = "20200910"; hardeningDisable = [ "pic" ]; src = fetchFromGitHub { owner = "hartkopp"; repo = "can-isotp"; - rev = "6003f9997587e6a563cebf1f246bcd0eb6deff3d"; - sha256 = "0b2pqb0vd1wgv2zpl7lvfavqkzr8mrwhrv7zdqkq3rz9givcv8w7"; + rev = "21a3a59e2bfad246782896841e7af042382fcae7"; + sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix index f94e6d72d5..5a66e53695 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "0gm438sfh84bif5d40wvaqrfl4dh3fxjvnjk9ab33al8ws3afpsj"; + sha256 = "0hw8bd7dj71m1ml9zvfab2j87jacs542z7a89nziapckmg6kmh6f"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/conspy/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/conspy/default.nix index 32905b8ec3..a52b873857 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/conspy/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/conspy/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="conspy"; - version="1.14"; + version="1.16"; name="${baseName}-${version}"; - hash="069k26xpzsvrn3197ix5yd294zvz03zi2xqj4fip6rlsw74habsf"; - url="mirror://sourceforge/project/conspy/conspy-1.14-1/conspy-1.14.tar.gz"; - sha256="069k26xpzsvrn3197ix5yd294zvz03zi2xqj4fip6rlsw74habsf"; + hash="02andak806vd04bgjlr0y0d2ddx7cazyf8nvca80vlh8x94gcppf"; + url="mirror://sourceforge/project/conspy/conspy-1.16-1/conspy-1.16.tar.gz"; + sha256="02andak806vd04bgjlr0y0d2ddx7cazyf8nvca80vlh8x94gcppf"; }; buildInputs = [ autoconf automake ncurses diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix new file mode 100644 index 0000000000..df0017eadc --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "cpuid"; + version = "20200427"; + + src = fetchurl { + name = "${pname}-${version}.src.tar.gz"; + url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; + sha256 = "1m31238z2ya8f8pzpyklwp0ksf5xicqrw1z941hhhx913wzldaf1"; + }; + + # For pod2man during the build process. + nativeBuildInputs = [ perl ]; + + # As runtime dependency for cpuinfo2cpuid. + buildInputs = [ perl ]; + + # The Makefile hardcodes $(BUILDROOT)/usr as installation + # destination. Just nuke all mentions of /usr to get the right + # installation location. + patchPhase = '' + sed -i -e 's,/usr/,/,' Makefile + ''; + + installPhase = '' + make install BUILDROOT=$out + + if [ ! -x $out/bin/cpuid ]; then + echo Failed to properly patch Makefile. + exit 1 + fi + ''; + + meta = { + description = "Linux tool to dump x86 CPUID information about the CPU"; + longDescription = '' + cpuid dumps detailed information about the CPU(s) gathered from the CPUID + instruction, and also determines the exact model of CPU(s). It supports + Intel, AMD, VIA, Hygon, and Zhaoxin CPUs, as well as older Transmeta, + Cyrix, UMC, NexGen, Rise, and SiS CPUs. + ''; + + platforms = [ "i686-linux" "x86_64-linux" ]; + license = stdenv.lib.licenses.gpl2; + homepage = "http://etallen.com/cpuid.html"; + maintainers = with stdenv.lib.maintainers; [ blitz ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix index 321f00b0ef..79132852d2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, kernel ? false }: +{ fetchFromGitHub, stdenv, kernel ? false }: stdenv.mkDerivation rec { - pname = "cryptodev-linux-1.9"; + pname = "cryptodev-linux-1.11"; name = "${pname}-${kernel.version}"; - src = fetchurl { - urls = [ - "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz" - ]; - sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z"; + src = fetchFromGitHub { + owner = "cryptodev-linux"; + repo = "cryptodev-linux"; + rev = pname; + sha256 = "1ky850qiyacq8p3lng7n3w6h3x2clqrz4lkv2cv3psy92mg9pvc9"; }; hardeningDisable = [ "pic" ]; @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { homepage = "http://cryptodev-linux.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - broken = !stdenv.lib.versionOlder kernel.version "4.13"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/deepin-anything/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/deepin-anything/default.nix deleted file mode 100644 index 4139cc153c..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/deepin-anything/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, deepin, kernel }: - -stdenv.mkDerivation { - pname = "deepin-anything-module"; - version = "${deepin.deepin-anything.version}-${kernel.version}"; - src = deepin.deepin-anything.modsrc; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildPhase = '' - make -C src/deepin-anything-0.0 kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - ''; - - installPhase = '' - install -m 644 -D -t $out/lib/modules/${kernel.modDirVersion}/extra src/deepin-anything-0.0/*.ko - ''; - - meta = deepin.deepin-anything.meta // { - description = deepin.deepin-anything.meta.description + " (kernel modules)"; - badPlatforms = [ "aarch64-linux" ]; # the kernel module is not building - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix index 13d819a08a..0599289ab7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix @@ -1,16 +1,31 @@ { stdenvNoCC, dtc, findutils }: with stdenvNoCC.lib; { - applyOverlays = (base: overlays: stdenvNoCC.mkDerivation { + applyOverlays = (base: overlays': stdenvNoCC.mkDerivation { name = "device-tree-overlays"; nativeBuildInputs = [ dtc findutils ]; buildCommand = let - quotedDtbos = concatMapStringsSep " " (o: "\"${toString o}\"") (toList overlays); + overlays = toList overlays'; in '' - for dtb in $(find ${base} -name "*.dtb" ); do - outDtb=$out/$(realpath --relative-to "${base}" "$dtb") - mkdir -p "$(dirname "$outDtb")" - fdtoverlay -o "$outDtb" -i "$dtb" ${quotedDtbos}; + mkdir -p $out + cd ${base} + find . -type f -name '*.dtb' -print0 \ + | xargs -0 cp -v --no-preserve=mode --target-directory $out --parents + + for dtb in $(find $out -type f -name '*.dtb'); do + dtbCompat="$( fdtget -t s $dtb / compatible )" + + ${flip (concatMapStringsSep "\n") overlays (o: '' + overlayCompat="$( fdtget -t s ${o.dtboFile} / compatible )" + # overlayCompat in dtbCompat + if [[ "$dtbCompat" =~ "$overlayCompat" ]]; then + echo "Applying overlay ${o.name} to $( basename $dtb )" + mv $dtb{,.in} + fdtoverlay -o "$dtb" -i "$dtb.in" ${o.dtboFile}; + rm $dtb.in + fi + '')} + done ''; }); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix index 97ad75851a..7d0990d9f8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "dmidecode-3.2"; @@ -8,6 +8,50 @@ stdenv.mkDerivation rec { sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; }; + patches = [ + # suggested patches for 3.2 according to https://www.nongnu.org/dmidecode/ + (fetchpatch { + name = "0001-fix_redfish_hostname_print_length.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=fde47bb227b8fa817c88d7e10a8eb771c46de1df"; + sha256 = "133nd0c72p68hnqs5m714167761r1pp6bd3kgbsrsrwdx40jlc3m"; + }) + (fetchpatch { + name = "0002-add_logical_non-volatile_device_to_memory_device_types.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=74dfb854b8199ddb0a27e89296fa565f4706cb9d"; + sha256 = "0wdpmlcwmqdyyrsmyis8jb7cx3q6fnqpdpc5xly663dj841jcvwh"; + }) + (fetchpatch { + name = "0003-only-scan-devmem-for-entry-point-on-x86.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d"; + sha256 = "1y2858n98bfa49syjinx911vza6mm7aa6xalvzjgdlyirhccs30i"; + }) + (fetchpatch { + name = "0004-fix_formatting_of_tpm_table_output.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=1d0db85949a5bdd96375f6131d393a11204302a6"; + sha256 = "11s8jciw7xf2668v79qcq2c9w2gwvm3dkcik8dl9v74p654y1nr8"; + }) + (fetchpatch { + name = "0005-fix_system-slot_information_for_pcie_ssd.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=fd08479625b5845e4d725ab628628f7ebfccc407"; + sha256 = "07l61wvsw1d8g14zzf6zm7l0ri9kkqz8j5n4h116qwhg1p2k49y4"; + }) + (fetchpatch { + name = "0006-print_type_33_name_unconditionally.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=65438a7ec0f4cddccf810136da6f280bd148af71"; + sha256 = "0gqz576ccxys0c8217spf1qmw9lxi9xalw85jjqwsi2bj1k6vy4n"; + }) + (fetchpatch { + name = "0007-dont_choke_on_invalid_processor_voltage.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=5bb7eb173b72256f70c6b3f3916d7a444be93340"; + sha256 = "1dkg4lq9kn2g1w5raz1gssn6zqk078zjqbnh9i32f822f727syhp"; + }) + (fetchpatch { + name = "0008-fix_the_alignment_of_type_25_name.patch"; + url = "https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=557c3c373a9992d45d4358a6a2ccf53b03276f39"; + sha256 = "18hc91pk7civyqrlilg3kn2nmp2warhh49xlbzrwqi7hgipyf12z"; + }) + ]; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index a83e02ae6b..9faeb831b4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.32"; + version = "0.33"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "07hm9lrhhb5y53l13yja2kr3xmjgs0azk3x7w2si99cplwkgxak2"; + sha256 = "0li788l57m2ic1i33fag4nnblqghbwqjyqkgppi8s2sifcvswfbw"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix index 6dfaa6ab38..ca49842572 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.09"; + version = "0.04.10"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "1b3m58mak62ym2amnmk62c2d6fypk30fw6jsmirh1qz7dwix4bl5"; + sha256 = "0rmg49m56qxji7gwci03pkk4f4hnaq1n2x1348dqkaf5zs5nhi6b"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/exfat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/exfat/default.nix index 59f9c709e5..5e212825ba 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/exfat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/exfat/default.nix @@ -5,14 +5,19 @@ assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0"; stdenv.mkDerivation rec { + # linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 + # Assertion moved here due to some tests unintenionally triggering it, + # e.g. nixosTests.kernel-latest; it's unclear how/why so far. + assertion = assert lib.versionOlder kernel.version "5.8"; null; + name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2019-09-06"; + version = "2020-04-15"; src = fetchFromGitHub { - owner = "AdrianBan"; + owner = "barrybingo"; repo = "exfat-nofuse"; - rev = "5536f067373c196f152061f5000fe0032dc07c48"; - sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k"; + rev = "297a5739cd4a942a1d814d05a9cd9b542e7b8fc8"; + sha256 = "14jahy7n6pr482fjfrlf9ck3f2rkr5ds0n5r85xdfsla37ria26d"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix new file mode 100644 index 0000000000..e98de6bbe9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -0,0 +1,38 @@ +{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: +rustPlatform.buildRustPackage rec { + pname = "firmware-manager"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = version; + sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; + + depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen"; + + postPatch = '' + sed -i 's|etc|$(prefix)/etc|' Makefile + ''; + + buildPhase = "make prefix='$(out)'"; + + installPhase = "make prefix='$(out)' install"; + + cargoSha256 = "0byc0pqa1w2qnfrx3psrzdq1c8qjslbmzxg872b9v6fr5d4c9cvg"; + + doCheck = false; + + meta = { + description = "Graphical frontend for firmware management"; + homepage = "https://github.com/pop-os/firmware-manager"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.shlevy ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index 0783fb7929..d502d049ac 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -5,9 +5,9 @@ , fetchpatch , substituteAll , gtk-doc -, pkgconfig +, pkg-config , gobject-introspection -, intltool +, gettext , libgudev , polkit , libxmlb @@ -23,13 +23,12 @@ , libsmbios , efivar , gnu-efi -, libyaml , valgrind , meson , libuuid , colord , docbook_xml_dtd_43 -, docbook_xsl +, docbook-xsl-nons , ninja , gcab , python3 @@ -67,10 +66,6 @@ let requests ]); - fontsConf = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - isx86 = stdenv.isx86_64 || stdenv.isi686; # Dell isn't supported on Aarch64 @@ -93,30 +88,50 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.4.5"; - - src = fetchurl { - url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0hpqxwqbbqn440c2swpnc06z8dskisrli4ynsxrzzqyp0dan46xw"; - }; + version = "1.4.6"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out # CLI programs go to out outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; + src = fetchurl { + url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; + sha256 = "AKG5stioIveQc7ooYb/2UoOaBzbPUFzYk8tZK0rzvK0="; + }; + + patches = [ + # Do not try to create useless paths in /var. + ./fix-paths.patch + + # Allow installing + ./add-option-for-installation-sysconfdir.patch + + # Install plug-ins and libfwupdplugin to out, + # they are not really part of the library. + ./install-fwupdplugin-to-out.patch + + # Installed tests are installed to different output + # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. + (substituteAll { + src = ./installed-tests-path.patch; + # Needs a different set of modules than po/make-images. + inherit installedTestsPython; + }) + ]; + nativeBuildInputs = [ meson ninja gtk-doc - pkgconfig + pkg-config gobject-introspection - intltool + gettext shared-mime-info valgrind gcab docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons help2man libxslt python @@ -133,7 +148,6 @@ let libsoup elfutils gnu-efi - libyaml libgudev colord libjcat @@ -152,50 +166,6 @@ let libsmbios ]; - patches = [ - ./fix-paths.patch - ./add-option-for-installation-sysconfdir.patch - - # Install plug-ins and libfwupdplugin to out, - # they are not really part of the library. - ./install-fwupdplugin-to-out.patch - - # Installed tests are installed to different output - # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. - (substituteAll { - src = ./installed-tests-path.patch; - # Needs a different set of modules than po/make-images. - inherit installedTestsPython; - }) - ]; - - postPatch = '' - patchShebangs \ - contrib/get-version.py \ - contrib/generate-version-script.py \ - meson_post_install.sh \ - po/make-images \ - po/make-images.sh \ - po/test-deps - ''; - - # /etc/os-release not available in sandbox - # doCheck = true; - - preFixup = let - binPath = [ - efibootmgr - bubblewrap - tpm2-tools - ] ++ stdenv.lib.optional haveFlashrom flashrom; - in '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - # See programs reached with fu_common_find_program_in_path in source - --prefix PATH : "${stdenv.lib.makeBinPath binPath}" - ) - ''; - mesonFlags = [ "-Dgtkdoc=true" "-Dplugin_dummy=true" @@ -223,20 +193,57 @@ let "-Dplugin_flashrom=true" ]; - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF + dontWrapGApps = true; + + # /etc/os-release not available in sandbox + # doCheck = true; + + # Environment variables + + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = + let + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + in fontsConf; # error: “PolicyKit files are missing” # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; - # TODO: wrapGAppsHook wraps efi capsule even though it is not elf - dontWrapGApps = true; + # Phase hooks + + postPatch = '' + patchShebangs \ + contrib/get-version.py \ + contrib/generate-version-script.py \ + meson_post_install.sh \ + po/make-images \ + po/make-images.sh \ + po/test-deps + ''; preCheck = '' addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" ''; - # so we need to wrap the executables manually + preFixup = let + binPath = [ + efibootmgr + bubblewrap + tpm2-tools + ] ++ stdenv.lib.optional haveFlashrom flashrom; + in '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + # See programs reached with fu_common_find_program_in_path in source + --prefix PATH : "${stdenv.lib.makeBinPath binPath}" + ) + ''; + + # Since we had to disable wrapGAppsHook, we need to wrap the executables manually. postFixup = '' find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ | while IFS= read -r -d ''' file; do @@ -307,7 +314,7 @@ let meta = with stdenv.lib; { homepage = "https://fwupd.org/"; maintainers = with maintainers; [ jtojnar ]; - license = [ licenses.gpl2 ]; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix new file mode 100644 index 0000000000..40598abac9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -0,0 +1,39 @@ +{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, efibootmgr, makeWrapper }: +rustPlatform.buildRustPackage rec { + pname = "system76-firmware"; + # Check Makefile when updating, make sure postInstall matches make install + version = "1.0.17"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = version; + sha256 = "0cnrskfk3sam90lfpgsraqs4bx9yz8rxhwfs8rxdri04lakxgghg"; + }; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ lzma openssl dbus ]; + + cargoBuildFlags = [ "--workspace" ]; + + cargoSha256 = "06jrmxy68glcmbn9px29wc0s8pqdn26iy4jn3c246dapv1zvbb4s"; + + # Purposefully don't install systemd unit file, that's for NixOS + postInstall = '' + install -D -m -0644 data/system76-firmware-daemon.conf $out/etc/dbus-1/system.d/system76-firmware-daemon.conf + + for bin in $out/bin/system76-firmware-* + do + wrapProgram $bin --prefix PATH : "${efibootmgr}/bin" + done + ''; + + meta = { + description = "Tools for managing firmware updates for system76 devices."; + homepage = "https://github.com/pop-os/system76-firmware"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.shlevy ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix index 1086e5ece0..000400e4cd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix @@ -34,10 +34,6 @@ buildGoModule rec { make install ''; - preFixup = '' - remove-references-to -t ${fscrypt-experimental.go} $out/lib/security/pam_fscrypt.so - ''; - meta = with stdenv.lib; { description = "A high-level tool for the management of Linux filesystem encryption"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix index 53a1bdbc4c..fc1a256338 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libv4l, gd }: stdenv.mkDerivation rec { - name = "fswebcam-20140113"; + name = "fswebcam-20200725"; src = fetchurl { url = "https://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; - sha256 = "3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199"; + sha256 = "1dazsrcaw9s30zz3jpxamk9lkff5dkmflp1s0jjjvdbwa0k6k6ii"; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix index fd62f07cd9..5de0eea0be 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.07.00"; + version = "20.08.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "0azhcnlfziwn8wvw3fly2jfjyg53m8zba3jlcxgzrasgb0kvzb1c"; + sha256 = "098vxj5sd2nm88jmj6cxzcvid8w81m8fxdz881iki0pi7ysixa5q"; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 5a3a5bf7a4..bba3549daf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,18 +11,15 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "20.02.15268"; + version = "20.33.17675"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "138gi92w85bn6haw5x38k39pgiyvvzfhiwpvz6hqlx2j03n8cs2k"; + sha256 = "1ckzspf05skdrjh947gv96finxbv5dpgc84hppm5pdsp5q70iyxp"; }; - # Build script tries to write the ICD to /etc - patches = [ ./etc-dir.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva ]; @@ -31,7 +28,7 @@ stdenv.mkDerivation rec { "-DSKIP_UNIT_TESTS=1" "-DIGC_DIR=${intel-graphics-compiler}" - "-DETC_DIR=${placeholder "out"}/etc" + "-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors" # The install script assumes this path is relative to CMAKE_INSTALL_PREFIX "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch deleted file mode 100644 index d9a80ffa6f..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/package.cmake b/package.cmake -index 24960d5..e9a21e7 100644 ---- a/package.cmake -+++ b/package.cmake -@@ -24,7 +24,9 @@ if(UNIX) - - get_os_release_info(os_name os_version) - -- if("${os_name}" STREQUAL "clear-linux-os") -+ if(DEFINED ETC_DIR) -+ set(_dir_etc ${ETC_DIR}) -+ elseif("${os_name}" STREQUAL "clear-linux-os") - # clear-linux-os distribution avoids /etc for distribution defaults. - set(_dir_etc "/usr/share/defaults/etc") - else() diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index 3ac79464ac..a9fcf455ee 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -5,16 +5,19 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "088gs56iqhdlpw1iqjwrss4zxd4zbl2wl8s2implrrdajjxcfpbj"; + sha256 = "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg"; }; preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile + # TODO: Drop temporary version fix for 5.8 (53159d81) once 5.9 is out: + substituteInPlace include/version.h \ + --replace "v5.7.0-77-gb687d1067169" "5.8.0" ''; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix index 4a58ae9e04..63f0abcd2a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix @@ -11,6 +11,12 @@ iproute.overrideAttrs (oa: rec { sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3"; }; + preConfigure = '' + # Don't try to create /var/lib/arpd: + sed -e '/ARPDDIR/d' -i Makefile + patchShebangs configure + ''; + meta = with stdenv.lib; { homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix index 1278463834..e12c44888a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns -, libcap, nettle, libidn2, systemd +, libcap, systemd, libidn2 }: with stdenv.lib; let - version = "20190709"; + version = "20200821"; sunAsIsLicense = { fullName = "AS-IS, SUN MICROSYSTEMS license"; url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; @@ -19,26 +19,27 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "s${version}"; - sha256 = "04bp4af15adp79ipxmiakfp0ij6hx5qam266flzbr94pr8z8l693"; + sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4"; }; - mesonFlags = - [ "-DUSE_CRYPTO=nettle" - "-DBUILD_RARPD=true" - "-DBUILD_TRACEROUTE6=true" - "-DNO_SETCAP_OR_SUID=true" - "-Dsystemdunitdir=etc/systemd/system" - ] + mesonFlags = [ + "-DBUILD_RARPD=true" + "-DBUILD_TRACEROUTE6=true" + "-DBUILD_TFTPD=true" + "-DNO_SETCAP_OR_SUID=true" + "-Dsystemdunitdir=etc/systemd/system" + ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; - buildInputs = [ libcap nettle systemd ] + buildInputs = [ libcap systemd ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2; meta = { - homepage = "https://github.com/iputils/iputils"; description = "A set of small useful utilities for Linux networking"; + inherit (src.meta) homepage; + changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; platforms = platforms.linux; maintainers = with maintainers; [ primeos lheckemann ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iw/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iw/default.nix index 585bbfd165..cbd19b7da8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iw/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iw"; - version = "5.4"; + version = "5.8"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0prrgb11pjrr6dw71v7nx2bic127qzrjifvz183v3mw8f1kryim2"; + sha256 = "1d1dfynrzh52zdia1l23ajv4q5wixgffnc1gkz05qrxnn2n4p75m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index fd34440f60..adf37a1b71 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.8"; + version = "1.9"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "0ds8nhbnkhxzhnnsi7vj3y2v8wq0nxqbmidhiac7mpxgjkc684gf"; + sha256 = "193wa13i2prfz1zr7nvwbgrxgacms57zj1n7x28yy5hmm3nnwbrd"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index e80e29aad3..8bd5d02120 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -244,6 +244,8 @@ let DRM_AMDGPU_SI = whenAtLeast "4.9" yes; # (stable) amdgpu support for bonaire and newer chipsets DRM_AMDGPU_CIK = whenAtLeast "4.9" yes; + # Allow device firmware updates + DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { # Intel GVT-g graphics virtualization supports 64-bit only DRM_I915_GVT = whenAtLeast "4.16" yes; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 36277dd74c..ca353ae922 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,22 +1,27 @@ { "4.14": { - "name": "linux-hardened-4.14.193.a.patch", - "sha256": "0hxr4v6ph29p0916dh894aknna5qxszcpz5xrci81xla3i50vy9v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.193.a/linux-hardened-4.14.193.a.patch" + "name": "linux-hardened-4.14.197.a.patch", + "sha256": "171bgi7pw64v8byqmplafnyx26h1yrxhci9b12ndjyfg91fkhw31", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.197.a/linux-hardened-4.14.197.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.140.a.patch", - "sha256": "03y0kp89wka9bjw44y2jqralnwi7rjxbgm7wym1ad5yqd4q29l4d", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.140.a/linux-hardened-4.19.140.a.patch" + "name": "linux-hardened-4.19.144.a.patch", + "sha256": "0vs48h3zcir6s72rnvkjxvjl6cscfaigwji00q940v7lgqyq8lvl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.144.a/linux-hardened-4.19.144.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.59.a.patch", - "sha256": "138kms73rlj5zmsb2ivjzz1jr5aa8y8pmwzx02c7j1qk08v82823", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.59.a/linux-hardened-5.4.59.a.patch" + "name": "linux-hardened-5.4.67.a.patch", + "sha256": "0jpjc1magvlhfwrx43n68xcxxk1g5w2g0rvp92n7yli0db97k1bm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.67.a/linux-hardened-5.4.67.a.patch" }, "5.7": { - "name": "linux-hardened-5.7.16.a.patch", - "sha256": "1fiyd6qsf8r84p05cxhwma7zwi81xyn9pl6yci93n583z8n1k2sw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.16.a/linux-hardened-5.7.16.a.patch" + "name": "linux-hardened-5.7.19.a.patch", + "sha256": "1lydlh499aj3ck5cnv8q2271y4klvp17zm7j7qni16am14bld936", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" + }, + "5.8": { + "name": "linux-hardened-5.8.11.a.patch", + "sha256": "0cbmlwfzh9ppcvih437sp832rkhr7dfhx97drnkz4gysfyiyh07l", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.11.a/linux-hardened-5.8.11.a.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 12e55cab2b..e0c370c594 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.193"; + version = "4.14.199"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "00wziff12xphafyspb02rnjim5a15zywnhdk70ks9q9h8hfv83qb"; + sha256 = "1yflafb0n783igghk6d392pk6lbk3p2w7y01ams08f1b4qm47wq2"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 6b9629edca..aebded8cb7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.140"; + version = "4.19.147"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "1a4fy48jb16qdx165n48qch6nikfvmxqwys7mw8fynq0pykzj3ya"; + sha256 = "19nnx61v7c0102ik1rjan0kdsj8av8v7iqz5vm3v3kjllmjmvr2x"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index ba03af8696..c6f9b6ddb4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.232"; + version = "4.4.237"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d7x30sy9c27n9bqf5f5mf64c6j5iljnw1gm7g8z00xgvrjqibjf"; + sha256 = "1q6hwjwvlsikgr8b04l7v2jia2wyqxgbli6i7y20aq49h13ap2qk"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 38353cc332..c6d29d2d8a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.232"; + version = "4.9.237"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0q2gpkazfw93r79aq21kv1y3hwxawl0swyvd3nd73p254gl75x2q"; + sha256 = "07w6mwgh7i3bvg1w3w5i9kgxjmvqr7cv7nzrmx7j9p6cq295gv41"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index d1fe6b4789..046007c58e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.59"; + version = "5.4.67"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1zdjqkm6sniy718dgqzbc1w1sgwpy2x64n1p91cjwps3wjr9vjwv"; + sha256 = "196avi0950qrd0lxdpdsl6lxa51f20sz476mcl1i5islbnfbsxf1"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.7.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.7.nix index 927940df9a..4f721d8b0e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.16"; + version = "5.7.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0lypik2wvkl3z60zi1x4dxrh646jn0c4x0cg5z9yp33504q4x1ip"; + sha256 = "1rwzp51ddlkdzanj6i8jqj5yh0njpzn7ly4r8nnzwkdfp5465721"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix new file mode 100644 index 0000000000..d9567b20e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.8.11"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "0jy0yrrixzql9dlk9305w98pja2pm6ijrdbai326595pnk740n9y"; + }; +} // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix new file mode 100644 index 0000000000..f58f08ca91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -0,0 +1,41 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "5.4.66-rt38"; # updated by ./update-rt.sh + branch = lib.versions.majorMinor version; + kversion = builtins.elemAt (lib.splitString "-" version) 0; +in buildLinux (args // { + inherit version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; + sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "1w0v5wl5fhxl5axd4701dljxhv9rywpgiix3yv7l6i3c5b8iw1zi"; + }; + }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + + structuredExtraConfig = with lib.kernel; { + PREEMPT_RT = yes; + # Fix error: unused option: PREEMPT_RT. + EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) + # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). + PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. + # Fix error: unused option: RT_GROUP_SCHED. + RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. + } // structuredExtraConfig; + + extraMeta = extraMeta // { + inherit branch; + }; +} // argsOverride) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix new file mode 100644 index 0000000000..7c77454040 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix @@ -0,0 +1,41 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "5.6.19-rt12"; # updated by ./update-rt.sh + branch = lib.versions.majorMinor version; + kversion = builtins.elemAt (lib.splitString "-" version) 0; +in buildLinux (args // { + inherit version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; + sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "0ia8rx0615x0z2s4ppw1244crg7c5ak07c9n3wbnz7y8bk8hyxws"; + }; + }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + + structuredExtraConfig = with lib.kernel; { + PREEMPT_RT = yes; + # Fix error: unused option: PREEMPT_RT. + EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) + # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). + PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. + # Fix error: unused option: RT_GROUP_SCHED. + RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. + } // structuredExtraConfig; + + extraMeta = extraMeta // { + inherit branch; + }; +} // argsOverride) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 456913c5e6..81dcb5d456 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,14 @@ -{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.3.2020.04.04"; - modDirVersion = "5.3.0"; + version = "5.8.0-2020.09.07"; + modDirVersion = "5.8.0"; - src = fetchgit { - url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230"; - sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs"; + rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf"; + sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 6cd63e0be6..b9db2f103e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9-rc1"; + version = "5.9-rc5"; extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "08x6s4wydbrr4rqq3zfxq6qmnha4ikn7m9rmdqd42hmxl2ynqxla"; + sha256 = "1f410hkrk1b5g9wkh6078ph03fiyxpmbd5kdl9w592afphcddbrc"; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index c7d14a4506..ce90893586 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.8.1"; + version = "5.8.10"; in buildLinux (args // { @@ -12,7 +12,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "122q09d0sybi9lqlaxpq6ffc0ha9127bg3wzjync256lbj5394b7"; + sha256 = "1mm4x2amnpwixvi7q8pj9my75b08ps2mafgz4j2iszpylkdzi53d"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 3a2682b2cf..92dc334135 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio, elfutils -, utillinuxMinimal , writeTextFile }: @@ -281,7 +280,6 @@ let in assert (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") -> libelf != null; -assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; assert stdenv.lib.versionAtLeast version "5.8" -> elfutils != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { @@ -294,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal + # Removed utillinuxMinimal since it should not be a dependency. ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh new file mode 100755 index 0000000000..bcfa494d7e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env bash +set -euo pipefail + +# To update all rt kernels run: ./update-rt.sh + +# To update just one ./linux-rt-5.X.nix run: ./update-rt.sh ./linux-rt-5.X.nix + +# To add a new kernel branch 5.Y run: ./update-rt.sh ./linux-rt-5.Y.nix +# (with nonexistent .nix file) and update all-packages.nix. + +# To commit run with: env COMMIT=1 + +mirror=https://kernel.org/pub/linux/kernel + +main() { + if [ $# -ge 1 ]; then + update-if-needed "$1" + else + update-all-if-needed + fi +} + +update-all-if-needed() { + for f in "$(dirname "$0")"/linux-rt-*.nix; do + update-if-needed "$f" + done +} + +file-version() { + file="$1" # e.g. ./linux-rt-5.4.nix + if [ -e "$file" ]; then + grep ' version = ' "$file" | grep -o '[0-9].[^"]*' + fi +} + +latest-rt-version() { + branch="$1" # e.g. 5.4 + curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" | + sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/; p; q }' +} + +update-if-needed() { + file="$1" # e.g. ./linux-rt-5.4.nix (created if does not exist) + branch=$(basename "$file" .nix) # e.g. linux-rt-5.4 + branch=${branch#linux-rt-} # e.g. 5.4 + cur=$(file-version "$file") # e.g. 5.4.59-rt36 or empty + new=$(latest-rt-version "$branch") # e.g. 5.4.61-rt37 + kversion=${new%-*} # e.g. 5.4.61 + major=${branch%.*} # e.g 5 + nixattr="linux-rt_${branch/./_}" + if [ "$new" = "$cur" ]; then + echo "$nixattr: $cur (up-to-date)" + return + fi + khash=$(nix-prefetch-url "$mirror/v${major}.x/linux-${kversion}.tar.xz") + phash=$(nix-prefetch-url "$mirror/projects/rt/${branch}/older/patch-${new}.patch.xz") + if [ "$cur" ]; then + msg="$nixattr: $cur -> $new" + else + msg="$nixattr: init at $new" + prev=$(ls "$(dirname "$0")"/linux-rt-*.nix | tail -1) + cp "$prev" "$file" + cur=$(file-version "$file") + fi + echo "$msg" + sed -i "$file" \ + -e "s/$cur/$new/" \ + -e "s|kernel/v[0-9]*|kernel/v$major|" \ + -e "1,/.patch.xz/ s/sha256 = .*/sha256 = \"$khash\";/" \ + -e "1,/.patch.xz/! s/sha256 = .*/sha256 = \"$phash\";/" + if [ "${COMMIT:-}" ]; then + git add "$file" + git commit -m "$msg" + fi +} + +return 2>/dev/null || main "$@" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update.sh b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update.sh index 55fdce06c9..560edced36 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update.sh @@ -58,6 +58,9 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do echo "Updated $OLDVER -> $V" done +# Update linux-rt +COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh + # Update linux-libre COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix index a92970726d..55faa216a1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "08li3aj9bvzabrih98jdxi3m19h85cp53s8cr7cqad42r8vjdvxb"; + sha256 = "0dmlkhnn5q8fc6rkzsisir4chkzmmiq6xkjmvyvf0g7yihwz2j2f"; }; patches = [ ./no-reinstall-kernel-headers.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix index f1cc4558b0..805b8a32ae 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { "--with-modulesdirs=${modulesDirs}" ] ++ lib.optional withStatic "--enable-static"; - patches = [ ./module-dir.patch ] + patches = [ ./module-dir.patch ./no-name-field.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch ++ lib.optional withStatic ./enable-static.patch; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/no-name-field.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/no-name-field.patch new file mode 100644 index 0000000000..282f59e55e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/no-name-field.patch @@ -0,0 +1,24 @@ + +--- + tools/modinfo.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tools/modinfo.c b/tools/modinfo.c +index 0231bb0..7b2259e 100644 +--- a/tools/modinfo.c ++++ b/tools/modinfo.c +@@ -178,7 +178,10 @@ static int modinfo_do(struct kmod_module *mod) + is_builtin = (filename == NULL); + + if (is_builtin) { +- printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator); ++ if (field == NULL || field != NULL && streq(field, "name")){ ++ printf("%-16s%s%c", "name:", ++ kmod_module_get_name(mod), separator); ++ } + filename = "(builtin)"; + } + +-- +2.28.0 + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix index 0a98475384..68ccef6529 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix @@ -1,20 +1,36 @@ { stdenv, fetchFromGitHub, pkgconfig , libelf, zlib +, fetchpatch }: with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.0.9"; + version = "0.1.0"; src = fetchFromGitHub { - owner = "libbpf"; - repo = "libbpf"; - rev = "v${version}"; - sha256 = "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7"; + owner = "libbpf"; + repo = "libbpf"; + rev = "v${version}"; + sha256 = "1wi3a795jq0smqg1c5ml2ghai47n1m5ijmch017wscybx4jdlynv"; }; + patches = [ + (fetchpatch { # included upstream for > 0.1.0 + name = "link-zlib.patch"; + url = "https://github.com/libbpf/libbpf/commit/8b14cb43ff837.diff"; + sha256 = "17mvjrs7s727drz013a8qlyj0345ldi2kph6pazcmxv6kl1qrz2z"; + }) + ]; + patchFlags = "-p2"; + # https://github.com/libbpf/libbpf/pull/201#issuecomment-689174740 + postPatch = '' + substituteInPlace ../scripts/check-reallocarray.sh \ + --replace 'mktemp /tmp/' 'mktemp ' \ + --replace '/bin/rm' 'rm' + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libelf zlib ]; @@ -22,11 +38,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ "PREFIX=$(out)" ]; - patchPhase = '' - substituteInPlace ../scripts/check-reallocarray.sh \ - --replace '/bin/rm' 'rm' - ''; - # FIXME: Multi-output requires some fixes to the way the pkgconfig file is # constructed (it gets put in $out instead of $dev for some reason, with # improper paths embedded). Don't enable it for now. @@ -37,7 +48,7 @@ stdenv.mkDerivation rec { description = "Upstream mirror of libbpf"; homepage = "https://github.com/libbpf/libbpf"; license = with licenses; [ lgpl21 /* or */ bsd2 ]; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice vcunat ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix index 40f92f38d1..52de79e1f2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.10.1"; + version = "1.11.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "0nf5x4v9rhyd67r6f6q3dw4sraaja8jfdkhhg9g8x41czmx4d456"; + sha256 = "1wgn6gsiy64rb76i46dsqlvp687lwqzxwg5lgj1y5y7lyqbq96wp"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix index 74abd12868..2e9003c3f9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix @@ -1,16 +1,47 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, bash, flex, bison, valgrind }: stdenv.mkDerivation rec { pname = "lockdep"; - version = "4.1.2"; - fullver = "4.1.2"; + # it would be nice to be able to pick a kernel version in sync with something + # else we already ship, but it seems userspace lockdep isn't very well maintained + # and appears broken in many kernel releases + version = "5.0.21"; + fullver = "5.0.21"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy"; + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1my2m9hvnvdrvzcg0fgqgaga59y2cd5zlpv7xrfj2nn98sjhglwq"; }; - preConfigure = "cd tools/lib/lockdep"; + # ensure *this* kernel's userspace-headers are picked up before we + # fall back to those in glibc, as they will be from a mismatched + # kernel version + postPatch = '' + substituteInPlace tools/lib/lockdep/Makefile \ + --replace 'CONFIG_INCLUDES =' $'CONFIG_INCLUDES = -I../../../usr/include\n#' + ''; + + nativeBuildInputs = [ flex bison ]; + + buildPhase = '' + make defconfig + make headers_install + cd tools/lib/lockdep + make + ''; + + doCheck = true; + checkInputs = [ valgrind ]; + checkPhase = '' + # there are more /bin/bash references than just shebangs + for f in lockdep run_tests.sh tests/*.sh; do + substituteInPlace $f \ + --replace '/bin/bash' '${bash}/bin/bash' + done + + ./run_tests.sh + ''; + installPhase = '' mkdir -p $out/bin $out/lib $out/include diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix index 8bfdb37360..7bbd1768c0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix @@ -16,11 +16,11 @@ assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { pname = "lvm2" + stdenv.lib.optionalString enableDmeventd "with-dmeventd"; - version = "2.03.09"; + version = "2.03.10"; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz"; - sha256 = "0xdr9qbqw6kja267wmx6ajnfv1nhw056gpxx9v2qmfh3bj6qnfn0"; + sha256 = "1l0fkn9abrgk5mfn6jfh9qhdr86b59l1c5pk6lp8jh0491d69las"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix index a1a37db9dd..135187c9a1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/amd.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "AMD Processor microcode patch"; - homepage = "http://www.amd64.org/support/microcode.html"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix index 61ad327c39..6a9f807947 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "2018-12-14"; + version = "2019-10-04"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "aef913e31b659462fe6b9320d241676cba97f67b"; - sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7"; + rev = "73d6c59af8d1bcedf5de4aa1f5d5b7f765f545f5"; + sha256 = "18a7qm86gavg15gv4h6xfnapgq24v4dyvhwfp53lkssxyhjbli0z"; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix index 93bb1316d2..e433fd1e9f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel, zlib }: let - version = "2.0"; + version = "3.1"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.atoptool.nl/download/netatop-${version}.tar.gz"; - sha256 = "03n248p1l3ps7gj2hdlcbrb1fsw1zcmgzypj4j4l4rynjjh7qvf6"; + sha256 = "0qjw8glfdmngfvbn1w63q128vxdz2jlabw13y140ga9i5ibl6vvk"; }; buildInputs = [ zlib ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation { -e s,/usr,$out, \ -e /init.d/d \ -e /depmod/d \ + -e /netatop.service/d \ Makefile ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules b/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules new file mode 100644 index 0000000000..ab07de9971 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules @@ -0,0 +1,2 @@ +SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="a291", TAG+="uaccess" +SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="df11", TAG+="uaccess" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/default.nix new file mode 100644 index 0000000000..4a123b2027 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "numworks-udev-rules"; + version = "unstable-2020-08-31"; + + udevRules = ./50-numworks-calculator.rules; + dontUnpack = true; + + installPhase = '' + install -Dm 644 "${udevRules}" "$out/lib/udev/rules.d/50-numworks-calculator.rules" + ''; + + meta = with stdenv.lib; { + description = "Udev rules for Numworks calculators"; + homepage = "https://numworks.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/update.sh b/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/update.sh new file mode 100755 index 0000000000..3949f6fd8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/numworks-udev-rules/update.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +wget -O 50-numworks-calculator.rules "https://workshop.numworks.com/files/drivers/linux/50-numworks-calculator.rules" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index df71a953fe..7c37fcf231 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -32,6 +32,17 @@ rec { # No active beta right now beta = stable; + # Vulkan developer beta driver + vulkan_beta = generic { + version = "450.56.11"; + persistencedVersion = "450.57"; + settingsVersion = "450.57"; + sha256_64bit = "1k64h8sp4rf6kc7liypznjgkmxi67njy1s8xy2r341fhl62pl010"; + settingsSha256 = "1clbj9a3kv3j8jg35c197gd7b3f9f9f4h9ll5hlax95hdg12lgan"; + persistencedSha256 = "17747z1fsbiznfsmahxmz8kmhwwcjanpfih60v5mwzk63gy4i3d5"; + url = "https://developer.nvidia.com/vulkan-beta-4505611-linux"; + }; + # Last one supporting x86 legacy_390 = generic { version = "390.138"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix index d62ade04e6..8a9e340a20 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -1,8 +1,11 @@ { version +, url ? null , sha256_32bit ? null , sha256_64bit , settingsSha256 +, settingsVersion ? version , persistencedSha256 +, persistencedVersion ? version , useGLVND ? true , useProfiles ? true , preferGtk2 ? false @@ -11,7 +14,7 @@ , prePatch ? "" , patches ? [] , broken ? false -}: +}@args: { stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl , kernel ? null, perl, nukeReferences @@ -19,6 +22,9 @@ # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. libsOnly ? false +, # don't include the bundled 32-bit libraries on 64-bit platforms, + # even if it’s in downloaded binary + disable32Bit ? false }: with stdenv.lib; @@ -30,7 +36,7 @@ assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-lin let nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; - i686bundled = versionAtLeast version "391"; + i686bundled = versionAtLeast version "391" && !disable32Bit; libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11 pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ]; @@ -43,12 +49,12 @@ let src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; + url = args.url or "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; sha256 = sha256_64bit; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; + url = args.url or "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; sha256 = sha256_32bit; } else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; @@ -86,6 +92,7 @@ let withGtk3 = !preferGtk2; }; persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; + inherit persistencedVersion settingsVersion; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index de36ad06c6..ff2792ac31 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -2,14 +2,14 @@ nvidia_x11: sha256: { stdenv, fetchFromGitHub, m4 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nvidia-persistenced"; - inherit (nvidia_x11) version; + version = nvidia_x11.persistencedVersion; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-persistenced"; - rev = nvidia_x11.version; + rev = nvidia_x11.persistencedVersion; inherit sha256; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix index b1250e56ee..fbddd7b7fa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -9,13 +9,13 @@ let src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-settings"; - rev = nvidia_x11.version; + rev = nvidia_x11.settingsVersion; inherit sha256; }; libXNVCtrl = stdenv.mkDerivation { pname = "libXNVCtrl"; - inherit (nvidia_x11) version; + version = nvidia_x11.settingsVersion; inherit src; buildInputs = [ libXrandr libXext ]; @@ -42,7 +42,7 @@ in stdenv.mkDerivation { pname = "nvidia-settings"; - inherit (nvidia_x11) version; + version = nvidia_x11.settingsVersion; inherit src; nativeBuildInputs = [ pkgconfig m4 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix new file mode 100644 index 0000000000..3247e8c4ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +, go-md2man +, installShellFiles +, pkg-config +, bcc +, libseccomp +}: + +buildGoModule rec { + pname = "oci-seccomp-bpf-hook"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "containers"; + repo = "oci-seccomp-bpf-hook"; + rev = "v${version}"; + sha256 = "143x4daixzhhhpli1l14r7dr7dn3q42w8dddr16jzhhwighsirqw"; + }; + vendorSha256 = null; + doCheck = false; + + outputs = [ "out" "man" ]; + nativeBuildInputs = [ + go-md2man + installShellFiles + pkg-config + ]; + buildInputs = [ + bcc + libseccomp + ]; + + buildPhase = '' + make + ''; + + postBuild = '' + substituteInPlace oci-seccomp-bpf-hook.json --replace HOOK_BIN_DIR "$out/bin" + ''; + + installPhase = '' + install -Dm755 bin/* -t $out/bin + install -Dm644 oci-seccomp-bpf-hook.json -t $out + installManPage docs/*.[1-9] + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/containers/oci-seccomp-bpf-hook"; + description = '' + OCI hook to trace syscalls and generate a seccomp profile + ''; + license = licenses.asl20; + maintainers = with maintainers; [ saschagrunert ]; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix index f0fb0a834f..33b252a022 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.13.0"; + version = "2.14.0"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0cd5vmfr6zwgcnkwys6rag6cmz68v0librpaplianv734xs74pyx"; + sha256 = "0q52k6mq1jfsv0ix55mjd5ljlalhklhqfrma3l61dzhgihmfawa1"; }; kernel = optional (_kernel != null) _kernel.dev; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix new file mode 100644 index 0000000000..84135f2492 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pam, gnupg }: + +stdenv.mkDerivation rec { + pname = "pam_gnupg"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "cruegge"; + repo = "pam-gnupg"; + rev = "v${version}"; + sha256 = "0b70mazyvcbg6xyqllm62rwhbz0y94pcy202db1qyy4w8466bhsw"; + }; + + configureFlags = [ + "--with-moduledir=${placeholder "out"}/lib/security" + ]; + + buildInputs = [ pam gnupg ]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "Unlock GnuPG keys on login"; + longDescription = '' + A PAM module that hands over your login password to gpg-agent. This can + be useful if you are using a GnuPG-based password manager like pass. + ''; + homepage = "https://github.com/cruegge/pam-gnupg"; + license = licenses.gpl3; + maintainers = with maintainers; [ mtreca ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix index 06126a9295..3c49e53d80 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "202007"; + version = "202008"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "1qqp51mvi52jvf6zf4g1fzv6nh9p37y0i7r2y273gwcdygbidzma"; + sha256 = "1paxwq0p39vp2ma0rg7dkalc3r28wzj77sm3alavvk2vxgvxi0ig"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index b1770a4d61..59a7125aad 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "30.0"; + version = "31.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1czfh6s0qz2cv2k7ha7nr9qiwcrj5lvwqnvyrvsds463m8ndpg12"; + sha256 = "0qr8a25ylmkwfgyj519zvl74q16bhf4895xjich2r98rl2yg0qdl"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rfkill/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rfkill/default.nix deleted file mode 100644 index 10d46a8482..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rfkill/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "rfkill-0.5"; - - src = fetchurl { - url = "mirror://kernel/software/network/rfkill/${name}.tar.bz2"; - sha256 = "01zs7p9kd92pxgcgwl5w46h3iyx4acfg6m1j5fgnflsaa350q5iy"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with stdenv.lib; { - homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; - description = "A tool to query, enable and disable wireless devices"; - platforms = platforms.linux; - maintainers = [ maintainers.eelco ]; - license = licenses.isc; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix new file mode 100644 index 0000000000..62ea8aaaab --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, kernel, bc }: +stdenv.mkDerivation rec { + name = "rtl8821cu-${kernel.version}-${version}"; + version = "unstable-2020-05-16"; + + src = fetchFromGitHub { + owner = "brektrou"; + repo = "rtl8821cu"; + rev = "5c510c9f14352fed4906a10921040b9e46b58346"; + sha256 = "1n74h1m3l2dj35caswaghzcjwcv5qlv3gj6j1rqdddbyg5khl4ag"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = [ bc ]; + buildInputs = kernel.moduleBuildDependencies; + + prePatch = '' + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = with stdenv.lib; { + description = "Realtek rtl8821cu driver"; + homepage = "https://github.com/brektrou/rtl8821CU"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.contrun ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix index 59577eb8d5..bef9231385 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.26.7"; + version = "0.27.0"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "09m6j2cl70jxb0k4ydsgrida381bipf0v026xz661152cy23r3ff"; + sha256 = "0lpp271g0749sx7qgpwl6myi0kgfpsxk1kc4yp3r9k1pynv8bq1b"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76-acpi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/system76-acpi/default.nix new file mode 100644 index 0000000000..b7c0e27669 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/system76-acpi/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, kernel }: +let + version = "1.0.1"; + sha256 = "0jmm9h607f7k20yassm6af9mh5l00yih5248wwv4i05bd68yw3p5"; +in +stdenv.mkDerivation { + name = "system76-acpi-module-${version}-${kernel.version}"; + + passthru.moduleName = "system76_acpi"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "system76-acpi-dkms"; + rev = version; + inherit sha256; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildFlags = [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D system76_acpi.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76_acpi.ko + mkdir -p $out/lib/udev/hwdb.d + mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d + ''; + + meta = with stdenv.lib; { + maintainers = [ maintainers.khumba ]; + license = [ licenses.gpl2Only ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + broken = versionOlder kernel.version "4.14"; + description = "System76 ACPI Driver (DKMS)"; + homepage = "https://github.com/pop-os/system76-acpi-dkms"; + longDescription = '' + This provides the system76_acpi in-tree driver for systems missing it. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76-io/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/system76-io/default.nix new file mode 100644 index 0000000000..dac1e2db1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/system76-io/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, kernel }: +let + version = "1.0.1"; + sha256 = "0qkgkkjy1isv6ws6hrcal75dxjz98rpnvqbm7agdcc6yv0c17wwh"; +in +stdenv.mkDerivation { + name = "system76-io-module-${version}-${kernel.version}"; + + passthru.moduleName = "system76_io"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "system76-io-dkms"; + rev = version; + inherit sha256; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildFlags = [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D system76-io.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76-io.ko + ''; + + meta = with stdenv.lib; { + maintainers = [ maintainers.khumba ]; + license = [ licenses.gpl2Plus ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + broken = versionOlder kernel.version "4.14"; + description = "DKMS module for controlling System76 I/O board"; + homepage = "https://github.com/pop-os/system76-io-dkms"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/system76/default.nix new file mode 100644 index 0000000000..02eca1d5bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/system76/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, kernel }: +let + version = "1.0.9"; + sha256 = "0i4825y2vd679kdjv30ifzj1i1066d3x37z4lgk39hx16993k162"; +in +stdenv.mkDerivation { + name = "system76-module-${version}-${kernel.version}"; + + passthru.moduleName = "system76"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "system76-dkms"; + rev = version; + inherit sha256; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildFlags = [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -D system76.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76.ko + mkdir -p $out/lib/udev/hwdb.d + mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d + ''; + + meta = with stdenv.lib; { + maintainers = [ maintainers.khumba ]; + license = [ licenses.gpl2Plus ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + broken = versionOlder kernel.version "4.14"; + description = "System76 DKMS driver"; + homepage = "https://github.com/pop-os/system76-dkms"; + longDescription = '' + The System76 DKMS driver. On newer System76 laptops, this driver controls + some of the hotkeys and allows for custom fan control. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index ab04ea9164..390e7f9f09 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 22f46f55c81d84e83a4614856d84e63c8400165c Mon Sep 17 00:00:00 2001 +From 54fb14592fc41752c3cd26552c974dd1ad4b9e73 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices @@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...) 1 file changed, 4 deletions(-) diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in -index c34b606216..3ab8c1c3fe 100644 +index 1c60eec587..b2486da130 100644 --- a/rules.d/99-systemd.rules.in +++ b/rules.d/99-systemd.rules.in @@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" @@ -28,5 +28,5 @@ index c34b606216..3ab8c1c3fe 100644 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index c52a13c9a4..9bb69092ca 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From e5b2b1e90d055068936336f6f01639bcde251b96 Mon Sep 17 00:00:00 2001 +From d52880eeae09aaacd308430499f55810157b1a6d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store @@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126 2 files changed, 4 insertions(+) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index b19127be09..f9adca1100 100644 +index 806dda8475..0220741c91 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { @@ -38,5 +38,5 @@ index 8a5e80eeaa..fab35ed6f3 100644 || path_equal(path, "/usr") #endif -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index e96593a593..5ee54f39b7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001 +From 794073e466a3b6c8e138f0e6d15c8d6465a1a4a9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/18] Fix NixOS containers @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 51d0c2a75b..4d3451ff3b 100644 +index 3b9493f232..0117a9939d 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) { +@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 51d0c2a75b..4d3451ff3b 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) { +@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } @@ -30,5 +30,5 @@ index 51d0c2a75b..4d3451ff3b 100644 } else { -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index 4b2c059afd..cdef28ad68 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From c87cc5b1cf9c37f195e6b362352279e14289554e Mon Sep 17 00:00:00 2001 +From caa8dcfa87cf2e46a7a1cce9c16f929916cf9186 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/18] Look for fsck in the right place @@ -21,5 +21,5 @@ index 80f7107b9d..74e48a385f 100644 cmdline[i++] = "-T"; -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index a8f3f0e21f..95dd17531a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,4 +1,4 @@ -From 450c133c1815b473136b2a5540f9213fef5506ee Mon Sep 17 00:00:00 2001 +From e5d73359928b79bd846bda29ce61fe276d8c0b76 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/18] Add some NixOS-specific unit directories @@ -10,51 +10,36 @@ persistent, mutable units (used for Dysnomia). Also, remove /usr and /lib as these don't exist on NixOS. --- - src/core/systemd.pc.in | 4 ++-- - src/shared/path-lookup.c | 18 +++++------------- - 2 files changed, 7 insertions(+), 15 deletions(-) + src/basic/path-lookup.c | 20 +++++--------------- + src/core/systemd.pc.in | 5 +++-- + 2 files changed, 8 insertions(+), 17 deletions(-) -diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index 8331832c7a..bedb97115d 100644 ---- a/src/core/systemd.pc.in -+++ b/src/core/systemd.pc.in -@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user - systemduserpresetdir=${prefix}/lib/systemd/user-preset - systemdsystemconfdir=${sysconfdir}/systemd/system - systemduserconfdir=${sysconfdir}/systemd/user --systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system --systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user -+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} -+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} - systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators - systemdusergeneratordir=${prefix}/lib/systemd/user-generators - systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir} -diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 48e0eec09a..a9d38f16d0 100644 ---- a/src/shared/path-lookup.c -+++ b/src/shared/path-lookup.c -@@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { +diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c +index 52968dee34..bba2eb09b8 100644 +--- a/src/basic/path-lookup.c ++++ b/src/basic/path-lookup.c +@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { } static const char* const user_data_unit_paths[] = { - "/usr/local/lib/systemd/user", - "/usr/local/share/systemd/user", - USER_DATA_UNIT_PATH, + USER_DATA_UNIT_DIR, - "/usr/lib/systemd/user", - "/usr/share/systemd/user", NULL }; static const char* const user_config_unit_paths[] = { - USER_CONFIG_UNIT_PATH, + USER_CONFIG_UNIT_DIR, "/etc/systemd/user", + "/etc/systemd-mutable/user", NULL }; -@@ -604,15 +601,14 @@ int lookup_paths_init( +@@ -616,15 +613,14 @@ int lookup_paths_init( persistent_config, - SYSTEM_CONFIG_UNIT_PATH, + SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", + "/etc/systemd-mutable/system", + "/nix/var/nix/profiles/default/lib/systemd/system", @@ -70,9 +55,9 @@ index 48e0eec09a..a9d38f16d0 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -628,14 +624,12 @@ int lookup_paths_init( +@@ -640,14 +636,12 @@ int lookup_paths_init( persistent_config, - USER_CONFIG_UNIT_PATH, + USER_CONFIG_UNIT_DIR, "/etc/systemd/user", + "/etc/systemd-mutable/user", + "/nix/var/nix/profiles/default/lib/systemd/user", @@ -82,26 +67,58 @@ index 48e0eec09a..a9d38f16d0 100644 - "/usr/local/share/systemd/user", - "/usr/share/systemd/user", - "/usr/local/lib/systemd/user", - USER_DATA_UNIT_PATH, + USER_DATA_UNIT_DIR, - "/usr/lib/systemd/user", STRV_IFNOTNULL(generator_late)); break; -@@ -824,14 +818,12 @@ char **generator_binary_paths(UnitFileScope scope) { - case UNIT_FILE_SYSTEM: - return strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", -- "/usr/local/lib/systemd/system-generators", - SYSTEM_GENERATOR_PATH); +@@ -797,7 +791,6 @@ char **generator_binary_paths(UnitFileScope scope) { + case UNIT_FILE_SYSTEM: + add = strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", +- "/usr/local/lib/systemd/system-generators", + SYSTEM_GENERATOR_DIR); + break; - case UNIT_FILE_GLOBAL: - case UNIT_FILE_USER: - return strv_new("/run/systemd/user-generators", - "/etc/systemd/user-generators", -- "/usr/local/lib/systemd/user-generators", - USER_GENERATOR_PATH); +@@ -805,7 +798,6 @@ char **generator_binary_paths(UnitFileScope scope) { + case UNIT_FILE_USER: + add = strv_new("/run/systemd/user-generators", + "/etc/systemd/user-generators", +- "/usr/local/lib/systemd/user-generators", + USER_GENERATOR_DIR); + break; - default: +@@ -844,12 +836,10 @@ char **env_generator_binary_paths(bool is_system) { + if (is_system) + add = strv_new("/run/systemd/system-environment-generators", + "/etc/systemd/system-environment-generators", +- "/usr/local/lib/systemd/system-environment-generators", + SYSTEM_ENV_GENERATOR_DIR); + else + add = strv_new("/run/systemd/user-environment-generators", + "/etc/systemd/user-environment-generators", +- "/usr/local/lib/systemd/user-environment-generators", + USER_ENV_GENERATOR_DIR); + + if (!add) +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index 8424837824..b1c541bc52 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir} + systemd_user_conf_dir=${sysconfdir}/systemd/user + systemduserconfdir=${systemd_user_conf_dir} + +-systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system ++systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} + systemdsystemunitpath=${systemd_system_unit_path} + +-systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user ++systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} ++ + systemduserunitpath=${systemd_user_unit_path} + + systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index ac3d3b0bd6..3e519e7fe7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From f88a9bb1e6080b539ed0116caa9781e7f6755f54 Mon Sep 17 00:00:00 2001 +From 1a3de021d9b8da060a77af6e26d2b61bafefda74 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/18] Get rid of a useless message in user sessions @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index c306183555..3db39fa435 100644 +index 2c09def06f..c70540e1a3 100644 --- a/src/core/unit.c +++ b/src/core/unit.c -@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) { +@@ -2150,7 +2150,8 @@ static void unit_check_binds_to(Unit *u) { } assert(other); @@ -27,5 +27,5 @@ index c306183555..3db39fa435 100644 /* A unit we need to run is gone. Sniff. Let's stop this. */ r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index cef3280aba..b63a051ae0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,20 +1,20 @@ -From e2b25ce3606d05ff8a387185c41ab32fb2a36161 Mon Sep 17 00:00:00 2001 +From 6c12e0d2afe80563e692fc1f2f545a487c83418c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that change system settings. --- - src/hostname/hostnamed.c | 9 +++++++++ + src/hostname/hostnamed.c | 6 ++++++ src/locale/localed.c | 9 +++++++++ src/timedate/timedated.c | 10 ++++++++++ - 3 files changed, 28 insertions(+) + 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 21f6471495..8c5af7619f 100644 +index 7f6607a527..b5a9388916 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -478,6 +481,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -626,6 +626,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -23,8 +23,8 @@ index 21f6471495..8c5af7619f 100644 + name = empty_to_null(name); - if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME])) -@@ -535,6 +541,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess + context_read_etc_hostname(c); +@@ -685,6 +688,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -33,12 +33,12 @@ index 21f6471495..8c5af7619f 100644 + name = empty_to_null(name); - if (streq_ptr(name, c->data[prop])) + context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index 09f16d25f4..c1cb87cef1 100644 +index 715ce5cac7..014f7dcf6c 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c -@@ -275,6 +275,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er +@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; @@ -46,9 +46,9 @@ index 09f16d25f4..c1cb87cef1 100644 + "Changing system settings via systemd is not supported on NixOS."); + /* If single locale without variable name is provided, then we assume it is LANG=. */ - if (strv_length(l) == 1 && !strchr(*l, '=')) { - if (!locale_is_valid(*l)) -@@ -410,6 +413,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro + if (strv_length(l) == 1 && !strchr(l[0], '=')) { + if (!locale_is_valid(l[0])) +@@ -432,6 +435,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro if (r < 0) return r; @@ -58,7 +58,7 @@ index 09f16d25f4..c1cb87cef1 100644 keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); -@@ -586,6 +592,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err +@@ -606,6 +612,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r < 0) return r; @@ -69,10 +69,10 @@ index 09f16d25f4..c1cb87cef1 100644 model = empty_to_null(model); variant = empty_to_null(variant); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 5e2fb50d83..63865f557c 100644 +index c467b85477..3e78b2f575 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -652,6 +652,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -83,7 +83,7 @@ index 5e2fb50d83..63865f557c 100644 if (!timezone_is_valid(z, LOG_DEBUG)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); -@@ -731,6 +735,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error +@@ -725,6 +729,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error if (r < 0) return r; @@ -93,7 +93,7 @@ index 5e2fb50d83..63865f557c 100644 if (lrtc == c->local_rtc) return sd_bus_reply_method_return(m, NULL); -@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error +@@ -917,6 +924,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error if (r < 0) return r; @@ -104,5 +104,5 @@ index 5e2fb50d83..63865f557c 100644 if (r < 0) return r; -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index 36d82e22f8..63bd03fcf3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,4 +1,4 @@ -From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001 +From 1e40be83eca9a831509ae764081c2252934478c3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/18] Fix hwdb paths @@ -28,5 +28,5 @@ index b3febdbb31..eba00a5bc7 100644 _public_ int sd_hwdb_new(sd_hwdb **ret) { _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 8b5c807e4a..dcdc0cd7ea 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From b509dbd302a7933ae0002f44b99aac6a1fd5775b Mon Sep 17 00:00:00 2001 +From 5e235e1f720f37fc5581b40c9a13d365368e74a8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo @@ -35,10 +35,10 @@ index 0f1652ee2e..71c4f95c2e 100644 Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 105584e2e7..5238f69931 100644 +index 15cc1b8851..d0abde5933 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) { +@@ -1259,7 +1259,7 @@ int get_timezones(char ***ret) { n_allocated = 2; n_zones = 1; @@ -47,7 +47,7 @@ index 105584e2e7..5238f69931 100644 if (f) { for (;;) { _cleanup_free_ char *line = NULL; -@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) { +@@ -1354,7 +1354,7 @@ bool timezone_is_valid(const char *name, int log_level) { if (p - name >= PATH_MAX) return false; @@ -56,7 +56,7 @@ index 105584e2e7..5238f69931 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) { -@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) { +@@ -1452,7 +1452,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -66,10 +66,10 @@ index 105584e2e7..5238f69931 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 901fbf0815..b57bdd8fbe 100644 +index a3f442518e..feff49e280 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -431,7 +431,7 @@ static int process_timezone(void) { +@@ -459,7 +459,7 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; @@ -79,10 +79,10 @@ index 901fbf0815..b57bdd8fbe 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 4d3451ff3b..1adb91335c 100644 +index 0117a9939d..d86445b40f 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u +@@ -1699,8 +1699,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -94,10 +94,10 @@ index 4d3451ff3b..1adb91335c 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 63865f557c..8021a8b753 100644 +index 3e78b2f575..de5477a08f 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -264,7 +264,7 @@ static int context_read_data(Context *c) { +@@ -269,7 +269,7 @@ static int context_read_data(Context *c) { r = get_timezone(&t); if (r == -EINVAL) @@ -106,7 +106,7 @@ index 63865f557c..8021a8b753 100644 else if (r < 0) log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); -@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) { +@@ -293,7 +293,7 @@ static int context_write_data_timezone(Context *c) { if (isempty(c->zone) || streq(c->zone, "UTC")) { @@ -115,7 +115,7 @@ index 63865f557c..8021a8b753 100644 if (unlink("/etc/localtime") < 0 && errno != ENOENT) return -errno; -@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) { +@@ -301,9 +301,9 @@ static int context_write_data_timezone(Context *c) { return 0; } @@ -128,5 +128,5 @@ index 63865f557c..8021a8b753 100644 return -ENOMEM; -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index b18ffb4016..50c2a1174d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From b5665ef8b9266c662c3a137df1ef1721cdff346e Mon Sep 17 00:00:00 2001 +From 141d1d7acf5f018df86f0a5f7fbe49a8e928fd73 Mon Sep 17 00:00:00 2001 From: Imuli Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 6f2d37d222..7aa2310d48 100644 +index e0664de826..c521f33a2a 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -286,7 +286,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; @@ -23,5 +23,5 @@ index 6f2d37d222..7aa2310d48 100644 return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index bc9efaed23..8ad310984e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From be6b5c37779302384079b22b7fd767daad878fa9 Mon Sep 17 00:00:00 2001 +From db3946f465c0066fb1775a92c1fcc6450134904d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir @@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index c09115e06a..62eba4186c 100644 +index dbbddb68e2..bbeb23223d 100644 --- a/meson.build +++ b/meson.build -@@ -3184,9 +3184,6 @@ install_data('LICENSE.GPL2', +@@ -3369,9 +3369,6 @@ install_data('LICENSE.GPL2', 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', install_dir : docdir) @@ -20,7 +20,7 @@ index c09115e06a..62eba4186c 100644 - ############################################################ - meson_check_help = find_program('tools/meson-check-help.sh') + check_help = find_program('tools/check-help.sh') -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch index 5d67ce0ca3..0844f85763 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -1,4 +1,4 @@ -From 9262f52b0e30cf8c39d9f7684a8c0e8fd4887cd5 Mon Sep 17 00:00:00 2001 +From 245af064c4d315d868cc12201b3663f61702cce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Feb 2018 14:25:57 +0000 Subject: [PATCH 12/18] Install default configuration into $out/share/factory @@ -31,10 +31,10 @@ store again, while having executables looking up files in /etc. 17 files changed, 29 insertions(+), 26 deletions(-) diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build -index 4df6dabf89..02d8d69095 100644 +index 5c77387a26..6404bc01ba 100644 --- a/hwdb.d/meson.build +++ b/hwdb.d/meson.build -@@ -27,7 +27,7 @@ if conf.get('ENABLE_HWDB') == 1 +@@ -43,7 +43,7 @@ if conf.get('ENABLE_HWDB') == 1 install_dir : udevhwdbdir) meson.add_install_script('sh', '-c', @@ -44,10 +44,10 @@ index 4df6dabf89..02d8d69095 100644 meson.add_install_script('sh', '-c', 'test -n "$DESTDIR" || @0@/systemd-hwdb update' diff --git a/meson.build b/meson.build -index 62eba4186c..b0b2edbb5a 100644 +index bbeb23223d..1a9c56fad2 100644 --- a/meson.build +++ b/meson.build -@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') +@@ -163,6 +163,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') catalogdir = join_paths(prefixdir, 'lib/systemd/catalog') kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d') factorydir = join_paths(datadir, 'factory') @@ -57,7 +57,7 @@ index 62eba4186c..b0b2edbb5a 100644 bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') testsdir = join_paths(prefixdir, 'lib/systemd/tests') systemdstatedir = join_paths(localstatedir, 'lib/systemd') -@@ -2511,7 +2514,7 @@ if conf.get('ENABLE_BINFMT') == 1 +@@ -2651,7 +2654,7 @@ if conf.get('ENABLE_BINFMT') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(binfmtdir)) meson.add_install_script('sh', '-c', @@ -66,16 +66,16 @@ index 62eba4186c..b0b2edbb5a 100644 endif if conf.get('ENABLE_REPART') == 1 -@@ -2612,7 +2615,7 @@ executable('systemd-sleep', - install_dir : rootlibexecdir) +@@ -2767,7 +2770,7 @@ executable( + install_dir : rootlibexecdir) install_data('src/sleep/sleep.conf', - install_dir : pkgsysconfdir) + install_dir : factorypkgconfdir) - exe = executable('systemd-sysctl', - 'src/sysctl/sysctl.c', -@@ -2924,7 +2927,7 @@ if conf.get('HAVE_KMOD') == 1 + public_programs += executable( + 'systemd-sysctl', +@@ -3101,7 +3104,7 @@ if conf.get('HAVE_KMOD') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(modulesloaddir)) meson.add_install_script('sh', '-c', @@ -83,8 +83,8 @@ index 62eba4186c..b0b2edbb5a 100644 + mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d'))) endif - exe = executable('systemd-nspawn', -@@ -3167,7 +3170,7 @@ install_subdir('factory/etc', + public_programs += executable( +@@ -3352,7 +3355,7 @@ install_subdir('factory/etc', install_dir : factorydir) install_data('xorg/50-systemd-user.sh', @@ -94,10 +94,10 @@ index 62eba4186c..b0b2edbb5a 100644 install_dir : modprobedir) install_data('LICENSE.GPL2', diff --git a/network/meson.build b/network/meson.build -index 544dcf4387..1828c50863 100644 +index 99a650eac3..8105a4e48d 100644 --- a/network/meson.build +++ b/network/meson.build -@@ -10,7 +10,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -11,7 +11,7 @@ if conf.get('ENABLE_NETWORKD') == 1 install_dir : networkdir) meson.add_install_script('sh', '-c', @@ -107,10 +107,10 @@ index 544dcf4387..1828c50863 100644 install_data('99-default.link', diff --git a/src/core/meson.build b/src/core/meson.build -index 3586838f59..02ddf1a123 100644 +index fa95108523..60ee0e31c1 100644 --- a/src/core/meson.build +++ b/src/core/meson.build -@@ -179,8 +179,8 @@ libcore = static_library( +@@ -183,8 +183,8 @@ libcore = static_library( systemd_sources = files('main.c') in_files = [['macros.systemd', rpmmacrosdir], @@ -121,7 +121,7 @@ index 3586838f59..02ddf1a123 100644 ['systemd.pc', pkgconfigdatadir], ['triggers.systemd', '']] -@@ -212,6 +212,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) +@@ -216,6 +216,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) @@ -180,15 +180,16 @@ index 5796f77cac..75d975c260 100644 if get_option('create-log-dirs') meson.add_install_script( diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build -index 261c3aaae4..dbc5e23513 100644 +index 9ae342dfba..65df666337 100644 --- a/src/kernel-install/meson.build +++ b/src/kernel-install/meson.build -@@ -11,4 +11,4 @@ install_data('00-entry-directory.install', - install_dir : kernelinstalldir) +@@ -14,5 +14,5 @@ if want_kernel_install + install_dir : kernelinstalldir) - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) + endif diff --git a/src/login/meson.build b/src/login/meson.build index 0a7d3d5440..ff90149c1c 100644 --- a/src/login/meson.build @@ -203,10 +204,10 @@ index 0a7d3d5440..ff90149c1c 100644 install_data('org.freedesktop.login1.conf', install_dir : dbuspolicydir) diff --git a/src/network/meson.build b/src/network/meson.build -index c1c02cfda1..1bfa79a03b 100644 +index b3a88d9910..be56d1e9d7 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -201,7 +201,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -229,7 +229,7 @@ if conf.get('ENABLE_NETWORKD') == 1 endif install_data('networkd.conf', @@ -227,10 +228,10 @@ index adbac24b54..e9dc88dfa2 100644 + install_dir : factorypkgconfdir) endif diff --git a/src/resolve/meson.build b/src/resolve/meson.build -index c4d8d4e5d9..f550c289a5 100644 +index 92b67b6333..ac5b9a0b0a 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build -@@ -170,7 +170,7 @@ if conf.get('ENABLE_RESOLVE') == 1 +@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1 output : 'resolved.conf', configuration : substs) install_data(resolved_conf, @@ -253,10 +254,10 @@ index e5c118c8db..19235df9ca 100644 install_dir : dbuspolicydir) install_data('org.freedesktop.timesync1.service', diff --git a/src/udev/meson.build b/src/udev/meson.build -index 173b10be50..82638cf5a9 100644 +index aa23b07090..ad004d803a 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build -@@ -187,7 +187,7 @@ foreach prog : [['ata_id/ata_id.c'], +@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'], endforeach install_data('udev.conf', @@ -265,7 +266,7 @@ index 173b10be50..82638cf5a9 100644 configure_file( input : 'udev.pc.in', -@@ -196,7 +196,7 @@ configure_file( +@@ -195,7 +195,7 @@ configure_file( install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) meson.add_install_script('sh', '-c', @@ -285,10 +286,10 @@ index 3f072e3db7..bd9f843eba 100644 - mkdir_p.format(join_paths(sysconfdir, 'sysctl.d'))) + mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d'))) diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build -index e77f46d06b..04d2ef621d 100644 +index 0a9582d8b9..3c56ca7d83 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build -@@ -57,5 +57,5 @@ endforeach +@@ -58,5 +58,5 @@ endforeach if enable_tmpfiles meson.add_install_script( 'sh', '-c', @@ -296,7 +297,7 @@ index e77f46d06b..04d2ef621d 100644 + mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d'))) endif diff --git a/units/meson.build b/units/meson.build -index ea91f0cc9e..8622054ca5 100644 +index aa2ed115ea..12e2925226 100644 --- a/units/meson.build +++ b/units/meson.build @@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf', @@ -309,5 +310,5 @@ index ea91f0cc9e..8622054ca5 100644 join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch index 11d2dc26e3..a15220fd3f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From 05c2761f6a981c8576fc47a3dd8beb5a2af3ef09 Mon Sep 17 00:00:00 2001 +From bfaa53731ffe984c93c5321099d1341b5059f029 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 13/18] inherit systemd environment when calling generators. @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 4412e7a849..b799eeca95 100644 +index 41e0d73736..d02de06f09 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3901,9 +3901,14 @@ static int manager_run_generators(Manager *m) { +@@ -4095,9 +4095,14 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) @@ -38,5 +38,5 @@ index 4412e7a849..b799eeca95 100644 finish: -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch index 06b00b82cb..dca7b5591d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From c70029539d0aec5df0c1e4203359335a3841a1e5 Mon Sep 17 00:00:00 2001 +From d8b93ef32f3b95a6ce6548a8ad1504a485ffbe81 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 14/18] add rootprefix to lookup dir paths @@ -34,5 +34,5 @@ index 970654a1ad..bb261040f8 100644 #define CONF_PATHS(n) \ CONF_PATHS_USR(n) \ -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 6431b56ea3..1bd9e23d25 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From 98580b4aa34f3d2e7401f54d6561c5af27ea3437 Mon Sep 17 00:00:00 2001 +From b3bc0aa899c51d19edfb53af2b00dde64123ab06 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 15/18] systemd-shutdown: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 523040b57c..561d91c94c 100644 +index 06c9710c6e..dadcc3117d 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) { +@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) { _cleanup_free_ char *cgroup = NULL; char *arguments[3], *watchdog_device; int cmd, r, umount_log_level = LOG_INFO; @@ -23,5 +23,5 @@ index 523040b57c..561d91c94c 100644 /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index c27d1a10d5..d99c7ecc96 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 3821e20966ee20f74986041f33c4934ad20385b2 Mon Sep 17 00:00:00 2001 +From 2679210f4ce804713bf1d244ac0fb8ac7b9b1e5f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 16/18] systemd-sleep: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index fbfddc0262..d2530b9421 100644 +index 7029352ca5..6d9c636872 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) { +@@ -182,6 +182,7 @@ static int execute(char **modes, char **states) { }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, @@ -22,5 +22,5 @@ index fbfddc0262..d2530b9421 100644 }; -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index 9fae2d5767..f45e4edd8e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,4 +1,4 @@ -From b07defe819e0f66d08563690b3a5abea5da08620 Mon Sep 17 00:00:00 2001 +From 561b0cc9a1faed5729d6f701304a65c2968394ec Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty @@ -23,5 +23,5 @@ index 0971edf9ec..87105a87b9 100644 [Service] Type=oneshot -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 321817dad6..a964aeede7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From 9c1ac48a7d95c09bef5a924bb5db6908596403b4 Mon Sep 17 00:00:00 2001 +From 0d9d7c03054babdbd1fa5f6f266b56e8c96e9ba5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL @@ -29,5 +29,5 @@ index 30031fca8e..d97145539a 100644 #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR -- -2.26.2 +2.27.0 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix deleted file mode 100644 index 3fd8ff07f4..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ systemd, cryptsetup }: - -systemd.overrideAttrs (p: { - version = p.version; - name = "systemd-cryptsetup-generator-${p.version}"; - - buildInputs = p.buildInputs ++ [ cryptsetup ]; - outputs = [ "out" ]; - - buildPhase = '' - ninja systemd-cryptsetup systemd-cryptsetup-generator - ''; - - # As ninja install is not used here, the rpath needs to be manually fixed. - # Otherwise the resulting binary doesn't properly link against systemd-shared.so - postFixup = '' - for prog in `find $out -type f -executable`; do - (patchelf --print-needed $prog | grep 'libsystemd-shared-.*\.so' > /dev/null) && ( - patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog - ) || true - done - # test it's OK - "$out"/lib/systemd/systemd-cryptsetup - ''; - - installPhase = '' - mkdir -p $out/lib/systemd/ - cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup - cp src/shared/*.so $out/lib/systemd/ - - mkdir -p $out/lib/systemd/system-generators/ - cp systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator - ''; -}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index a76156a985..54060b156f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap -, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, utillinux, libffi +{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap +, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, e2fsprogs, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , audit, lz4, bzip2, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders @@ -9,6 +9,7 @@ , patchelf , substituteAll , getent +, cryptsetup, lvm2 , buildPackages , perl , withSelinux ? false, libselinux @@ -16,33 +17,24 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -let gnupg-minimal = gnupg.override { - enableMinimal = true; - guiSupport = false; - pcsclite = null; - sqlite = null; - pinentry = null; - adns = null; - gnutls = null; - libusb1 = null; - openldap = null; - readline = null; - zlib = null; - bzip2 = null; -}; +let + version = "246"; in stdenv.mkDerivation { - version = "245.6"; + inherit version; pname = "systemd"; - # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! - # Also fresh patches should be cherry-picked from that tree to our current one. + # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly + # This has proven to be less error-prone than the previous systemd fork. src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "aa0cb635f1f6a4d9b50ed2cca7782f3f751be933"; - sha256 = "191f0r1g946bsqxky00z78wygsxi9pld11y2q4374bshnpsff2ll"; + rev = "v${version}"; + sha256 = "0zrkyxrh5rm45f2l1rnjyv229bcyzawfw7c63jqxwix75px60dyw"; }; + # If these need to be regenerated, `git am path/to/00*.patch` them into a + # systemd worktree, rebase to the more recent systemd version, and export the + # patches again via `git format-patch v${version}`. patches = [ ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -75,7 +67,7 @@ in stdenv.mkDerivation { "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" ''; - outputs = [ "out" "lib" "man" "dev" ]; + outputs = [ "out" "man" "dev" ]; nativeBuildInputs = [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 @@ -89,7 +81,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ linuxHeaders libcap curl.dev kmod xz pam acl - /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 + cryptsetup libuuid glib libgcrypt libgpgerror libidn2 pcre2 ] ++ stdenv.lib.optional withKexectools kexectools ++ stdenv.lib.optional withLibseccomp libseccomp ++ @@ -105,7 +97,6 @@ in stdenv.mkDerivation { "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" "-Dpamconfdir=${placeholder "out"}/etc/pam.d" "-Drootprefix=${placeholder "out"}" - "-Drootlibdir=${placeholder "lib"}/lib" "-Dpkgconfiglibdir=${placeholder "dev"}/lib/pkgconfig" "-Dpkgconfigdatadir=${placeholder "dev"}/share/pkgconfig" "-Dloadkeys-path=${kbd}/bin/loadkeys" @@ -176,12 +167,28 @@ in stdenv.mkDerivation { export LC_ALL="en_US.UTF-8"; # FIXME: patch this in systemd properly (and send upstream). # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/shutdown/shutdown.c src/nspawn/nspawn.c src/shared/generator.c units/systemd-logind.service.in units/systemd-nspawn@.service.in; do + for i in \ + src/core/mount.c \ + src/core/swap.c \ + src/cryptsetup/cryptsetup-generator.c \ + src/fsck/fsck.c \ + src/journal/cat.c \ + src/nspawn/nspawn.c \ + src/remount-fs/remount-fs.c \ + src/shared/generator.c \ + src/shutdown/shutdown.c \ + units/emergency.service.in \ + units/rescue.service.in \ + units/systemd-logind.service.in \ + units/systemd-nspawn@.service.in; \ + do test -e $i substituteInPlace $i \ --replace /usr/bin/getent ${getent}/bin/getent \ + --replace /sbin/mkswap ${lib.getBin utillinux}/sbin/mkswap \ --replace /sbin/swapon ${lib.getBin utillinux}/sbin/swapon \ --replace /sbin/swapoff ${lib.getBin utillinux}/sbin/swapoff \ + --replace /sbin/mke2fs ${lib.getBin e2fsprogs}/sbin/mke2fs \ --replace /sbin/fsck ${lib.getBin utillinux}/sbin/fsck \ --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ @@ -197,7 +204,7 @@ in stdenv.mkDerivation { # absolute paths to gpg & tar substituteInPlace src/import/pull-common.c \ - --replace '"gpg"' '"${gnupg-minimal}/bin/gpg"' + --replace '"gpg"' '"${gnupg}/bin/gpg"' for file in src/import/{{export,import,pull}-tar,import-common}.c; do substituteInPlace $file \ --replace '"tar"' '"${gnutar}/bin/tar"' @@ -258,38 +265,10 @@ in stdenv.mkDerivation { # "kernel-install" shouldn't be used on NixOS. find $out -name "*kernel-install*" -exec rm {} \; - - # Keep only libudev and libsystemd in the lib output. - mkdir -p $out/lib - mv $lib/lib/security $lib/lib/libnss* $out/lib/ ''; # */ enableParallelBuilding = true; - # On aarch64 we "leak" a reference to $out/lib/systemd/catalog in the lib - # output. The result of that is a dependency cycle between $out and $lib. - # Thus nix (rightfully) marks the build as failed. That reference originates - # from an array of strings (catalog_file_dirs) in systemd - # (src/src/journal/catalog.{c,h}). The only consumer (as of v242) of the - # symbol is the main function of journalctl. Still libsystemd.so contains - # the VALUE but not the symbol. Systemd seems to be properly using function - # & data sections together with the linker flags to garbage collect unused - # sections (-Wl,--gc-sections). For unknown reasons those flags do not - # eliminate the unused string constants, in this case on aarch64-linux. The - # hacky way is to just remove the reference after we finished compiling. - # Since it can not be used (there is no symbol to actually refer to it) there - # should not be any harm. It is a bit odd and I really do not like starting - # these kind of hacks but there doesn't seem to be a straight forward way at - # this point in time. - # The reference will be replaced by the same reference the usual nukeRefs - # tooling uses. The standard tooling can not / should not be uesd since it - # is a bit too excessive and could potentially do us some (more) harm. - postFixup = '' - nukedRef=$(echo $out | sed -e "s,$NIX_STORE/[^-]*-\(.*\),$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-\1,") - cat $lib/lib/libsystemd.so | perl -pe "s|$out/lib/systemd/catalog|$nukedRef/lib/systemd/catalog|" > $lib/lib/libsystemd.so.tmp - mv $lib/lib/libsystemd.so.tmp $(readlink -f $lib/lib/libsystemd.so) - ''; - # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is # fine, of course.) It should be increased whenever systemd changes diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix index 0fc5acba4d..5d081f2db8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, withoutInitTools ? false }: -let version = "2.96"; in +let version = "2.97"; in stdenv.mkDerivation { name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version; src = fetchurl { url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz"; - sha256 = "11xmcamvjmrw874zp0vc37hrqc4hz02i0iy8n4xa4dd25avjcbia"; + sha256 = "042iyayyh3j28vfbypzn822b73r3nfmyn79f9mixigqrfn2rcn9d"; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix index fb2773b4d3..f9196fc168 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pcre , tinyxml , libusb1 @@ -12,7 +12,6 @@ , gst_all_1 , libwebcam , libunwind -, gstreamer , elfutils , orc , python3 @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ @@ -46,54 +45,37 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base libwebcam libunwind - gstreamer elfutils orc python3 libuuid ]; - 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" + "-DTCAM_INSTALL_UDEV=${placeholder "out"}/lib/udev/rules.d" + "-DTCAM_INSTALL_UVCDYNCTRL=${placeholder "out"}/share/uvcdynctrl/data/199e" + "-DTCAM_INSTALL_GST_1_0=${placeholder "out"}/lib/gstreamer-1.0" + "-DTCAM_INSTALL_GIR=${placeholder "out"}/share/gir-1.0" + "-DTCAM_INSTALL_TYPELIB=${placeholder "out"}/lib/girepository-1.0" + "-DTCAM_INSTALL_SYSTEMD=${placeholder "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. + "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; postPatch = '' - substituteInPlace ./data/udev/80-theimagingsource-cameras.rules.in \ - --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:+:}$LD_LIBRARY_PATH - ''; - meta = with lib; { description = "The Linux sources and UVC firmwares for The Imaging Source cameras"; homepage = "https://github.com/TheImagingSource/tiscamera"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index fafa8fe6e8..ac6ad8a4bb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.35.2"; + version = "2.36"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12mm5qvkq1vpllfv99gq93lkxlvysp1yxgh1392dkg7nh8g47dr1"; + sha256 = "1cg0m4psswg71v6wrqc2bngcw20fsp01vbijxdzvdf8kxdkiqjwy"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix index fa57837287..b8b65fecaf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200729"; + version = "1.0.20200908"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "0fk2i65q8pk11n46a31017059aan7hbbx0xv6d2c9d80dzrw5a36"; + sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix index 7a1c2d1cec..5f10189692 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xpadneo"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "atar-axis"; repo = pname; rev = "v${version}"; - sha256 = "0v688j7jx2b68zlwnrr5y63zxzhldygw1lcp8f3irayhcp8ikzzy"; + sha256 = "1g3ml7vq0dzwl9815c3l0i0qz3a7v8c376c6dqbfkbj2f1d43vqs"; }; setSourceRoot = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix index ac6e85b804..23acaaa3e2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zenmonitor"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "ocerman"; repo = "zenmonitor"; rev = "v${version}"; - sha256 = "1g6sk2mcd7znjq6zmbf2fgn02a0yimyv2dw2143aciq2pxqjawmp"; + sha256 = "0smv94vi36hziw42gasivyw25h5n1sgwwk1cv78id5g85w0kw246"; }; buildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 56b36d4f36..27e26b13a5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -42,25 +42,27 @@ let inherit rev sha256; }; - patches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ] ++ extraPatches; + patches = extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts # The arrays must remain the same length, so we repeat a flag that is # already part of the command and therefore has no effect. - substituteInPlace ./module/zfs/zfs_ctldir.c --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ - --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' + substituteInPlace ./module/${optionalString isUnstable "os/linux/"}zfs/zfs_ctldir.c \ + --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ + --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' '' + optionalString buildUser '' substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" \ --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${ + substituteInPlace ./lib/libshare/${optionalString isUnstable "os/linux/"}nfs.c --replace "/usr/sbin/exportfs" "${ # We don't *need* python support, but we set it like this to minimize closure size: # If it's disabled by default, no need to enable it, even if we have python enabled # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) }/bin/exportfs" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" - substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ + --replace "/etc/default" "$out/etc/default" substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" @@ -79,6 +81,13 @@ let substituteInPlace ./etc/systemd/system/Makefile.am \ --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)' + ${optionalString isUnstable '' + substituteInPlace ./contrib/initramfs/conf.d/Makefile.am \ + --replace "/usr/share/initramfs-tools/conf.d" "$out/usr/share/initramfs-tools/conf.d" + substituteInPlace ./contrib/initramfs/conf-hooks.d/Makefile.am \ + --replace "/usr/share/initramfs-tools/conf-hooks.d" "$out/usr/share/initramfs-tools/conf-hooks.d" + ''} + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ --replace "/bin/rm " "${coreutils}/bin/rm " @@ -190,6 +199,7 @@ in { version = "0.8.4"; sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; + extraPatches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ]; }; zfsUnstable = common { @@ -197,9 +207,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.4"; + version = "2.0.0-rc1"; - sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; + sha256 = "0d1m5zwgqzfwbscvb60zvzkjgl5nkbvas22vjsyci3xygz0qwjsb"; isUnstable = true; }; } diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index c4b3070e9f..2d0d4abd91 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.5"; + version = "3.8.8"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "014pfgfj90scas40lf0yjx14vhx5l5zbi3by2nnb704lg8w2n456"; + sha256 = "14rzlikaqxi7cvpy4np1s1pnkila547zdxsb7nl4ilman1zwdgk7"; }; buildInputs = @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rabbitmq.com/"; description = "An implementation of the AMQP messaging protocol"; - license = stdenv.lib.licenses.mpl11; + license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix index a8baefa98e..6daf325110 100644 --- a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix +++ b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused, ps, +{ stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps, majorVersion ? "1.0" }: let @@ -49,11 +49,18 @@ let sha256 = "0bldfrvd351agm237icnvn36va67crpnzmbh6dlq84ip910xsgas"; }; "2.4" = { - kafkaVersion = "2.4.0"; + kafkaVersion = "2.4.1"; scalaVersion = "2.12"; - sha256 = "1vng5ipkjzqy0wijc706w2m1rjl5d0nsgbxiacci739y1jmjnn5r"; + sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1"; + }; + "2.5" = { + kafkaVersion = "2.5.0"; + scalaVersion = "2.13"; + sha256 = "0w3g7ii8x63m2blv2a8c491d0diczpliaqm9f7w5yn98hikh0aqi"; }; }; + + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 in with versionMap.${majorVersion}; diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix index 116b8b935b..ab5c2da5ed 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.6.1"; + version = "7.7.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0ipkr0d4mwsah698fg320h9g5il9xcnwlifbfvfnsijs60y9ps8x"; + sha256 = "12ay2y7ixaxzj12pw66k65743ic3iccicn49cnjmas51c5ww09h1"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix index 81bb6a0e5d..ab3746e6e0 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.10.0"; + version = "8.12.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "1l0kxh4cwqyciylbccd4vfmsvq9cr5sfd0v2gbs3lz41av79mlwa"; + sha256 = "149yqj60b35mbvjz7jyh5a3ayh61kvwrz452s0zyb1q3pirj10xq"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index 075b5e5844..92ca263f46 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.8.4.4"; + version = "0.9.0.2"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "09qpy5fyyidi45968qg37cighfh3rgwsi8pfz4fk5fp2v1xq23yg"; + sha256 = "1lvldklj61hg9h1m0ixaa4zcf4ggdj6wf4myhwwampq4bmr2havj"; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -r * $out/src mkdir -p $out/bin - makeWrapper "${(python3.withPackages (ps: [ps.lxml])).interpreter}" \ + makeWrapper "${(python3.withPackages (ps: [ps.lxml ps.numpy])).interpreter}" \ $out/bin/bazarr \ --add-flags "$out/src/bazarr.py" \ ''; diff --git a/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/default.nix index 05b69c30e6..1ed6fcd2d5 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/caddy/default.nix @@ -2,35 +2,23 @@ buildGoModule rec { pname = "caddy"; - version = "1.0.5"; + version = "2.1.1"; - subPackages = [ "caddy" ]; + subPackages = [ "cmd/caddy" ]; src = fetchFromGitHub { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g"; + sha256 = "0c682zrivkawsxlps5hlx8js5zp4ddahg0zi5cr0861gnllbdll0"; }; - vendorSha256 = "09vnci9pp8zp7bvn8zj68wslz2nc54nhcd0ll31sqfjbp00215mj"; - doCheck = false; - - preBuild = '' - cat << EOF > caddy/main.go - package main - import "github.com/caddyserver/caddy/caddy/caddymain" - func main() { - caddymain.EnableTelemetry = false - caddymain.Run() - } - EOF - ''; + vendorSha256 = "0jzx00c2b8y7zwl73r2fh1826spcd15y39nfzr53s5lay3fvkybc"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = with maintainers; [ rushmorem fpletz zimbatm filalex77 ]; + maintainers = with maintainers; [ filalex77 ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/caddy/v1.nix b/third_party/nixpkgs/pkgs/servers/caddy/v1.nix new file mode 100644 index 0000000000..dce4eea84b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/caddy/v1.nix @@ -0,0 +1,38 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "caddy"; + version = "1.0.5"; + + goPackagePath = "github.com/caddyserver/caddy"; + + subPackages = [ "caddy" ]; + + src = fetchFromGitHub { + owner = "caddyserver"; + repo = pname; + rev = "v${version}"; + sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g"; + }; + + vendorSha256 = "09vnci9pp8zp7bvn8zj68wslz2nc54nhcd0ll31sqfjbp00215mj"; + + preBuild = '' + cat << EOF > caddy/main.go + package main + import "github.com/caddyserver/caddy/caddy/caddymain" + var run = caddymain.Run // replaced for tests + func main() { + caddymain.EnableTelemetry = false + run() + } + EOF + ''; + + meta = with stdenv.lib; { + homepage = "https://caddyserver.com"; + description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; + license = licenses.asl20; + maintainers = with maintainers; [ rushmorem fpletz zimbatm filalex77 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/caddy/v2.nix b/third_party/nixpkgs/pkgs/servers/caddy/v2.nix deleted file mode 100644 index 4021e82980..0000000000 --- a/third_party/nixpkgs/pkgs/servers/caddy/v2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "caddy"; - version = "2.1.1"; - - subPackages = [ "cmd/caddy" ]; - - src = fetchFromGitHub { - owner = "caddyserver"; - repo = pname; - rev = "v${version}"; - sha256 = "0c682zrivkawsxlps5hlx8js5zp4ddahg0zi5cr0861gnllbdll0"; - }; - - vendorSha256 = "0jzx00c2b8y7zwl73r2fh1826spcd15y39nfzr53s5lay3fvkybc"; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = "https://caddyserver.com"; - description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; - license = licenses.asl20; - maintainers = with maintainers; [ filalex77 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix index 2b06671e4e..cc77dbd489 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.02.4.1"; + version = "20.02.5.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "071lwny7cj4idq0h03mmvkk4f4i6fgl3c5q8cvbh7z8px6k50cfp"; + sha256 = "09d4zyyjl5mcrzhzbh6nhc35mzim1sy0h0p2h468nwk1fbl81ff5"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index 196b680796..b2f9b27e8f 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.8.0"; + version = "1.8.3"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1rmybh0piqlbsy5ihqy9cmg0vsgg9pnxiza2kia8ww4qx98nvh6y"; + sha256 = "172m8izv0jqvwxl8nwxdy6x7syp7gn70x4zx41h6ajy4h564l16y"; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "12a2x8j4kc1vi3ip0cz81k6anfwac23iqqyz00wf7wpvgxqzcxn3"; + vendorSha256 = "1q4mvmypza2n2kqnri71y9k2qqmb34x3pa7ifql8gwlp8r0bicy7"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/dex/default.nix b/third_party/nixpkgs/pkgs/servers/dex/default.nix index 09a3cd877a..5886a2ae73 100644 --- a/third_party/nixpkgs/pkgs/servers/dex/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dex/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "dex"; - version = "2.17.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn"; + sha256 = "1fr5r7d0xwj0b69jhszyyif4yc4kiy7zpfcpf83zdy12mh8f96c8"; }; goPackagePath = "github.com/dexidp/dex"; diff --git a/third_party/nixpkgs/pkgs/servers/dgraph/default.nix b/third_party/nixpkgs/pkgs/servers/dgraph/default.nix index 9a05f71817..c1657dbfec 100644 --- a/third_party/nixpkgs/pkgs/servers/dgraph/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "20.03.4"; + version = "20.07.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "1i098wimzwna62q4wp8ipx8qjrmhrdv48kklm1jdi2sfiz18c9sc"; + sha256 = "0jcr3imv6vy40c8zdahsfph5mdxkmp2yqapl5982cf0a61gj7brp"; }; - vendorSha256 = "0n442nsa2whwb22dl0cjxspl8dc00rqv29zivcw9liwdzara81bw"; + vendorSha256 = "0fb8ba2slav6jk93qwaw715myanivrpajfjwi654n0psr57vc7gf"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/dico/default.nix b/third_party/nixpkgs/pkgs/servers/dico/default.nix index ea549cd796..69ec2e6222 100644 --- a/third_party/nixpkgs/pkgs/servers/dico/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dico/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "dico"; - version = "2.9"; + version = "2.10"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0i9xqhy3h5nlizcmav4mv5ay8ivdgn4l4k0k7fxix3fsc87nijyr"; + sha256 = "0qag47mzs00d53hnrmh381r0jay42766vp5xrffmzmsn2307x8vl"; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index 2aae5634cc..2afc5da51f 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -1,8 +1,8 @@ { config, stdenv, lib, fetchurl, fetchpatch -, perl -, libcap, libtool, libxml2, openssl +, perl, pkg-config +, libcap, libtool, libxml2, openssl, libuv , enablePython ? config.bind.enablePython or false, python3 ? null -, enableSeccomp ? false, libseccomp ? null, buildPackages +, enableSeccomp ? false, libseccomp ? null, buildPackages, nixosTests }: assert enableSeccomp -> libseccomp != null; @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.14.12"; + version = "9.16.7"; src = fetchurl { - url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "1j7ldvdschmvzxrbajjhmdsl2iqxc1lm64vk0a5sdykxpy9y8kcw"; + url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; + sha256 = "1l8lhgnkj3fnl1101bs3pzj5gv2x5m9ahvrbyscsc9mxxc91hzcz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { ./remove-mkdir-var.patch ]; - nativeBuildInputs = [ perl ]; - buildInputs = [ libtool libxml2 openssl ] + nativeBuildInputs = [ perl pkg-config ]; + buildInputs = [ libtool libxml2 openssl libuv ] ++ lib.optional stdenv.isLinux libcap ++ lib.optional enableSeccomp libseccomp ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])); @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-libtool" - "--with-libxml2=${libxml2.dev}" - "--with-openssl=${openssl.dev}" (if enablePython then "--with-python" else "--without-python") "--without-atf" "--without-dlopen" @@ -59,7 +57,6 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/bind9-config $dev - moveToOutput bin/isc-config.sh $dev moveToOutput bin/host $host @@ -68,13 +65,15 @@ stdenv.mkDerivation rec { moveToOutput bin/nslookup $dnsutils moveToOutput bin/nsupdate $dnsutils - for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do + for f in "$lib/lib/"*.la "$dev/bin/"bind*-config; do sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g' done ''; doCheck = false; # requires root and the net + passthru.tests = { inherit (nixosTests) bind; }; + meta = with stdenv.lib; { homepage = "https://www.isc.org/downloads/bind/"; description = "Domain name server"; diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index 17fdb15ad4..ceb887e678 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,40 +1,37 @@ -diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index b8e356b..cbe6c94 100644 ---- a/bin/named/include/named/globals.h -+++ b/bin/named/include/named/globals.h -@@ -68,7 +68,9 @@ EXTERN const char * named_g_version INIT(VERSION); - EXTERN const char * named_g_product INIT(PRODUCT); - EXTERN const char * named_g_description INIT(DESCRIPTION); - EXTERN const char * named_g_srcid INIT(SRCID); +diff -ru a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h +--- a/bin/named/include/named/globals.h 2020-09-24 17:43:49.398977491 +0200 ++++ b/bin/named/include/named/globals.h 2020-09-24 17:44:36.826590553 +0200 +@@ -69,7 +69,9 @@ + EXTERN const char *named_g_product INIT(PRODUCT); + EXTERN const char *named_g_description INIT(DESCRIPTION); + EXTERN const char *named_g_srcid INIT(SRCID); +#if 0 - EXTERN const char * named_g_configargs INIT(CONFIGARGS); + EXTERN const char *named_g_configargs INIT(CONFIGARGS); +#endif - EXTERN const char * named_g_builder INIT(BUILDER); - EXTERN in_port_t named_g_port INIT(0); - EXTERN isc_dscp_t named_g_dscp INIT(-1); -diff --git a/bin/named/main.c b/bin/named/main.c -index 62d9ce3..342abdc 100644 ---- a/bin/named/main.c -+++ b/bin/named/main.c -@@ -459,8 +459,10 @@ printversion(bool verbose) { + EXTERN const char *named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); +diff -ru a/bin/named/main.c b/bin/named/main.c +--- a/bin/named/main.c 2020-09-24 17:43:49.399977504 +0200 ++++ b/bin/named/main.c 2020-09-24 17:44:24.102426273 +0200 +@@ -506,7 +506,9 @@ } printf("running on %s\n", named_os_uname()); +#if 0 - printf("built by %s with %s\n", - named_g_builder, named_g_configargs); + printf("built by %s with %s\n", named_g_builder, named_g_configargs); +#endif #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); - #else -@@ -1001,9 +1003,11 @@ setup(void) { - NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, - "running on %s", named_os_uname()); + #else /* ifdef __clang__ */ +@@ -1102,9 +1104,11 @@ + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", + named_os_uname()); +#if 0 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, - NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, - "built with %s", named_g_configargs); + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s", + named_g_configargs); +#endif isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 6a602883b3..3ebb31e20f 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring -, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb +, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2 , autoreconfHook }: let inherit (stdenv.lib) optional optionals; in -# Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.5"; + version = "3.0.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "1109a8ba212ff8ddfdbaf44a6f8fc13a2b880a98a9e54c19112ba72a1aacbf76"; + sha256 = "f1c96aff6e873a2f9b1b8c2441d5a7801dd48d3abdb738a4d24b26c2a8fbe6c4"; }; outputs = [ "bin" "out" "dev" ]; @@ -27,6 +26,7 @@ stdenv.mkDerivation rec { # Don't try to create directories like /var/lib/knot at build time. # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch + ./runtime-deps.patch ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -34,10 +34,15 @@ stdenv.mkDerivation rec { gnutls liburcu libidn2 libunistring nettle libedit libiconv lmdb libintl + nghttp2 # DoH support in kdig libmaxminddb # optional for geoip module (it's tiny) # without sphinx &al. for developer documentation + # TODO: add dnstap support? ] - ++ optionals stdenv.isLinux [ libcap_ng systemd ] + ++ optionals stdenv.isLinux [ + libcap_ng systemd + libbpf # XDP support + ] ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/runtime-deps.patch b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/runtime-deps.patch new file mode 100644 index 0000000000..19fc9cd07b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/runtime-deps.patch @@ -0,0 +1,14 @@ +Remove unnecessary runtime dependencies. + +`knotc status configure` shows summary from the configure script, +but that contains also references like include paths. +Filter these at least in a crude way (whole lines). +--- a/configure.ac ++++ b/configure.ac +@@ -766,5 +766,5 @@ result_msg_base=" Knot DNS $VERSION + +-result_msg_esc=$(echo -n "$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n') ++result_msg_esc=$(echo -n "$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n') + + AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary]) + diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 3466fb776f..9f54d2f5fa 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -16,11 +16,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "caa4f941caf39080184554fb1310f383eba4b30d9c4c2215670d6b0a2de8f836"; + sha256 = "20cd829027e39a9f7d993894e3640e886825b492d9ac1a744ac5616cc101458b"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix index db7bb5c939..be52b1bf1a 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix @@ -2,21 +2,18 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.10"; - - #vendorSha256 = null; revert to `null` for > 3.4.10 - - vendorSha256 = "1fhrycl8m8ddb7mwasbyfiwrl4d9lfdk7zd3mxb7ahkipdp2c94z"; - - doCheck = false; + version = "3.4.13"; deleteVendor = true; + vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc"; + + doCheck = false; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "07kzgh2rm7kzprlpnay6fq8lziiyhiqyikf1qjx8gjjsdsjy180f"; + sha256 = "0bvky593241i60qf6793sxzsxwfl3f56cgscnva9f2jfhk157wmy"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/etcd/default.nix b/third_party/nixpkgs/pkgs/servers/etcd/default.nix index 4c0df659f3..53ad0d6ed2 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "etcd"; - version = "3.3.22"; + version = "3.3.25"; goPackagePath = "github.com/coreos/etcd"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "1rd390qfx9k20j9gh1wp1g9ygc571f2kv1dg2wvqij3kwydhymcj"; + sha256 = "10cyy6jr2xzmla5yyn850cv323ixrk70fjpk8lxjjjvy0ffmb6hj"; }; buildPhase = '' @@ -24,10 +24,7 @@ buildGoPackage rec { install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; - passthru.tests = with nixosTests; { - etcd = etcd; - etcd-cluster = etcd-cluster; - }; + passthru.tests = { inherit (nixosTests) etcd etcd-cluster; }; meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; diff --git a/third_party/nixpkgs/pkgs/servers/freeradius/default.nix b/third_party/nixpkgs/pkgs/servers/freeradius/default.nix index 9c80b7e7db..84c92619f7 100644 --- a/third_party/nixpkgs/pkgs/servers/freeradius/default.nix +++ b/third_party/nixpkgs/pkgs/servers/freeradius/default.nix @@ -43,11 +43,11 @@ assert withRest -> curl != null && withJson; with stdenv.lib; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.0.20"; + version = "3.0.21"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "0zrnlpril8lcnyd6zz0wy45wj5i2k2krcf42dwa0rldjsjh6nazp"; + sha256 = "1bij07angf6ll6bq8lccd4fx1a1clf7k13kh5vbryh6lf7a19y9b"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/servers/gonic/default.nix b/third_party/nixpkgs/pkgs/servers/gonic/default.nix new file mode 100644 index 0000000000..343b3d2b19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gonic/default.nix @@ -0,0 +1,59 @@ +{ lib, buildGoPackage, fetchFromGitHub +, pkg-config, taglib, alsaLib + +# Disable on-the-fly transcoding, +# removing the dependency on ffmpeg. +# The server will (as of 0.11.0) gracefully fall back +# to the original file, but if transcoding is configured +# that takes a while. So best to disable all transcoding +# in the configuration if you disable transcodingSupport. +, transcodingSupport ? true, ffmpeg + +# udpater +, writers, vgo2nix }: + +assert transcodingSupport -> ffmpeg != null; + +let + # update these, then run `updateScript` to update dependencies + version = "0.11.0"; + rev = "056fb54a703ef5b5194ce112cbbdd8fb53dbb1ea"; + sha256 = "0hd794wrz29nh89lfnq67w1rc23sg085rqf1agwlgpqycns2djl9"; + + src = fetchFromGitHub { + owner = "sentriz"; + repo = "gonic"; + inherit rev sha256; + }; + +in +buildGoPackage { + pname = "gonic-${version}"; + inherit version src; + goPackagePath = "go.senan.xyz/gonic"; + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ taglib alsaLib ]; + + postPatch = lib.optionalString transcodingSupport '' + substituteInPlace \ + server/encode/encode.go \ + --replace \ + 'ffmpegPath = "/usr/bin/ffmpeg"' \ + 'ffmpegPath = "${ffmpeg}/bin/ffmpeg"' \ + ''; + + passthru.updateScript = writers.writeDash "update-gonic" '' + ${vgo2nix}/bin/vgo2nix \ + -dir ${src} \ + -outfile ${lib.escapeShellArg (toString ./deps.nix)} + ''; + + meta = { + homepage = "https://github.com/sentriz/gonic"; + description = "Music streaming server / subsonic server API implementation"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ Profpatsch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/gonic/deps.nix b/third_party/nixpkgs/pkgs/servers/gonic/deps.nix new file mode 100644 index 0000000000..71b2f83a0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/gonic/deps.nix @@ -0,0 +1,795 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "v0.33.1"; + sha256 = "1xs487sqajpvnhlwp130sfaajyinhxxq2yvmv2533mwf0zhcpz6v"; + }; + } + { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/BurntSushi/xgb"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/xgb"; + rev = "27f122750802"; + sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; + }; + } + { + goPackagePath = "github.com/Masterminds/goutils"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/goutils"; + rev = "v1.1.0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "v1.5.0"; + sha256 = "1i169xscsxsh8lsw8bz2apnsqixld37xdnfh36i30xy5wnf0iwfx"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "v2.22.0"; + sha256 = "09dzwhj4zh3p6f1jhyic16n4qdnvpamz7hyk9fycpm4b1jfq63gd"; + }; + } + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.2"; + sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + { + goPackagePath = "github.com/d4l3k/messagediff"; + fetch = { + type = "git"; + url = "https://github.com/d4l3k/messagediff"; + rev = "7e0a312ae40b"; + sha256 = "1ab2gm7ys33rs84fjzqcb7b4jy2rr1a0w5a9kakfaf80wd0rjrah"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/denisenkom/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/denisenkom/go-mssqldb"; + rev = "732737034ffd"; + sha256 = "0k1inn33lbfj97d5ir3k5gffjcpb39kairq91jfrz6pnbq0w3zlf"; + }; + } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "v1.6.2"; + sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/erikstmartin/go-testdb"; + fetch = { + type = "git"; + url = "https://github.com/erikstmartin/go-testdb"; + rev = "8d10e4a1bae5"; + sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq"; + }; + } + { + goPackagePath = "github.com/faiface/beep"; + fetch = { + type = "git"; + url = "https://github.com/faiface/beep"; + rev = "v1.0.2"; + sha256 = "07j0k0ynw1q8f7fzsan4kvfmdlda11583sck66hxfsk9zbp8vpxv"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "v1.0.0"; + sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "v1.1.1"; + sha256 = "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d"; + }; + } + { + goPackagePath = "github.com/go-audio/audio"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/audio"; + rev = "v1.0.0"; + sha256 = "05ai13yc8wwk2zlk9br62lh4z9hs1q685l7ij618bknf449vjsf3"; + }; + } + { + goPackagePath = "github.com/go-audio/riff"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/riff"; + rev = "v1.0.0"; + sha256 = "0wg3p3gsad1rql7bzx7pwwsyd00a5gdb8f1h7zfr7hlqja5skwb4"; + }; + } + { + goPackagePath = "github.com/go-audio/wav"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/wav"; + rev = "v1.0.0"; + sha256 = "058mgc5ahjibnsqayk3k75l04gg9mv27bpmj79jyrya3kaczpamk"; + }; + } + { + goPackagePath = "github.com/go-gl/glfw"; + fetch = { + type = "git"; + url = "https://github.com/go-gl/glfw"; + rev = "6f7a984d4dc4"; + sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.5.0"; + sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; + }; + } + { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "v3.2.0"; + sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; + }; + } + { + goPackagePath = "github.com/golang-sql/civil"; + fetch = { + type = "git"; + url = "https://github.com/golang-sql/civil"; + rev = "cb61b32ac6fe"; + sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0210a2f0f73c"; + sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherwasm"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherwasm"; + rev = "v1.0.0"; + sha256 = "0q20il68gqnrc0s8jndc8mw1ynln60a4xy1lrqakzmp8whyilwri"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "v1.1.1"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.7.4"; + sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh"; + }; + } + { + goPackagePath = "github.com/gorilla/securecookie"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/securecookie"; + rev = "v1.1.1"; + sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"; + }; + } + { + goPackagePath = "github.com/gorilla/sessions"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/sessions"; + rev = "v1.2.0"; + sha256 = "1kz6ydgp7vamhl2ak02hvzp2yv1dbfbwzsdxn6271lyzzdvz4pp1"; + }; + } + { + goPackagePath = "github.com/hajimehoshi/go-mp3"; + fetch = { + type = "git"; + url = "https://github.com/hajimehoshi/go-mp3"; + rev = "v0.2.1"; + sha256 = "0dxqpyj4xbq570if25g5wqbbp6frhq733h2ny3b2z3z8hw4q7vgg"; + }; + } + { + goPackagePath = "github.com/hajimehoshi/oto"; + fetch = { + type = "git"; + url = "https://github.com/hajimehoshi/oto"; + rev = "v0.6.1"; + sha256 = "1k3c0y8gdxn2c8fqc8rbjrn7nbbbhii3krma267jg01qq2zpsm8h"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "v1.3.1"; + sha256 = "0j5vsyjxclk7g7vfr3mfybbimywf3khr8yx07dsdcm1zjwb092iy"; + }; + } + { + goPackagePath = "github.com/icza/bitio"; + fetch = { + type = "git"; + url = "https://github.com/icza/bitio"; + rev = "v1.0.0"; + sha256 = "1c4ps4a9khx2bqp6v0p7b7l0s0gly3vj8rkh816vznj4mdlgk76w"; + }; + } + { + goPackagePath = "github.com/icza/mighty"; + fetch = { + type = "git"; + url = "https://github.com/icza/mighty"; + rev = "cfd07d671de6"; + sha256 = "09prb460wqg72s753g3a9rm0ph60hp83najj0lx9ifp1lixnfb3d"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.9"; + sha256 = "042v7bzx575isa4pr868hrlv085qxpg8qi4m04jnkh5vbq4hvs90"; + }; + } + { + goPackagePath = "github.com/jfreymuth/oggvorbis"; + fetch = { + type = "git"; + url = "https://github.com/jfreymuth/oggvorbis"; + rev = "v1.0.0"; + sha256 = "0c0r63sp4q8bl8vvgayr98m0fsscl1f65cd2h7i4cr1awg6r6l6a"; + }; + } + { + goPackagePath = "github.com/jfreymuth/vorbis"; + fetch = { + type = "git"; + url = "https://github.com/jfreymuth/vorbis"; + rev = "v1.0.0"; + sha256 = "16gl1lwagiqw6ib48zsl4zpv1dmykz7fzhxc65vpcdipx2byhi7a"; + }; + } + { + goPackagePath = "github.com/jinzhu/gorm"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/gorm"; + rev = "v1.9.12"; + sha256 = "06d25jvrqvp1bd4k7mh9gsk414d2vhpr049qvj46yx21hyv9d6v3"; + }; + } + { + goPackagePath = "github.com/jinzhu/inflection"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/inflection"; + rev = "v1.0.0"; + sha256 = "165i20d11s03771gi43skl66salxj36212r25fbs0cgr4qgfj7fy"; + }; + } + { + goPackagePath = "github.com/jinzhu/now"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/now"; + rev = "v1.0.1"; + sha256 = "1b4gyw01b3rq3js43n0wqb1k2iymb2mnpdv7vapjs0lsbm4g5q1p"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } + { + goPackagePath = "github.com/josephburnett/jd"; + fetch = { + type = "git"; + url = "https://github.com/josephburnett/jd"; + rev = "aa1a7c66b42f"; + sha256 = "0yjdnifwxhdgzcw4jkal3f69sgcjrdiscd5wg45d83zfrsqbb34c"; + }; + } + { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "v1.15.6"; + sha256 = "0i8202kcihz2hvqp7zzbla5p9x2ljpbjg5zy5dy3x0capz0ina3c"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.3.0"; + sha256 = "0bfravwqyj7z6v4lhsibbmgp7lajdydy4ij6c81g8hv0067x2mqw"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "12d3b2882a08"; + sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v2.0.3"; + sha256 = "0gn4dgvwmbf8gmhn5nzpwixc39g8mkp3n8lhyjgvhvsl72llcdzv"; + }; + } + { + goPackagePath = "github.com/mewkiz/flac"; + fetch = { + type = "git"; + url = "https://github.com/mewkiz/flac"; + rev = "v1.0.6"; + sha256 = "19083pfc6wxkb45s61di9a542jslcgkzif5z3qjymy085w4aizzx"; + }; + } + { + goPackagePath = "github.com/mewkiz/pkg"; + fetch = { + type = "git"; + url = "https://github.com/mewkiz/pkg"; + rev = "f6b5e26764c3"; + sha256 = "0djxw953sp2cwqybjxsfrsfma5yjn8n1l19g8yrd629cb6r1ghq2"; + }; + } + { + goPackagePath = "github.com/mitchellh/copystructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/copystructure"; + rev = "v1.0.0"; + sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "v1.0.0"; + sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; + }; + } + { + goPackagePath = "github.com/mitchellh/reflectwalk"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/reflectwalk"; + rev = "v1.0.1"; + sha256 = "0pa6a3nhzwv5s5yqcmsmsfhdp5ggxsg2wa86f3akawxrhrkjarnx"; + }; + } + { + goPackagePath = "github.com/nicksellen/audiotags"; + fetch = { + type = "git"; + url = "https://github.com/nicksellen/audiotags"; + rev = "94015fa599bd"; + sha256 = "1817vw2j1lnk4y3925cszmkvwzsdcmgccrcdqyq39jqpwawl2c0j"; + }; + } + { + goPackagePath = "github.com/oklog/run"; + fetch = { + type = "git"; + url = "https://github.com/oklog/run"; + rev = "v1.1.0"; + sha256 = "0r55p3kgdkgw55i33lqvvvl60mjp92mhd1170m980sw98z9150jk"; + }; + } + { + goPackagePath = "github.com/oxtoacart/bpool"; + fetch = { + type = "git"; + url = "https://github.com/oxtoacart/bpool"; + rev = "03653db5a59c"; + sha256 = "1crdgm5w6kvcnvdglrrnrfkh5h60ldafwvrv00q97lz3790kgb15"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.6.0"; + sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; + }; + } + { + goPackagePath = "github.com/peterbourgon/ff"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/ff"; + rev = "v1.7.0"; + sha256 = "17msscfi4pfdih1w3sq0wsw6246a30fckga9kvjpzwva6jni0466"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/rainycape/unidecode"; + fetch = { + type = "git"; + url = "https://github.com/rainycape/unidecode"; + rev = "cb7f23ec59be"; + sha256 = "1wvzdijd640blwkgmw6h09frkfa04kcpdq87n2zh2ymj1dzla5v5"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/wader/gormstore"; + fetch = { + type = "git"; + url = "https://github.com/wader/gormstore"; + rev = "65a111a20c23"; + sha256 = "0dnylv4gdqsizll7b07nivv6chanqm0014yhqg6gcjccns6bl9bm"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "06a226fb4e37"; + sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "00229845015e"; + sha256 = "0b0f05vbxzbgaaawxqns2m9qbvkfam1ylq8c8yhv7h6jnk2afaff"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "33d19683fad8"; + sha256 = "16qw6s9qlv84x98s9dib90y97x8bli3msaqw8kz498dbnbyx59zk"; + }; + } + { + goPackagePath = "golang.org/x/mobile"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mobile"; + rev = "4c31acba0007"; + sha256 = "0k42pn6fq886k9hn85wbgg4h4y1myj7niw0746sn50zfbrmy3s2c"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "331c550502dd"; + sha256 = "0942gzs6mlsjal4drjmm8gr54pj1cdhsl9mnj3ygm200mf3fj6pi"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3b0461eec859"; + sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fe76b779f299"; + sha256 = "0g6j3n9fdv1a2lp2i8wbaaya85yrbfx3ns6iq1s7l2ayhxxmgh6b"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "b753a1ba74fa"; + sha256 = "1xyzswbz9cx0bns2n75fw9pbm82dk9dj2il9iknmryyxvci9n5zv"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "1b5146add898"; + sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + }; + } + { + goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1"; + rev = "v1.3.0"; + sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/gormigrate.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/gormigrate.v1"; + rev = "v1.6.0"; + sha256 = "03304vh58i5gxchrxy2v91bjdfgp7849jarmlanz3gaa2r574fmf"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.4"; + sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + }; + } +] diff --git a/third_party/nixpkgs/pkgs/servers/gotify/default.nix b/third_party/nixpkgs/pkgs/servers/gotify/default.nix index 88617d0cd8..924625ebd7 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/default.nix @@ -3,7 +3,6 @@ , lib , fetchFromGitHub , buildGoModule -, packr , sqlite , callPackage }: @@ -25,19 +24,12 @@ buildGoModule rec { doCheck = false; - postPatch = '' - substituteInPlace app.go \ - --replace 'Version = "unknown"' 'Version = "${version}"' - ''; - buildInputs = [ sqlite ]; - nativeBuildInputs = [ packr ]; - ui = callPackage ./ui.nix { }; preBuild = '' - cp -r ${ui}/libexec/gotify-ui/deps/gotify-ui/build ui/build && packr + cp -r ${ui}/libexec/gotify-ui/deps/gotify-ui/build ui/build && go run hack/packr/packr.go ''; passthru = { @@ -49,7 +41,7 @@ buildGoModule rec { subPackages = [ "." ]; buildFlagsArray = [ - "-ldflags='-X main.Version=${version} -X main.Mode=prod'" + "-ldflags=-X main.Version=${version} -X main.Mode=prod" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/gotify/package.json b/third_party/nixpkgs/pkgs/servers/gotify/package.json index 7e8defe385..6224d53301 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/package.json +++ b/third_party/nixpkgs/pkgs/servers/gotify/package.json @@ -5,24 +5,24 @@ "homepage": ".", "proxy": "http://localhost:80", "dependencies": { - "@material-ui/core": "^4.9.5", + "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", - "axios": "^0.19.0", - "codemirror": "^5.43.0", - "detect-browser": "^5.1.0", - "js-base64": "^2.5.1", - "mobx": "^5.1.1", - "mobx-react": "^6.2.2", - "mobx-utils": "^5.0.2", + "axios": "^0.20.0", + "codemirror": "^5.57.0", + "detect-browser": "^5.1.1", + "js-base64": "^3.4.5", + "mobx": "^5.15.6", + "mobx-react": "^6.3.0", + "mobx-utils": "^5.6.1", "notifyjs": "^3.0.0", "prop-types": "^15.6.2", "react": "^16.4.2", - "react-codemirror2": "^7.1.0", + "react-codemirror2": "^7.2.1", "react-dom": "^16.4.2", "react-infinite": "^0.13.0", "react-markdown": "^4.0.6", - "react-router": "^5.1.2", - "react-router-dom": "^5.1.2", + "react-router": "^5.2.0", + "react-router-dom": "^5.2.0", "react-timeago": "^4.1.9", "remove-markdown": "^0.3.0", "typeface-roboto": "0.0.75" @@ -32,36 +32,41 @@ "build": "react-scripts build", "test": "react-scripts test --env=node", "eject": "react-scripts eject", - "lint": "tslint --project .", - "lintfix": "tslint --fix --project .", + "lint": "eslint \"src/*.{ts,tsx}\"", "format": "prettier \"src/**/*.{ts,tsx}\" --write", "testformat": "prettier \"src/**/*.{ts,tsx}\" --list-different" }, "devDependencies": { - "@types/codemirror": "0.0.91", + "@types/codemirror": "0.0.98", "@types/detect-browser": "^4.0.0", "@types/get-port": "^4.0.0", - "@types/jest": "^25.2.1", - "@types/js-base64": "^2.3.1", - "@types/node": "^13.13.5", - "@types/notifyjs": "^3.0.0", - "@types/puppeteer": "^2.0.1", - "@types/react": "^16.4.11", - "@types/react-dom": "^16.0.7", - "@types/react-infinite": "0.0.34", + "@types/jest": "^26.0.13", + "@types/js-base64": "^3.0.0", + "@types/node": "^14.10.1", + "@types/notifyjs": "^3.0.2", + "@types/puppeteer": "^3.0.2", + "@types/react": "^16.9.49", + "@types/react-dom": "^16.9.8", + "@types/react-infinite": "0.0.35", "@types/react-router-dom": "^5.1.5", "@types/remove-markdown": "^0.1.1", "@types/rimraf": "^3.0.0", + "@typescript-eslint/eslint-plugin": "^4.1.0", + "@typescript-eslint/parser": "^4.1.0", + "eslint-config-prettier": "^6.11.0", + "eslint-plugin-import": "^2.22.0", + "eslint-plugin-jest": "^24.0.0", + "eslint-plugin-prefer-arrow": "^1.2.2", + "eslint-plugin-react": "^7.20.6", + "eslint-plugin-unicorn": "^21.0.0", "get-port": "^5.1.1", - "prettier": "^2.0.5", - "puppeteer": "^3.0.4", - "react-scripts": "^3.4.1", + "prettier": "^2.1.1", + "puppeteer": "^5.3.0", + "react-scripts": "^3.4.3", "rimraf": "^3.0.2", "tree-kill": "^1.2.0", - "tslint": "^6.1.2", - "tslint-sonarts": "^1.7.0", - "typescript": "3.8.3", - "wait-on": "^5.0.0" + "typescript": "4.0.2", + "wait-on": "^5.2.0" }, "eslintConfig": { "extends": "react-app" diff --git a/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix b/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix index 2d7375fc9b..8f20c05407 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix @@ -1 +1 @@ -"0agnbpqzz751643c4s0fs10b3zw98pp8r9kys9p1vxbb3d6r2anb" \ No newline at end of file +"1v123j9d4psbg7pnqnc7bc9li2qyahapjbimmf0qpfxacx968gm9" diff --git a/third_party/nixpkgs/pkgs/servers/gotify/update.sh b/third_party/nixpkgs/pkgs/servers/gotify/update.sh index dc39a15be7..f0a40e30c9 100755 --- a/third_party/nixpkgs/pkgs/servers/gotify/update.sh +++ b/third_party/nixpkgs/pkgs/servers/gotify/update.sh @@ -9,11 +9,11 @@ latest_release=$(curl --silent https://api.github.com/repos/gotify/server/releas version=$(jq -r '.tag_name' <<<"$latest_release") echo got version $version echo \""${version#v}"\" > "$dirname/version.nix" -printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix +printf '%s\n' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix tput setaf 1 echo zeroing vendorSha256 in $dirname/vendor-sha.nix tput sgr0 -printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix +printf '"%s"\n' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version" @@ -32,7 +32,7 @@ echo running nix-build for gotify itself in order to get vendorSha256 set +e vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" set -e -printf '"%s"' "$vendorSha256" > $dirname/vendor-sha.nix +printf '"%s"\n' "$vendorSha256" > $dirname/vendor-sha.nix tput setaf 2 echo got vendorSha256 of: $vendorSha256 tput sgr0 diff --git a/third_party/nixpkgs/pkgs/servers/gotify/vendor-sha.nix b/third_party/nixpkgs/pkgs/servers/gotify/vendor-sha.nix index e8f4037233..f9e648a957 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/vendor-sha.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/vendor-sha.nix @@ -1 +1 @@ -"0cczw8h1mibxmfgy2z6xnqq11x31ai17gnq2z4j5751b5finhqng" \ No newline at end of file +"1in4gzmrgb6z7p5fnz33f88g5l0vki2xlxlllk5wy9icp4h3h9sd" diff --git a/third_party/nixpkgs/pkgs/servers/gotify/version.nix b/third_party/nixpkgs/pkgs/servers/gotify/version.nix index 7473811783..0018815632 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/version.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/version.nix @@ -1 +1 @@ -"2.0.17" +"2.0.18" diff --git a/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix b/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix index 798c2787e3..c6631cd960 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix @@ -10,11 +10,19 @@ }; } { - name = "_babel_compat_data___compat_data_7.9.6.tgz"; + name = "_babel_code_frame___code_frame_7.10.4.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz"; - sha1 = "3f604c40e420131affe6f2c8052e9a275ae2049b"; + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + }; + } + { + name = "_babel_compat_data___compat_data_7.11.0.tgz"; + path = fetchurl { + name = "_babel_compat_data___compat_data_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz"; + sha1 = "e9f73efe09af1355b723a7f39b11bad637d7c99c"; }; } { @@ -26,243 +34,251 @@ }; } { - name = "_babel_core___core_7.9.6.tgz"; + name = "_babel_core___core_7.11.6.tgz"; path = fetchurl { - name = "_babel_core___core_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz"; - sha1 = "d9aa1f580abf3b2286ef40b6904d390904c63376"; + name = "_babel_core___core_7.11.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz"; + sha1 = "3a9455dc7387ff1bac45770650bc13ba04a15651"; }; } { - name = "_babel_generator___generator_7.9.6.tgz"; + name = "_babel_generator___generator_7.11.6.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz"; - sha1 = "5408c82ac5de98cda0d77d8124e99fa1f2170a43"; + name = "_babel_generator___generator_7.11.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz"; + sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; - sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; + sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; - sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; + sha1 = "bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"; }; } { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz"; - sha1 = "0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz"; + sha1 = "4ea43dd63857b0a35cd1f1b161dc29b43414e79f"; }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; - sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"; + sha1 = "8095cddbff858e6fa9c326daee54a2f2732c1d5d"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz"; - sha1 = "1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; + sha1 = "804ae8e3f04376607cc791b9d47d540276332bd2"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz"; - sha1 = "965c8b0a9f051801fd9d3b372ca0ccf200a90897"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; + sha1 = "9f61446ba80e8240b0a5c85c6fdac8459d6f259d"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; - sha1 = "5d84180b588f560b7864efaeea89243e58312087"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; + sha1 = "fdd60d88524659a0b6959c0579925e425714f3b8"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; + name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; - sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15"; + name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; + sha1 = "b53c10db78a640800152692b13393147acb9bb30"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; - sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; + sha1 = "2d8e3470252cc17aba917ede7803d4a7a276a41b"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; - sha1 = "2b53820d35275120e1874a82e5aabe1376920a5c"; + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; - sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; + sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; - sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; + sha1 = "d49b001d1d5a68ca5e6604dda01a6297f7c9381e"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; - sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; + sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; - sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; + sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; - sha1 = "43b34dfe15961918707d247327431388e9fe96e5"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; + sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; - sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; + sha1 = "50dc96413d594f995a77905905b05893cd779673"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; - sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; + sha1 = "2f75a831269d4f677de49986dff59927533cf375"; }; } { - name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; + name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; - sha1 = "139772607d51b93f23effe72105b319d2a4c6965"; + name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; + sha1 = "32dfbb79899073c415557053a19bd055aae50ae0"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; - sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; + sha1 = "4474ea9f7438f18575e30b0cac784045b402a12d"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz"; - sha1 = "03149d7e6a5586ab6764996cd31d6981a17e1444"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; + sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; - sha1 = "7f8109928b4dab4654076986af575231deb639ae"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; + sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; - sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; + sha1 = "eec162f112c2f58d3af0af125e3bb57665146729"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; - sha1 = "90977a8e6fbf6b431a7dc31752eee233bf052d80"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; - sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; }; } { - name = "_babel_helpers___helpers_7.9.6.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz"; - sha1 = "092c774743471d0bb6c7de3ad465ab3d3486d580"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; + sha1 = "8a6f701eab0ff39f765b5a1cfef409990e624b87"; }; } { - name = "_babel_highlight___highlight_7.9.0.tgz"; + name = "_babel_helpers___helpers_7.10.4.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; - sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; + name = "_babel_helpers___helpers_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz"; + sha1 = "2abeb0d721aff7c0a97376b9e1f6f65d7a475044"; }; } { - name = "_babel_parser___parser_7.9.6.tgz"; + name = "_babel_highlight___highlight_7.10.4.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; - sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; + name = "_babel_highlight___highlight_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; + sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; + name = "_babel_parser___parser_7.11.5.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; - sha1 = "bad329c670b382589721b27540c7d288601c6e6f"; + name = "_babel_parser___parser_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz"; + sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; + sha1 = "3491cabf2f7c179ab820606cec27fed15e0e8558"; }; } { @@ -273,6 +289,14 @@ sha1 = "5e06654af5cd04b608915aada9b2a6788004464e"; }; } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; + sha1 = "a33bf632da390a59c7a8c570045d1115cd778807"; + }; + } { name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; path = fetchurl { @@ -282,19 +306,35 @@ }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz"; - sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; + sha1 = "ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; - sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; + sha1 = "570d883b91031637b3e2958eea3c438e62c05f54"; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; + sha1 = "593e59c63528160233bd321b1aebe0820c2341db"; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; + sha1 = "9f80e482c03083c87125dee10026b58527ea20c8"; }; } { @@ -305,6 +345,14 @@ sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2"; }; } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; + sha1 = "02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"; + }; + } { name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; path = fetchurl { @@ -314,19 +362,27 @@ }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz"; - sha1 = "7a093586fcb18b08266eb1a7177da671ac575b63"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; + sha1 = "ce1590ff0a65ad12970a609d78855e9a4c1aef06"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; - sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; + sha1 = "bd81f95a1f746760ea43b6c2d3d62b11790ad0af"; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; + sha1 = "31c938309d24a78a49d68fdabffaa863758554dd"; }; } { @@ -338,11 +394,27 @@ }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; - sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; + sha1 = "de5866d0646f6afdaab8a566382fe3a221755076"; + }; + } + { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; + sha1 = "b160d972b8fdba5c7d111a145fc8c421fc2a6909"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; + sha1 = "4483cda53041ce3413b7fe2f00022665ddfaa75d"; }; } { @@ -354,11 +426,19 @@ }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz"; - sha1 = "8d2c15a9f1af624b0025f961682a9d53d3001bda"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; + sha1 = "6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"; + }; + } + { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz"; + sha1 = "6853085b2c429f9d322d02f5a635018cdeb2360c"; }; } { @@ -370,11 +450,19 @@ }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz"; - sha1 = "f2c883bd61a6316f2c89380ae5122f923ba4527f"; + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a"; + }; + } + { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz"; + sha1 = "53351dd7ae01995e567d04ce42af1a6e0ba846a6"; }; } { @@ -386,11 +474,19 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz"; - sha1 = "521b06c83c40480f1e58b4fd33b92eceb1d6ea94"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz"; + sha1 = "39abaae3cbf710c4373d8429484e6ba21340166c"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; }; } { @@ -402,11 +498,11 @@ }; } { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; - sha1 = "0e3fb63e09bea1b11e96467271c8308007e7c41f"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; }; } { @@ -434,99 +530,99 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz"; - sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; + sha1 = "4bbeb8917b54fcf768364e0a81f560e33a3ef57d"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz"; - sha1 = "c1f659dda97711a569cef75275f7e15dcaa6cabc"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz"; + sha1 = "2f55e770d3501e83af217d782cb7517d7bb34d25"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; - sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; + sha1 = "e22960d77e697c74f41c501d44d73dbf8a6a64cd"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; - sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; + sha1 = "41a5017e49eb6f3cda9392a51eef29405b245a37"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; - sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; + sha1 = "1afa595744f75e43a91af73b0d998ecfe4ebc2e8"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; - sha1 = "97d35dab66857a437c166358b91d09050c868f3a"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; + sha1 = "5b7efe98852bef8d652c0b28144cd93a9e4b5215"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz"; - sha1 = "800597ddb8aefc2c293ed27459c1fcc935a26c2c"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; + sha1 = "405136af2b3e218bc4a1926228bc917ab1a0adc7"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; - sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; + sha1 = "9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz"; - sha1 = "72c97cf5f38604aea3abf3b935b0e17b1db76a50"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; + sha1 = "70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; - sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; + sha1 = "469c2062105c1eb6a040eaf4fac4b488078395ee"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; - sha1 = "8d12df309aa537f272899c565ea1768e286e21f1"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; + sha1 = "697e50c9fee14380fe843d1f306b295617431e47"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; - sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; + sha1 = "5ae338c57f8cf4001bdb35607ae66b92d665af2e"; }; } { @@ -538,115 +634,115 @@ }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; - sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; + sha1 = "c08892e8819d3a5db29031b115af511dbbfebae9"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; - sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; + sha1 = "6a467880e0fc9638514ba369111811ddbe2644b7"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; - sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; + sha1 = "9f42ba0841100a135f22712d0e391c462f571f3c"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz"; - sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; + sha1 = "b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz"; - sha1 = "8539ec42c153d12ea3836e0e3ac30d5aae7b258e"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; + sha1 = "1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz"; - sha1 = "64b7474a4279ee588cacd1906695ca721687c277"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; + sha1 = "66667c3eeda1ebf7896d41f1f16b17105a2fbca0"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz"; - sha1 = "207f1461c78a231d5337a92140e52422510d81a4"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; + sha1 = "6270099c854066681bae9e05f87e1b9cadbe8c85"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; - sha1 = "e909acae276fec280f9b821a5f38e1f08b480697"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; + sha1 = "9a8481fe81b824654b3a0b65da3df89f3d21839e"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; - sha1 = "a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; + sha1 = "78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; - sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; + sha1 = "9097d753cb7b024cb7381a3b2e52e9513a9c6888"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; - sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; + sha1 = "d7146c4d139433e7a6526f888c667e314a093894"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz"; - sha1 = "173b265746f5e15b2afe527eeda65b73623a0795"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; + sha1 = "59d339d58d0b1950435f4043e74e2510005e2c4a"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz"; - sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; + sha1 = "f6fe54b6590352298785b83edd815d214c42e3c0"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz"; - sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz"; + sha1 = "0f485260bf1c29012bb973e7e404749eaac12c9e"; }; } { @@ -658,51 +754,67 @@ }; } { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz"; - sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz"; + sha1 = "b5795f4e3e3140419c3611b7a2a3832b9aef328d"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz"; - sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.11.5.tgz"; + sha1 = "e1439e6a57ee3d43e9f54ace363fb29cefe5d7b6"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz"; - sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz"; + sha1 = "cd301a5fed8988c182ed0b9d55e9bd6db0bd9369"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz"; - sha1 = "86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz"; + sha1 = "34f1779117520a779c054f2cdd9680435b9222b4"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; - sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz"; + sha1 = "673c9f913948764a4421683b2bef2936968fddf2"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz"; - sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz"; + sha1 = "3eefbb73db94afbc075f097523e445354a1c6501"; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; + sha1 = "2015e59d839074e76838de2159db421966fd8b63"; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; + sha1 = "8f2682bcdcef9ed327e1b0861585d7013f8a54dd"; }; } { @@ -714,59 +826,67 @@ }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; - sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; + sha1 = "9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; - sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; + sha1 = "fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; - sha1 = "be7a1290f81dae767475452199e1f76d6175b100"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; + sha1 = "8f3889ee8657581130a29d9cc91d7c73b7c4a28d"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; - sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; + sha1 = "78bc5d626a6642db3312d9d0f001f5e7639fde8c"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; - sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; + sha1 = "9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz"; - sha1 = "2248971416a506fc78278fc0c0ea3179224af1e9"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; + sha1 = "2b4879676af37342ebb278216dd090ac67f13abb"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; - sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; + sha1 = "feae523391c7651ddac115dae0a9d06857892007"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; + sha1 = "e56d71f9282fac6db09c82742055576d5e6d80a8"; }; } { @@ -778,19 +898,19 @@ }; } { - name = "_babel_preset_env___preset_env_7.9.6.tgz"; + name = "_babel_preset_env___preset_env_7.11.5.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz"; - sha1 = "df063b276c6455ec6fcfc6e53aacc38da9b0aea6"; + name = "_babel_preset_env___preset_env_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz"; + sha1 = "18cb4b9379e3e92ffea92c07471a99a2914e4272"; }; } { - name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; path = fetchurl { - name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; - sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha1 = "362f2b68c662842970fdb5e254ffc8fc1c2e415e"; }; } { @@ -802,11 +922,11 @@ }; } { - name = "_babel_preset_react___preset_react_7.9.4.tgz"; + name = "_babel_preset_react___preset_react_7.10.4.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.9.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz"; - sha1 = "c6c97693ac65b6b9c0b4f25b948a8f665463014d"; + name = "_babel_preset_react___preset_react_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz"; + sha1 = "92e8a66d816f9911d11d4cc935be67adfc82dbcf"; }; } { @@ -818,11 +938,11 @@ }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; - sha1 = "67aded13fffbbc2cb93247388cf84d77a4be9a71"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz"; + sha1 = "02c3029743150188edeb66541195f54600278419"; }; } { @@ -834,35 +954,35 @@ }; } { - name = "_babel_runtime___runtime_7.9.6.tgz"; + name = "_babel_runtime___runtime_7.11.2.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; - sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + name = "_babel_runtime___runtime_7.11.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz"; + sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; }; } { - name = "_babel_template___template_7.8.6.tgz"; + name = "_babel_template___template_7.10.4.tgz"; path = fetchurl { - name = "_babel_template___template_7.8.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; - sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + name = "_babel_template___template_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; + sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; }; } { - name = "_babel_traverse___traverse_7.9.6.tgz"; + name = "_babel_traverse___traverse_7.11.5.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz"; - sha1 = "5540d7577697bf619cc57b92aa0f1c231a94f442"; + name = "_babel_traverse___traverse_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz"; + sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3"; }; } { - name = "_babel_types___types_7.9.6.tgz"; + name = "_babel_types___types_7.11.5.tgz"; path = fetchurl { - name = "_babel_types___types_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz"; - sha1 = "2c5502b427251e9de1bd2dff95add646d95cc9f7"; + name = "_babel_types___types_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz"; + sha1 = "d9de577d01252d77c6800cee039ee64faf75662d"; }; } { @@ -906,11 +1026,11 @@ }; } { - name = "_hapi_address___address_4.0.1.tgz"; + name = "_hapi_address___address_4.1.0.tgz"; path = fetchurl { - name = "_hapi_address___address_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.1.tgz"; - sha1 = "267301ddf7bc453718377a6fb3832a2f04a721dd"; + name = "_hapi_address___address_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/address/-/address-4.1.0.tgz"; + sha1 = "d60c5c0d930e77456fdcde2598e77302e2955e1d"; }; } { @@ -938,11 +1058,11 @@ }; } { - name = "_hapi_hoek___hoek_9.0.4.tgz"; + name = "_hapi_hoek___hoek_9.1.0.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_9.0.4.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.0.4.tgz"; - sha1 = "e80ad4e8e8d2adc6c77d985f698447e8628b6010"; + name = "_hapi_hoek___hoek_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz"; + sha1 = "6c9eafc78c1529248f8f4d92b0799a712b6052c6"; }; } { @@ -953,14 +1073,6 @@ sha1 = "c675b8a71296f02833f8d6d243b34c57b8ce19d7"; }; } - { - name = "_hapi_joi___joi_17.1.1.tgz"; - path = fetchurl { - name = "_hapi_joi___joi_17.1.1.tgz"; - url = "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz"; - sha1 = "9cc8d7e2c2213d1e46708c6260184b447c661350"; - }; - } { name = "_hapi_pinpoint___pinpoint_2.0.0.tgz"; path = fetchurl { @@ -1074,11 +1186,11 @@ }; } { - name = "_material_ui_core___core_4.9.13.tgz"; + name = "_material_ui_core___core_4.11.0.tgz"; path = fetchurl { - name = "_material_ui_core___core_4.9.13.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.13.tgz"; - sha1 = "024962bcdda05139e1bad17a1815bf4088702b15"; + name = "_material_ui_core___core_4.11.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz"; + sha1 = "b69b26e4553c9e53f2bfaf1053e216a0af9be15a"; }; } { @@ -1090,43 +1202,35 @@ }; } { - name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; + name = "_material_ui_styles___styles_4.10.0.tgz"; path = fetchurl { - name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/react-transition-group/-/react-transition-group-4.3.0.tgz"; - sha1 = "92529142addb5cc179dbf42d246c7e3fe4d6104b"; + name = "_material_ui_styles___styles_4.10.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.10.0.tgz"; + sha1 = "2406dc23aa358217aa8cc772e6237bd7f0544071"; }; } { - name = "_material_ui_styles___styles_4.9.13.tgz"; + name = "_material_ui_system___system_4.9.14.tgz"; path = fetchurl { - name = "_material_ui_styles___styles_4.9.13.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.13.tgz"; - sha1 = "08b3976bdd21c38bc076693d95834f97539f3b15"; + name = "_material_ui_system___system_4.9.14.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz"; + sha1 = "4b00c48b569340cefb2036d0596b93ac6c587a5f"; }; } { - name = "_material_ui_system___system_4.9.13.tgz"; + name = "_material_ui_types___types_5.1.0.tgz"; path = fetchurl { - name = "_material_ui_system___system_4.9.13.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.13.tgz"; - sha1 = "adefb3b6a5ddf0b00fe4e82ac63bb48276e9749d"; + name = "_material_ui_types___types_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz"; + sha1 = "efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"; }; } { - name = "_material_ui_types___types_5.0.1.tgz"; + name = "_material_ui_utils___utils_4.10.2.tgz"; path = fetchurl { - name = "_material_ui_types___types_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.1.tgz"; - sha1 = "c4954063cdc196eb327ee62c041368b1aebb6d61"; - }; - } - { - name = "_material_ui_utils___utils_4.9.12.tgz"; - path = fetchurl { - name = "_material_ui_utils___utils_4.9.12.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.9.12.tgz"; - sha1 = "0d639f1c1ed83fffb2ae10c21d15a938795d9e65"; + name = "_material_ui_utils___utils_4.10.2.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.10.2.tgz"; + sha1 = "3fd5470ca61b7341f1e0468ac8f29a70bf6df321"; }; } { @@ -1137,6 +1241,22 @@ sha1 = "524af240d1a360527b730475ecfa1344aa540dde"; }; } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; + sha1 = "3a582bdb53804c6ba6d146579c46e52130cf4a3b"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; + sha1 = "34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"; + }; + } { name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz"; path = fetchurl { @@ -1145,6 +1265,14 @@ sha1 = "2b5a3ab3f918cca48a8c754c08168e3f03eba61b"; }; } + { + name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; + sha1 = "011b9202a70a6366e436ca5c065844528ab04976"; + }; + } { name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_4.2.0.tgz"; path = fetchurl { @@ -1258,11 +1386,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.7.tgz"; + name = "_types_babel__core___babel__core_7.1.9.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.7.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz"; - sha1 = "1dacad8840364a57c98d0dd4855c6dd3752c6b89"; + name = "_types_babel__core___babel__core_7.1.9.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz"; + sha1 = "77e59d438522a6fb898fa43dc3455c6e72f3963d"; }; } { @@ -1282,19 +1410,19 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; + name = "_types_babel__traverse___babel__traverse_7.0.14.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz"; - sha1 = "1ae3010e8bf8851d324878b42acec71986486d18"; + name = "_types_babel__traverse___babel__traverse_7.0.14.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.14.tgz"; + sha1 = "e99da8c075d4fb098c774ba65dabf7dc9954bd13"; }; } { - name = "_types_codemirror___codemirror_0.0.91.tgz"; + name = "_types_codemirror___codemirror_0.0.98.tgz"; path = fetchurl { - name = "_types_codemirror___codemirror_0.0.91.tgz"; - url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.91.tgz"; - sha1 = "4cb9832388726e57e747f0e3a8ab69105ad02a66"; + name = "_types_codemirror___codemirror_0.0.98.tgz"; + url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.98.tgz"; + sha1 = "b35c7a4ab1fc1684b08a4e3eb65240020556ebfb"; }; } { @@ -1322,19 +1450,11 @@ }; } { - name = "_types_estree___estree_0.0.44.tgz"; + name = "_types_estree___estree_0.0.45.tgz"; path = fetchurl { - name = "_types_estree___estree_0.0.44.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz"; - sha1 = "980cc5a29a3ef3bea6ff1f7d021047d7ea575e21"; - }; - } - { - name = "_types_events___events_3.0.0.tgz"; - path = fetchurl { - name = "_types_events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; - sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; + name = "_types_estree___estree_0.0.45.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz"; + sha1 = "e9387572998e5ecdac221950dab3e8c3b16af884"; }; } { @@ -1346,27 +1466,27 @@ }; } { - name = "_types_glob___glob_7.1.1.tgz"; + name = "_types_glob___glob_7.1.3.tgz"; path = fetchurl { - name = "_types_glob___glob_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; - sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + name = "_types_glob___glob_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; + sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } { - name = "_types_history___history_4.7.5.tgz"; + name = "_types_history___history_4.7.7.tgz"; path = fetchurl { - name = "_types_history___history_4.7.5.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz"; - sha1 = "527d20ef68571a4af02ed74350164e7a67544860"; + name = "_types_history___history_4.7.7.tgz"; + url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.7.tgz"; + sha1 = "613957d900fab9ff84c8dfb24fa3eef0c2a40896"; }; } { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; path = fetchurl { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; - sha1 = "42995b446db9a48a11a07ec083499a860e9138ff"; + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; }; } { @@ -1378,35 +1498,43 @@ }; } { - name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; - sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a"; + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; + sha1 = "e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"; }; } { - name = "_types_jest___jest_25.2.1.tgz"; + name = "_types_jest___jest_26.0.13.tgz"; path = fetchurl { - name = "_types_jest___jest_25.2.1.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.1.tgz"; - sha1 = "9544cd438607955381c1bdbdb97767a249297db5"; + name = "_types_jest___jest_26.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.13.tgz"; + sha1 = "5a7b9d5312f5dd521a38329c38ee9d3802a0b85e"; }; } { - name = "_types_js_base64___js_base64_2.3.1.tgz"; + name = "_types_js_base64___js_base64_3.0.0.tgz"; path = fetchurl { - name = "_types_js_base64___js_base64_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/@types/js-base64/-/js-base64-2.3.1.tgz"; - sha1 = "c39f14f129408a3d96a1105a650d8b2b6eeb4168"; + name = "_types_js_base64___js_base64_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/js-base64/-/js-base64-3.0.0.tgz"; + sha1 = "b7b4c130facefefd5c57ba82664c41e2995f91be"; }; } { - name = "_types_json_schema___json_schema_7.0.4.tgz"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; - sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + }; + } + { + name = "_types_json5___json5_0.0.29.tgz"; + path = fetchurl { + name = "_types_json5___json5_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; } { @@ -1418,19 +1546,27 @@ }; } { - name = "_types_node___node_13.13.5.tgz"; + name = "_types_node___node_14.10.1.tgz"; path = fetchurl { - name = "_types_node___node_13.13.5.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz"; - sha1 = "96ec3b0afafd64a4ccea9107b75bf8489f0e5765"; + name = "_types_node___node_14.10.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.10.1.tgz"; + sha1 = "cc323bad8e8a533d4822f45ce4e5326f36e42177"; }; } { - name = "_types_notifyjs___notifyjs_3.0.1.tgz"; + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; path = fetchurl { - name = "_types_notifyjs___notifyjs_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.1.tgz"; - sha1 = "eba3bec10e44309df4aba31a73bfd26a562bc755"; + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + }; + } + { + name = "_types_notifyjs___notifyjs_3.0.2.tgz"; + path = fetchurl { + name = "_types_notifyjs___notifyjs_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.2.tgz"; + sha1 = "97451aa8225e7bbf4f73bf0cb6f9fd2e12889719"; }; } { @@ -1450,35 +1586,35 @@ }; } { - name = "_types_puppeteer___puppeteer_2.0.1.tgz"; + name = "_types_puppeteer___puppeteer_3.0.2.tgz"; path = fetchurl { - name = "_types_puppeteer___puppeteer_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-2.0.1.tgz"; - sha1 = "83a1d7f0a1c2e0edbbb488b4d8fb54b14ec9d455"; + name = "_types_puppeteer___puppeteer_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-3.0.2.tgz"; + sha1 = "20085220593b560c7332b6d46aecaf81ae263540"; }; } { - name = "_types_q___q_1.5.2.tgz"; + name = "_types_q___q_1.5.4.tgz"; path = fetchurl { - name = "_types_q___q_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz"; - sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8"; + name = "_types_q___q_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz"; + sha1 = "15925414e0ad2cd765bfef58842f7e26a7accb24"; }; } { - name = "_types_react_dom___react_dom_16.9.7.tgz"; + name = "_types_react_dom___react_dom_16.9.8.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.7.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz"; - sha1 = "60844d48ce252d7b2dccf0c7bb937130e27c0cd2"; + name = "_types_react_dom___react_dom_16.9.8.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz"; + sha1 = "fe4c1e11dfc67155733dfa6aa65108b4971cb423"; }; } { - name = "_types_react_infinite___react_infinite_0.0.34.tgz"; + name = "_types_react_infinite___react_infinite_0.0.35.tgz"; path = fetchurl { - name = "_types_react_infinite___react_infinite_0.0.34.tgz"; - url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.34.tgz"; - sha1 = "0b514f65c4ba80ad22dea079075e04345ddcaae2"; + name = "_types_react_infinite___react_infinite_0.0.35.tgz"; + url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.35.tgz"; + sha1 = "0199474dcafe4a41c30d22a19ccafd8901634fb6"; }; } { @@ -1490,27 +1626,27 @@ }; } { - name = "_types_react_router___react_router_5.1.7.tgz"; + name = "_types_react_router___react_router_5.1.8.tgz"; path = fetchurl { - name = "_types_react_router___react_router_5.1.7.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.7.tgz"; - sha1 = "e9d12ed7dcfc79187e4d36667745b69a5aa11556"; + name = "_types_react_router___react_router_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.8.tgz"; + sha1 = "4614e5ba7559657438e17766bb95ef6ed6acc3fa"; }; } { - name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; + name = "_types_react_transition_group___react_transition_group_4.4.0.tgz"; path = fetchurl { - name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.2.4.tgz"; - sha1 = "c7416225987ccdb719262766c1483da8f826838d"; + name = "_types_react_transition_group___react_transition_group_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz"; + sha1 = "882839db465df1320e4753e6e9f70ca7e9b4d46d"; }; } { - name = "_types_react___react_16.9.34.tgz"; + name = "_types_react___react_16.9.49.tgz"; path = fetchurl { - name = "_types_react___react_16.9.34.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz"; - sha1 = "f7d5e331c468f53affed17a8a4d488cd44ea9349"; + name = "_types_react___react_16.9.49.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz"; + sha1 = "09db021cf8089aba0cdb12a49f8021a69cce4872"; }; } { @@ -1554,19 +1690,19 @@ }; } { - name = "_types_yargs___yargs_13.0.8.tgz"; + name = "_types_yargs___yargs_13.0.10.tgz"; path = fetchurl { - name = "_types_yargs___yargs_13.0.8.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz"; - sha1 = "a38c22def2f1c2068f8971acb3ea734eb3c64a99"; + name = "_types_yargs___yargs_13.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.10.tgz"; + sha1 = "e77bf3fc73c781d48c2eb541f87c453e321e5f4b"; }; } { - name = "_types_yargs___yargs_15.0.4.tgz"; + name = "_types_yargs___yargs_15.0.5.tgz"; path = fetchurl { - name = "_types_yargs___yargs_15.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz"; - sha1 = "7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"; + name = "_types_yargs___yargs_15.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz"; + sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79"; }; } { @@ -1578,35 +1714,91 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.34.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz"; - sha1 = "942c921fec5e200b79593c71fafb1e3f57aa2e36"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz"; + sha1 = "6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.1.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz"; - sha1 = "a9ec514bf7fd5e5e82bc10dcb6a86d58baae9508"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1.0.tgz"; + sha1 = "7d309f60815ff35e9627ad85e41928d7b7fd443f"; }; } { - name = "_typescript_eslint_parser___parser_2.31.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.34.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_2.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.31.0.tgz"; - sha1 = "beddd4e8efe64995108b229b2862cd5752d40d6f"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz"; + sha1 = "d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.1.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz"; - sha1 = "ac536c2d46672aa1f27ba0ec2140d53670635cfd"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.0.tgz"; + sha1 = "263d7225645c09a411c8735eeffd417f50f49026"; + }; + } + { + name = "_typescript_eslint_parser___parser_2.34.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz"; + sha1 = "50252630ca319685420e9a39ca05fe185a256bc8"; + }; + } + { + name = "_typescript_eslint_parser___parser_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.1.0.tgz"; + sha1 = "9b0409411725f14cd7faa81a664e5051225961db"; + }; + } + { + name = "_typescript_eslint_scope_manager___scope_manager_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_scope_manager___scope_manager_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.1.0.tgz"; + sha1 = "9e389745ee9cfe12252ed1e9958808abd6b3a683"; + }; + } + { + name = "_typescript_eslint_types___types_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_types___types_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.1.0.tgz"; + sha1 = "edbd3fec346f34e13ce7aa176b03b497a32c496a"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.34.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz"; + sha1 = "14aeb6353b39ef0732cc7f1b8285294937cf37d5"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.0.tgz"; + sha1 = "394046ead25164494218c0e3d6b960695ea967f6"; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.1.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.0.tgz"; + sha1 = "b2d528c9484e7eda1aa4f86ccf0432fb16e4d545"; }; } { @@ -1770,11 +1962,11 @@ }; } { - name = "abab___abab_2.0.3.tgz"; + name = "abab___abab_2.0.5.tgz"; path = fetchurl { - name = "abab___abab_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; - sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; }; } { @@ -1794,11 +1986,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } { @@ -1826,11 +2018,11 @@ }; } { - name = "acorn___acorn_7.1.1.tgz"; + name = "acorn___acorn_7.4.0.tgz"; path = fetchurl { - name = "acorn___acorn_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz"; - sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf"; + name = "acorn___acorn_7.4.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz"; + sha1 = "e1ad486e6c54501634c6c397c5c121daa383607c"; }; } { @@ -1858,19 +2050,19 @@ }; } { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; path = fetchurl { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; - sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; }; } { - name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz"; + name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz"; path = fetchurl { - name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz"; - url = "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz"; - sha1 = "5287820043af1eb469f5b0af0d6f70da6c52aaef"; + name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz"; + url = "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz"; + sha1 = "b96274cefa1abb14f623f804173ee97c13971dc2"; }; } { @@ -1882,19 +2074,19 @@ }; } { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } { - name = "ajv___ajv_6.12.2.tgz"; + name = "ajv___ajv_6.12.4.tgz"; path = fetchurl { - name = "ajv___ajv_6.12.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; - sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; + name = "ajv___ajv_6.12.4.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz"; + sha1 = "0614facc4522127fa713445c6bfd3ebd376e2234"; }; } { @@ -2105,6 +2297,14 @@ sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; }; } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + } { name = "array_uniq___array_uniq_1.0.3.tgz"; path = fetchurl { @@ -2137,6 +2337,14 @@ sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; }; } + { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; + sha1 = "1c13f84a178566042dd63de4414440db9222e443"; + }; + } { name = "arrify___arrify_1.0.1.tgz"; path = fetchurl { @@ -2154,11 +2362,11 @@ }; } { - name = "asn1.js___asn1.js_4.10.1.tgz"; + name = "asn1.js___asn1.js_5.4.1.tgz"; path = fetchurl { - name = "asn1.js___asn1.js_4.10.1.tgz"; - url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz"; - sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"; + name = "asn1.js___asn1.js_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; + sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; }; } { @@ -2258,11 +2466,11 @@ }; } { - name = "autoprefixer___autoprefixer_9.7.6.tgz"; + name = "autoprefixer___autoprefixer_9.8.6.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_9.7.6.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz"; - sha1 = "63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"; + name = "autoprefixer___autoprefixer_9.8.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz"; + sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f"; }; } { @@ -2274,11 +2482,11 @@ }; } { - name = "aws4___aws4_1.9.1.tgz"; + name = "aws4___aws4_1.10.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; - sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; + name = "aws4___aws4_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; + sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; }; } { @@ -2290,11 +2498,19 @@ }; } { - name = "axobject_query___axobject_query_2.1.2.tgz"; + name = "axios___axios_0.20.0.tgz"; path = fetchurl { - name = "axobject_query___axobject_query_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; - sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; + name = "axios___axios_0.20.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz"; + sha1 = "057ba30f04884694993a8cd07fa394cff11c50bd"; + }; + } + { + name = "axobject_query___axobject_query_2.2.0.tgz"; + path = fetchurl { + name = "axobject_query___axobject_query_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz"; + sha1 = "943d47e10c0b704aa42275e20edf3722648989be"; }; } { @@ -2498,11 +2714,11 @@ }; } { - name = "binary_extensions___binary_extensions_2.0.0.tgz"; + name = "binary_extensions___binary_extensions_2.1.0.tgz"; path = fetchurl { - name = "binary_extensions___binary_extensions_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c"; + name = "binary_extensions___binary_extensions_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; }; } { @@ -2514,11 +2730,11 @@ }; } { - name = "bl___bl_4.0.2.tgz"; + name = "bl___bl_4.0.3.tgz"; path = fetchurl { - name = "bl___bl_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz"; - sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"; + name = "bl___bl_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; + sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; }; } { @@ -2530,19 +2746,19 @@ }; } { - name = "bn.js___bn.js_4.11.8.tgz"; + name = "bn.js___bn.js_4.11.9.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.8.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz"; - sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f"; + name = "bn.js___bn.js_4.11.9.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; + sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; }; } { - name = "bn.js___bn.js_5.1.1.tgz"; + name = "bn.js___bn.js_5.1.3.tgz"; path = fetchurl { - name = "bn.js___bn.js_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.1.tgz"; - sha1 = "48efc4031a9c4041b9c99c6941d903463ab62eb5"; + name = "bn.js___bn.js_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; + sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; }; } { @@ -2650,11 +2866,11 @@ }; } { - name = "browserify_sign___browserify_sign_4.1.0.tgz"; + name = "browserify_sign___browserify_sign_4.2.1.tgz"; path = fetchurl { - name = "browserify_sign___browserify_sign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.1.0.tgz"; - sha1 = "4fe971b379a5aeb4925e06779f9fa1f41d249d70"; + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"; }; } { @@ -2674,11 +2890,11 @@ }; } { - name = "browserslist___browserslist_4.12.0.tgz"; + name = "browserslist___browserslist_4.14.2.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.12.0.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz"; - sha1 = "06c6d5715a1ede6c51fc39ff67fd647f740b656d"; + name = "browserslist___browserslist_4.14.2.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.2.tgz"; + sha1 = "1b3cec458a1ba87588cc5e9be62f19b6d48813ce"; }; } { @@ -2737,14 +2953,6 @@ sha1 = "a31749dc7d81d84db08abf937b6b8c4033f62786"; }; } - { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - path = fetchurl { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - } { name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; path = fetchurl { @@ -2866,11 +3074,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001125.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001054.tgz"; - sha1 = "7e82fc42d927980b0ce1426c4813df12381e1a75"; + name = "caniuse_lite___caniuse_lite_1.0.30001125.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001125.tgz"; + sha1 = "2a1a51ee045a0a2207474b086f628c34725e997b"; }; } { @@ -2921,6 +3129,14 @@ sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; }; } + { + name = "chalk___chalk_4.1.0.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; + sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + }; + } { name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; path = fetchurl { @@ -2962,11 +3178,11 @@ }; } { - name = "chokidar___chokidar_3.4.0.tgz"; + name = "chokidar___chokidar_3.4.2.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz"; - sha1 = "b30611423ce376357c765b9b8f904b9fba3c0be8"; + name = "chokidar___chokidar_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz"; + sha1 = "38dc8e658dec3809741eb3ef7bb0a47fe424232d"; }; } { @@ -3017,6 +3233,14 @@ sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; }; } + { + name = "clean_regexp___clean_regexp_1.0.0.tgz"; + path = fetchurl { + name = "clean_regexp___clean_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz"; + sha1 = "8df7c7aae51fd36874e8f8d05b9180bc11a3fed7"; + }; + } { name = "clean_stack___clean_stack_2.2.0.tgz"; path = fetchurl { @@ -3042,11 +3266,11 @@ }; } { - name = "cliui___cliui_4.1.0.tgz"; + name = "cli_width___cli_width_3.0.0.tgz"; path = fetchurl { - name = "cliui___cliui_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz"; - sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; + name = "cli_width___cli_width_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz"; + sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6"; }; } { @@ -3074,11 +3298,11 @@ }; } { - name = "clsx___clsx_1.1.0.tgz"; + name = "clsx___clsx_1.1.1.tgz"; path = fetchurl { - name = "clsx___clsx_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/clsx/-/clsx-1.1.0.tgz"; - sha1 = "62937c6adfea771247c34b54d320fb99624f5702"; + name = "clsx___clsx_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz"; + sha1 = "98b3134f9abbdf23b2663491ace13c5c03a73188"; }; } { @@ -3098,19 +3322,11 @@ }; } { - name = "code_point_at___code_point_at_1.1.0.tgz"; + name = "codemirror___codemirror_5.57.0.tgz"; path = fetchurl { - name = "code_point_at___code_point_at_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - } - { - name = "codemirror___codemirror_5.53.2.tgz"; - path = fetchurl { - name = "codemirror___codemirror_5.53.2.tgz"; - url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.53.2.tgz"; - sha1 = "9799121cf8c50809cca487304e9de3a74d33f428"; + name = "codemirror___codemirror_5.57.0.tgz"; + url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.57.0.tgz"; + sha1 = "d26365b72f909f5d2dbb6b1209349ca1daeb2d50"; }; } { @@ -3177,6 +3393,14 @@ sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10"; }; } + { + name = "colorette___colorette_1.2.1.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; + sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; + }; + } { name = "combined_stream___combined_stream_1.0.8.tgz"; path = fetchurl { @@ -3434,11 +3658,11 @@ }; } { - name = "create_ecdh___create_ecdh_4.0.3.tgz"; + name = "create_ecdh___create_ecdh_4.0.4.tgz"; path = fetchurl { - name = "create_ecdh___create_ecdh_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha1 = "c9111b6f33045c4697f144787f9254cdc77c45ff"; + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e"; }; } { @@ -3586,11 +3810,11 @@ }; } { - name = "css_what___css_what_3.2.1.tgz"; + name = "css_what___css_what_3.3.0.tgz"; path = fetchurl { - name = "css_what___css_what_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz"; - sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1"; + name = "css_what___css_what_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz"; + sha1 = "10fec696a9ece2e591ac772d759aacabac38cd39"; }; } { @@ -3698,11 +3922,19 @@ }; } { - name = "csstype___csstype_2.6.10.tgz"; + name = "csstype___csstype_2.6.13.tgz"; path = fetchurl { - name = "csstype___csstype_2.6.10.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz"; - sha1 = "e63af50e66d7c266edb6b32909cfd0aabe03928b"; + name = "csstype___csstype_2.6.13.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz"; + sha1 = "a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"; + }; + } + { + name = "csstype___csstype_3.0.3.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz"; + sha1 = "2b410bbeba38ba9633353aff34b05d9755d065f8"; }; } { @@ -3890,11 +4122,11 @@ }; } { - name = "detect_browser___detect_browser_5.1.0.tgz"; + name = "detect_browser___detect_browser_5.1.1.tgz"; path = fetchurl { - name = "detect_browser___detect_browser_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.0.tgz"; - sha1 = "0c51c66b747ad8f98a6832bf3026a5a23a7850ff"; + name = "detect_browser___detect_browser_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.1.tgz"; + sha1 = "a800db91d3fd60d0861669f5984f1be9ffbe009c"; }; } { @@ -3921,6 +4153,14 @@ sha1 = "24707deabe932d4a3cf621302027c2b266568275"; }; } + { + name = "devtools_protocol___devtools_protocol_0.0.799653.tgz"; + path = fetchurl { + name = "devtools_protocol___devtools_protocol_0.0.799653.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.799653.tgz"; + sha1 = "86fc95ce5bf4fdf4b77a58047ba9d2301078f119"; + }; + } { name = "diff_sequences___diff_sequences_24.9.0.tgz"; path = fetchurl { @@ -3937,14 +4177,6 @@ sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; }; } - { - name = "diff___diff_4.0.2.tgz"; - path = fetchurl { - name = "diff___diff_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; - sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; - }; - } { name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; path = fetchurl { @@ -3961,6 +4193,14 @@ sha1 = "0b205d2b6aef98238ca286598a8204d29d0a0034"; }; } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + } { name = "dns_equal___dns_equal_1.0.0.tgz"; path = fetchurl { @@ -4018,11 +4258,11 @@ }; } { - name = "dom_helpers___dom_helpers_5.1.4.tgz"; + name = "dom_helpers___dom_helpers_5.2.0.tgz"; path = fetchurl { - name = "dom_helpers___dom_helpers_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz"; - sha1 = "4609680ab5c79a45f2531441f1949b79d6587f4b"; + name = "dom_helpers___dom_helpers_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz"; + sha1 = "57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b"; }; } { @@ -4033,6 +4273,14 @@ sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; }; } + { + name = "dom_serializer___dom_serializer_1.0.1.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.0.1.tgz"; + sha1 = "79695eb49af3cd8abc8d93a73da382deb1ca0795"; + }; + } { name = "domain_browser___domain_browser_1.2.0.tgz"; path = fetchurl { @@ -4098,11 +4346,11 @@ }; } { - name = "domutils___domutils_2.0.0.tgz"; + name = "domutils___domutils_2.2.0.tgz"; path = fetchurl { - name = "domutils___domutils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz"; - sha1 = "15b8278e37bfa8468d157478c58c367718133c08"; + name = "domutils___domutils_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.2.0.tgz"; + sha1 = "f3ce1610af5c30280bde1b71f84b018b958f32cf"; }; } { @@ -4114,11 +4362,11 @@ }; } { - name = "dot_prop___dot_prop_5.2.0.tgz"; + name = "dot_prop___dot_prop_5.3.0.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; - sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; }; } { @@ -4138,11 +4386,11 @@ }; } { - name = "duplexer___duplexer_0.1.1.tgz"; + name = "duplexer___duplexer_0.1.2.tgz"; path = fetchurl { - name = "duplexer___duplexer_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + name = "duplexer___duplexer_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; + sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; }; } { @@ -4170,19 +4418,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.566.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.431.tgz"; - sha1 = "705dd8ef46200415ba837b31d927cdc1e43db303"; + name = "electron_to_chromium___electron_to_chromium_1.3.566.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.566.tgz"; + sha1 = "e373876bb63e5c9bbcbe1b48cbb2db000f79bf88"; }; } { - name = "elliptic___elliptic_6.5.2.tgz"; + name = "elliptic___elliptic_6.5.3.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; - sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; + name = "elliptic___elliptic_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; + sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; }; } { @@ -4226,11 +4474,11 @@ }; } { - name = "encoding___encoding_0.1.12.tgz"; + name = "encoding___encoding_0.1.13.tgz"; path = fetchurl { - name = "encoding___encoding_0.1.12.tgz"; - url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + name = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha1 = "56574afdd791f54a8e9b2785c0582a2d26210fa9"; }; } { @@ -4242,11 +4490,11 @@ }; } { - name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; - sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66"; + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; + sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126"; }; } { @@ -4258,11 +4506,11 @@ }; } { - name = "entities___entities_2.0.0.tgz"; + name = "entities___entities_2.0.3.tgz"; path = fetchurl { - name = "entities___entities_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz"; - sha1 = "68d6084cab1b079767540d80e56a39b423e4abf4"; + name = "entities___entities_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; + sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; }; } { @@ -4274,11 +4522,11 @@ }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz"; - sha1 = "01c885dde2114b4690bf741f8dc94cee3060eb78"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz"; + sha1 = "59c1b734b0927543e3d8dc477299ec957feb312d"; }; } { @@ -4298,11 +4546,19 @@ }; } { - name = "es_abstract___es_abstract_1.17.5.tgz"; + name = "es_abstract___es_abstract_1.17.6.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.17.5.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz"; - sha1 = "d8c9d1d66c8981fb9200e2251d799eee92774ae9"; + name = "es_abstract___es_abstract_1.17.6.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; + sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; + }; + } + { + name = "es_abstract___es_abstract_1.18.0_next.0.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.0_next.0.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz"; + sha1 = "b302834927e624d8e5837ed48224291f2c66e6fc"; }; } { @@ -4337,6 +4593,14 @@ sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; }; } + { + name = "escalade___escalade_3.0.2.tgz"; + path = fetchurl { + name = "escalade___escalade_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz"; + sha1 = "6a580d70edb87880f22b4c91d0d56078df6962c4"; + }; + } { name = "escape_html___escape_html_1.0.3.tgz"; path = fetchurl { @@ -4362,11 +4626,27 @@ }; } { - name = "escodegen___escodegen_1.14.1.tgz"; + name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; - sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + }; + } + { + name = "eslint_ast_utils___eslint_ast_utils_1.1.0.tgz"; + path = fetchurl { + name = "eslint_ast_utils___eslint_ast_utils_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-ast-utils/-/eslint-ast-utils-1.1.0.tgz"; + sha1 = "3d58ba557801cfb1c941d68131ee9f8c34bd1586"; + }; + } + { + name = "eslint_config_prettier___eslint_config_prettier_6.11.0.tgz"; + path = fetchurl { + name = "eslint_config_prettier___eslint_config_prettier_6.11.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz"; + sha1 = "f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"; }; } { @@ -4378,11 +4658,11 @@ }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; - sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; }; } { @@ -4417,6 +4697,22 @@ sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3"; }; } + { + name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; + path = fetchurl { + name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz"; + sha1 = "92f7736fe1fde3e2de77623c838dd992ff5ffb7e"; + }; + } + { + name = "eslint_plugin_jest___eslint_plugin_jest_24.0.0.tgz"; + path = fetchurl { + name = "eslint_plugin_jest___eslint_plugin_jest_24.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.0.0.tgz"; + sha1 = "6b1c460c529104c7d16d889e76fe708b281c4d14"; + }; + } { name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz"; path = fetchurl { @@ -4425,6 +4721,14 @@ sha1 = "b872a09d5de51af70a97db1eea7dc933043708aa"; }; } + { + name = "eslint_plugin_prefer_arrow___eslint_plugin_prefer_arrow_1.2.2.tgz"; + path = fetchurl { + name = "eslint_plugin_prefer_arrow___eslint_plugin_prefer_arrow_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.2.tgz"; + sha1 = "0c6d25a6b94cb3e0110a23d129760af5860edb6e"; + }; + } { name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_1.7.0.tgz"; path = fetchurl { @@ -4441,6 +4745,22 @@ sha1 = "6d08f9673628aa69c5559d33489e855d83551666"; }; } + { + name = "eslint_plugin_react___eslint_plugin_react_7.20.6.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.20.6.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.6.tgz"; + sha1 = "4d7845311a93c463493ccfa0a19c9c5d0fd69f60"; + }; + } + { + name = "eslint_plugin_unicorn___eslint_plugin_unicorn_21.0.0.tgz"; + path = fetchurl { + name = "eslint_plugin_unicorn___eslint_plugin_unicorn_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-21.0.0.tgz"; + sha1 = "7e3a8b0f725f003619e1f40d769939ecd8d708d0"; + }; + } { name = "eslint_scope___eslint_scope_4.0.3.tgz"; path = fetchurl { @@ -4450,11 +4770,19 @@ }; } { - name = "eslint_scope___eslint_scope_5.0.0.tgz"; + name = "eslint_scope___eslint_scope_5.1.0.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz"; - sha1 = "e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"; + name = "eslint_scope___eslint_scope_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; + sha1 = "d0f971dfe59c69e0cada684b23d49dbf82600ce5"; + }; + } + { + name = "eslint_template_visitor___eslint_template_visitor_2.2.1.tgz"; + path = fetchurl { + name = "eslint_template_visitor___eslint_template_visitor_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-template-visitor/-/eslint-template-visitor-2.2.1.tgz"; + sha1 = "2dccb1ab28fa7429e56ba6dd0144def2d89bc2d6"; }; } { @@ -4466,19 +4794,27 @@ }; } { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; - sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; }; } { @@ -4514,11 +4850,11 @@ }; } { - name = "esrecurse___esrecurse_4.2.1.tgz"; + name = "esrecurse___esrecurse_4.3.0.tgz"; path = fetchurl { - name = "esrecurse___esrecurse_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; - sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; }; } { @@ -4530,11 +4866,11 @@ }; } { - name = "estraverse___estraverse_5.1.0.tgz"; + name = "estraverse___estraverse_5.2.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; - sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; }; } { @@ -4554,19 +4890,19 @@ }; } { - name = "eventemitter3___eventemitter3_4.0.0.tgz"; + name = "eventemitter3___eventemitter3_4.0.7.tgz"; path = fetchurl { - name = "eventemitter3___eventemitter3_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz"; - sha1 = "d65176163887ee59f386d64c82610b696a4a74eb"; + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; }; } { - name = "events___events_3.1.0.tgz"; + name = "events___events_3.2.0.tgz"; path = fetchurl { - name = "events___events_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz"; - sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"; + name = "events___events_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; + sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; }; } { @@ -4682,11 +5018,11 @@ }; } { - name = "extract_zip___extract_zip_2.0.0.tgz"; + name = "extract_zip___extract_zip_2.0.1.tgz"; path = fetchurl { - name = "extract_zip___extract_zip_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz"; - sha1 = "f53b71d44f4ff5a4527a2259ade000fb8b303492"; + name = "extract_zip___extract_zip_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; + sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; }; } { @@ -4706,11 +5042,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; }; } { @@ -4721,6 +5057,14 @@ sha1 = "6953857c3afa475fff92ee6015d52da70a4cd39d"; }; } + { + name = "fast_glob___fast_glob_3.2.4.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz"; + sha1 = "d20aefbf99579383e7f3cc66529158c9b98554d3"; + }; + } { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; path = fetchurl { @@ -4737,6 +5081,14 @@ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; } + { + name = "fastq___fastq_1.8.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz"; + sha1 = "550e1f9f59bbc65fe185cb6a9b4d95357107f481"; + }; + } { name = "faye_websocket___faye_websocket_0.10.0.tgz"; path = fetchurl { @@ -4946,11 +5298,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.11.0.tgz"; + name = "follow_redirects___follow_redirects_1.13.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz"; - sha1 = "afa14f08ba12a52963140fe43212658897bc0ecb"; + name = "follow_redirects___follow_redirects_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; + sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; }; } { @@ -5153,14 +5505,6 @@ sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; }; } - { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; - }; - } { name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { @@ -5185,6 +5529,14 @@ sha1 = "0469ed07563479de6efb986baf053dcd7d4e3193"; }; } + { + name = "get_stdin___get_stdin_6.0.0.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz"; + sha1 = "9e09bf712b360ab9225e812048f71fde9c89657b"; + }; + } { name = "get_stream___get_stream_4.1.0.tgz"; path = fetchurl { @@ -5194,11 +5546,11 @@ }; } { - name = "get_stream___get_stream_5.1.0.tgz"; + name = "get_stream___get_stream_5.2.0.tgz"; path = fetchurl { - name = "get_stream___get_stream_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; - sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; }; } { @@ -5289,6 +5641,14 @@ sha1 = "5697619ccd95c5275dbb2d6faa42087c1a941d8d"; }; } + { + name = "globby___globby_11.0.1.tgz"; + path = fetchurl { + name = "globby___globby_11.0.1.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz"; + sha1 = "9a2bf107a068f3ffeabc49ad702c79ede8cfd357"; + }; + } { name = "globby___globby_6.1.0.tgz"; path = fetchurl { @@ -5313,14 +5673,6 @@ sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; }; } - { - name = "gud___gud_1.0.0.tgz"; - path = fetchurl { - name = "gud___gud_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz"; - sha1 = "a489581b17e6a70beca9abe3ae57de7a499852c0"; - }; - } { name = "gzip_size___gzip_size_5.1.1.tgz"; path = fetchurl { @@ -5346,11 +5698,11 @@ }; } { - name = "har_validator___har_validator_5.1.3.tgz"; + name = "har_validator___har_validator_5.1.5.tgz"; path = fetchurl { - name = "har_validator___har_validator_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; }; } { @@ -5554,19 +5906,19 @@ }; } { - name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; path = fetchurl { - name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz"; - sha1 = "95d3df037f04835e9d1a09d1767c0e361a7de916"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha1 = "922e96f1f3bb60832c2634b79884096389b1f054"; }; } { - name = "html_to_react___html_to_react_1.4.2.tgz"; + name = "html_to_react___html_to_react_1.4.3.tgz"; path = fetchurl { - name = "html_to_react___html_to_react_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.2.tgz"; - sha1 = "7b628ab56cd63a52f2d0b79d0fa838a51f088a57"; + name = "html_to_react___html_to_react_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.3.tgz"; + sha1 = "1430a1cb581ef29533892ec70a2fdc4554b17ffd"; }; } { @@ -5626,11 +5978,11 @@ }; } { - name = "http_parser_js___http_parser_js_0.4.10.tgz"; + name = "http_parser_js___http_parser_js_0.5.2.tgz"; path = fetchurl { - name = "http_parser_js___http_parser_js_0.4.10.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz"; - sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + name = "http_parser_js___http_parser_js_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz"; + sha1 = "da2e31d237b393aae72ace43882dd7e270a8ff77"; }; } { @@ -5642,11 +5994,11 @@ }; } { - name = "http_proxy___http_proxy_1.18.0.tgz"; + name = "http_proxy___http_proxy_1.18.1.tgz"; path = fetchurl { - name = "http_proxy___http_proxy_1.18.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz"; - sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a"; + name = "http_proxy___http_proxy_1.18.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; + sha1 = "401541f0534884bbf95260334e72f88ee3976549"; }; } { @@ -5674,11 +6026,11 @@ }; } { - name = "hyphenate_style_name___hyphenate_style_name_1.0.3.tgz"; + name = "hyphenate_style_name___hyphenate_style_name_1.0.4.tgz"; path = fetchurl { - name = "hyphenate_style_name___hyphenate_style_name_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz"; - sha1 = "097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48"; + name = "hyphenate_style_name___hyphenate_style_name_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz"; + sha1 = "691879af8e220aea5750e8827db4ef62a54e361d"; }; } { @@ -5689,6 +6041,14 @@ sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; }; } + { + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz"; + sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"; + }; + } { name = "icss_utils___icss_utils_4.1.1.tgz"; path = fetchurl { @@ -5737,6 +6097,14 @@ sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; }; } + { + name = "ignore___ignore_5.1.8.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; + }; + } { name = "immer___immer_1.10.0.tgz"; path = fetchurl { @@ -5745,14 +6113,6 @@ sha1 = "bad67605ba9c810275d91e1c2a47d4582e98286d"; }; } - { - name = "immutable___immutable_3.8.2.tgz"; - path = fetchurl { - name = "immutable___immutable_3.8.2.tgz"; - url = "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz"; - sha1 = "c2439951455bb39913daf281376f1530e104adf3"; - }; - } { name = "import_cwd___import_cwd_2.1.0.tgz"; path = fetchurl { @@ -5793,6 +6153,14 @@ sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; }; } + { + name = "import_modules___import_modules_2.0.0.tgz"; + path = fetchurl { + name = "import_modules___import_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-modules/-/import-modules-2.0.0.tgz"; + sha1 = "9c1e13b4e7a15682f70a6e3fa29534e4540cfc5d"; + }; + } { name = "imurmurhash___imurmurhash_0.1.4.tgz"; path = fetchurl { @@ -5874,11 +6242,11 @@ }; } { - name = "inquirer___inquirer_7.1.0.tgz"; + name = "inquirer___inquirer_7.3.3.tgz"; path = fetchurl { - name = "inquirer___inquirer_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz"; - sha1 = "1298a01859883e17c7264b82870ae1034f92dd29"; + name = "inquirer___inquirer_7.3.3.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz"; + sha1 = "04d176b2af04afc157a83fd7c100e98ee0aad003"; }; } { @@ -5905,14 +6273,6 @@ sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; }; } - { - name = "invert_kv___invert_kv_2.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; - sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; - }; - } { name = "ip_regex___ip_regex_2.1.0.tgz"; path = fetchurl { @@ -6034,11 +6394,11 @@ }; } { - name = "is_callable___is_callable_1.1.5.tgz"; + name = "is_callable___is_callable_1.2.1.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; - sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; + name = "is_callable___is_callable_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.1.tgz"; + sha1 = "4d1e21a4f437509d25ce55f8184350771421c96d"; }; } { @@ -6114,11 +6474,11 @@ }; } { - name = "is_docker___is_docker_2.0.0.tgz"; + name = "is_docker___is_docker_2.1.1.tgz"; path = fetchurl { - name = "is_docker___is_docker_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz"; - sha1 = "2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"; + name = "is_docker___is_docker_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; + sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; }; } { @@ -6145,14 +6505,6 @@ sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - } { name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; path = fetchurl { @@ -6209,6 +6561,14 @@ sha1 = "56ff4db683a078c6082eb95dad7dc62e1d04f835"; }; } + { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + } { name = "is_number___is_number_3.0.0.tgz"; path = fetchurl { @@ -6282,11 +6642,11 @@ }; } { - name = "is_regex___is_regex_1.0.5.tgz"; + name = "is_regex___is_regex_1.1.1.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; - sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; + name = "is_regex___is_regex_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; + sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; }; } { @@ -6634,11 +6994,11 @@ }; } { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; path = fetchurl { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz"; - sha1 = "ecdae604c077a7fbc70defb6d517c3c1c898923a"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; + sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; }; } { @@ -6754,11 +7114,19 @@ }; } { - name = "js_base64___js_base64_2.5.2.tgz"; + name = "joi___joi_17.2.1.tgz"; path = fetchurl { - name = "js_base64___js_base64_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz"; - sha1 = "313b6274dda718f714d00b3330bbae6e38e90209"; + name = "joi___joi_17.2.1.tgz"; + url = "https://registry.yarnpkg.com/joi/-/joi-17.2.1.tgz"; + sha1 = "e5140fdf07e8fecf9bc977c2832d1bdb1e3f2a0a"; + }; + } + { + name = "js_base64___js_base64_3.4.5.tgz"; + path = fetchurl { + name = "js_base64___js_base64_3.4.5.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-3.4.5.tgz"; + sha1 = "6d1921e65a172cfd924604e1416dfaff45752c3e"; }; } { @@ -6778,11 +7146,11 @@ }; } { - name = "js_yaml___js_yaml_3.13.1.tgz"; + name = "js_yaml___js_yaml_3.14.0.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.13.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; - sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + name = "js_yaml___js_yaml_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; + sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; }; } { @@ -6833,6 +7201,14 @@ sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; }; } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -6922,75 +7298,75 @@ }; } { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.1.1.tgz"; - sha1 = "8e73ecc4f1d0f8dfe4dd31f6f9f2782588970e78"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.4.0.tgz"; + sha1 = "46c75ff7fd61c304984c21af5817823f0f501ceb"; }; } { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.1.1.tgz"; - sha1 = "2df86016dfe73085eead843f5794e3890e9c5c47"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.4.0.tgz"; + sha1 = "2b10f01269eaea7f36f0f5fd1cfbfcc76ed42854"; }; } { - name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; + name = "jss_plugin_global___jss_plugin_global_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.1.1.tgz"; - sha1 = "36b0d6d9facb74dfd99590643708a89260747d14"; + name = "jss_plugin_global___jss_plugin_global_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.4.0.tgz"; + sha1 = "19449425a94e4e74e113139b629fd44d3577f97d"; }; } { - name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; + name = "jss_plugin_nested___jss_plugin_nested_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.1.1.tgz"; - sha1 = "5c3de2b8bda344de1ebcef3a4fd30870a29a8a8c"; + name = "jss_plugin_nested___jss_plugin_nested_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.4.0.tgz"; + sha1 = "017d0c02c0b6b454fd9d7d3fc33470a15eea9fd1"; }; } { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.1.1.tgz"; - sha1 = "34bddcbfaf9430ec8ccdf92729f03bb10caf1785"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.4.0.tgz"; + sha1 = "7110bf0b6049cc2080b220b506532bf0b70c0e07"; }; } { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.1.1.tgz"; - sha1 = "be00dac6fc394aaddbcef5860b9eca6224d96382"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.4.0.tgz"; + sha1 = "7cff4a91e84973536fa49b6ebbdbf7f339b01c82"; }; } { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.4.0.tgz"; path = fetchurl { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.1.1.tgz"; - sha1 = "8348b20749f790beebab3b6a8f7075b07c2cfcfd"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.4.0.tgz"; + sha1 = "2a78f3c5d57d1e024fe7ad7c41de34d04e72ecc0"; }; } { - name = "jss___jss_10.1.1.tgz"; + name = "jss___jss_10.4.0.tgz"; path = fetchurl { - name = "jss___jss_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/jss/-/jss-10.1.1.tgz"; - sha1 = "450b27d53761af3e500b43130a54cdbe157ea332"; + name = "jss___jss_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/jss/-/jss-10.4.0.tgz"; + sha1 = "473a6fbe42e85441020a07e9519dac1e8a2e79ca"; }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; - sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; + name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz"; + sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e"; }; } { @@ -7073,14 +7449,6 @@ sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; } - { - name = "lcid___lcid_2.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; - sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; - }; - } { name = "left_pad___left_pad_1.3.0.tgz"; path = fetchurl { @@ -7209,6 +7577,14 @@ sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; }; } + { + name = "lodash.get___lodash.get_4.4.2.tgz"; + path = fetchurl { + name = "lodash.get___lodash.get_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + } { name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; path = fetchurl { @@ -7266,19 +7642,27 @@ }; } { - name = "lodash___lodash_4.17.15.tgz"; + name = "lodash.zip___lodash.zip_4.2.0.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + name = "lodash.zip___lodash.zip_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz"; + sha1 = "ec6662e4896408ed4ab6c542a3990b72cc080020"; }; } { - name = "loglevel___loglevel_1.6.8.tgz"; + name = "lodash___lodash_4.17.20.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.8.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz"; - sha1 = "8a25fb75d092230ecd4457270d80b54e28011171"; + name = "lodash___lodash_4.17.20.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; + sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + }; + } + { + name = "loglevel___loglevel_1.7.0.tgz"; + path = fetchurl { + name = "loglevel___loglevel_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz"; + sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; }; } { @@ -7337,14 +7721,6 @@ sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4"; }; } - { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - path = fetchurl { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; - }; - } { name = "map_cache___map_cache_0.2.2.tgz"; path = fetchurl { @@ -7409,14 +7785,6 @@ sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; } - { - name = "mem___mem_4.3.0.tgz"; - path = fetchurl { - name = "mem___mem_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; - sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; - }; - } { name = "memory_fs___memory_fs_0.4.1.tgz"; path = fetchurl { @@ -7458,11 +7826,11 @@ }; } { - name = "merge2___merge2_1.3.0.tgz"; + name = "merge2___merge2_1.4.1.tgz"; path = fetchurl { - name = "merge2___merge2_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz"; - sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81"; + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; }; } { @@ -7489,6 +7857,14 @@ sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; }; } + { + name = "micromatch___micromatch_4.0.2.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; + sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + }; + } { name = "miller_rabin___miller_rabin_4.0.1.tgz"; path = fetchurl { @@ -7522,11 +7898,11 @@ }; } { - name = "mime___mime_2.4.5.tgz"; + name = "mime___mime_2.4.6.tgz"; path = fetchurl { - name = "mime___mime_2.4.5.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz"; - sha1 = "d8de2ecb92982dedbb6541c9b6841d7f218ea009"; + name = "mime___mime_2.4.6.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; + sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; }; } { @@ -7538,11 +7914,11 @@ }; } { - name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; + name = "mini_create_react_context___mini_create_react_context_0.4.0.tgz"; path = fetchurl { - name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz"; - sha1 = "79fc598f283dd623da8e088b05db8cddab250189"; + name = "mini_create_react_context___mini_create_react_context_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz"; + sha1 = "df60501c83151db69e28eac0ef08b4002efab040"; }; } { @@ -7602,19 +7978,19 @@ }; } { - name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; path = fetchurl { - name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz"; - sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; }; } { - name = "minipass___minipass_3.1.1.tgz"; + name = "minipass___minipass_3.1.3.tgz"; path = fetchurl { - name = "minipass___minipass_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; - sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; }; } { @@ -7658,35 +8034,35 @@ }; } { - name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; + name = "mobx_react_lite___mobx_react_lite_2.2.1.tgz"; path = fetchurl { - name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.0.6.tgz"; - sha1 = "e1307a2b271c6a6016c8ad815a25014b7f95997d"; + name = "mobx_react_lite___mobx_react_lite_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.2.1.tgz"; + sha1 = "9c05dd799005d29ec1671ae86ca30b3ab5411055"; }; } { - name = "mobx_react___mobx_react_6.2.2.tgz"; + name = "mobx_react___mobx_react_6.3.0.tgz"; path = fetchurl { - name = "mobx_react___mobx_react_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.2.2.tgz"; - sha1 = "45e8e7c4894cac8399bba0a91060d7cfb8ea084b"; + name = "mobx_react___mobx_react_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.3.0.tgz"; + sha1 = "7d11799f988bbdadc49e725081993b18baa20329"; }; } { - name = "mobx_utils___mobx_utils_5.5.7.tgz"; + name = "mobx_utils___mobx_utils_5.6.1.tgz"; path = fetchurl { - name = "mobx_utils___mobx_utils_5.5.7.tgz"; - url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.5.7.tgz"; - sha1 = "0ef58f2d5e05ca0e59ba2322f84f9c763de6ce14"; + name = "mobx_utils___mobx_utils_5.6.1.tgz"; + url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.6.1.tgz"; + sha1 = "b7d9184b7442fe704be367d4363a2e9961be28cc"; }; } { - name = "mobx___mobx_5.15.4.tgz"; + name = "mobx___mobx_5.15.6.tgz"; path = fetchurl { - name = "mobx___mobx_5.15.4.tgz"; - url = "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz"; - sha1 = "9da1a84e97ba624622f4e55a0bf3300fb931c2ab"; + name = "mobx___mobx_5.15.6.tgz"; + url = "https://registry.yarnpkg.com/mobx/-/mobx-5.15.6.tgz"; + sha1 = "24750af56f87bcf9c3cf82ece4c79eb91bb71968"; }; } { @@ -7737,6 +8113,14 @@ sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229"; }; } + { + name = "multimap___multimap_1.1.0.tgz"; + path = fetchurl { + name = "multimap___multimap_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/multimap/-/multimap-1.1.0.tgz"; + sha1 = "5263febc085a1791c33b59bb3afc6a76a2a10ca8"; + }; + } { name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { @@ -7778,11 +8162,11 @@ }; } { - name = "neo_async___neo_async_2.6.1.tgz"; + name = "neo_async___neo_async_2.6.2.tgz"; path = fetchurl { - name = "neo_async___neo_async_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz"; - sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c"; + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; }; } { @@ -7858,11 +8242,11 @@ }; } { - name = "node_releases___node_releases_1.1.55.tgz"; + name = "node_releases___node_releases_1.1.61.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.55.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz"; - sha1 = "8af23b7c561d8e2e6e36a46637bab84633b07cee"; + name = "node_releases___node_releases_1.1.61.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz"; + sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e"; }; } { @@ -7945,14 +8329,6 @@ sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; }; } - { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - path = fetchurl { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - } { name = "nwsapi___nwsapi_2.2.0.tgz"; path = fetchurl { @@ -8002,11 +8378,11 @@ }; } { - name = "object_inspect___object_inspect_1.7.0.tgz"; + name = "object_inspect___object_inspect_1.8.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; - sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + name = "object_inspect___object_inspect_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; + sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; }; } { @@ -8042,19 +8418,19 @@ }; } { - name = "object.assign___object.assign_4.1.0.tgz"; + name = "object.assign___object.assign_4.1.1.tgz"; path = fetchurl { - name = "object.assign___object.assign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + name = "object.assign___object.assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz"; + sha1 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd"; }; } { - name = "object.entries___object.entries_1.1.1.tgz"; + name = "object.entries___object.entries_1.1.2.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; - sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; + name = "object.entries___object.entries_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; + sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; }; } { @@ -8122,19 +8498,19 @@ }; } { - name = "onetime___onetime_5.1.0.tgz"; + name = "onetime___onetime_5.1.2.tgz"; path = fetchurl { - name = "onetime___onetime_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; - sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; }; } { - name = "open___open_7.0.3.tgz"; + name = "open___open_7.2.1.tgz"; path = fetchurl { - name = "open___open_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz"; - sha1 = "db551a1af9c7ab4c7af664139930826138531c48"; + name = "open___open_7.2.1.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.2.1.tgz"; + sha1 = "07b0ade11a43f2a8ce718480bdf3d7563a095195"; }; } { @@ -8177,14 +8553,6 @@ sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; } - { - name = "os_locale___os_locale_3.1.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; - sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; - }; - } { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { @@ -8193,14 +8561,6 @@ sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; } - { - name = "p_defer___p_defer_1.0.0.tgz"; - path = fetchurl { - name = "p_defer___p_defer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - } { name = "p_each_series___p_each_series_1.0.0.tgz"; path = fetchurl { @@ -8217,14 +8577,6 @@ sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; } - { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - path = fetchurl { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; - }; - } { name = "p_limit___p_limit_1.3.0.tgz"; path = fetchurl { @@ -8346,11 +8698,11 @@ }; } { - name = "parse_asn1___parse_asn1_5.1.5.tgz"; + name = "parse_asn1___parse_asn1_5.1.6.tgz"; path = fetchurl { - name = "parse_asn1___parse_asn1_5.1.5.tgz"; - url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha1 = "003271343da58dc94cace494faef3d2147ecea0e"; + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4"; }; } { @@ -8378,11 +8730,11 @@ }; } { - name = "parse_json___parse_json_5.0.0.tgz"; + name = "parse_json___parse_json_5.1.0.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; - sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + name = "parse_json___parse_json_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; + sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; }; } { @@ -8546,11 +8898,11 @@ }; } { - name = "pbkdf2___pbkdf2_3.0.17.tgz"; + name = "pbkdf2___pbkdf2_3.1.1.tgz"; path = fetchurl { - name = "pbkdf2___pbkdf2_3.0.17.tgz"; - url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz"; - sha1 = "976c206530617b14ebb32114239f7b09336e93a6"; + name = "pbkdf2___pbkdf2_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; + sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; }; } { @@ -8666,11 +9018,11 @@ }; } { - name = "pkg_up___pkg_up_2.0.0.tgz"; + name = "pluralize___pluralize_8.0.0.tgz"; path = fetchurl { - name = "pkg_up___pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + name = "pluralize___pluralize_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz"; + sha1 = "1a6fa16a38d12a1901e0320fa017051c539ce3b1"; }; } { @@ -8690,19 +9042,19 @@ }; } { - name = "popper.js___popper.js_1.16.1.tgz"; + name = "popper.js___popper.js_1.16.1_lts.tgz"; path = fetchurl { - name = "popper.js___popper.js_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; - sha1 = "2a223cb3dc7b6213d740e40372be40de43e65b1b"; + name = "popper.js___popper.js_1.16.1_lts.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz"; + sha1 = "cf6847b807da3799d80ee3d6d2f90df8a3f50b05"; }; } { - name = "portfinder___portfinder_1.0.26.tgz"; + name = "portfinder___portfinder_1.0.28.tgz"; path = fetchurl { - name = "portfinder___portfinder_1.0.26.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz"; - sha1 = "475658d56ca30bed72ac7f1378ed350bd1b64e70"; + name = "portfinder___portfinder_1.0.28.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; + sha1 = "67c4622852bd5374dd1dd900f779f53462fac778"; }; } { @@ -8730,11 +9082,11 @@ }; } { - name = "postcss_calc___postcss_calc_7.0.2.tgz"; + name = "postcss_calc___postcss_calc_7.0.4.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz"; - sha1 = "504efcd008ca0273120568b0792b16cdcde8aac1"; + name = "postcss_calc___postcss_calc_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz"; + sha1 = "5e177ddb417341e6d4a193c5d9fd8ada79094f8b"; }; } { @@ -9026,11 +9378,11 @@ }; } { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; - sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; + sha1 = "bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"; }; } { @@ -9306,11 +9658,11 @@ }; } { - name = "postcss___postcss_7.0.29.tgz"; + name = "postcss___postcss_7.0.32.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.29.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz"; - sha1 = "d3a903872bd52280b83bce38cdc83ce55c06129e"; + name = "postcss___postcss_7.0.32.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz"; + sha1 = "4310d6ee347053da3433db2be492883d62cec59d"; }; } { @@ -9330,19 +9682,19 @@ }; } { - name = "prettier___prettier_2.0.5.tgz"; + name = "prettier___prettier_2.1.1.tgz"; path = fetchurl { - name = "prettier___prettier_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz"; - sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; + name = "prettier___prettier_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz"; + sha1 = "d9485dd5e499daa6cb547023b87a6cf51bee37d6"; }; } { - name = "pretty_bytes___pretty_bytes_5.3.0.tgz"; + name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; path = fetchurl { - name = "pretty_bytes___pretty_bytes_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha1 = "f2849e27db79fb4d6cfe24764fc4134f165989f2"; + name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; + sha1 = "cd89f79bbcef21e3d21eb0da68ffe93f803e884b"; }; } { @@ -9369,14 +9721,6 @@ sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; }; } - { - name = "private___private_0.1.8.tgz"; - path = fetchurl { - name = "private___private_0.1.8.tgz"; - url = "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz"; - sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff"; - }; - } { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; path = fetchurl { @@ -9538,11 +9882,11 @@ }; } { - name = "puppeteer___puppeteer_3.0.4.tgz"; + name = "puppeteer___puppeteer_5.3.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.4.tgz"; - sha1 = "f445aae0a6732c65bbb90e963dcd6fd8fde0d780"; + name = "puppeteer___puppeteer_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-5.3.0.tgz"; + sha1 = "0abf83d0f2d1273baf2b56885a813f8052903e33"; }; } { @@ -9594,11 +9938,11 @@ }; } { - name = "querystringify___querystringify_2.1.1.tgz"; + name = "querystringify___querystringify_2.2.0.tgz"; path = fetchurl { - name = "querystringify___querystringify_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz"; - sha1 = "60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"; + name = "querystringify___querystringify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; + sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; }; } { @@ -9610,11 +9954,11 @@ }; } { - name = "ramda___ramda_0.26.1.tgz"; + name = "ramda___ramda_0.27.1.tgz"; path = fetchurl { - name = "ramda___ramda_0.26.1.tgz"; - url = "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz"; - sha1 = "8d41351eb8111c55353617fc3bbffad8e4d35d06"; + name = "ramda___ramda_0.27.1.tgz"; + url = "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz"; + sha1 = "66fc2df3ef873874ffc2da6aa8984658abacf5c9"; }; } { @@ -9658,11 +10002,11 @@ }; } { - name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; + name = "react_codemirror2___react_codemirror2_7.2.1.tgz"; path = fetchurl { - name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-7.1.0.tgz"; - sha1 = "b874a275ad4f6f2ee5adb23b550c0f4b8b82776d"; + name = "react_codemirror2___react_codemirror2_7.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-7.2.1.tgz"; + sha1 = "38dab492fcbe5fb8ebf5630e5bb7922db8d3a10c"; }; } { @@ -9722,27 +10066,27 @@ }; } { - name = "react_router_dom___react_router_dom_5.1.2.tgz"; + name = "react_router_dom___react_router_dom_5.2.0.tgz"; path = fetchurl { - name = "react_router_dom___react_router_dom_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz"; - sha1 = "06701b834352f44d37fbb6311f870f84c76b9c18"; + name = "react_router_dom___react_router_dom_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz"; + sha1 = "9e65a4d0c45e13289e66c7b17c7e175d0ea15662"; }; } { - name = "react_router___react_router_5.1.2.tgz"; + name = "react_router___react_router_5.2.0.tgz"; path = fetchurl { - name = "react_router___react_router_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz"; - sha1 = "6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"; + name = "react_router___react_router_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz"; + sha1 = "424e75641ca8747fbf76e5ecca69781aa37ea293"; }; } { - name = "react_scripts___react_scripts_3.4.1.tgz"; + name = "react_scripts___react_scripts_3.4.3.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.1.tgz"; - sha1 = "f551298b5c71985cc491b9acf3c8e8c0ae3ada0a"; + name = "react_scripts___react_scripts_3.4.3.tgz"; + url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.3.tgz"; + sha1 = "21de5eb93de41ee92cd0b85b0e1298d0bb2e6c51"; }; } { @@ -9793,6 +10137,14 @@ sha1 = "1b221c6088ba7799601c808f91161c66e58f8978"; }; } + { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; + }; + } { name = "read_pkg___read_pkg_2.0.0.tgz"; path = fetchurl { @@ -9809,6 +10161,14 @@ sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; }; } + { + name = "read_pkg___read_pkg_5.2.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + }; + } { name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { @@ -9874,11 +10234,11 @@ }; } { - name = "regenerate___regenerate_1.4.0.tgz"; + name = "regenerate___regenerate_1.4.1.tgz"; path = fetchurl { - name = "regenerate___regenerate_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz"; - sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11"; + name = "regenerate___regenerate_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz"; + sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f"; }; } { @@ -9890,19 +10250,19 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; }; } { - name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; - sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4"; }; } { @@ -9921,6 +10281,14 @@ sha1 = "9e66a8f73d89a107616e63b39d4deddfee912b37"; }; } + { + name = "regexp_tree___regexp_tree_0.1.21.tgz"; + path = fetchurl { + name = "regexp_tree___regexp_tree_0.1.21.tgz"; + url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.21.tgz"; + sha1 = "55e2246b7f7d36f1b461490942fa780299c400d7"; + }; + } { name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; path = fetchurl { @@ -9954,11 +10322,11 @@ }; } { - name = "regjsgen___regjsgen_0.5.1.tgz"; + name = "regjsgen___regjsgen_0.5.2.tgz"; path = fetchurl { - name = "regjsgen___regjsgen_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; - sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; + name = "regjsgen___regjsgen_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; + sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; }; } { @@ -10034,19 +10402,19 @@ }; } { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha1 = "e9a3c081b51380dfea677336061fea879a829ee9"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; }; } { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; }; } { @@ -10065,14 +10433,6 @@ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; } - { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - path = fetchurl { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - } { name = "require_main_filename___require_main_filename_2.0.0.tgz"; path = fetchurl { @@ -10089,6 +10449,14 @@ sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; } + { + name = "reserved_words___reserved_words_0.1.2.tgz"; + path = fetchurl { + name = "reserved_words___reserved_words_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz"; + sha1 = "00a0940f98cd501aeaaac316411d9adc52b31ab1"; + }; + } { name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; path = fetchurl { @@ -10185,6 +10553,14 @@ sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; }; } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } { name = "rework_visit___rework_visit_1.0.0.tgz"; path = fetchurl { @@ -10265,6 +10641,14 @@ sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } + { + name = "run_parallel___run_parallel_1.1.9.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.1.9.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz"; + sha1 = "c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"; + }; + } { name = "run_queue___run_queue_1.0.3.tgz"; path = fetchurl { @@ -10274,11 +10658,11 @@ }; } { - name = "rxjs___rxjs_6.5.5.tgz"; + name = "rxjs___rxjs_6.6.3.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.5.5.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz"; - sha1 = "c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"; + name = "rxjs___rxjs_6.6.3.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz"; + sha1 = "8ca84635c4daa900c0d3967a6ee7ac60271ee552"; }; } { @@ -10290,11 +10674,11 @@ }; } { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; }; } { @@ -10305,6 +10689,14 @@ sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; }; } + { + name = "safe_regex___safe_regex_2.1.1.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz"; + sha1 = "f7128f00d056e2fe5c11e81a1324dd974aadced2"; + }; + } { name = "safer_buffer___safer_buffer_2.1.2.tgz"; path = fetchurl { @@ -10370,11 +10762,11 @@ }; } { - name = "schema_utils___schema_utils_2.6.6.tgz"; + name = "schema_utils___schema_utils_2.7.1.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.6.6.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz"; - sha1 = "299fe6bd4a3365dc23d99fd446caff8f1d6c330c"; + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; }; } { @@ -10417,6 +10809,14 @@ sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; }; } + { + name = "semver___semver_7.3.2.tgz"; + path = fetchurl { + name = "semver___semver_7.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; + sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + }; + } { name = "send___send_0.17.1.tgz"; path = fetchurl { @@ -10426,11 +10826,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; + sha1 = "b525e1238489a5ecfc42afacc3fe99e666f4b1aa"; }; } { @@ -10562,11 +10962,11 @@ }; } { - name = "side_channel___side_channel_1.0.2.tgz"; + name = "side_channel___side_channel_1.0.3.tgz"; path = fetchurl { - name = "side_channel___side_channel_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; - sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; + name = "side_channel___side_channel_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz"; + sha1 = "cdc46b057550bbab63706210838df5d4c19519c3"; }; } { @@ -10658,11 +11058,11 @@ }; } { - name = "sockjs___sockjs_0.3.19.tgz"; + name = "sockjs___sockjs_0.3.20.tgz"; path = fetchurl { - name = "sockjs___sockjs_0.3.19.tgz"; - url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz"; - sha1 = "d976bbe800af7bd20ae08598d582393508993c0d"; + name = "sockjs___sockjs_0.3.20.tgz"; + url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz"; + sha1 = "b26a283ec562ef8b2687b44033a4eeceac75d855"; }; } { @@ -10722,11 +11122,11 @@ }; } { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; }; } { @@ -10738,11 +11138,11 @@ }; } { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; }; } { @@ -10913,22 +11313,6 @@ sha1 = "107ef8c23456e187a8abd4a61162ff4ac6e25837"; }; } - { - name = "string_width___string_width_1.0.2.tgz"; - path = fetchurl { - name = "string_width___string_width_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - } - { - name = "string_width___string_width_2.1.1.tgz"; - path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; - }; - } { name = "string_width___string_width_3.1.0.tgz"; path = fetchurl { @@ -10961,22 +11345,6 @@ sha1 = "85812a6b847ac002270f5808146064c995fb6913"; }; } - { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; - path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; - sha1 = "4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"; - }; - } - { - name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; - path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; - sha1 = "c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"; - }; - } { name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; path = fetchurl { @@ -11066,11 +11434,11 @@ }; } { - name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; - sha1 = "7638d31422129ecf4457440009fba03f9f9ac180"; + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; }; } { @@ -11114,11 +11482,11 @@ }; } { - name = "supports_color___supports_color_7.1.0.tgz"; + name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { - name = "supports_color___supports_color_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; - sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; }; } { @@ -11162,43 +11530,43 @@ }; } { - name = "tar_fs___tar_fs_2.0.1.tgz"; + name = "tar_fs___tar_fs_2.1.0.tgz"; path = fetchurl { - name = "tar_fs___tar_fs_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.1.tgz"; - sha1 = "e44086c1c60d31a4f0cf893b1c4e155dabfae9e2"; + name = "tar_fs___tar_fs_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.0.tgz"; + sha1 = "d1cdd121ab465ee0eb9ccde2d35049d3f3daf0d5"; }; } { - name = "tar_stream___tar_stream_2.1.2.tgz"; + name = "tar_stream___tar_stream_2.1.4.tgz"; path = fetchurl { - name = "tar_stream___tar_stream_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz"; - sha1 = "6d5ef1a7e5783a95ff70b69b97455a5968dc1325"; + name = "tar_stream___tar_stream_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz"; + sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa"; }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.8.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz"; - sha1 = "5ad971acce5c517440ba873ea4f09687de2f4a81"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz"; + sha1 = "894764a19b0743f2f704e7c2a848c5283a696724"; }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; - sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; + sha1 = "a217aefaea330e734ffacb6120ec1fa312d6040b"; }; } { - name = "terser___terser_4.6.13.tgz"; + name = "terser___terser_4.8.0.tgz"; path = fetchurl { - name = "terser___terser_4.6.13.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz"; - sha1 = "e879a7364a5e0db52ba4891ecde007422c56a916"; + name = "terser___terser_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; + sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; }; } { @@ -11418,35 +11786,19 @@ }; } { - name = "tslib___tslib_1.11.2.tgz"; + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.11.2.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz"; - sha1 = "9c79d83272c9a7aaf166f73915c9667ecdde3cc9"; + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; }; } { - name = "tslint_sonarts___tslint_sonarts_1.9.0.tgz"; + name = "tslib___tslib_1.13.0.tgz"; path = fetchurl { - name = "tslint_sonarts___tslint_sonarts_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.9.0.tgz"; - sha1 = "feb593e92db328c0328b430b838adbe65d504de9"; - }; - } - { - name = "tslint___tslint_6.1.2.tgz"; - path = fetchurl { - name = "tslint___tslint_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/tslint/-/tslint-6.1.2.tgz"; - sha1 = "2433c248512cc5a7b2ab88ad44a6b1b34c6911cf"; - }; - } - { - name = "tsutils___tsutils_2.29.0.tgz"; - path = fetchurl { - name = "tsutils___tsutils_2.29.0.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; - sha1 = "32b488501467acbedd4b85498673a0812aca0b99"; + name = "tslib___tslib_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; + sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; }; } { @@ -11497,6 +11849,14 @@ sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; }; } + { + name = "type_fest___type_fest_0.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + }; + } { name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { @@ -11522,11 +11882,11 @@ }; } { - name = "type___type_2.0.0.tgz"; + name = "type___type_2.1.0.tgz"; path = fetchurl { - name = "type___type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; - sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; + name = "type___type_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz"; + sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"; }; } { @@ -11546,11 +11906,11 @@ }; } { - name = "typescript___typescript_3.8.3.tgz"; + name = "typescript___typescript_4.0.2.tgz"; path = fetchurl { - name = "typescript___typescript_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; - sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; + name = "typescript___typescript_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz"; + sha1 = "7ea7c88777c723c681e33bf7988be5d008d05ac2"; }; } { @@ -11562,11 +11922,11 @@ }; } { - name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { - name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz"; - sha1 = "84eb9e783b186d8fb397515fbb656f312f1a7dbf"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; }; } { @@ -11746,11 +12106,11 @@ }; } { - name = "uri_js___uri_js_4.2.2.tgz"; + name = "uri_js___uri_js_4.4.0.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; - sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + name = "uri_js___uri_js_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; + sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; }; } { @@ -11858,11 +12218,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; - sha1 = "e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"; + name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; + sha1 = "54bc3cdd43317bca91e35dcaf305b1a7237de745"; }; } { @@ -11954,11 +12314,11 @@ }; } { - name = "wait_on___wait_on_5.0.0.tgz"; + name = "wait_on___wait_on_5.2.0.tgz"; path = fetchurl { - name = "wait_on___wait_on_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/wait-on/-/wait-on-5.0.0.tgz"; - sha1 = "72e554b338490bbc7131362755ca1af04f46d029"; + name = "wait_on___wait_on_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/wait-on/-/wait-on-5.2.0.tgz"; + sha1 = "6711e74422523279714a36d52cf49fb47c9d9597"; }; } { @@ -11970,11 +12330,19 @@ }; } { - name = "watchpack___watchpack_1.6.1.tgz"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; path = fetchurl { - name = "watchpack___watchpack_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz"; - sha1 = "280da0a8718592174010c078c7585a74cd8cd0e2"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; + sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; + }; + } + { + name = "watchpack___watchpack_1.7.4.tgz"; + path = fetchurl { + name = "watchpack___watchpack_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz"; + sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b"; }; } { @@ -12002,11 +12370,11 @@ }; } { - name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz"; path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; - sha1 = "f35945036813e57ef582c2420ef7b470e14d3af0"; + name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; + sha1 = "8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"; }; } { @@ -12042,19 +12410,27 @@ }; } { - name = "websocket_driver___websocket_driver_0.7.3.tgz"; + name = "websocket_driver___websocket_driver_0.6.5.tgz"; path = fetchurl { - name = "websocket_driver___websocket_driver_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz"; - sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"; + name = "websocket_driver___websocket_driver_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; }; } { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; + name = "websocket_driver___websocket_driver_0.7.4.tgz"; path = fetchurl { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha1 = "5d2ff22977003ec687a4b87073dfbbac146ccf29"; + name = "websocket_driver___websocket_driver_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz"; + sha1 = "89ad5295bbf64b480abcba31e4953aca706f5760"; + }; + } + { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + path = fetchurl { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; }; } { @@ -12066,11 +12442,11 @@ }; } { - name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz"; + name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz"; - sha1 = "fc804e458cc460009b1a2b966bc8817d2578aefb"; + name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; + sha1 = "e5f871572d6879663fa5674c8f833f15a8425ab3"; }; } { @@ -12273,14 +12649,6 @@ sha1 = "cb565bd6d7071a8f16660686051e969ad32f54d5"; }; } - { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - } { name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; path = fetchurl { @@ -12330,11 +12698,11 @@ }; } { - name = "ws___ws_7.2.5.tgz"; + name = "ws___ws_7.3.1.tgz"; path = fetchurl { - name = "ws___ws_7.2.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz"; - sha1 = "abb1370d4626a5a9cd79d8de404aa18b3465d10d"; + name = "ws___ws_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz"; + sha1 = "d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"; }; } { @@ -12402,19 +12770,11 @@ }; } { - name = "yaml___yaml_1.9.2.tgz"; + name = "yaml___yaml_1.10.0.tgz"; path = fetchurl { - name = "yaml___yaml_1.9.2.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.9.2.tgz"; - sha1 = "f0cfa865f003ab707663e4f04b3956957ea564ed"; - }; - } - { - name = "yargs_parser___yargs_parser_11.1.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_11.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz"; - sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; + name = "yaml___yaml_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; + sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; }; } { @@ -12425,14 +12785,6 @@ sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } - { - name = "yargs___yargs_12.0.5.tgz"; - path = fetchurl { - name = "yargs___yargs_12.0.5.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz"; - sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; - }; - } { name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/servers/hasura/cli.nix b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix index 88b6b418dd..af2f6f2a11 100644 --- a/third_party/nixpkgs/pkgs/servers/hasura/cli.nix +++ b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix @@ -9,7 +9,7 @@ buildGoModule rec { subPackages = [ "cmd/hasura" ]; - vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a"; + vendorSha256 = "sha256-Fp6o3xZ/964q8yzJJFrqWZtQ5zYNy6Wreh42YxWjNbU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/hasura/default.nix b/third_party/nixpkgs/pkgs/servers/hasura/default.nix deleted file mode 100644 index 0852746603..0000000000 --- a/third_party/nixpkgs/pkgs/servers/hasura/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ haskell }: - -with haskell.lib; - -let - # version in cabal file is invalid - version = "1.2.1"; - - pkgs = haskell.packages.ghc865.override { - overrides = self: super: { - # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git - hasura-graphql-engine = justStaticExecutables - ((self.callPackage ./graphql-engine.nix { }).overrideDerivation (d: { - name = "graphql-engine-${version}"; - - inherit version; - - # hasura needs VERSION env exported during build - preBuild = "export VERSION=${version}"; - })); - - hasura-cli = self.callPackage ./cli.nix { - hasura-graphql-engine = self.hasura-graphql-engine // { - inherit version; - }; - }; - - # internal dependencies, non published on hackage (find revisions in cabal.project file) - # cabal2nix --revision https://github.com/hasura/ci-info-hs.git - ci-info = self.callPackage ./ci-info.nix { }; - # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git - graphql-parser = self.callPackage ./graphql-parser.nix { }; - # cabal2nix --revision https://github.com/hasura/pg-client-hs.git - pg-client = self.callPackage ./pg-client.nix { }; - - # version constrained dependencies, without these hasura will not build, - # find versions in graphql-engine.cabal - # cabal2nix cabal://dependent-map-0.2.4.0 - dependent-map = self.callPackage ./dependent-map.nix { }; - # cabal2nix cabal://dependent-sum-0.4 - dependent-sum = self.callPackage ./dependent-sum.nix { }; - # cabal2nix cabal://these-0.7.6 - these = doJailbreak (self.callPackage ./these.nix { }); - # cabal2nix cabal://immortal-0.2.2.1 - immortal = self.callPackage ./immortal.nix { }; - # cabal2nix cabal://network-uri-2.6.1.0 - network-uri = self.callPackage ./network-uri.nix { }; - # cabal2nix cabal://ghc-heap-view-0.6.0 - ghc-heap-view = disableLibraryProfiling (self.callPackage ./ghc-heap-view.nix { }); - - # unmark broewn packages and do required modifications - stm-hamt = doJailbreak (unmarkBroken super.stm-hamt); - superbuffer = dontCheck (doJailbreak (unmarkBroken super.superbuffer)); - Spock-core = dontCheck (unmarkBroken super.Spock-core); - stm-containers = dontCheck (unmarkBroken super.stm-containers); - ekg-json = unmarkBroken super.ekg-json; - list-t = dontCheck (unmarkBroken super.list-t); - primitive-extras = unmarkBroken super.primitive-extras; - }; - }; -in { - inherit (pkgs) hasura-graphql-engine hasura-cli; -} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/dependent-map.nix b/third_party/nixpkgs/pkgs/servers/hasura/dependent-map.nix deleted file mode 100644 index 68ebb616b5..0000000000 --- a/third_party/nixpkgs/pkgs/servers/hasura/dependent-map.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ mkDerivation, base, containers, dependent-sum, stdenv }: -mkDerivation { - pname = "dependent-map"; - version = "0.2.4.0"; - sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246"; - revision = "1"; - editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1"; - libraryHaskellDepends = [ base containers dependent-sum ]; - homepage = "https://github.com/mokus0/dependent-map"; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; -} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/dependent-sum.nix b/third_party/nixpkgs/pkgs/servers/hasura/dependent-sum.nix deleted file mode 100644 index 90717b8736..0000000000 --- a/third_party/nixpkgs/pkgs/servers/hasura/dependent-sum.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ mkDerivation, base, stdenv }: -mkDerivation { - pname = "dependent-sum"; - version = "0.4"; - sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/mokus0/dependent-sum"; - description = "Dependent sum type"; - license = stdenv.lib.licenses.publicDomain; -} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/ghc-heap-view.nix b/third_party/nixpkgs/pkgs/servers/hasura/ghc-heap-view.nix deleted file mode 100644 index 54c873baee..0000000000 --- a/third_party/nixpkgs/pkgs/servers/hasura/ghc-heap-view.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ mkDerivation, base, binary, bytestring, Cabal, containers -, deepseq, filepath, ghc-heap, stdenv, template-haskell -, transformers -}: -mkDerivation { - pname = "ghc-heap-view"; - version = "0.6.0"; - sha256 = "99ed6034d02a7a942e1b6ed970e9f7028dcdfd5b5d29fd8a0fb89f1a5e7c5ec8"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal filepath ]; - libraryHaskellDepends = [ - base binary bytestring containers ghc-heap template-haskell - transformers - ]; - testHaskellDepends = [ base deepseq ]; - description = "Extract the heap representation of Haskell values and thunks"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/immortal.nix b/third_party/nixpkgs/pkgs/servers/hasura/immortal.nix deleted file mode 100644 index c53f0f1870..0000000000 --- a/third_party/nixpkgs/pkgs/servers/hasura/immortal.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ mkDerivation, base, lifted-base, monad-control, stdenv, stm -, tasty, tasty-hunit, transformers, transformers-base -}: -mkDerivation { - pname = "immortal"; - version = "0.2.2.1"; - sha256 = "ed4aa1a2883a693a73fec47c8c2d5332d61a0626a2013403e1a8fb25cc6c8d8e"; - libraryHaskellDepends = [ - base lifted-base monad-control stm transformers-base - ]; - testHaskellDepends = [ - base lifted-base stm tasty tasty-hunit transformers - ]; - homepage = "https://github.com/feuerbach/immortal"; - description = "Spawn threads that never die (unless told to do so)"; - license = stdenv.lib.licenses.mit; -} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/network-uri.nix b/third_party/nixpkgs/pkgs/servers/hasura/network-uri.nix deleted file mode 100644 index 45016d470a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/hasura/network-uri.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ mkDerivation, base, deepseq, HUnit, parsec, stdenv -, test-framework, test-framework-hunit, test-framework-quickcheck2 -}: -mkDerivation { - pname = "network-uri"; - version = "2.6.1.0"; - sha256 = "423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0"; - revision = "1"; - editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32"; - libraryHaskellDepends = [ base deepseq parsec ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "https://github.com/haskell/network-uri"; - description = "URI manipulation"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/these.nix b/third_party/nixpkgs/pkgs/servers/hasura/these.nix deleted file mode 100644 index 396f9e2a28..0000000000 --- a/third_party/nixpkgs/pkgs/servers/hasura/these.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ mkDerivation, aeson, base, base-compat, bifunctors, binary -, containers, data-default-class, deepseq, hashable, keys, lens -, mtl, QuickCheck, quickcheck-instances, semigroupoids, stdenv -, tasty, tasty-quickcheck, transformers, transformers-compat -, unordered-containers, vector, vector-instances -}: -mkDerivation { - pname = "these"; - version = "0.7.6"; - sha256 = "9464b83d98e626360a8ad9836ba77e5201cd1e9c89b95b1b11a28ef3c23ac746"; - libraryHaskellDepends = [ - aeson base base-compat bifunctors binary containers - data-default-class deepseq hashable keys lens mtl QuickCheck - semigroupoids transformers transformers-compat unordered-containers - vector vector-instances - ]; - testHaskellDepends = [ - aeson base base-compat bifunctors binary containers hashable lens - QuickCheck quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 4290599cbf..3342c488c9 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,11 +2,11 @@ # Do not edit! { - version = "0.114.2"; + version = "0.114.4"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather - "acer_projector" = ps: with ps; [ pyserial]; + "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse "actiontec" = ps: with ps; [ ]; "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome @@ -15,39 +15,39 @@ "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ ]; # missing inputs: airly - "airvisual" = ps: with ps; [ pyairvisual]; + "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; # missing inputs: adext "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ aiohttp-cors]; - "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond + "alexa" = ps: with ps; [ aiohttp-cors ]; + "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage - "amazon_polly" = ps: with ps; [ boto3]; - "ambiclimate" = ps: with ps; [ aiohttp-cors]; # missing inputs: ambiclimate + "amazon_polly" = ps: with ps; [ boto3 ]; + "ambiclimate" = ps: with ps; [ aiohttp-cors ]; # missing inputs: ambiclimate "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient - "amcrest" = ps: with ps; [ ha-ffmpeg]; # missing inputs: amcrest + "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest "ampio" = ps: with ps; [ ]; # missing inputs: asmog "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell[async] androidtv[async] pure-python-adb "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav - "apache_kafka" = ps: with ps; [ aiokafka]; + "apache_kafka" = ps: with ps; [ aiokafka ]; "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess - "api" = ps: with ps; [ aiohttp-cors]; + "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf]; - "apprise" = ps: with ps; [ apprise]; + "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; + "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo + "arlo" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: pyarlo "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg - "aruba" = ps: with ps; [ pexpect]; - "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "aruba" = ps: with ps; [ pexpect ]; + "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt @@ -57,17 +57,17 @@ "august" = ps: with ps; [ ]; # missing inputs: py-august "aurora" = ps: with ps; [ ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy - "auth" = ps: with ps; [ aiohttp-cors]; - "automation" = ps: with ps; [ aiohttp-cors]; + "auth" = ps: with ps; [ aiohttp-cors ]; + "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ ]; # missing inputs: avea "avion" = ps: with ps; [ ]; # missing inputs: avion - "avri" = ps: with ps; [ pycountry]; # missing inputs: avri-api + "avri" = ps: with ps; [ pycountry ]; # missing inputs: avri-api "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore - "axis" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: axis + "axis" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: axis "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub - "azure_service_bus" = ps: with ps; [ azure-servicebus]; + "azure_service_bus" = ps: with ps; [ azure-servicebus ]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip "bayesian" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO @@ -80,22 +80,22 @@ "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy - "blinksticklight" = ps: with ps; [ BlinkStick]; + "blinksticklight" = ps: with ps; [ BlinkStick ]; "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; - "bluesound" = ps: with ps; [ xmltodict]; + "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] - "bluetooth_tracker" = ps: with ps; [ bt_proximity]; # missing inputs: pybluez + "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop "bond" = ps: with ps; [ ]; # missing inputs: bond-api - "braviatv" = ps: with ps; [ bravia-tv]; - "broadlink" = ps: with ps; [ broadlink]; - "brother" = ps: with ps; [ brother]; + "braviatv" = ps: with ps; [ bravia-tv ]; + "broadlink" = ps: with ps; [ broadlink ]; + "brother" = ps: with ps; [ brother ]; "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt @@ -103,15 +103,15 @@ "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar - "caldav" = ps: with ps; [ caldav]; - "calendar" = ps: with ps; [ aiohttp-cors]; - "camera" = ps: with ps; [ aiohttp-cors]; - "canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf]; + "caldav" = ps: with ps; [ caldav ]; + "calendar" = ps: with ps; [ aiohttp-cors ]; + "camera" = ps: with ps; [ aiohttp-cors ]; + "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook - "cisco_ios" = ps: with ps; [ pexpect]; + "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress "cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk "citybikes" = ps: with ps; [ ]; @@ -120,44 +120,44 @@ "clicksend" = ps: with ps; [ ]; "clicksend_tts" = ps: with ps; [ ]; "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa]; + "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase - "coinmarketcap" = ps: with ps; [ coinmarketcap]; + "coinmarketcap" = ps: with ps; [ coinmarketcap ]; "comed_hourly_pricing" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect "command_line" = ps: with ps; [ ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 - "config" = ps: with ps; [ aiohttp-cors]; + "config" = ps: with ps; [ aiohttp-cors ]; "configurator" = ps: with ps; [ ]; "control4" = ps: with ps; [ ]; # missing inputs: pyControl4 - "conversation" = ps: with ps; [ aiohttp-cors]; + "conversation" = ps: with ps; [ aiohttp-cors ]; "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy - "cpuspeed" = ps: with ps; [ py-cpuinfo]; + "cpuspeed" = ps: with ps; [ py-cpuinfo ]; "crimereports" = ps: with ps; [ ]; # missing inputs: crimereports - "cups" = ps: with ps; [ pycups]; + "cups" = ps: with ps; [ pycups ]; "currencylayer" = ps: with ps; [ ]; "daikin" = ps: with ps; [ ]; # missing inputs: pydaikin "danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair - "darksky" = ps: with ps; [ python-forecastio]; - "datadog" = ps: with ps; [ datadog]; + "darksky" = ps: with ps; [ python-forecastio ]; + "datadog" = ps: with ps; [ datadog ]; "ddwrt" = ps: with ps; [ ]; - "debugpy" = ps: with ps; [ debugpy]; + "debugpy" = ps: with ps; [ debugpy ]; "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz - "decora" = ps: with ps; [ bluepy]; # missing inputs: decora + "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend + "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf ]; # missing inputs: home-assistant-frontend "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn - "deluge" = ps: with ps; [ deluge-client]; - "demo" = ps: with ps; [ aiohttp-cors]; + "deluge" = ps: with ps; [ deluge-client ]; + "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; - "denonavr" = ps: with ps; [ denonavr getmac]; + "denonavr" = ps: with ps; [ denonavr getmac ]; "derivative" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene "device_automation" = ps: with ps; [ ]; @@ -166,40 +166,40 @@ "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api "dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT - "dialogflow" = ps: with ps; [ aiohttp-cors]; - "digital_ocean" = ps: with ps; [ digital-ocean]; + "dialogflow" = ps: with ps; [ aiohttp-cors ]; + "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ ]; # missing inputs: directv - "discogs" = ps: with ps; [ discogs_client]; - "discord" = ps: with ps; [ discordpy]; - "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; - "dlib_face_detect" = ps: with ps; [ face_recognition]; - "dlib_face_identify" = ps: with ps; [ face_recognition]; + "discogs" = ps: with ps; [ discogs_client ]; + "discord" = ps: with ps; [ discordpy ]; + "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; + "dlib_face_detect" = ps: with ps; [ face_recognition ]; + "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 - "dlna_dmr" = ps: with ps; [ async-upnp-client]; - "dnsip" = ps: with ps; [ aiodns]; - "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi - "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods - "doorbird" = ps: with ps; [ aiohttp-cors]; # missing inputs: doorbirdpy + "dlna_dmr" = ps: with ps; [ async-upnp-client ]; + "dnsip" = ps: with ps; [ aiodns ]; + "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi + "doods" = ps: with ps; [ pillow ]; # missing inputs: pydoods + "doorbird" = ps: with ps; [ aiohttp-cors ]; # missing inputs: doorbirdpy "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ ]; "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser - "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ ]; "dublin_bus_transport" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd - "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict]; + "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: libpurecool + "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface "ecobee" = ps: with ps; [ ]; # missing inputs: python-ecobee-api "econet" = ps: with ps; [ ]; # missing inputs: pyeconet "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks - "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan] + "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax "edl21" = ps: with ps; [ ]; # missing inputs: pysml "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox @@ -213,9 +213,9 @@ "emby" = ps: with ps; [ ]; # missing inputs: pyemby "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; - "emulated_hue" = ps: with ps; [ aiohttp-cors]; + "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku - "enigma2" = ps: with ps; [ openwebifpy]; + "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ ]; # missing inputs: enocean "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient @@ -225,8 +225,8 @@ "ephember" = ps: with ps; [ ]; # missing inputs: pyephember "epson" = ps: with ps; [ ]; # missing inputs: epson-projector "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter - "eq3btsmart" = ps: with ps; [ construct]; # missing inputs: python-eq3bt - "esphome" = ps: with ps; [ aioesphomeapi]; + "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt + "esphome" = ps: with ps; [ aioesphomeapi ]; "essent" = ps: with ps; [ ]; # missing inputs: PyEssent "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside @@ -240,17 +240,17 @@ "fan" = ps: with ps; [ ]; "fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom "feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant - "ffmpeg" = ps: with ps; [ ha-ffmpeg]; - "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg]; - "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg]; + "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 "fido" = ps: with ps; [ ]; # missing inputs: pyfido "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; - "filter" = ps: with ps; [ aiohttp-cors sqlalchemy]; - "fints" = ps: with ps; [ fints]; + "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "fints" = ps: with ps; [ fints ]; "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express - "fitbit" = ps: with ps; [ aiohttp-cors fitbit]; + "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ ]; # missing inputs: fixerio "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus @@ -260,23 +260,23 @@ "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou "flux" = ps: with ps; [ ]; - "flux_led" = ps: with ps; [ flux-led]; + "flux_led" = ps: with ps; [ flux-led ]; "folder" = ps: with ps; [ ]; - "folder_watcher" = ps: with ps; [ watchdog]; + "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam - "foursquare" = ps: with ps; [ aiohttp-cors]; + "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms - "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: aiofreepybox + "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: aiofreepybox "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection]; - "fritzbox" = ps: with ps; [ pyfritzhome]; - "fritzbox_callmonitor" = ps: with ps; [ fritzconnection]; - "fritzbox_netmonitor" = ps: with ps; [ fritzconnection]; + "fritz" = ps: with ps; [ fritzconnection ]; + "fritzbox" = ps: with ps; [ pyfritzhome ]; + "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; + "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius - "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "frontend" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip "garadget" = ps: with ps; [ ]; @@ -290,29 +290,29 @@ "geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client - "geofency" = ps: with ps; [ aiohttp-cors]; + "geofency" = ps: with ps; [ aiohttp-cors ]; "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano "gios" = ps: with ps; [ ]; # missing inputs: gios - "github" = ps: with ps; [ PyGithub]; - "gitlab_ci" = ps: with ps; [ python-gitlab]; + "github" = ps: with ps; [ PyGithub ]; + "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ ]; # missing inputs: glances_api "gntp" = ps: with ps; [ ]; # missing inputs: gntp "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api - "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client]; - "google_assistant" = ps: with ps; [ aiohttp-cors]; - "google_cloud" = ps: with ps; [ google_cloud_texttospeech]; + "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; + "google_assistant" = ps: with ps; [ aiohttp-cors ]; + "google_cloud" = ps: with ps; [ google_cloud_texttospeech ]; "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib - "google_pubsub" = ps: with ps; [ google_cloud_pubsub]; - "google_translate" = ps: with ps; [ gtts-token]; + "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; + "google_translate" = ps: with ps; [ gtts-token ]; "google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps "google_wifi" = ps: with ps; [ ]; - "gpmdp" = ps: with ps; [ websocket_client]; + "gpmdp" = ps: with ps; [ websocket_client ]; "gpsd" = ps: with ps; [ ]; # missing inputs: gps3 - "gpslogger" = ps: with ps; [ aiohttp-cors]; + "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality @@ -325,8 +325,8 @@ "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr - "harmony" = ps: with ps; [ aioharmony]; - "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "harmony" = ps: with ps; [ aioharmony ]; + "hassio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC @@ -336,27 +336,27 @@ "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1 - "history" = ps: with ps; [ aiohttp-cors sqlalchemy]; - "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy]; + "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 - "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect + "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash - "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: aiohomekit[IP] - "homematic" = ps: with ps; [ pyhomematic]; + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG base36 fnvhash + "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit[IP] + "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks "honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort "horizon" = ps: with ps; [ ]; # missing inputs: horimote "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo - "html5" = ps: with ps; [ aiohttp-cors pywebpush]; - "http" = ps: with ps; [ aiohttp-cors]; + "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; + "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi - "huawei_lte" = ps: with ps; [ getmac stringcase]; # missing inputs: huawei-lte-api url-normalize + "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize "huawei_router" = ps: with ps; [ ]; - "hue" = ps: with ps; [ aiohue]; + "hue" = ps: with ps; [ aiohue ]; "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti @@ -365,17 +365,17 @@ "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink - "icloud" = ps: with ps; [ pyicloud]; + "icloud" = ps: with ps; [ pyicloud ]; "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py - "ifttt" = ps: with ps; [ aiohttp-cors pyfttt]; + "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "iglo" = ps: with ps; [ ]; # missing inputs: iglo "ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client - "ihc" = ps: with ps; [ defusedxml]; # missing inputs: ihcsdk - "image_processing" = ps: with ps; [ aiohttp-cors]; + "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk + "image_processing" = ps: with ps; [ aiohttp-cors ]; "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib "imap_email_content" = ps: with ps; [ ]; "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client - "influxdb" = ps: with ps; [ influxdb-client influxdb]; + "influxdb" = ps: with ps; [ influxdb-client influxdb ]; "input_boolean" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; "input_number" = ps: with ps; [ ]; @@ -383,15 +383,15 @@ "input_text" = ps: with ps; [ ]; "insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon "integration" = ps: with ps; [ ]; - "intent" = ps: with ps; [ aiohttp-cors]; + "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ ]; # missing inputs: pyintesishome - "ios" = ps: with ps; [ aiohttp-cors zeroconf]; + "ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma - "ipp" = ps: with ps; [ pyipp]; - "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia + "ipp" = ps: with ps; [ pyipp ]; + "iqvia" = ps: with ps; [ numpy ]; # missing inputs: pyiqvia "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator "iss" = ps: with ps; [ ]; # missing inputs: pyiss @@ -406,92 +406,92 @@ "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client - "kef" = ps: with ps; [ getmac]; # missing inputs: aiokef + "kef" = ps: with ps; [ getmac ]; # missing inputs: aiokef "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput - "keyboard_remote" = ps: with ps; [ evdev]; # missing inputs: aionotify + "keyboard_remote" = ps: with ps; [ evdev ]; # missing inputs: aionotify "kira" = ps: with ps; [ ]; # missing inputs: pykira "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "knx" = ps: with ps; [ ]; # missing inputs: xknx - "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket]; - "konnected" = ps: with ps; [ aiohttp-cors]; # missing inputs: konnected + "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; + "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify "lannouncer" = ps: with ps; [ ]; - "lastfm" = ps: with ps; [ pylast]; + "lastfm" = ps: with ps; [ pylast ]; "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches "lcn" = ps: with ps; [ ]; # missing inputs: pypck "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal "life360" = ps: with ps; [ ]; # missing inputs: life360 - "lifx" = ps: with ps; [ aiolifx aiolifx-effects]; + "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "lifx_cloud" = ps: with ps; [ ]; "lifx_legacy" = ps: with ps; [ ]; # missing inputs: liffylights "light" = ps: with ps; [ ]; "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave - "limitlessled" = ps: with ps; [ limitlessled]; + "limitlessled" = ps: with ps; [ limitlessled ]; "linksys_smart" = ps: with ps; [ ]; - "linode" = ps: with ps; [ linode-api]; - "linux_battery" = ps: with ps; [ batinfo]; + "linode" = ps: with ps; [ linode-api ]; + "linux_battery" = ps: with ps; [ batinfo ]; "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc "litejet" = ps: with ps; [ ]; # missing inputs: pylitejet "llamalab_automate" = ps: with ps; [ ]; "local_file" = ps: with ps; [ ]; "local_ip" = ps: with ps; [ ]; - "locative" = ps: with ps; [ aiohttp-cors]; + "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; # missing inputs: home-assistant-frontend "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; - "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg]; # missing inputs: logi_circle + "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle "london_air" = ps: with ps; [ ]; "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy "lovelace" = ps: with ps; [ ]; - "luci" = ps: with ps; [ openwrt-luci-rpc]; - "luftdaten" = ps: with ps; [ luftdaten]; + "luci" = ps: with ps; [ openwrt-luci-rpc ]; + "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy "lutron" = ps: with ps; [ ]; # missing inputs: pylutron "lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed - "mailbox" = ps: with ps; [ aiohttp-cors]; - "mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner + "mailbox" = ps: with ps; [ aiohttp-cors ]; + "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; - "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "map" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py - "matrix" = ps: with ps; [ matrix-client]; + "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx - "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light]; - "media_player" = ps: with ps; [ aiohttp-cors]; + "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; + "media_player" = ps: with ps; [ aiohttp-cors ]; "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate - "meraki" = ps: with ps; [ aiohttp-cors]; + "meraki" = ps: with ps; [ aiohttp-cors ]; "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird - "met" = ps: with ps; [ pymetno]; + "met" = ps: with ps; [ pymetno ]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts - "microsoft_face" = ps: with ps; [ aiohttp-cors]; - "microsoft_face_detect" = ps: with ps; [ aiohttp-cors]; - "microsoft_face_identify" = ps: with ps; [ aiohttp-cors]; - "miflora" = ps: with ps; [ bluepy]; # missing inputs: miflora + "microsoft_face" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; + "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ aiodns getmac]; # missing inputs: mcstatus - "minio" = ps: with ps; [ minio]; + "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus + "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa]; + "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem @@ -499,34 +499,34 @@ "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; "mpchc" = ps: with ps; [ ]; - "mpd" = ps: with ps; [ mpd2]; - "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "mpd" = ps: with ps; [ mpd2 ]; + "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "msteams" = ps: with ps; [ ]; # missing inputs: pymsteams - "mvglive" = ps: with ps; [ PyMVGLive]; + "mvglive" = ps: with ps; [ PyMVGLive ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ ]; # missing inputs: pymyq - "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: pymysensors - "mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom + "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors + "mystrom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: python-mystrom "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "n26" = ps: with ps; [ ]; # missing inputs: n26 "nad" = ps: with ps; [ ]; # missing inputs: nad_receiver - "namecheapdns" = ps: with ps; [ defusedxml]; - "nanoleaf" = ps: with ps; [ pynanoleaf]; - "neato" = ps: with ps; [ pybotvac]; + "namecheapdns" = ps: with ps; [ defusedxml ]; + "nanoleaf" = ps: with ps; [ pynanoleaf ]; + "neato" = ps: with ps; [ pybotvac ]; "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient "nest" = ps: with ps; [ ]; # missing inputs: python-nest - "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo]; + "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ ]; # missing inputs: netdata "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt - "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio + "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio "nexia" = ps: with ps; [ ]; # missing inputs: nexia "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext @@ -535,11 +535,11 @@ "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2 - "nmap_tracker" = ps: with ps; [ getmac]; # missing inputs: python-nmap + "nmap_tracker" = ps: with ps; [ getmac ]; # missing inputs: python-nmap "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ ]; "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa - "norway_air" = ps: with ps; [ pymetno]; + "norway_air" = ps: with ps; [ pymetno ]; "notify" = ps: with ps; [ ]; "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events "notion" = ps: with ps; [ ]; # missing inputs: aionotion @@ -555,17 +555,17 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai - "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; + "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat - "ohmconnect" = ps: with ps; [ defusedxml]; + "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi - "onboarding" = ps: with ps; [ aiohttp-cors]; + "onboarding" = ps: with ps; [ aiohttp-cors ]; "onewire" = ps: with ps; [ ]; # missing inputs: pyownet - "onkyo" = ps: with ps; [ onkyo-eiscp]; - "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: WSDiscovery onvif-zeep-async + "onkyo" = ps: with ps; [ onkyo-eiscp ]; + "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; - "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless + "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless "openerz" = ps: with ps; [ ]; # missing inputs: openerz-api "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openexchangerates" = ps: with ps; [ ]; @@ -576,22 +576,22 @@ "opensky" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv - "openweathermap" = ps: with ps; [ pyowm]; + "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO "oru" = ps: with ps; [ ]; # missing inputs: oru "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify - "otp" = ps: with ps; [ pyotp]; + "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy - "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt]; - "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: python-openzwave-mqtt + "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; + "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera - "pandora" = ps: with ps; [ pexpect]; - "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend - "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "pandora" = ps: with ps; [ pexpect ]; + "panel_custom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend + "panel_iframe" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -605,41 +605,41 @@ "ping" = ps: with ps; [ ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 - "plaato" = ps: with ps; [ aiohttp-cors]; - "plant" = ps: with ps; [ sqlalchemy]; - "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos]; + "plaato" = ps: with ps; [ aiohttp-cors ]; + "plant" = ps: with ps; [ sqlalchemy ]; + "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts - "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint + "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix - "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client]; + "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; "proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer - "proxy" = ps: with ps; [ pillow]; + "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd - "pulseaudio_loopback" = ps: with ps; [ pulsectl]; - "push" = ps: with ps; [ aiohttp-cors]; - "pushbullet" = ps: with ps; [ pushbullet]; - "pushover" = ps: with ps; [ pushover-complete]; + "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; + "push" = ps: with ps; [ aiohttp-cors ]; + "pushbullet" = ps: with ps; [ pushbullet ]; + "pushover" = ps: with ps; [ pushover-complete ]; "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ jsonpath xmltodict]; + "pvoutput" = ps: with ps; [ jsonpath xmltodict ]; "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc "pyload" = ps: with ps; [ ]; - "python_script" = ps: with ps; [ restrictedpython]; + "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qld_bushfire" = ps: with ps; [ ]; # missing inputs: georss_qld_bushfire_alert_client "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats - "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar + "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: rachiopy + "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: rachiopy "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird @@ -650,66 +650,66 @@ "raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste - "recorder" = ps: with ps; [ sqlalchemy]; + "recorder" = ps: with ps; [ sqlalchemy ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch - "reddit" = ps: with ps; [ praw]; + "reddit" = ps: with ps; [ praw ]; "rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl - "remember_the_milk" = ps: with ps; [ httplib2]; # missing inputs: RtmAPI + "remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier - "rest" = ps: with ps; [ jsonpath xmltodict]; + "rest" = ps: with ps; [ jsonpath xmltodict ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; # missing inputs: rflink "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx - "ring" = ps: with ps; [ ha-ffmpeg]; # missing inputs: ring_doorbell + "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api - "rmvtransport" = ps: with ps; [ PyRMVtransport]; + "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy - "route53" = ps: with ps; [ boto3]; + "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio "rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf - "rss_feed_template" = ps: with ps; [ aiohttp-cors]; + "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound - "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend + "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj "salt" = ps: with ps; [ ]; # missing inputs: saltbox - "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket] + "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter - "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict]; + "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict ]; "script" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate - "search" = ps: with ps; [ aiohttp-cors]; - "season" = ps: with ps; [ ephem]; + "search" = ps: with ps; [ aiohttp-cors ]; + "season" = ps: with ps; [ ephem ]; "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid "sense" = ps: with ps; [ ]; # missing inputs: sense_energy "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo "sensor" = ps: with ps; [ ]; - "sentry" = ps: with ps; [ sentry-sdk]; - "serial" = ps: with ps; [ pyserial-asyncio]; + "sentry" = ps: with ps; [ sentry-sdk ]; + "serial" = ps: with ps; [ pyserial-asyncio ]; "serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 - "seven_segments" = ps: with ps; [ pillow]; + "seven_segments" = ps: with ps; [ pillow ]; "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track "shell_command" = ps: with ps; [ ]; - "shiftr" = ps: with ps; [ paho-mqtt]; - "shodan" = ps: with ps; [ shodan]; - "shopping_list" = ps: with ps; [ aiohttp-cors]; + "shiftr" = ps: with ps; [ paho-mqtt ]; + "shodan" = ps: with ps; [ shodan ]; + "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 "sigfox" = ps: with ps; [ ]; - "sighthound" = ps: with ps; [ pillow]; # missing inputs: simplehound + "sighthound" = ps: with ps; [ pillow ]; # missing inputs: simplehound "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python @@ -723,51 +723,51 @@ "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ ]; # missing inputs: pysma - "smappee" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmappee + "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab - "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: pysmartapp pysmartthings + "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg "sms" = ps: with ps; [ ]; # missing inputs: python-gammu "smtp" = ps: with ps; [ ]; - "snapcast" = ps: with ps; [ snapcast]; - "snips" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "snmp" = ps: with ps; [ pysnmp]; + "snapcast" = ps: with ps; [ snapcast ]; + "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "snmp" = ps: with ps; [ pysnmp ]; "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient - "solaredge" = ps: with ps; [ stringcase]; # missing inputs: solaredge + "solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher "solax" = ps: with ps; [ ]; # missing inputs: solax "soma" = ps: with ps; [ ]; # missing inputs: pysoma - "somfy" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymfy + "somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy "sonarr" = ps: with ps; [ ]; # missing inputs: sonarr "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal - "sonos" = ps: with ps; [ pysonos]; + "sonos" = ps: with ps; [ pysonos ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp - "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf]; - "spaceapi" = ps: with ps; [ aiohttp-cors]; + "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ]; + "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw - "speedtestdotnet" = ps: with ps; [ speedtest-cli]; + "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; "spider" = ps: with ps; [ ]; # missing inputs: spiderpy "splunk" = ps: with ps; [ ]; "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime - "spotify" = ps: with ps; [ aiohttp-cors spotipy]; - "sql" = ps: with ps; [ sqlalchemy]; - "squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox - "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf]; + "spotify" = ps: with ps; [ aiohttp-cors spotipy ]; + "sql" = ps: with ps; [ sqlalchemy ]; + "squeezebox" = ps: with ps; [ pysqueezebox ]; + "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf ]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank - "startca" = ps: with ps; [ xmltodict]; - "statistics" = ps: with ps; [ sqlalchemy]; - "statsd" = ps: with ps; [ statsd]; + "startca" = ps: with ps; [ xmltodict ]; + "statistics" = ps: with ps; [ sqlalchemy ]; + "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd "stiebel_eltron" = ps: with ps; [ ]; # missing inputs: pymodbus pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert - "stream" = ps: with ps; [ aiohttp-cors av]; + "stream" = ps: with ps; [ aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater - "stt" = ps: with ps; [ aiohttp-cors]; + "stt" = ps: with ps; [ aiohttp-cors ]; "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; @@ -786,9 +786,9 @@ "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm "syslog" = ps: with ps; [ ]; - "system_health" = ps: with ps; [ aiohttp-cors]; - "system_log" = ps: with ps; [ aiohttp-cors]; - "systemmonitor" = ps: with ps; [ psutil]; + "system_health" = ps: with ps; [ aiohttp-cors ]; + "system_log" = ps: with ps; [ aiohttp-cors ]; + "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ ]; # missing inputs: python-tado "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility @@ -796,19 +796,19 @@ "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli "tcp" = ps: with ps; [ ]; - "ted5000" = ps: with ps; [ xmltodict]; + "ted5000" = ps: with ps; [ xmltodict ]; "teksavvy" = ps: with ps; [ ]; - "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; - "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; + "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; + "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; "tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive "tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow protobuf]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim + "tensorflow" = ps: with ps; [ numpy pillow protobuf ]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac - "thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke + "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke "thethingsnetwork" = ps: with ps; [ ]; "thingspeak" = ps: with ps; [ ]; # missing inputs: thingspeak "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner @@ -821,51 +821,51 @@ "timer" = ps: with ps; [ ]; "tmb" = ps: with ps; [ ]; # missing inputs: tmb "tod" = ps: with ps; [ ]; - "todoist" = ps: with ps; [ todoist]; + "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 "tomato" = ps: with ps; [ ]; - "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: toonapi - "torque" = ps: with ps; [ aiohttp-cors]; + "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: toonapi + "torque" = ps: with ps; [ aiohttp-cors ]; "totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline - "tplink" = ps: with ps; [ pyhs100]; + "tplink" = ps: with ps; [ pyhs100 ]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected - "traccar" = ps: with ps; [ aiohttp-cors stringcase]; # missing inputs: pytraccar + "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async] "trafikverket_train" = ps: with ps; [ ]; # missing inputs: pytrafikverket "trafikverket_weatherstation" = ps: with ps; [ ]; # missing inputs: pytrafikverket - "transmission" = ps: with ps; [ transmissionrpc]; + "transmission" = ps: with ps; [ transmissionrpc ]; "transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy - "trend" = ps: with ps; [ numpy]; - "tts" = ps: with ps; [ aiohttp-cors mutagen]; + "trend" = ps: with ps; [ numpy ]; + "tts" = ps: with ps; [ aiohttp-cors mutagen ]; "tuya" = ps: with ps; [ ]; # missing inputs: tuyaha "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu - "twilio" = ps: with ps; [ aiohttp-cors twilio]; - "twilio_call" = ps: with ps; [ aiohttp-cors twilio]; - "twilio_sms" = ps: with ps; [ aiohttp-cors twilio]; + "twilio" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI "ubee" = ps: with ps; [ ]; # missing inputs: pyubee "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; "uk_transport" = ps: with ps; [ ]; - "unifi" = ps: with ps; [ aiounifi]; - "unifi_direct" = ps: with ps; [ pexpect]; + "unifi" = ps: with ps; [ aiounifi ]; + "unifi_direct" = ps: with ps; [ pexpect ]; "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ ]; # missing inputs: upb_lib "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api - "updater" = ps: with ps; [ distro]; - "upnp" = ps: with ps; [ async-upnp-client]; + "updater" = ps: with ps; [ distro ]; + "upnp" = ps: with ps; [ async-upnp-client ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client "utility_meter" = ps: with ps; [ ]; - "uvc" = ps: with ps; [ uvcclient]; + "uvc" = ps: with ps; [ uvcclient ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp @@ -873,43 +873,43 @@ "velux" = ps: with ps; [ ]; # missing inputs: pyvlx "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch "vera" = ps: with ps; [ ]; # missing inputs: pyvera - "verisure" = ps: with ps; [ jsonpath]; # missing inputs: vsure + "verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense - "version" = ps: with ps; [ pyhaversion]; + "version" = ps: with ps; [ pyhaversion ]; "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek "vizio" = ps: with ps; [ ]; # missing inputs: pyvizio - "vlc" = ps: with ps; [ python-vlc]; + "vlc" = ps: with ps; [ python-vlc ]; "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ ]; # missing inputs: volkszaehler "volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall - "vultr" = ps: with ps; [ vultr]; + "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 - "wake_on_lan" = ps: with ps; [ wakeonlan]; + "wake_on_lan" = ps: with ps; [ wakeonlan ]; "waqi" = ps: with ps; [ ]; # missing inputs: waqiasync "water_heater" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; # missing inputs: waterfurnace "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson - "waze_travel_time" = ps: with ps; [ WazeRouteCalculator]; + "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; - "webhook" = ps: with ps; [ aiohttp-cors]; + "webhook" = ps: with ps; [ aiohttp-cors ]; "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv - "websocket_api" = ps: with ps; [ aiohttp-cors]; + "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ ]; # missing inputs: python-whois "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi - "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink + "wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy - "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api + "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api "wled" = ps: with ps; [ ]; # missing inputs: wled "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset - "workday" = ps: with ps; [ holidays]; + "workday" = ps: with ps; [ holidays ]; "worldclock" = ps: with ps; [ ]; "worldtidesinfo" = ps: with ps; [ ]; "worxlandroid" = ps: with ps; [ ]; @@ -920,33 +920,33 @@ "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway - "xiaomi" = ps: with ps; [ ha-ffmpeg]; - "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: PyXiaomiGateway - "xiaomi_miio" = ps: with ps; [ construct python-miio]; + "xiaomi" = ps: with ps; [ ha-ffmpeg ]; + "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway + "xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv - "xmpp" = ps: with ps; [ slixmpp]; + "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient - "yamaha" = ps: with ps; [ rxv]; + "yamaha" = ps: with ps; [ rxv ]; "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: yeelight + "yeelight" = ps: with ps; [ aiohttp-cors netdisco yeelight zeroconf ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS - "yi" = ps: with ps; [ aioftp ha-ffmpeg]; - "yr" = ps: with ps; [ xmltodict]; + "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; + "yr" = ps: with ps; [ xmltodict ]; "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge - "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; + "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc - "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy]; + "zestimate" = ps: with ps; [ xmltodict ]; + "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zone" = ps: with ps; [ ]; - "zoneminder" = ps: with ps; [ zm-py]; - "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher]; + "zoneminder" = ps: with ps; [ zm-py ]; + "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index f0a664dd63..17ce095e39 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -32,12 +32,8 @@ let (mkOverride "pyowm" "2.10.0" "1xvcv3sbcn9na8cwz21nnjlixysfk5lymnf65d1nqkbgacc1mm4g") - # required by aioesphomeapi - (self: super: { - protobuf = super.protobuf.override { - protobuf = protobuf3_6; - }; - }) + (mkOverride "bcrypt" "3.1.7" + "0hhywhxx301cxivgxrpslrangbfpccc8y83qbwn1f57cab3nj00b") # hass-frontend does not exist in python3.pkgs (self: super: { @@ -72,7 +68,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.114.2"; + hassVersion = "0.114.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -91,9 +87,14 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0llyf3icdgb9mh7x02309m35hxhinzsbd6i31mmb9fjfzp0d27q9"; + sha256 = "0k9px4ny0b72d9ysr3x72idprgfgjab1z91ildr87629826bb4n7"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "yarl==1.4.2" "yarl~=1.4" + ''; + propagatedBuildInputs = [ # From setup.py aiohttp astral async-timeout attrs bcrypt certifi importlib-metadata jinja2 @@ -114,9 +115,14 @@ in with py.pkgs; buildPythonApplication rec { # - components' dependencies are not included, so they cannot be tested # - test_merge_id_schema requires pyqwikswitch # - test_loader.py tries to load not-packaged dependencies + # - test_notify pyotp doesn't like the short mock keys # - unclear why test_merge fails: assert merge_log_err.call_count != 0 # - test_setup_safe_mode_if_no_frontend: requires dependencies for components we have not packaged - py.test --ignore tests/components --ignore tests/test_loader.py -k "not test_setup_safe_mode_if_no_frontend and not test_merge_id_schema and not test_merge" + py.test \ + --ignore tests/components \ + --ignore tests/test_loader.py \ + --ignore tests/auth/mfa_modules/test_notify.py \ + -k "not test_setup_safe_mode_if_no_frontend and not test_merge_id_schema and not test_merge" # Some basic components should be tested however py.test \ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py index 3c6d0c4bca..4fa4b8a48e 100755 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -113,6 +113,10 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional # instead of python-3.6-python-mpd2 inside Nixpkgs if req.startswith("python-") or req.startswith("python_"): names.append(req[len("python-") :]) + # Add name variant without extra_require, e.g. samsungctl + # instead of samsungctl[websocket] + if req.endswith("]"): + names.append(req[:req.find("[")]) for name in names: # treat "-" and "_" equally name = re.sub("[-_]", "[-_]", name) @@ -173,9 +177,10 @@ def main() -> None: f.write(" components = {\n") for component, deps in build_inputs.items(): available, missing = deps - f.write(f' "{component}" = ps: with ps; [ ') - f.write(" ".join(available)) - f.write("];") + f.write(f' "{component}" = ps: with ps; [') + if available: + f.write(" " + " ".join(available)) + f.write(" ];") if len(missing) > 0: f.write(f" # missing inputs: {' '.join(missing)}") f.write("\n") diff --git a/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix b/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix new file mode 100644 index 0000000000..3716afae49 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey +, coreutils, bash, makeWrapper, python3 }: + +stdenv.mkDerivation rec { + pname = "couchdb"; + version = "3.1.0"; + + + # when updating this, please consider bumping the erlang/OTP version + # in all-packages.nix + src = fetchurl { + url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; + sha256 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8"; + }; + + buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))]; + postPatch = '' + substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey.dev}/include/mozjs-68" + patchShebangs bin/rebar + ''; + + dontAddPrefix= "True"; + configureFlags = ["--spidermonkey-version=68"]; + buildFlags = ["release"]; + + installPhase = '' + mkdir -p $out + cp -r rel/couchdb/* $out + ''; + + meta = with stdenv.lib; { + description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; + homepage = "http://couchdb.apache.org"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ lostnet ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix index c67606785e..de74a72e78 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.0"; - sha256 = "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4"; + version = "1.19.2"; + sha256 = "0wr4ss4gld7x717m4j3a6l6f7ijblrrd55y563lkwhvr7sqpn7vw"; } diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix index 9fcb3305f0..ae658a7fdd 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -4,10 +4,11 @@ let http_proxy_connect_module_generic = patchName: rec { src = fetchFromGitHub { + name = "http_proxy_connect_module_generic"; owner = "chobits"; repo = "ngx_http_proxy_connect_module"; - rev = "002f8f9ef15562dc3691b977134518ad216d7a90"; - sha256 = "163wg0xb7w5mwh6wrfarzcgaf6c7gb5qydgpi2wk35k551f7286s"; + rev = "96ae4e06381f821218f368ad0ba964f87cbe0266"; + sha256 = "1nc7z31i7x9dzp67kzgvs34hs6ps749y26wcpi3wf5mm63i803rh"; }; patches = [ @@ -18,12 +19,26 @@ let in { + fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; + ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth"; + + aws-auth = { + src = fetchFromGitHub { + name = "aws-auth"; + owner = "anomalizer"; + repo = "ngx_aws_auth"; + rev = "2.1.1"; + sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9"; + }; + }; + brotli = { src = let gitsrc = pkgs.fetchFromGitHub { + name = "brotli"; owner = "google"; repo = "ngx_brotli"; - rev = "e505dce68acc190cc5a1e780a3b0275e39f160ca"; - sha256 = "00j48lffki62y1nmjyy81iklw5nlyzvrjy3z04qch4fp3p57hwla"; + rev = "25f86f0bac1101b6512135eac5f93c49c63609e3"; + sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv"; }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' cp -a ${gitsrc} $out substituteInPlace $out/filter/config \ @@ -32,8 +47,19 @@ in inputs = [ pkgs.brotli ]; }; + cache-purge = { + src = fetchFromGitHub { + name = "cache-purge"; + owner = "nginx-modules"; + repo = "ngx_cache_purge"; + rev = "2.5.1"; + sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd"; + }; + }; + coolkit = { src = fetchFromGitHub { + name = "coolkit"; owner = "FRiCKLE"; repo = "ngx_coolkit"; rev = "0.2"; @@ -43,6 +69,7 @@ in dav = { src = fetchFromGitHub { + name = "dav"; owner = "arut"; repo = "nginx-dav-ext-module"; rev = "v3.0.0"; @@ -53,24 +80,27 @@ in develkit = { src = fetchFromGitHub { - owner = "simpl"; + name = "develkit"; + owner = "vision5"; repo = "ngx_devel_kit"; - rev = "v0.3.1rc1"; - sha256 = "00vqvpx67qra2hr85hkvj1dha4h7x7v9sblw7w1df11nq1gzsdbb"; + rev = "v0.3.1"; + sha256 = "1c5zfpvm0hrd9lp8rasmw79dnr2aabh0i6y11wzb783bp8m3p2sq"; }; }; echo = { src = fetchFromGitHub { + name = "echo"; owner = "openresty"; repo = "echo-nginx-module"; - rev = "v0.61"; - sha256 = "0brjhhphi94ms4gia7za0mfx0png4jbhvq6j0nzjwp537iyiy23k"; + rev = "v0.62"; + sha256 = "0kr1y094yw1a9fyrf4w73ikq18w5ys463wza9n7yfl77xdwirnvl"; }; }; fancyindex = { src = fetchFromGitHub { + name = "fancyindex"; owner = "aperezdc"; repo = "ngx-fancyindex"; rev = "v0.4.4"; @@ -78,17 +108,9 @@ in }; }; - fastcgi-cache-purge = { - src = fetchFromGitHub { - owner = "nginx-modules"; - repo = "ngx_cache_purge"; - rev = "2.5"; - sha256 = "1f4kxagzvz10vqbcjwi57wink6xw3s1h7wlrrlrlpkmhfbf9704y"; - }; - }; - fluentd = { src = fetchFromGitHub { + name = "fluentd"; owner = "fluent"; repo = "nginx-fluentd-module"; rev = "8af234043059c857be27879bc547c141eafd5c13"; @@ -96,12 +118,17 @@ in }; }; - http_proxy_connect_module_v16 = http_proxy_connect_module_generic "proxy_connect_rewrite_101504" // { - supports = with lib.versions; version: major version == "1" && minor version == "16"; + http_proxy_connect_module_v18 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // { + supports = with lib.versions; version: major version == "1" && minor version == "18"; + }; + + http_proxy_connect_module_v19 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // { + supports = with lib.versions; version: major version == "1" && minor version == "19"; }; ipscrub = { src = fetchFromGitHub { + name = "ipscrub"; owner = "masonicboom"; repo = "ipscrub"; rev = "v1.0.1"; @@ -112,6 +139,7 @@ in limit-speed = { src = fetchFromGitHub { + name = "limit-speed"; owner = "yaoweibin"; repo = "nginx_limit_speed_module"; rev = "f77ad4a56fbb134878e75827b40cf801990ed936"; @@ -121,6 +149,7 @@ in live ={ src = fetchFromGitHub { + name = "live"; owner = "arut"; repo = "nginx-live-module"; rev = "5e4a1e3a718e65e5206c24eba00d42b0d1c4b7dd"; @@ -130,6 +159,7 @@ in lua = { src = fetchFromGitHub { + name = "lua"; owner = "openresty"; repo = "lua-nginx-module"; rev = "v0.10.15"; @@ -145,6 +175,7 @@ in lua-upstream = { src = fetchFromGitHub { + name = "lua-upstream"; owner = "openresty"; repo = "lua-upstream-nginx-module"; rev = "v0.07"; @@ -164,16 +195,18 @@ in modsecurity-nginx = { src = fetchFromGitHub { + name = "modsecurity-nginx"; owner = "SpiderLabs"; repo = "ModSecurity-nginx"; - rev = "v1.0.0"; - sha256 = "0zzpdqhbdqqy8kjkszv0mrq6136ah9v3zwr1jbh312j8izmzdyi7"; + rev = "v1.0.1"; + sha256 = "0cbb3g3g4v6q5zc6an212ia5kjjad62bidnkm8b70i4qv1615pzf"; }; inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; }; moreheaders = { src = fetchFromGitHub { + name = "moreheaders"; owner = "openresty"; repo = "headers-more-nginx-module"; rev = "v0.33"; @@ -183,6 +216,7 @@ in mpeg-ts ={ src = fetchFromGitHub { + name = "mpeg-ts"; owner = "arut"; repo = "nginx-ts-module"; rev = "v0.1.1"; @@ -192,29 +226,22 @@ in naxsi ={ src = fetchFromGitHub { + name = "naxsi"; owner = "nbs-system"; repo = "naxsi"; - rev = "0.56"; - sha256 = "12kn6wbl8xqc19fi05ffprqps4pplg4a6i1cf01xc0d6brx1fg8v"; + rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7"; + sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3"; } + "/naxsi_src"; }; - ngx_aws_auth = { - src = fetchFromGitHub { - owner = "anomalizer"; - repo = "ngx_aws_auth"; - rev = "2.1.1"; - sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9"; - }; - }; - opentracing = { src = let src' = fetchFromGitHub { + name = "opentracing"; owner = "opentracing-contrib"; repo = "nginx-opentracing"; - rev = "v0.7.0"; - sha256 = "16jzxhhsyfjaxb50jy5py9ppscidfx1shvc29ihldp0zs6d8khma"; + rev = "v0.10.0"; + sha256 = "1q234s3p55xv820207dnh4fcxkqikjcq5rs02ai31ylpmfsf0kkb"; }; in "${src'}/opentracing"; inputs = [ pkgs.opentracing-cpp ]; @@ -225,6 +252,7 @@ in version = pkgs.psol.version; moduleSrc = fetchFromGitHub { + name = "pagespeed"; owner = "pagespeed"; repo = "ngx_pagespeed"; rev = "v${version}-stable"; @@ -253,16 +281,18 @@ in pam = { src = fetchFromGitHub { + name = "pam"; owner = "stogh"; repo = "ngx_http_auth_pam_module"; - rev = "v1.5.1"; - sha256 = "031q006bcv10dzxi3mzamqiyg14p48v0bzd5mrwz073pbf0ba2fl"; + rev = "v1.5.2"; + sha256 = "06nydxk82rc9yrw4408nakb197flxh4z1yv935crg65fn9706rl7"; }; inputs = [ pkgs.pam ]; }; pinba = { src = fetchFromGitHub { + name = "pinba"; owner = "tony2001"; repo = "ngx_http_pinba_module"; rev = "28131255d4797a7e2f82a6a35cf9fc03c4678fe6"; @@ -272,15 +302,17 @@ in push-stream ={ src = fetchFromGitHub { + name = "push-stream"; owner = "wandenberg"; repo = "nginx-push-stream-module"; - rev = "0.5.4"; - sha256 = "0izn7lqrp2zfl738aqa9i8c5lba97wkhcnqg8qbw3ipp5cysb2hr"; + rev = "1cdc01521ed44dc614ebb5c0d19141cf047e1f90"; + sha256 = "0ijka32b37dl07k2jl48db5a32ix43jaczrpjih84cvq8yph0jjr"; }; }; rtmp ={ src = fetchFromGitHub { + name = "rtmp"; owner = "arut"; repo = "nginx-rtmp-module"; rev = "v1.2.1"; @@ -290,6 +322,7 @@ in set-misc = { src = fetchFromGitHub { + name = "set-misc"; owner = "openresty"; repo = "set-misc-nginx-module"; rev = "v0.32"; @@ -299,15 +332,17 @@ in shibboleth = { src = fetchFromGitHub { + name = "shibboleth"; owner = "nginx-shib"; repo = "nginx-http-shibboleth"; - rev = "48b70d87bf7796d7813813a837e52b3a86e6f6f4"; - sha256 = "0k8xcln5sf0m4r0m550dkhl07zhncp285dpysk6r4v6vqzqmhzdc"; + rev = "3f5ff4212fa12de23cb1acae8bf3a5a432b3f43b"; + sha256 = "136zjipaz7iikgcgqwdv1mrh3ya996zyzbkdy6d4k07s2h9g7hy6"; }; }; sla = { src = fetchFromGitHub { + name = "sla"; owner = "goldenclone"; repo = "nginx-sla"; rev = "7778f0125974befbc83751d0e1cadb2dcea57601"; @@ -317,6 +352,7 @@ in slowfs-cache = { src = fetchFromGitHub { + name = "slowfs-cache"; owner = "FRiCKLE"; repo = "ngx_slowfs_cache"; rev = "1.10"; @@ -326,6 +362,7 @@ in sorted-querystring = { src = fetchFromGitHub { + name = "sorted-querystring"; owner = "wandenberg"; repo = "nginx-sorted-querystring-module"; rev = "0.3"; @@ -335,7 +372,8 @@ in statsd = { src = fetchFromGitHub { - owner = "apcera"; + name = "statsd"; + owner = "harvesthq"; repo = "nginx-statsd"; rev = "b970e40467a624ba710c9a5106879a0554413d15"; sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr"; @@ -344,6 +382,7 @@ in stream-sts = { src = fetchFromGitHub { + name = "stream-sts"; owner = "vozlt"; repo = "nginx-module-stream-sts"; rev = "v0.1.1"; @@ -353,6 +392,7 @@ in sts = { src = fetchFromGitHub { + name = "sts"; owner = "vozlt"; repo = "nginx-module-sts"; rev = "v0.1.1"; @@ -362,15 +402,17 @@ in subsFilter = { src = fetchFromGitHub { + name = "subsFilter"; owner = "yaoweibin"; repo = "ngx_http_substitutions_filter_module"; - rev = "bc58cb11844bc42735bbaef7085ea86ace46d05b"; - sha256 = "1q5hr3sqys4f365gzjci549rn9ylhgj4xb29ril04zr5vkhzlnar"; + rev = "b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0"; + sha256 = "027jxzx66q9a6ycn47imjh40xmnqr0z423lz0ds3w4rf1c2x130f"; }; }; sysguard = { src = fetchFromGitHub { + name = "sysguard"; owner = "vozlt"; repo = "nginx-module-sysguard"; rev = "e512897f5aba4f79ccaeeebb51138f1704a58608"; @@ -380,15 +422,17 @@ in upstream-check = { src = fetchFromGitHub { + name = "upstream-check"; owner = "yaoweibin"; repo = "nginx_upstream_check_module"; - rev = "007f76f7adbcbd6abd9352502af1a4ae463def85"; - sha256 = "1qcg7c9rcl70wr1qf188shnn9s2f7cxnlw05s6scbvlgnf6ik6in"; + rev = "e538034b6ad7992080d2403d6d3da56e4f7ac01e"; + sha256 = "06y7k04072xzqyqyb08m0vaaizkp4rfwm0q7i735imbzw2rxb74l"; }; }; upstream-tarantool = { src = fetchFromGitHub { + name = "upstream-tarantool"; owner = "tarantool"; repo = "nginx_upstream_module"; rev = "v2.7.1"; @@ -399,6 +443,7 @@ in url = { src = fetchFromGitHub { + name = "url"; owner = "vozlt"; repo = "nginx-module-url"; rev = "9299816ca6bc395625c3683fbd2aa7b916bfe91e"; @@ -408,6 +453,7 @@ in video-thumbextractor = { src = fetchFromGitHub { + name = "video-thumbextractor"; owner = "wandenberg"; repo = "nginx-video-thumbextractor-module"; rev = "0.9.0"; @@ -418,6 +464,7 @@ in vts = { src = fetchFromGitHub { + name = "vts"; owner = "vozlt"; repo = "nginx-module-vts"; rev = "v0.1.18"; diff --git a/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix b/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix index d845d92ec8..734dfb0414 100644 --- a/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/openresty/default.nix @@ -8,12 +8,12 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.15.8"; - version = "${nginxVersion}.3"; + nginxVersion = "1.17.8"; + version = "${nginxVersion}.2"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "1a1la7vszv1parsnhphydblz64ffhycazncn3ividnvqg2mg735n"; + sha256 = "1813w33hjm1hcqvl3b3f67qgi5zfjiqg6s01hiy12a5j3jqilcig"; }; fixPatch = patch: let name = patch.name or (builtins.baseNameOf patch); in diff --git a/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix index 17c4367866..fa2769f99d 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.24"; + version = "1.2.25"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f"; + sha512 = "e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d"; }; sourceRoot = "${pname}-${version}-src/native"; diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index 2f73a5d924..27f45fe6e4 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -3,8 +3,8 @@ , withPython3 ? true, python3, ncurses , withPHP73 ? false, php73 , withPHP74 ? true, php74 -, withPerl528 ? false, perl528 -, withPerl530 ? true, perl530 +, withPerl530 ? false, perl530 +, withPerl532 ? true, perl532 , withPerldevel ? false, perldevel , withRuby_2_5 ? false, ruby_2_5 , withRuby_2_6 ? true, ruby_2_6 @@ -47,8 +47,8 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP73 php73-unit ++ optional withPHP74 php74-unit - ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 + ++ optional withPerl532 perl532 ++ optional withPerldevel perldevel ++ optional withRuby_2_5 ruby_2_5 ++ optional withRuby_2_6 ruby_2_6 @@ -73,8 +73,8 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"} - ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} + ${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} ${optionalString withRuby_2_5 "./configure ruby --module=ruby25 --ruby=${ruby_2_5}/bin/ruby"} ${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"} diff --git a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix index a35b545927..6414d445a0 100644 --- a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { pname = "icingaweb2"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "18q3d15w7d46g4vyq4iph5c1bbxcl8ikcdc8djrfi30wx36ziybs"; + sha256 = "1hmw681a2qv578npr389szkxpbhcfqzq9c1wzkbjjm3avnvi37mf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index 9d1a56877d..5197b1d3df 100644 --- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "048bfkazjijf7p0wb5y09qhl7pgg297xxshgmkfyr025d7d50lf4"; + sha256 = "0p6vy5b6dhv23qnn6sk99hn0j5wiwqpaprsg5jgm2wxb0w2bfz0w"; rev = "v${version}"; }; - vendorSha256 = "1pvyr3lazza89njdl6q3h2nd0mkvjvbryyrfqv11kd3s52055ckz"; + vendorSha256 = "0jrp778cjr8k8sbal0yn1zy7s9sj534q9i90qv4c29fxd9xw7qgp"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix b/third_party/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix new file mode 100644 index 0000000000..84b80203f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/irc/robustirc-bridge/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "robustirc-bridge"; + version = "1.8"; + + src = fetchFromGitHub { + owner = "robustirc"; + repo = "bridge"; + rev = "v${version}"; + sha256 = "12jzil97147f978shdgm6whz7699db0shh0c1fzgrjh512dw502c"; + }; + + vendorSha256 = "0lm8j2iz0yysgi0bbh78ca629kb6sxvyy9al3aj2587hpvy79q85"; + + postInstall = '' + install -D robustirc-bridge.1 $out/share/man/man1/robustirc-bridge.1 + ''; + + passthru.tests.robustirc-bridge = nixosTests.robustirc-bridge; + + meta = with stdenv.lib; { + description = "Bridge to robustirc.net-IRC-Network"; + homepage = "https://robustirc.net/"; + license = licenses.bsd3; + maintainers = [ maintainers.hax404 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/isso/default.nix b/third_party/nixpkgs/pkgs/servers/isso/default.nix index bb9302479e..d2387a1fa6 100644 --- a/third_party/nixpkgs/pkgs/servers/isso/default.nix +++ b/third_party/nixpkgs/pkgs/servers/isso/default.nix @@ -1,26 +1,32 @@ -{ stdenv, python2, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: + +with python3Packages; buildPythonApplication rec { -with python2.pkgs; buildPythonApplication rec { pname = "isso"; - version = "0.12.2"; + # Can not use 0.12.2 because of: + # https://github.com/posativ/isso/issues/617 + version = "unstable-2020-09-14"; # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; - rev = version; - sha256 = "18v8lzwgl5hcbnawy50lfp3wnlc0rjhrnw9ja9260awkx7jra9ba"; + rev = "f4d2705d4f1b51f444d0629355a6fcbcec8d57b5"; + sha256 = "02jgfzq3svd54zj09jj7lm2r7ypqqjynzxa9dgnnm0pqvq728wzr"; }; propagatedBuildInputs = [ - bleach - cffi - configparser - html5lib - ipaddr + itsdangerous jinja2 misaka + html5lib werkzeug + bleach + flask-caching + ]; + + buildInputs = [ + cffi ]; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index aaa762836b..e76fd0eae9 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -1,46 +1,30 @@ -{ lib, stdenv, fetchurl, makeWrapper, curl, icu60, openssl, zlib }: +{ lib, stdenv, fetchurl, mono, makeWrapper, curl, icu60, openssl, zlib }: stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.175"; + version = "0.16.1057"; - src = { - x86_64-linux = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; - sha512 = "269n84qc8sfrmnidgrjywanbqr65mhkmk24dlqfi17pi0l27wi4fc4qmnjj683xwprz5hqjsmkqf963pbx4k3jaz0rp0jnizan91wij"; - }; - aarch64-linux = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxARM64.tar.gz"; - sha512 = "0dmyhprd2vi2z9q5g79psqgsc3w0zdac4s6k20rngi8jxm5jgphzrzcic4rgdijyryap99my619k447w701a08vh9sfcfk0fjg9pgwb"; - }; - }."${stdenv.targetPlatform.system}" or (throw "Missing hash for host system: ${stdenv.targetPlatform.system}"); + src = fetchurl { + url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; + sha256 = "0scc7xjyr7igbnmkg67lmzijvkgv3si1r502npnxamiflic59rnx"; + }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/{bin,opt/${pname}-${version}} - cp -r * $out/opt/${pname}-${version} + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version} - makeWrapper "$out/opt/${pname}-${version}/jackett" $out/bin/Jackett \ - --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib:${icu60.out}/lib:${openssl.out}/lib:${zlib.out}/lib" - ''; - - preFixup = let - libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib # libstdc++.so.6 - ]; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" \ - $out/opt/${pname}-${version}/jackett + makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ + --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ curl icu60 openssl zlib ]} ''; meta = with stdenv.lib; { description = "API Support for your favorite torrent trackers."; homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; - maintainers = with maintainers; [ edwtjo nyanloutre ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix index 9194681d63..afa5375c9f 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.6.2"; + version = "10.6.4"; # Impossible to build anything offline with dotnet src = fetchurl { - url = "https://repo.jellyfin.org/releases/server/portable/stable/combined/jellyfin_${version}.tar.gz"; - sha256 = "16yib2k9adch784p6p0whgfb6lrjzwiigg1n14cp88dx64hyhxhb"; + url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz"; + sha256 = "OqN070aUKPk0dXAy8R/lKUnSWen+si/AJ6tkYh5ibqo="; }; buildInputs = [ @@ -56,6 +56,6 @@ in stdenv.mkDerivation rec { description = "The Free Software Media System"; homepage = "https://jellyfin.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ nyanloutre minijackson ]; + maintainers = with maintainers; [ nyanloutre minijackson purcell ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index 10b74f6b79..614eb2a467 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "10.0.2"; + version = "11.0.2"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "1fn8yd02m0bnvwkbrfxrdnxfab30s0wzm3zxpy63wf3vak7nacma"; + sha256 = "0ayg6cl6mff64qs36djnfs3is4x0pzhk7zwb27cbln77q3icc0j0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix b/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix index 2186301808..5f5db310bf 100644 --- a/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix +++ b/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, writeText }: +{ stdenv, fetchFromGitHub, writeText, nixosTests }: stdenv.mkDerivation rec { pname = "limesurvey"; - version = "3.17.12+190823"; + version = "3.23.0+200813"; src = fetchFromGitHub { owner = "LimeSurvey"; repo = "LimeSurvey"; rev = version; - sha256 = "1i7jpxndrbya5ggl4babscwzmxx4c0jwri5kpl7h2ihqrn90m4b5"; + sha256 = "0r260z40g6b2bsfzxgfwdffbs17bl784xsc67n7q8222rs601hxf"; }; phpConfig = writeText "config.php" '' @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + smoke-test = nixosTests.limesurvey; + }; + meta = with stdenv.lib; { description = "Open source survey application"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix index 156c0f108a..60122d6b45 100644 --- a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix @@ -1,30 +1,32 @@ -{ stdenv, fetchFromGitHub, buildGoPackage -, pkgconfig, ffmpeg_3 +{ stdenv, fetchFromGitHub, buildGoModule +, pkg-config, ffmpeg, gnutls }: -buildGoPackage rec { +buildGoModule rec { pname = "livepeer"; - version = "0.2.4"; + version = "0.5.10"; - goPackagePath = "github.com/livepeer/go-livepeer"; - goDeps = ./deps.nix; + runVend = true; + vendorSha256 = "0i5977skw4b209zvdvgvzfnhqb574067mmfk2gf9y590lgnr86f7"; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; - rev = version; - sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia"; + rev = "v${version}"; + sha256 = "0qccvnk2yyly7ha9lkcpd6zj5n9xnhdjkl3nllb9xziidsq6p65h"; }; - nativeBuildInputs = [ pkgconfig ]; + # livepeer_cli has a vendoring problem + subPackages = [ "cmd/livepeer" ]; - buildInputs = [ ffmpeg_3 ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ ffmpeg gnutls ]; meta = with stdenv.lib; { description = "Official Go implementation of the Livepeer protocol"; homepage = "https://livepeer.org"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/livepeer/deps.nix b/third_party/nixpkgs/pkgs/servers/livepeer/deps.nix deleted file mode 100644 index 297d0724a4..0000000000 --- a/third_party/nixpkgs/pkgs/servers/livepeer/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - 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/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix index a12c86cd3f..1a11e065d9 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz globin ]; + maintainers = with stdenv.lib.maintainers; [ peti fpletz globin ]; platforms = stdenv.lib.platforms.unix; }; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index aca694f53d..5c01453cb2 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "http://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; - maintainers = with maintainers; [ rickynils globin ]; + maintainers = with maintainers; [ globin ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix index c489f2b14f..a59e18837d 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ rickynils obadz ekleog ]; + maintainers = with maintainers; [ obadz ekleog ]; }; passthru.tests = { basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; diff --git a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix index ac5b947502..e449f4ae95 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { description = "A fast, easy to administer, and secure mail server"; license = with licenses; [ ipl10 epl20 ]; platforms = platforms.linux; - maintainers = with maintainers; [ rickynils globin ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index a321f609df..cc4447914c 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.0"; + version = "1.19.3"; src = fetchPypi { inherit pname version; - sha256 = "1fl9p0cb442271hx7zjz8vp111xgvdpn4khk8bk3kl8z9hjs2l1p"; + sha256 = "1r63gw9a4n2sd3520zadpn05zxfk45nqrgwxp3zky5nkyrh4qbys"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index 813d1f18e8..a63d75552c 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; rev = "v${version}"; - sha256 = "1qagp6jnc4n368pg4h3jr9bzpwpbnva1xyl1b1k2a7q4b5fm5yww"; + sha256 = "1c77f3ffm6m9j8q9p1hb9i8zrqqpvfkr9ffamly44gs7xddmv9sv"; }; buildInputs = [ olm ]; - vendorSha256 = "1dmlqhhwmc0k9nbab5j8sl20b8d6b5yrmcdf7ibaiqh7i16zrp3s"; + vendorSha256 = "01yr5321paqifmgzz235lknsa0w4hbs3182y6pxw8hqsvh18c48b"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/mbtileserver/default.nix b/third_party/nixpkgs/pkgs/servers/mbtileserver/default.nix new file mode 100644 index 0000000000..56309f6f1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mbtileserver/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "mbtileserver"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "consbio"; + repo = pname; + rev = "v${version}"; + sha256 = "0b0982rn5jsv8zxfkrcmhys764nim6136hafc8ccj0mwdyvwafxd"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "A simple Go-based server for map tiles stored in mbtiles format"; + homepage = "https://github.com/consbio/mbtileserver"; + license = licenses.isc; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/meguca/default.nix b/third_party/nixpkgs/pkgs/servers/meguca/default.nix deleted file mode 100644 index d3853fc9de..0000000000 --- a/third_party/nixpkgs/pkgs/servers/meguca/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full -, ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson -, nodePackages, emscripten, opencv, statik }: - -buildGoPackage { - pname = "meguca-unstable"; - version = "2019-03-12"; - goPackagePath = "github.com/bakape/meguca"; - goDeps = ./server_deps.nix; - - src = fetchFromGitHub { - owner = "bakape"; - repo = "meguca"; - rev = "21b08de09b38918061c5cd0bbd0dc9bcc1280525"; - sha256 = "1nb3bf1bscbdma83sp9fbgvmxxlxh21j9h80wakfn85sndcrws5i"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ pkgconfig cmake go-bindata ]; - - buildInputs = [ - ffmpeg-full graphicsmagick ghostscript quicktemplate - easyjson emscripten opencv statik - ]; - - buildPhase = '' - export HOME=`pwd` - cd 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 -j $NIX_BUILD_CORES generate all - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - make -j $NIX_BUILD_CORES wasm - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/meguca - cp meguca $out/bin - cp -r www $out/share/meguca - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/bakape/meguca"; - description = "High performance anonymous realtime imageboard"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ chiiruno ]; - broken = true; # Broken on Hydra since 2019-04-18: - # https://hydra.nixos.org/build/98885902 - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/meguca/server_deps.nix b/third_party/nixpkgs/pkgs/servers/meguca/server_deps.nix deleted file mode 100644 index bff9d5624e..0000000000 --- a/third_party/nixpkgs/pkgs/servers/meguca/server_deps.nix +++ /dev/null @@ -1,390 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/ErikDubbelboer/gspt"; - fetch = { - type = "git"; - url = "https://github.com/ErikDubbelboer/gspt"; - rev = "e68493906b8382891943ddc9960cb9c6ecd1a1f0"; - sha256 = "17xjyg6zw02yzly30hs92pwgn0w85naixr4kb2c0mgp5zavl1ffz"; - }; - } - { - goPackagePath = "github.com/Masterminds/squirrel"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/squirrel"; - rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c"; - sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/goquery"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/goquery"; - rev = "3dcf72e6c17f694381a21592651ca1464ded0e10"; - sha256 = "0fpsf6b54z33a7zl28x860jbaj3g5722g8kpqs6rdpaqv99yyvnn"; - }; - } - { - goPackagePath = "github.com/andybalholm/cascadia"; - fetch = { - type = "git"; - url = "https://github.com/andybalholm/cascadia"; - rev = "680b6a57bda4f657485ad44bdea42342ead737bc"; - sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm"; - }; - } - { - goPackagePath = "github.com/aquilax/tripcode"; - fetch = { - type = "git"; - url = "https://github.com/aquilax/tripcode"; - rev = "1a14b0a5e89f7fdb8a821562569338ad59ab2da5"; - sha256 = "1ishrg37gkkx04gbchhsk7jp01mmfvln2i2zrncbj4qxs2amnn2l"; - }; - } - { - goPackagePath = "github.com/badoux/goscraper"; - fetch = { - type = "git"; - url = "https://github.com/badoux/goscraper"; - rev = "9b4686c4b62c22b0489d53dddf5421605caba33e"; - sha256 = "1f1wc4s2b6g1ndpihb0gn7cxmwyi4wfqi5slvsk6i6p9q4kxrkvx"; - }; - } - { - goPackagePath = "github.com/bakape/boorufetch"; - fetch = { - type = "git"; - url = "https://github.com/bakape/boorufetch"; - rev = "90aee10269a138a08ce49cd91635500336657a82"; - sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk"; - }; - } - { - goPackagePath = "github.com/bakape/captchouli"; - fetch = { - type = "git"; - url = "https://github.com/bakape/captchouli"; - rev = "b57177c8d2f239547e9545354e2f55fbc851ab47"; - sha256 = "1fi24322bbicc2bpfla37nhy2w89cf67345dbybcavgcny5rs65a"; - }; - } - { - goPackagePath = "github.com/bakape/mnemonics"; - fetch = { - type = "git"; - url = "https://github.com/bakape/mnemonics"; - rev = "056d8d3259923b93bb0449a45b0c56ac20c77f1b"; - sha256 = "137dl4bkpszj7pm4dyj222xdvy9lmwsgmm0l6bxni0msc3jdrqkl"; - }; - } - { - goPackagePath = "github.com/bakape/thumbnailer"; - fetch = { - type = "git"; - url = "https://github.com/bakape/thumbnailer"; - rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949"; - sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5"; - sha256 = "12f5swiwzcamk87r9j73nn7rmyyday7jkgzfh7x5wdg9blzhrir2"; - }; - } - { - goPackagePath = "github.com/chai2010/webp"; - fetch = { - type = "git"; - url = "https://github.com/chai2010/webp"; - rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab"; - sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh"; - }; - } - { - goPackagePath = "github.com/dimfeld/httptreemux"; - fetch = { - type = "git"; - url = "https://github.com/dimfeld/httptreemux"; - rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff"; - sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp"; - }; - } - { - goPackagePath = "github.com/dsnet/compress"; - fetch = { - type = "git"; - url = "https://github.com/dsnet/compress"; - rev = "da652975a8eea9fa0735aba8056747a751db0bd3"; - sha256 = "1wwjaymzb1xxq3ybch3nwn72xhi2s40cvz0cl986yad3w1xwzj91"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "11844c0959f6fff69ba325d097fce35bd85a8e93"; - sha256 = "0driasljawka9r914530mr9df2i5cwldcgj2v94qkhzlkb48ljwc"; - }; - } - { - goPackagePath = "github.com/go-playground/ansi"; - fetch = { - type = "git"; - url = "https://github.com/go-playground/ansi"; - rev = "777788a9be1a7296979a999c86b251fc777077a9"; - sha256 = "1y2pqx04lc7cqg50scfivzw0n8f0dliflnih14f5jf4svff8s561"; - }; - } - { - goPackagePath = "github.com/go-playground/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-playground/errors"; - rev = "4050dd2e2e3b2052ef736048661d1d23a4a4e55d"; - sha256 = "0b3bhf2c9fpv095db3ajyb1fz7nxjn7rfg9rjb83hqfm492wjy86"; - }; - } - { - goPackagePath = "github.com/go-playground/log"; - fetch = { - type = "git"; - url = "https://github.com/go-playground/log"; - rev = "fdcdf507e3bf20900bc1a44b0cbd73fee5bcbe19"; - sha256 = "0mbzawm09n2kggrkmj0khrhipmdi191z01mw120ahbmmjdjls749"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2a8bb927dd31d8daada140a5d09578521ce5c36a"; - sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; - }; - } - { - goPackagePath = "github.com/gorilla/handlers"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/handlers"; - rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05"; - sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "0ec3d1bd7fe50c503d6df98ee649d81f4857c564"; - sha256 = "0mdq489izwy20bpjg31k8qnfgvh5r7mm5yq709q6xyzmzdd5nasx"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "26a05976f9bf5c3aa992cc20e8588c359418ee58"; - sha256 = "0bmvrgg373fxwqsr6nri01bmi9qdj6knxkmnbw70h9rmi2d9c585"; - }; - } - { - goPackagePath = "github.com/lann/builder"; - fetch = { - type = "git"; - url = "https://github.com/lann/builder"; - rev = "47ae307949d02aa1f1069fdafc00ca08e1dbabac"; - sha256 = "1kg9jy1rciznj627hafpq2mi7hr5d3ssgqcpwrm3bnlk9sqnydil"; - }; - } - { - goPackagePath = "github.com/lann/ps"; - fetch = { - type = "git"; - url = "https://github.com/lann/ps"; - rev = "62de8c46ede02a7675c4c79c84883eb164cb71e3"; - sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee"; - sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1"; - sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz"; - }; - } - { - goPackagePath = "github.com/nwaples/rardecode"; - fetch = { - type = "git"; - url = "https://github.com/nwaples/rardecode"; - rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7"; - sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; - }; - } - { - goPackagePath = "github.com/oschwald/maxminddb-golang"; - fetch = { - type = "git"; - url = "https://github.com/oschwald/maxminddb-golang"; - rev = "fc04c43d3c694a35570a7e4358b0f4d4ac3fea32"; - sha256 = "16bz3g8mkg2xhb4pxcpk6scxrmn48485jgky7wvi4gzpizlhsxxq"; - }; - } - { - goPackagePath = "github.com/otium/ytdl"; - fetch = { - type = "git"; - url = "https://github.com/otium/ytdl"; - rev = "5c8ee71b4175be285baaff66147458254884f748"; - sha256 = "1w22cfc6nr7z5fc3hmcymmx2xfcb66ylhfs89vn4i19ksxbkkcjk"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "062282ea0dcff40c9fb8525789eef9644b1fbd6e"; - sha256 = "04lzigxv2f4yv9gr1dybsjkcnmv1lj0mx9ls2ry1pzy2l9z6i6cp"; - }; - } - { - goPackagePath = "github.com/rakyll/statik"; - fetch = { - type = "git"; - url = "https://github.com/rakyll/statik"; - rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e"; - sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5"; - }; - } - { - goPackagePath = "github.com/sevlyar/go-daemon"; - fetch = { - type = "git"; - url = "https://github.com/sevlyar/go-daemon"; - rev = "fedf95d0cd0be92511436dbc84c290ff1c104f61"; - sha256 = "1ffjgx75wvpharzq60aqbpl78z1jwx13b21ifcadm1f976vdjq1q"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "dae0fa8d5b0c810a8ab733fbd5510c7cae84eca4"; - sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w"; - }; - } - { - goPackagePath = "github.com/ulikunitz/xz"; - fetch = { - type = "git"; - url = "https://github.com/ulikunitz/xz"; - rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; - sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; - }; - } - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; - sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; - }; - } - { - goPackagePath = "github.com/valyala/quicktemplate"; - fetch = { - type = "git"; - url = "https://github.com/valyala/quicktemplate"; - rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; - sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; - }; - } - { - goPackagePath = "gitlab.com/nyarla/go-crypt"; - fetch = { - type = "git"; - url = "https://gitlab.com/nyarla/go-crypt.git"; - rev = "d9a5dc2b789bc330075d4b805d9b7c971f2865a1"; - sha256 = "0249hbwvhy0xywi9b5k8964km27pvfkr3jvliy3azri6vnyvkkx1"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2bc60bb26ad24e09734fdc2d9ec58"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d8887717615a059821345a5c23649351b52a1c0b"; - sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fead79001313d15903fb4605b4a1b781532cd93e"; - sha256 = "12vwl6sv6w7q0dyvynjhbp67242rhh77d6nlsb22ajr8rf17c63i"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5d731a35f4867878fc89f7744f7b6debb3beded6"; - sha256 = "1ipmjki0i0dvpal1g0vgr8qc77kkvw3ka6yxlm0qzjk9j3579bsq"; - }; - } - { - goPackagePath = "gopkg.in/gomail.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gomail.v2"; - rev = "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1"; - sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"; - }; - } - { - goPackagePath = "gopkg.in/mholt/archiver.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mholt/archiver.v2"; - rev = "de0d89e255e17c8d75a40122055763e743ab0593"; - sha256 = "02fsc0za0yi3dg0r5caa8vpxz6kqxjxxlmwzzj5899dlmdvqk57g"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix index 6b3bcdf72d..2298ecc84c 100644 --- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.36.2"; + version = "0.36.4"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1m3wafv6fh3ivxi474bf0in3wryyimv27pqv3920ryvwkawz7gyi"; + sha256 = "1k6f22ii9vga8j9jxipl1r55msxgag0lbkjxw7vf285z1hdhwylq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/microserver/default.nix b/third_party/nixpkgs/pkgs/servers/microserver/default.nix new file mode 100644 index 0000000000..9132ef9672 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/microserver/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "microserver"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "robertohuertasm"; + repo = "microserver"; + rev = "v${version}"; + sha256 = "1i9689ra5jnmhkxabrx4zcp5f422w9ql9m4xzldqwmpnckm736v6"; + }; + + cargoSha256 = "1yn3xmmhpixiviayicl2szlzfjx5crffp3pq75d5nz6ky3miai9l"; + + meta = with stdenv.lib; { + homepage = "https://github.com/robertohuertasm/microserver"; + description = "Simple ad-hoc server with SPA support"; + maintainers = with maintainers; [ flosse ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix index 8420f53aba..55a328b21d 100644 --- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix @@ -1,17 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: -buildGoPackage rec { +let pname = "miniflux"; - version = "2.0.21"; + version = "2.0.23"; + +in buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0yhzmfs35jfc7vq26r9c14v4lnv8sxj3pv23r2cx2rfx47b1zmk7"; + sha256 = "0v0n5lvrfn3ngs1s1m3hv95dvnqn8ysksb044m4ifk2cr3b77ryc"; }; - goPackagePath = "miniflux.app"; + vendorSha256 = "1iin5r9l8wb9gm0bwgdmpx0cp1q35ij4y7zf98lnj2kvb3jv5crp"; nativeBuildInputs = [ installShellFiles ]; @@ -23,9 +26,11 @@ buildGoPackage rec { postInstall = '' mv $out/bin/miniflux.app $out/bin/miniflux - installManPage go/src/${goPackagePath}/miniflux.1 + installManPage miniflux.1 ''; + passthru.tests = nixosTests.miniflux; + meta = with stdenv.lib; { description = "Minimalist and opinionated feed reader"; homepage = "https://miniflux.app/"; @@ -33,4 +38,3 @@ buildGoPackage rec { maintainers = with maintainers; [ rvolosatovs benpye ]; }; } - diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 19e228b162..4a14dca660 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -23,6 +23,15 @@ buildGoModule rec { sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go ''; + postConfigure = '' + export CGO_ENABLED=0 + ''; + + buildFlagsArray = [ + "-tags=kqueue" + "-trimpath" + ]; + passthru.tests.minio = nixosTests.minio; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix b/third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix index 0761468bd1..653ca399fc 100644 --- a/third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix @@ -30,6 +30,7 @@ buildGoPackage rec { ''; goPackagePath = "github.com/etix/mirrorbits"; + deleteVendor = true; goDeps = ./deps.nix; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 1f4d91c9c8..975c092251 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.1.3"; + version = "7.2.0"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1acvvqsgwfrkqmbgzdxfa8shwmx7c91agaqv3gsfgpqkqwp3pnmh"; + sha256 = "1pzsg6kr5kq5767plji7m6ssy2z9jxjp9zp182baxjd634mmclcx"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0c72xmazr3rgiccrqcy02w30159vsq9d78dkqf5c2yjqn8zzwf98"; + sha256 = "003sn06r94m68b6l91cjr3xr3i7hq54ay0gb562i6y5swrfkqqwz"; }; - vendorSha256 = "11zi7a4mqi80m5z4zcrc6wnzhgk6xnmzisrk2v4vpmfp33s732lz"; + vendorSha256 = "1b33kibvfa1qgalqb9ngxqimcn92cy8sllsc81wc9gmz4giz9mn1"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 668695aa8d..ec9d56f2cb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -1,7 +1,7 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { - version = "1.5.0"; + version = "1.6.1"; pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "137lnd69p8qfg2z8l32dr1mrk2lhrxjx392xfij11sy5i9blfc3n"; + sha256 = "0bakskzizazc5cd6km3n6facc5val5567zinnxg3yjy29xdi64ww"; }; postPatch = '' @@ -25,7 +25,7 @@ buildGoPackage rec { preFixup = stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/promtail \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix index b8246c27b4..12957f6d1b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = [ "all" ]; + CFLAGS = "-ldl"; # Do not create /var directories preInstall = '' @@ -36,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nagios.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; + maintainers = with stdenv.lib.maintainers; [ immae thoughtpolice relrod ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index 03f09992b8..6f1a3f21f5 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -6,8 +6,6 @@ buildGoPackage rec { goPackagePath = "github.com/ribbybibby/s3_exporter"; - goDeps = ./aws-s3-exporter_deps.nix; - src = fetchFromGitHub { owner = "ribbybibby"; repo = "s3_exporter"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix deleted file mode 100644 index 5ca160cb16..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix +++ /dev/null @@ -1,336 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.20.1"; - sha256 = "0nhdkkcm11d2n2974kph6jjhddkp1fjbcpfgmalabc798gmqfg54"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e8439af"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.4"; - sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a90"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.2"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d28f0bde5980"; - sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b47fdc937951"; - sha256 = "17k4qwql2zizrxwjd0qv0gccwgyyv2axiha1vh5lrjfps1h5kli7"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 0b17f7801b..7e729cd366 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ -{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: +{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }: let - version = "2.19.3"; + version = "2.20.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "0dlvhbxahdq0x0qa0gv1rc4y5dp6lx44w280rbm9279nv1nplffh"; + sha256 = "0svhx08pbz55nhn6g9pn79zbhyvr394k5w3ny1mq3wp382h62r5j"; }; webui = mkYarnPackage { @@ -61,6 +61,8 @@ in buildGoPackage rec { doCheck = true; + passthru.tests = { inherit (nixosTests) prometheus; }; + meta = with lib; { description = "Service monitoring system and time series database"; homepage = "https://prometheus.io"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 506d334a92..c66373e929 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests +{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests , systemd, withSystemdSupport ? true }: with stdenv.lib; @@ -44,7 +44,7 @@ buildGoPackage rec { postInstall = optionalString withSystemdSupport '' wrapProgram $out/bin/postfix_exporter \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; passthru.tests = { inherit (nixosTests.prometheus-exporters) postfix; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix index b9cbfd8d63..9b90b9a57f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -6,8 +6,6 @@ buildGoPackage rec { goPackagePath = "github.com/ncabatoff/process-exporter"; - goDeps = ./process-exporter_deps.nix; - src = fetchFromGitHub { owner = "ncabatoff"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix deleted file mode 100644 index c888011920..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix +++ /dev/null @@ -1,156 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.1.0"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/ncabatoff/fakescraper"; - fetch = { - type = "git"; - url = "https://github.com/ncabatoff/fakescraper"; - rev = "15938421d91a"; - sha256 = "1in2iakq6xly9r8gk0mfim8n0glbjzpa07hkaj1rlrm0i11jlc6f"; - }; - } - { - goPackagePath = "github.com/ncabatoff/go-seq"; - fetch = { - type = "git"; - url = "https://github.com/ncabatoff/go-seq"; - rev = "b08ef85ed833"; - sha256 = "1x88x285n4wf221pp7ccmh2ai7rgcnwz764gn8k861qg30jl1ky6"; - }; - } - { - goPackagePath = "github.com/ncabatoff/procfs"; - fetch = { - type = "git"; - url = "https://github.com/ncabatoff/procfs"; - rev = "9ced60d7b905"; - sha256 = "19756h4lw5v8f0xr70cl8gd0wfqcnszrhhgawqhyinnir82rz728"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.8.0"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "c7de2306084e"; - sha256 = "11dqfm2d0m4sjjgyrnayman96g59x2apmvvqby9qmww2qj2k83ig"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "ea9eea638872"; - sha256 = "1j99qszynx2asac82bhzhk0g1nav87nfgkb1cz5a2iywj81liirj"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 7e9843dc98..8b7d346e56 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -4122,11 +4122,11 @@ }; } { - name = "elliptic___elliptic_6.5.2.tgz"; + name = "elliptic___elliptic_6.5.3.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; - sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; + name = "elliptic___elliptic_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; + sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; }; } { @@ -11698,11 +11698,11 @@ }; } { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; path = fetchurl { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha1 = "5d2ff22977003ec687a4b87073dfbbac146ccf29"; + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; }; } { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix index 6d04d8609b..7af9970b50 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,14 +4,14 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.21.1"; + version = "5.21.2"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "1vgb25d546dh5sassclym077vmvvl1wj4ndd2084ngvify7dp1a9"; + sha256 = "1hsvdqz0ckk8d1yxinqwylw97jd3gnf7c63zkjly87vasg98qk9x"; }; inherit subPackages postInstall; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/timescale-prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/timescale-prometheus/default.nix index f5f4a4fd41..6a0383610e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/timescale-prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/timescale-prometheus/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "timescale-prometheus"; - version = "0.1.0-beta.2"; + version = "0.1.0-beta.4"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "${version}"; - sha256 = "1rrr0qb27hh3kcmmxapr1j39dhfxf02vihpjf4b7zpwdf1mpvrbc"; + sha256 = "1q9zjxxjxa5kkhlsh69bvgns3kzf23z84jjzg294qb7y7xypym5q"; }; vendorSha256 = "sha256:0y5rq2y48kf2z1z3a8ags6rqzfvjs54klk2679fk8x0yjamj5x04"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix new file mode 100644 index 0000000000..7ddc53f38e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "unifi-poller"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "unifi-poller"; + repo = "unifi-poller"; + rev = "v${version}"; + sha256 = "16q9hrbl9qgilj3vb7865l1yx0xhm7m4sx5j1ys5vi63drq59g93"; + }; + + vendorSha256 = "1fgcbg34g0a0f85qv7bjanv2lpnnszcrspfppp2lnj9kv52j4c1w"; + + buildFlagsArray = '' + -ldflags=-w -s + -X github.com/prometheus/common/version.Branch=master + -X github.com/prometheus/common/version.BuildDate=unknown + -X github.com/prometheus/common/version.Revision=${src.rev} + -X github.com/prometheus/common/version.Version=${version}-0 + ''; + + meta = with stdenv.lib; { + description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus"; + homepage = "https://github.com/unifi-poller/unifi-poller"; + license = licenses.mit; + maintainers = with maintainers; [ elseym ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix index fdf3fd476d..9d0e1c199d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib +{ stdenv, fetchurl, autoreconfHook, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib , jabberSupport ? true, iksemel , ldapSupport ? true, openldap , odbcSupport ? true, unixODBC @@ -25,7 +25,7 @@ in inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ curl libevent @@ -65,6 +65,13 @@ in find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + ''; + preAutoreconf = '' + for i in $(find . -type f -name "*.m4"); do + substituteInPlace $i \ + --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' + done + ''; + postInstall = '' mkdir -p $out/share/zabbix/database/ cp -r include $out/ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix index c75df46cf0..2552964fe8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,12 +1,12 @@ generic: { - v44 = generic { - version = "4.4.8"; - sha256 = "0l9n4l5179lf90krv1kb0lraipj7q4hyba6r48n6rj2zqx2j4mn0"; + v50 = generic { + version = "5.0.3"; + sha256 = "1dc3fb9pa2cr6mfwgfyy1hpx26pbrws7989wj2kiiilmvimvrz1l"; }; v40 = generic { - version = "4.0.20"; - sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w"; + version = "4.0.24"; + sha256 = "01nm0pqsb168qawm1j7b3lixbwkz6hi8hd2052q6dlzqm7s2mi2s"; }; v30 = generic { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix index a75deff3db..f677fe5c0a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/web.nix @@ -18,7 +18,7 @@ import ./versions.nix ({ version, sha256 }: installPhase = '' mkdir -p $out/share/zabbix/ - cp -a frontends/php/. $out/share/zabbix/ + cp -a ${if stdenv.lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/ cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php ''; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix index 54d5e8484b..4d5c24c730 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix @@ -32,15 +32,9 @@ let # do not set GCC's -march=xxx based on builder's /proc/cpuinfo "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" # also avoid using builder's /proc/cpuinfo - ] ++ - { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; + "-DHAVE_SSE42=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + "-DASM_OPTIMIZATIONS=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix index 8d4cd5b3b2..db07bdc96a 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "influxdb"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "111n36xifmd644xp80imqxx61nlap6fdwx1di2qphlqb43z99jrq"; + sha256 = "11zkia43i3in1xv84iz6rm9cfhf4k6nxn144m7dz7a7nv3chi20g"; }; vendorSha256 = "097x3z1fhdl5s3ni2qzbqxqr60l6lqcrbikq20fs052dp287q0sp"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix index 46a23ed252..40ffddd4f1 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix @@ -5,20 +5,13 @@ stdenv.mkDerivation rec { pname = "rethinkdb"; - version = "2.3.6"; + version = "2.4.1"; src = fetchurl { - url = "https://download.rethinkdb.com/dist/${pname}-${version}.tgz"; - sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4"; + url = "https://download.rethinkdb.com/repository/raw/dist/${pname}-${version}.tgz"; + sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b"; }; - patches = [ - (fetchurl { - url = "https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c.patch"; - sha256 = "05nagixlwnq3x7441fhll5vs70pxppbsciw8qjqp660bdb5m4jm1"; - }) - ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py @@ -36,6 +29,8 @@ stdenv.mkDerivation rec { "--lib-path=${jemalloc}/lib" ]; + makeFlags = [ "rethinkdb" ]; + buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ] ++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc ++ stdenv.lib.optional stdenv.isDarwin libtool; @@ -58,9 +53,8 @@ stdenv.mkDerivation rec { joins and group by, and is easy to setup and learn. ''; homepage = "http://www.rethinkdb.com"; - license = stdenv.lib.licenses.agpl3; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ]; - broken = true; # broken with openssl 1.1 }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index c470dcf1fd..b41861768d 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "VictoriaMetrics"; - version = "1.37.4"; + version = "1.40.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02jr0qz130jz7ncfch1jry0prd00669j53mlmpb6ky0xiz5y2zq1"; + sha256 = "0dnzc7yrd91g67wkx0g1b0gi7918pi1hqv4mjlxi2ccs8phxkk7l"; }; goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics"; diff --git a/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix b/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix index 4c506c9fd3..4fd6a398a3 100644 --- a/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "6.0.0"; + version = "6.1.1"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "0mbjg0d0w173xpq69frjdvgyx5k74pkrfx3phc3lq8snvhnf1c2n"; + sha256 = "10vvib4089yywd10kigjszsfxkzv8xzj7dy3wr5df8h80rcfa74n"; rev = "v${version}"; }; - vendorSha256 = "1hrk3h729kcc77fq44kiywmyzk5a78v7bm5d2yl76lfxxdcdric7"; + vendorSha256 = "0z8ibmpil899xvjaw7siswy22shjhx17a6lnjpr62paqdxy1sfwc"; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); diff --git a/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix b/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix new file mode 100644 index 0000000000..2e0c787d0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/openbgpd/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, autoconf, automake +, libtool, m4, yacc }: + +let + openbsd_version = "OPENBSD_6_7"; # This has to be equal to ${src}/OPENBSD_BRANCH + openbsd = fetchFromGitHub { + owner = "openbgpd-portable"; + repo = "openbgpd-openbsd"; + rev = openbsd_version; + sha256 = "sha256-YJTHUsn6s4xLcLQuxCLmEkIE8ozxzooj71cJ5Wl+0lI="; + }; +in stdenv.mkDerivation rec { + pname = "opengpd"; + version = "6.7p0"; + + src = fetchFromGitHub { + owner = "openbgpd-portable"; + repo = "openbgpd-portable"; + rev = version; + sha256 = "sha256-10DfK45BsSHeyANB0OJLKog1mEj0mydXSDAT9G6u1gM"; + }; + + nativeBuildInputs = + [ autoconf automake libtool m4 yacc ]; + + preConfigure = '' + mkdir ./openbsd + cp -r ${openbsd}/* ./openbsd/ + chmod -R +w ./openbsd + openbsd_version=$(cat ./OPENBSD_BRANCH) + if [ "$openbsd_version" != "${openbsd_version}" ]; then + echo "OPENBSD VERSION does not match" + exit 1 + fi + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol."; + license = licenses.isc; + homepage = "http://www.openbgpd.org/"; + maintainers = with maintainers; [ kloenk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix index 360e39ab68..a2f417d88f 100644 --- a/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix @@ -14,14 +14,14 @@ let }; in with python.pkgs; buildPythonApplication rec { pname = "pinnwand"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "supakeen"; repo = pname; rev = "v${version}"; - sha256 = "1rk7rpyb4vmqxqqv8k9jpjmgakr3mn1iaqxyj34r74p1n5vfzimq"; + sha256 = "0cxdpc3lxgzakzgvdyyrn234380dm05svnwr8av5nrjp4nm9s8z4"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index bc429e3950..48f786c137 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.19.5.3112-b23ab3896"; + version = "1.20.1.3252-a78fef9a9"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0lh0yqpp1xyhb3bkc8wqg1afdyvaqhv3bmbyjqalpj2ikkk5lxwk"; + sha256 = "0z50c6kgsxz1pj8d65ibliqd4xbkwjlmim76j8rjid3amhj50jmx"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/pounce/default.nix b/third_party/nixpkgs/pkgs/servers/pounce/default.nix index 4ab3a4ee16..a418417ce2 100644 --- a/third_party/nixpkgs/pkgs/servers/pounce/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "1.3p1"; + version = "1.4p2"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "1ab4pz7gyvlms00hcarcmsljkn0whwqxfck8b343l4riai2rj9xv"; + sha256 = "0fpnj9yvmj4gbbfpya4i0lyin56r782pz19z3pgd8xgs22gd48cc"; }; buildInputs = [ libressl ]; diff --git a/third_party/nixpkgs/pkgs/servers/radarr/default.nix b/third_party/nixpkgs/pkgs/servers/radarr/default.nix index a76c45c195..e39e0bf764 100644 --- a/third_party/nixpkgs/pkgs/servers/radarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/radarr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A Usenet/BitTorrent movie downloader"; homepage = "https://radarr.video/"; license = licenses.gpl3; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo purcell ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix index 7b42bd3be3..4b49b1e40c 100644 --- a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix +++ b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.0.3"; + version = "3.0.5"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = version; - sha256 = "170mqxlnfzx15img4wb71axq9cnxwllk5cabsv8i008q7wyjqp0n"; + sha256 = "0w8qkjm7b62cr49dbis41kvv3179sfmvvzlhlc0rbqss6vmwbq4p"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/rippled/default.nix b/third_party/nixpkgs/pkgs/servers/rippled/default.nix index 426b29c4b0..c9095339cc 100644 --- a/third_party/nixpkgs/pkgs/servers/rippled/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rippled/default.nix @@ -31,8 +31,8 @@ let nudb = fetchgit rec { url = "https://github.com/CPPAlliance/NuDB.git"; - rev = "2.0.1"; - sha256 = "10hlp2k7pc0c705f8sk0qw6mjfky0k08cjhh262bbjvp9fbdc7r4"; + rev = "2.0.3"; + sha256 = "0imd9sh6knydwa3pxa5bbvjs3bmb8650dnsvj04qgns6bynwlqh1"; leaveDotGit = true; fetchSubmodules = true; postFetch = "cd $out && git tag ${rev}"; @@ -49,8 +49,8 @@ let lz4 = fetchgit rec { url = "https://github.com/lz4/lz4.git"; - rev = "v1.8.2"; - sha256 = "1niv553q60hwn95yflzmrqkp1046hrid13h0yr36lm4fjza21h9w"; + rev = "v1.9.2"; + sha256 = "0322xy2vfhxkb8akas7vwajjgcigq1q8l9f5fnfmavcsd6kmxmgg"; leaveDotGit = true; fetchSubmodules = false; postFetch = "cd $out && git tag ${rev}"; @@ -58,8 +58,8 @@ let libarchive = fetchgit rec { url = "https://github.com/libarchive/libarchive.git"; - rev = "v3.3.3"; - sha256 = "165imgfmizpi4ffpiwfs8gxysn6lw3y1fxj5rga98filkl7hxs31"; + rev = "v3.4.3"; + sha256 = "00yrzy2129vr4nfhigd91651984sl447dyfjfz26dmzvna5hwzp1"; leaveDotGit = true; fetchSubmodules = false; postFetch = "cd $out && git tag ${rev}"; @@ -116,12 +116,12 @@ let }; in stdenv.mkDerivation rec { pname = "rippled"; - version = "1.5.0"; + version = "1.6.0"; src = fetchgit { url = "https://github.com/ripple/rippled.git"; rev = version; - sha256 = "0nh0x1ygrj3fw558vxbcp0md80qh27yrp3xhdlasrir7h1l2nplv"; + sha256 = "176i3dm98zp5jllslpzfhh52bd2lapq9i8r7m45v8sg9icvsmyz7"; leaveDotGit = true; fetchSubmodules = true; }; @@ -146,6 +146,9 @@ in stdenv.mkDerivation rec { git config --global url."file://${google-test}".insteadOf "${google-test.url}" git config --global url."file://${date}".insteadOf "${date.url}" + substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" + substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "https://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" + substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "URL ${sqlite3.url}" "URL ${sqlite3}" ''; diff --git a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix index 54d327d5fc..f6b0574fa5 100644 --- a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix @@ -1,17 +1,33 @@ -{stdenv, fetchFromGitHub, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}: +{ stdenv +, fetchFromGitHub +, python3 +, par2cmdline +, unzip +, unrar +, p7zip +, makeWrapper +}: let - pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]); + pythonEnv = python3.withPackages(ps: with ps; [ + chardet + cheetah3 + cherrypy + cryptography + configobj + feedparser + sabyenc3 + ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "2.3.9"; + version = "3.0.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "06ln00rqz4xpsqhq0f495893xq1w5dfjawb8dgfyjjfds8627p16"; + sha256 = "1zp8cxz56qmai1z6xcscnq85gxhv64dv1s5zqsqdn0zpbxyqqdlr"; }; buildInputs = [ pythonEnv makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix index fa3c9e4dd4..a1fd391520 100644 --- a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.5"; + version = "10.0.6"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "04rjqmlhv55jmdc159q5ckrakq5iwp18wi72lzl6zy21yk5hxmp0"; + sha256 = "1q3xx6jc967nj7h8gvnrqxn8657dn3qy9j802rjzcg6iwlpjack9"; }; buildInputs = with stdenv.lib; diff --git a/third_party/nixpkgs/pkgs/servers/search/solr/default.nix b/third_party/nixpkgs/pkgs/servers/search/solr/default.nix index 88a84dd619..b5390d1537 100644 --- a/third_party/nixpkgs/pkgs/servers/search/solr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.5.2"; + version = "8.6.1"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "1kvd0vfic9h3glhz8dz5c1n8mmb9yv339pz1878wlh9j4k3xcmy4"; + sha256 = "0ds6zjsnwgpcmivzi7d6yqdmyn2mhf3k8g7xp26yfpm7f12gpq4g"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix index 9f82a76c32..ef592420b1 100644 --- a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "154sc7aa74c2vwfwan41qwqxckp36lw9wf3qydamsyvd9ampjf5x"; + sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw"; }; buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index e67b7244a3..a382c969da 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.21.33"; + version = "0.21.42"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "0ilgjm21psfb0ix32qm560976wn84qg0y5cg7506ybwsynlmway2"; + sha256 = "0a18vn1vy4zdp40iizgg3yji6k74r54rb7d7gn5byz1zj28g5c5c"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix index d18e9fb7f5..a1c854b772 100644 --- a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Smart PVR for newsgroup and bittorrent users"; homepage = "https://sonarr.tv/"; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.fadenb ]; + maintainers = with stdenv.lib.maintainers; [ fadenb purcell ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix index 852f1ea61d..a5071efb48 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix @@ -14,13 +14,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "20.1.3"; + version = "20.1.4"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0bg60rcfn2d4awg5al8d5xvk8h7bab986qlbpl9bkv6zpw9wipfb"; + sha256 = "1m82m776axyf7b5f1lzlv5y7zslyhikfxjgagqy7ci5zwn8j4i0n"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index af95a8aa8e..9e4eadf72d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "054dy5n9b8ahfwsih4chqg83c5sp8ihc68y79kz4508d42r0zvxz"; + sha256 = "1rfwhh62phz75kariqgpkxi4wzll1crzc34x0ybihxllpjf998zx"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1dp1asi4iz9j0m8bqiap7m6ph0qf2bi9j2yn6q53539qspc5gkr2"; + vendorSha256 = "1bq8z31yxff0nybzjs7jz7rg61hgqz6l2scbab7062j8whg8wybb"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix b/third_party/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix index 43c1de7ea8..4691352533 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "percona-server"; - version = "5.6.43-84.3"; + version = "5.6.49-89.0"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz"; - sha256 = "1cc0lfmpq4pw90bcsszsygw06vd4j4bh3ph5x0yn3z7wddvmjlpw"; + sha256 = "09qqk02iny7jvngyk6k2j0kk2sspc6gw8sm3i6nn97njbkihi697"; }; buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 2b440f78e9..e759a62c2e 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -182,41 +182,41 @@ let in self: { postgresql_9_5 = self.callPackage generic { - version = "9.5.22"; + version = "9.5.23"; psqlSchema = "9.5"; - sha256 = "03v4d4nr9f86y0i1j5jmvfan5w8y4ga1mar59lhcnj3jl5q58ma8"; + sha256 = "0rl31jc3kg2wq6hazyd297gnmx3cibjvivllbsivii2m6dzgl573"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.18"; + version = "9.6.19"; psqlSchema = "9.6"; - sha256 = "16crr2a1sl97aiacqzd0bk56yl1abq6blc0c6qpx5rl5ny1c4zji"; + sha256 = "1c2wnl5bbpjs1s1rpzvlnzsqlpb0p823zw7s38nhpgnxrja3myb1"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.13"; + version = "10.14"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d"; + sha256 = "0fxj30jvwq5pqpbj97vhlxgmn2ah59a78s9jyjr7vxyqj7sdh71q"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.8"; + version = "11.9"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "1qksqyayxmnccmbapg3ajsw9pjgqva0inxjhx64rqd6ckhrg9wpa"; + sha256 = "0db6pfphc5rp12abnkvv2l9pbl7bdyf3hhiwj8ghjwh35skqlq9m"; this = self.postgresql_11; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.3"; + version = "12.4"; psqlSchema = "12"; - sha256 = "0hfg3n7rlz96579cj3z1dh2idl15rh3wfvn8jl31jj4h2yk69vcl"; + sha256 = "1k06wryy8p4s1fim9qafcjlak3f58l0wqaqnrccr9x9j5jz3zsdy"; this = self.postgresql_12; inherit self; }; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix new file mode 100644 index 0000000000..09021317cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchFromGitHub, bison, flex, postgresql }: + +stdenv.mkDerivation rec { + pname = "age"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bitnine-oss"; + repo = "AgensGraph-Extension"; + rev = "v${version}"; + sha256 = "0way59lj30727jlz2qz6rnw4fsxcd5028xcwgrwk7jxcaqi5fa17"; + }; + + buildInputs = [ postgresql ]; + + makeFlags = [ + "BISON=${bison}/bin/bison" + "FLEX=${flex}/bin/flex" + ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + passthru.tests = stdenv.mkDerivation { + inherit version src; + + pname = "age-regression"; + + dontConfigure = true; + + buildPhase = let + postgresqlAge = postgresql.withPackages (ps: [ ps.age ]); + in '' + # The regression tests need to be run in the order specified in the Makefile. + echo -e "include Makefile\nfiles:\n\t@echo \$(REGRESS)" > Makefile.regress + REGRESS_TESTS=$(make -f Makefile.regress files) + + ${postgresql}/lib/pgxs/src/test/regress/pg_regress \ + --inputdir=./ \ + --bindir='${postgresqlAge}/bin' \ + --encoding=UTF-8 \ + --load-extension=age \ + --inputdir=./regress --outputdir=./regress --temp-instance=./regress/instance \ + --port=61958 --dbname=contrib_regression \ + $REGRESS_TESTS + ''; + + installPhase = '' + touch $out + ''; + }; + + meta = with stdenv.lib; { + description = "A graph database extension for PostgreSQL"; + homepage = "https://github.com/bitnine-oss/AgensGraph-Extension"; + changelog = "https://github.com/bitnine-oss/AgensGraph-Extension/releases/tag/v${version}"; + maintainers = with maintainers; [ danieldk ]; + platforms = postgresql.meta.platforms; + license = licenses.asl20; + broken = versionOlder postgresql.version "11.0"; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 168cee9711..9625c240c5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "1si4k37azigp7hqibnkzr1p6zknadxm7pb33lygrxarqkifx67j4"; + sha256 = "1q5gy1jaklk885xjda9dhf6jd5q3sc7jd8p1zdlwv4srxf6sgf10"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 79e0e05212..674aa29dae 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.0.2"; + version = "3.1.0"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "10ij3ww0081wc81jzvmkgl8r3qpqp7lcsi9pgn62bqd1c8dw88yg"; + sha256 = "0sdyq0a98snmcq6g6mgmadlz6cgvacivv34943azhnzspa3iy409"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 4e76fc3568..76619b83c1 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.7.2"; + version = "1.7.4"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0xqyq3a43j2rav5n87lv1d0f66h9kqjnlxq5nq5d54h5g5qbsr3y"; + sha256 = "0w0sl5izwic3j1k94xhky2y4wkd8l18m5hcknj5vqxq3ryhxaszc"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix index 44e560a5f8..d45c2d37c8 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix @@ -1,5 +1,9 @@ self: super: { + age = super.callPackage ./ext/age.nix { + bison = self.bison_3_5; + }; + periods = super.callPackage ./ext/periods.nix { }; postgis = super.callPackage ./ext/postgis.nix { diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index d14252da99..ad7d534103 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "4.12"; + version = "4.13"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "05z34ysy2zn7as11vd365xxhh36bm1ysiwcbr0i0f0nwng406apl"; + sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/sslh/default.nix b/third_party/nixpkgs/pkgs/servers/sslh/default.nix index 5be4805909..578d280afd 100644 --- a/third_party/nixpkgs/pkgs/servers/sslh/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sslh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sslh"; - version = "1.21"; + version = "1.21c"; src = fetchurl { url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; - sha256 = "1am63nslvv9xkbn9xavpf1zl6f7g1snz8cvnzlya7dq4la4y97d7"; + sha256 = "01p7w74ppszxgz6n41lqd6xqvc7bjk2dsc769dd1yb7q4qvpiziv"; }; postPatch = "patchShebangs *.sh"; diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 863dc50503..32c0c84dd0 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "1m3cfq4qyg2l0hpk8s7nr8cw2j7akiga7x8bwyhdjifnkwsyz6x7"; + sha256 = "0ib2s694kf5iz5hvrlzfs80z0931dhva7yir80crq0pji9y4rp7b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/tegola/default.nix b/third_party/nixpkgs/pkgs/servers/tegola/default.nix index 24e25f0c13..ecb7fdd488 100644 --- a/third_party/nixpkgs/pkgs/servers/tegola/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tegola/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tegola"; - version = "0.11.2"; + version = "0.12.0"; goPackagePath = "github.com/go-spatial/tegola"; @@ -10,9 +10,11 @@ buildGoPackage rec { owner = "go-spatial"; repo = pname; rev = "v${version}"; - sha256 = "0xrjs0py08q9i31rl0cxi6idncrrgqwcspqks3c5vd9i65yqc6fv"; + sha256 = "1bm791cis6bqgvhkk6n03kdxh0y9fdkhsx4rgmv7pm3zzdd7b17r"; }; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; + meta = with stdenv.lib; { homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index 3d5880245e..b18530f8c0 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.2.8"; + version = "2.2.11"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1p2qv8vrjxn5wg41ywxbpaghb8585xmkwr8ih5df4dbdjw2m3k1f"; + sha256 = "0l93qb0kjbm5gjba0bxfyb5a0n1p54n5crhcsyzgrki4x586lan0"; }; - vendorSha256 = "0kz7y64k07vlybzfjg6709fdy7krqlv1gkk01nvhs84sk8bnrcvn"; + vendorSha256 = "06x2mcyp6c1jdf5wz51prhcn071d0580322lcv3x2bxk2grx08i2"; doCheck = false; @@ -26,9 +26,9 @@ buildGoModule rec { CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) - makeFlagsArray+=("-ldflags=\ - -X github.com/containous/traefik/version.Version=${version} \ - -X github.com/containous/traefik/version.Codename=$CODENAME") + buildFlagsArray+=("-ldflags=\ + -X github.com/containous/traefik/v2/pkg/version.Version=${version} \ + -X github.com/containous/traefik/v2/pkg/version.Codename=$CODENAME") ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix b/third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix index 8ad511e5b5..1f47f5b222 100644 --- a/third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; - version = "2.3.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "levito"; repo = "tt-rss-feedly-theme"; rev = "v${version}"; - sha256 = "0rl5g664grx3m7yxa14rgnbvnlc3xnn44kzjji5layxww6jd8h2s"; + sha256 = "sha256-wZ6Q4cxvJKot1TWE8tOVZeaaeBSXghmkYkOK9GjAnEM="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/unifi/default.nix b/third_party/nixpkgs/pkgs/servers/unifi/default.nix index 29975ef5ba..a43f00973e 100644 --- a/third_party/nixpkgs/pkgs/servers/unifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifi/default.nix @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.13.32"; - sha256 = "0r1lz73hn4pl5jygmmfngr8sr0iybirsqlkcdkq31a36vcr567i8"; + version = "5.14.23"; + sha256 = "1aar05yjm3z5a30x505w4kakbyz35i7mk7xyg0wm4ml6h94d84pv"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/codimd/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/codimd/default.nix index 6771f459b6..7de539bb09 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/codimd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/codimd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, makeWrapper -, which, nodejs, mkYarnPackage, python2 }: +, which, nodejs, mkYarnPackage, python2, nixosTests }: mkYarnPackage rec { name = "codimd"; @@ -63,6 +63,8 @@ mkYarnPackage rec { runHook postDist ''; + passthru.tests = { inherit (nixosTests) codimd; }; + meta = with stdenv.lib; { description = "Realtime collaborative markdown notes on all platforms"; license = licenses.agpl3; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix index 152ed40871..eca43dc6f1 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.13.6"; - sha256 = "1d3s5v96mmhcxdnxi7qh822p55g9a2nxh0zcq2d8bhg0cshi9804"; + version = "3.14.1"; + sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; }; matomo-beta = { - version = "3.13.6"; + version = "3.14.1"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "1d3s5v96mmhcxdnxi7qh822p55g9a2nxh0zcq2d8bhg0cshi9804"; + sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; }; }; common = pname: { version, sha256, beta ? null }: diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix index 3e78b5d9d4..1ec512ba0c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix @@ -1,24 +1,25 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir -, openssl_1_1, openldap, sope, libmemcached, curl }: with lib; gnustep.stdenv.mkDerivation rec { +, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkgconfig }: +with lib; gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "4.3.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "1xxad23a8zy6w850x5nrrf54db0x73lc9drmc5kpfk870fk2lmr0"; + sha256 = "sha256-SEyyHekUCSkb5rOh7Ty8AhtT4S9KicTRbo9iWhijdGE="; }; nativeBuildInputs = [ gnustep.make makeWrapper python2 ]; - buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) ] + buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkgconfig ] ++ optional (openldap != null) openldap; patches = [ # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches (fetchpatch { - url = "https://sources.debian.org/data/main/s/sogo/4.3.0-1/debian/patches/0005-Remove-build-date.patch"; - sha256 = "0lrh3bkfj3r0brahfkyb0g7zx7r2jjd5cxzjl43nqla0fs09wsh8"; + url = "https://salsa.debian.org/debian/sogo/-/raw/120ac6390602c811908c7fcb212a79acbc7f7f28/debian/patches/0005-Remove-build-date.patch"; + sha256 = "151i8504kwdlcirgd0pbif7cxnb1q6jsp5j7dbh9p6zw2xgwkp25"; }) ]; diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix index e1cec51e4a..257d94f4a7 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "biboumi"; - version = "8.3"; + version = "8.5"; src = fetchurl { url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz"; - sha256 = "0896f52nh8vd0idkdznv3gj6wqh1nqhjbwv0m560f0h62f01vm7k"; + sha256 = "0rn9p99iqdyvxjzjq9w0ra7pkk0mngjy65nlg3hqfdw8kq9mv5qf"; }; louiz_catch = fetchgit { @@ -24,10 +24,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - substituteInPlace unit/biboumi.service.cmake --replace /bin/kill ${coreutils}/bin/kill cp $louiz_catch/single_include/catch.hpp tests/ - # echo "policy_directory=$out/etc/biboumi" >> conf/biboumi.cfg - # TODO include conf/biboumi.cfg as example somewhere ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 0a0cc9aeaf..54c4a4c521 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -15,7 +15,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.11.5"; # also update communityModules + version = "0.11.6"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m"; + sha256 = "0m8p2kwiy4l87ifpygricpyixi1vpx6j1jb6ki1zi4az3iixp8fd"; }; # A note to all those merging automated updates: Please also update this @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "2dcbc01c9931"; - sha256 = "0ydhbvfp7vk5zqpsc54ihxz6y2gmzh0bcgyz0xidlxrmxzwcvvyh"; + rev = "e77122025080"; + sha256 = "1pjax8lzgcwcn3mq5q4kbwfyyzaifqcc3a0s4rl9gib5rhwddybh"; }; buildInputs = [ @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://prosody.im"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ninjatrappeur ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix index ad351c89a6..235f020967 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix @@ -3,7 +3,7 @@ let package = (import ./node.nix { inherit pkgs system; }).package; in package.override rec { - version = "1.14.2"; + version = "1.14.4"; reconstructLock = true; postInstall = '' @@ -20,7 +20,7 @@ package.override rec { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "0yv51rds28az5pqzgkprhrzwmky29l1mvqb73l7dbs8qlx8x1x52"; + sha256 = "1gyl4f7wh7796w4789pi0ix5y30677784miwylr8wrfqgb1hmddq"; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix index df81863403..1605e25da6 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@babel/cli-7.10.4" = { + "@babel/cli-7.10.5" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.10.4.tgz"; - sha512 = "xX99K4V1BzGJdQANK5cwK+EpF1vP9gvqhn+iWvG+TubCjecplW7RSQimJ2jcCvu6fnK5pY6mZMdu6EWTj32QVA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.10.5.tgz"; + sha512 = "j9H9qSf3kLdM0Ao3aGPbGZ73mEA9XazuupcS6cDGWuiyAcANoguhP0r2Lx32H5JGw4sSSoHG3x/mxVnHgvOoyA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -22,49 +22,31 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.10.4" = { + "@babel/compat-data-7.11.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.4.tgz"; - sha512 = "t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"; + sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.10.4" = { + "@babel/core-7.11.4" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.10.4.tgz"; - sha512 = "3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.4.tgz"; + sha512 = "5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg=="; }; }; - "@babel/core-7.10.5" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz"; - sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; - }; - }; - "@babel/generator-7.10.4" = { + "@babel/generator-7.11.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz"; - sha512 = "toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng=="; - }; - }; - "@babel/generator-7.10.5" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz"; - sha512 = "3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz"; + sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -94,13 +76,13 @@ let sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.10.4" = { + "@babel/helper-create-class-features-plugin-7.10.5" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz"; - sha512 = "9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; + sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A=="; }; }; "@babel/helper-create-regexp-features-plugin-7.10.4" = { @@ -112,22 +94,22 @@ let sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g=="; }; }; - "@babel/helper-define-map-7.10.4" = { + "@babel/helper-define-map-7.10.5" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz"; - sha512 = "nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; + sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.10.4" = { + "@babel/helper-explode-assignable-expression-7.11.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz"; - sha512 = "4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; + sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ=="; }; }; "@babel/helper-function-name-7.10.4" = { @@ -157,22 +139,13 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.10.4" = { + "@babel/helper-member-expression-to-functions-7.11.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz"; - sha512 = "m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.10.5" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz"; - sha512 = "HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; + sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; }; }; "@babel/helper-module-imports-7.10.4" = { @@ -184,22 +157,13 @@ let sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; }; }; - "@babel/helper-module-transforms-7.10.4" = { + "@babel/helper-module-transforms-7.11.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz"; - sha512 = "Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q=="; - }; - }; - "@babel/helper-module-transforms-7.10.5" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz"; - sha512 = "4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; + sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; }; }; "@babel/helper-optimise-call-expression-7.10.4" = { @@ -220,22 +184,22 @@ let sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; }; }; - "@babel/helper-regex-7.10.4" = { + "@babel/helper-regex-7.10.5" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.4.tgz"; - sha512 = "inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ=="; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; + sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; }; }; - "@babel/helper-remap-async-to-generator-7.10.4" = { + "@babel/helper-remap-async-to-generator-7.11.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz"; - sha512 = "86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; + sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA=="; }; }; "@babel/helper-replace-supers-7.10.4" = { @@ -256,13 +220,22 @@ let sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; }; }; - "@babel/helper-split-export-declaration-7.10.4" = { + "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = { + name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; + packageName = "@babel/helper-skip-transparent-expression-wrappers"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; + sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q=="; + }; + }; + "@babel/helper-split-export-declaration-7.11.0" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; - sha512 = "pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; }; }; "@babel/helper-validator-identifier-7.10.4" = { @@ -301,31 +274,22 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.10.4" = { + "@babel/parser-7.11.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz"; - sha512 = "8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"; + sha512 = "MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="; }; }; - "@babel/parser-7.10.5" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz"; - sha512 = "wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ=="; - }; - }; - "@babel/plugin-proposal-async-generator-functions-7.10.4" = { + "@babel/plugin-proposal-async-generator-functions-7.10.5" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz"; - sha512 = "MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; + sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg=="; }; }; "@babel/plugin-proposal-class-properties-7.10.4" = { @@ -346,6 +310,15 @@ let sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; }; }; + "@babel/plugin-proposal-export-namespace-from-7.10.4" = { + name = "_at_babel_slash_plugin-proposal-export-namespace-from"; + packageName = "@babel/plugin-proposal-export-namespace-from"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; + sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg=="; + }; + }; "@babel/plugin-proposal-json-strings-7.10.4" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; @@ -355,6 +328,15 @@ let sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; }; }; + "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = { + name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; + packageName = "@babel/plugin-proposal-logical-assignment-operators"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; + sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q=="; + }; + }; "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; @@ -373,13 +355,13 @@ let sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.10.4" = { + "@babel/plugin-proposal-object-rest-spread-7.11.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz"; - sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; + sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { @@ -391,13 +373,13 @@ let sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.10.4" = { + "@babel/plugin-proposal-optional-chaining-7.11.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz"; - sha512 = "ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; + sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; }; }; "@babel/plugin-proposal-private-methods-7.10.4" = { @@ -454,6 +436,15 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; + "@babel/plugin-syntax-export-namespace-from-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-export-namespace-from"; + packageName = "@babel/plugin-syntax-export-namespace-from"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; + }; + }; "@babel/plugin-syntax-import-meta-7.10.4" = { name = "_at_babel_slash_plugin-syntax-import-meta"; packageName = "@babel/plugin-syntax-import-meta"; @@ -571,13 +562,13 @@ let sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; }; }; - "@babel/plugin-transform-block-scoping-7.10.4" = { + "@babel/plugin-transform-block-scoping-7.11.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.10.4"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz"; - sha512 = "J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; + sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew=="; }; }; "@babel/plugin-transform-classes-7.10.4" = { @@ -670,13 +661,13 @@ let sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw=="; }; }; - "@babel/plugin-transform-modules-amd-7.10.4" = { + "@babel/plugin-transform-modules-amd-7.10.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz"; - sha512 = "3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; + sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw=="; }; }; "@babel/plugin-transform-modules-commonjs-7.10.4" = { @@ -688,13 +679,13 @@ let sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.10.4" = { + "@babel/plugin-transform-modules-systemjs-7.10.5" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz"; - sha512 = "Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; + sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw=="; }; }; "@babel/plugin-transform-modules-umd-7.10.4" = { @@ -733,13 +724,13 @@ let sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ=="; }; }; - "@babel/plugin-transform-parameters-7.10.4" = { + "@babel/plugin-transform-parameters-7.10.5" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz"; - sha512 = "RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; + sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw=="; }; }; "@babel/plugin-transform-property-literals-7.10.4" = { @@ -778,13 +769,13 @@ let sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; }; }; - "@babel/plugin-transform-spread-7.10.4" = { + "@babel/plugin-transform-spread-7.11.0" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz"; - sha512 = "1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; + sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw=="; }; }; "@babel/plugin-transform-sticky-regex-7.10.4" = { @@ -796,13 +787,13 @@ let sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ=="; }; }; - "@babel/plugin-transform-template-literals-7.10.4" = { + "@babel/plugin-transform-template-literals-7.10.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.10.4"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz"; - sha512 = "4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; + sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw=="; }; }; "@babel/plugin-transform-typeof-symbol-7.10.4" = { @@ -814,13 +805,13 @@ let sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; }; }; - "@babel/plugin-transform-typescript-7.10.4" = { + "@babel/plugin-transform-typescript-7.11.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.4.tgz"; - sha512 = "3WpXIKDJl/MHoAN0fNkSr7iHdUMHZoppXjf2HJ9/ed5Xht5wNIsXllJXdityKOxeA3Z8heYRb1D3p2H5rfCdPw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; + sha512 = "edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w=="; }; }; "@babel/plugin-transform-unicode-escapes-7.10.4" = { @@ -841,22 +832,22 @@ let sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/preset-env-7.10.4" = { + "@babel/preset-env-7.11.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.4.tgz"; - sha512 = "tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz"; + sha512 = "2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg=="; }; }; - "@babel/preset-modules-0.1.3" = { + "@babel/preset-modules-0.1.4" = { name = "_at_babel_slash_preset-modules"; packageName = "@babel/preset-modules"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; - sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; "@babel/preset-typescript-7.10.4" = { @@ -868,13 +859,13 @@ let sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; }; }; - "@babel/runtime-7.10.4" = { + "@babel/runtime-7.11.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.10.4"; + version = "7.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz"; - sha512 = "UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; + sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; "@babel/template-7.10.4" = { @@ -886,40 +877,22 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.10.4" = { + "@babel/traverse-7.11.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz"; - sha512 = "aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; + sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; }; }; - "@babel/traverse-7.10.5" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz"; - sha512 = "yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ=="; - }; - }; - "@babel/types-7.10.4" = { + "@babel/types-7.11.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz"; - sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; - }; - }; - "@babel/types-7.10.5" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz"; - sha512 = "ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; + sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -967,94 +940,94 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/console-26.1.0" = { + "@jest/console-26.3.0" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-26.1.0.tgz"; - sha512 = "+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A=="; + url = "https://registry.npmjs.org/@jest/console/-/console-26.3.0.tgz"; + sha512 = "/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w=="; }; }; - "@jest/core-26.1.0" = { + "@jest/core-26.4.2" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-26.1.0.tgz"; - sha512 = "zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw=="; + url = "https://registry.npmjs.org/@jest/core/-/core-26.4.2.tgz"; + sha512 = "sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg=="; }; }; - "@jest/environment-26.1.0" = { + "@jest/environment-26.3.0" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-26.1.0.tgz"; - sha512 = "86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-26.3.0.tgz"; + sha512 = "EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA=="; }; }; - "@jest/fake-timers-26.1.0" = { + "@jest/fake-timers-26.3.0" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.1.0.tgz"; - sha512 = "Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA=="; + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.3.0.tgz"; + sha512 = "ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A=="; }; }; - "@jest/globals-26.1.0" = { + "@jest/globals-26.4.2" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-26.1.0.tgz"; - sha512 = "MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-26.4.2.tgz"; + sha512 = "Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow=="; }; }; - "@jest/reporters-26.1.0" = { + "@jest/reporters-26.4.1" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "26.1.0"; + version = "26.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.1.0.tgz"; - sha512 = "SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.1.tgz"; + sha512 = "aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ=="; }; }; - "@jest/source-map-26.1.0" = { + "@jest/source-map-26.3.0" = { name = "_at_jest_slash_source-map"; packageName = "@jest/source-map"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.1.0.tgz"; - sha512 = "XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA=="; + url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.3.0.tgz"; + sha512 = "hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ=="; }; }; - "@jest/test-result-26.1.0" = { + "@jest/test-result-26.3.0" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.1.0.tgz"; - sha512 = "Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.3.0.tgz"; + sha512 = "a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg=="; }; }; - "@jest/test-sequencer-26.1.0" = { + "@jest/test-sequencer-26.4.2" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz"; - sha512 = "Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz"; + sha512 = "83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog=="; }; }; - "@jest/transform-26.1.0" = { + "@jest/transform-26.3.0" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-26.1.0.tgz"; - sha512 = "ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-26.3.0.tgz"; + sha512 = "Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A=="; }; }; "@jest/types-25.5.0" = { @@ -1066,112 +1039,103 @@ let sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; - "@jest/types-26.1.0" = { + "@jest/types-26.3.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz"; - sha512 = "GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ=="; + url = "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz"; + sha512 = "BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ=="; }; }; - "@serialport/binding-abstract-9.0.0" = { + "@serialport/binding-abstract-9.0.1" = { name = "_at_serialport_slash_binding-abstract"; packageName = "@serialport/binding-abstract"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.0.tgz"; - sha512 = "ZU+6ZypP33Rzda1cDnpN0+CNfnODwbRU66GBawNtj2+xE+OMI7a0hbuZAYvQ+BThyDfdX/vn55P1YYeVWI8qpQ=="; + url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.1.tgz"; + sha512 = "ncUFSRyVdpyCRuah2dzrs99UfEWWMAhV31ae2FT6j4f8TypQ8OgAF8KkcHiD4M3wORDh3UKCCTS7n8aJWge1RA=="; }; }; - "@serialport/binding-mock-9.0.0" = { + "@serialport/binding-mock-9.0.1" = { name = "_at_serialport_slash_binding-mock"; packageName = "@serialport/binding-mock"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.0.tgz"; - sha512 = "E65ZbykGwZSoHpQvjuJkTbwEM0uZku+SROtO+VMs/mShMalBnOSoRDU2IedkFKvz6IqowZZOVyaBUbnKYoAUuQ=="; + url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.1.tgz"; + sha512 = "C01T6iX+nNKB7S6BhQEy5nfk4lUk/CkdFEfen9DDPYhtFtIsm5GCGvRB3Fjnp+8oDrGWJOrZfxFf3kWOOx665A=="; }; }; - "@serialport/bindings-9.0.0" = { + "@serialport/bindings-9.0.1" = { name = "_at_serialport_slash_bindings"; packageName = "@serialport/bindings"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.0.tgz"; - sha512 = "2LoYX80h5U8uIgpPaBXpIhs9uXIPhn6k+9u0FH3mFPHHeJ/tyVliwbj7uxdQ6xAUe5Zf3T2cH9JC/LnxewWyuw=="; + url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.1.tgz"; + sha512 = "O5QuwCdnHuZygBKw7tVq2wHysfOnCbOyKtR/k9T9zHqptd89Tzy6xJQNtnrcbV/2D22noKX6yWj+1wqvNe6NRA=="; }; }; - "@serialport/parser-byte-length-9.0.0" = { + "@serialport/parser-byte-length-9.0.1" = { name = "_at_serialport_slash_parser-byte-length"; packageName = "@serialport/parser-byte-length"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.0.tgz"; - sha512 = "MaXWTqxz9SeWaN488uFhDMA3cy2sQFoGHDQqDpy6q9wBGlPBe+UpRAznzOoNPkAehqyPo1Vc7gxYsBfgjZtWaw=="; + url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.1.tgz"; + sha512 = "1Ikv4lgCNw8OMf35yCpgzjHwkpgBEkhBuXFXIdWZk+ixaHFLlAtp03QxGPZBmzHMK58WDmEQoBHC1V5BkkAKSQ=="; }; }; - "@serialport/parser-cctalk-9.0.0" = { + "@serialport/parser-cctalk-9.0.1" = { name = "_at_serialport_slash_parser-cctalk"; packageName = "@serialport/parser-cctalk"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.0.tgz"; - sha512 = "tFJRF+uceEMYQeOLi92CYr1SScnI+2QLkawNHaVwwcmLV0ezwmsm1hvwBCWHkWDsY6U1SiElNJ5HpF89kS28zQ=="; + url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.1.tgz"; + sha512 = "GtMda2DeJ+23bNqOc79JYV06dax2n3FLLFM3zA7nfReCOi98QbuDj4TUbFESMOnp4DB0oMO0GYHCR9gHOedTkg=="; }; }; - "@serialport/parser-delimiter-9.0.0" = { + "@serialport/parser-delimiter-9.0.1" = { name = "_at_serialport_slash_parser-delimiter"; packageName = "@serialport/parser-delimiter"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.0.tgz"; - sha512 = "OesbvlJf1BjFC1zde6cnW1RttxZ8BoXGCOiNvM9mLKdvJ06l9o/4HyVCg2bymj6ziy/gz4407pwyPfvVYApE3A=="; + url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.1.tgz"; + sha512 = "+oaSl5zEu47OlrRiF5p5tn2qgGqYuhVcE+NI+Pv4E1xsNB/A0fFxxMv/8XUw466CRLEJ5IESIB9qbFvKE6ltaQ=="; }; }; - "@serialport/parser-readline-9.0.0" = { + "@serialport/parser-readline-9.0.1" = { name = "_at_serialport_slash_parser-readline"; packageName = "@serialport/parser-readline"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.0.tgz"; - sha512 = "JMCqfn6A+BzcCc/4upYeLB48zijBJmOO/YGcyilXgCW0Mfedqsewgtatmk2tqFhQoJfjyOu3dRE3Lz9xHlRGZQ=="; + url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.1.tgz"; + sha512 = "38058gxvyfgdeLpg3aUyD98NuWkVB9yyTLpcSdeQ3GYiupivwH6Tdy/SKPmxlHIw3Ml2qil5MR2mtW2fLPB5CQ=="; }; }; - "@serialport/parser-ready-9.0.0" = { + "@serialport/parser-ready-9.0.1" = { name = "_at_serialport_slash_parser-ready"; packageName = "@serialport/parser-ready"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.0.tgz"; - sha512 = "oSQR7773Jdc6SjXMA1mWgfFlyBLcIRlZtt1BJMfO07k3ynBmanJ4VysVDTDvxtsREHLgcjoLRKQC/6wl2wvXOQ=="; + url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.1.tgz"; + sha512 = "lgzGkVJaaV1rJVx26WwI2UKyPxc0vu1rsOeldzA3VVbF+ABrblUQA06+cRPpT6k96GY+X4+1fB1rWuPpt8HbgQ=="; }; }; - "@serialport/parser-regex-9.0.0" = { + "@serialport/parser-regex-9.0.1" = { name = "_at_serialport_slash_parser-regex"; packageName = "@serialport/parser-regex"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.0.tgz"; - sha512 = "Q4LDXbWnun5r1ML6ZLS5Wb2BurnkJjtP1geHtZbshLUmpfms++Q28li8OPzv/KQ6praC1HDRG37D0AY6xoObSw=="; + url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.1.tgz"; + sha512 = "BHTV+Lkl+J8hSecFtDRENaR4fgA6tw44J+dmA1vEKEyum0iDN4bihbu8yvztYyo4PhBGUKDfm/PnD5EkJm0dPA=="; }; }; - "@serialport/stream-9.0.0" = { + "@serialport/stream-9.0.1" = { name = "_at_serialport_slash_stream"; packageName = "@serialport/stream"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.0.tgz"; - sha512 = "JK952xKP+7PX3tXj9DgKafQaAru0sdbkTIY1OpjUNGp0xYWTVUbZRnLK//MLkH6FpoDTJc9ghN2ILK0YRtpLLA=="; - }; - }; - "@sinonjs/commons-1.8.0" = { - name = "_at_sinonjs_slash_commons"; - packageName = "@sinonjs/commons"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz"; - sha512 = "wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q=="; + url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.1.tgz"; + sha512 = "S1xaf99vygbrMDNS/9GHYZYskWJHXJy6dCksW+ME2dzNXEXpz64vF0iug1tC1EIAhME9oD/s3ky2C9CUAd/GUg=="; }; }; "@sinonjs/commons-1.8.1" = { @@ -1291,13 +1255,22 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jest-26.0.4" = { + "@types/istanbul-reports-3.0.0" = { + name = "_at_types_slash_istanbul-reports"; + packageName = "@types/istanbul-reports"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; + sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA=="; + }; + }; + "@types/jest-26.0.10" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "26.0.4"; + version = "26.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.4.tgz"; - sha512 = "4fQNItvelbNA9+sFgU+fhJo8ZFF+AS4Egk3GWwCW2jFtViukXbnztccafAdLhzE/0EiCogljtQQXP8aQ9J7sFg=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.10.tgz"; + sha512 = "i2m0oyh8w/Lum7wWK/YOZJakYF8Mx08UaKA1CtbmFeDquVhAEdA7znacsVSf2hJ1OQ/OfVMGN90pw/AtzF8s/Q=="; }; }; "@types/json-schema-7.0.5" = { @@ -1318,22 +1291,13 @@ let sha512 = "M0ISm1qsNvkdXNZml1r/1bEVqt5SJHF/LFcCtH5dHfsSIG0LEj5FhwK0f4fZy9WPCsXjmrKfpzgEW/bdQuKqmQ=="; }; }; - "@types/node-14.0.22" = { + "@types/node-14.6.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.22"; + version = "14.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.22.tgz"; - sha512 = "emeGcJvdiZ4Z3ohbmw93E/64jRzUHAItSHt8nF7M4TGgQTiWqFVGB8KNpLGFmUHmHLvjvBgFwVlqNcq+VuGv9g=="; - }; - }; - "@types/node-14.0.23" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.0.23"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz"; - sha512 = "Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.6.2.tgz"; + sha512 = "onlIwbaeqvZyniGPfdw/TEhKIh79pz66L1q06WUQqJLnAb6wbjvOtepLYTGHTqzdXgBYIE3ZdmqHDGsRsbBz7A=="; }; }; "@types/normalize-package-data-2.4.0" = { @@ -1345,13 +1309,13 @@ let sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; }; }; - "@types/prettier-2.0.2" = { + "@types/prettier-2.1.0" = { name = "_at_types_slash_prettier"; packageName = "@types/prettier"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.2.tgz"; - sha512 = "IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA=="; + url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.0.tgz"; + sha512 = "hiYA88aHiEIgDmeKlsyVsuQdcFn3Z2VuFd/Xm/HCnGnPD8UFU5BM128uzzRVVGEzKDKYUrRsRH9S2o+NUy/3IA=="; }; }; "@types/serialport-8.0.1" = { @@ -1390,13 +1354,13 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; - "@typescript-eslint/eslint-plugin-3.6.0" = { + "@typescript-eslint/eslint-plugin-3.10.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.6.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.6.0.tgz"; - sha512 = "ubHlHVt1lsPQB/CZdEov9XuOFhNG9YRC//kuiS1cMQI6Bs1SsqKrEmZnpgRwthGR09/kEDtr9MywlqXyyYd8GA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz"; + sha512 = "PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ=="; }; }; "@typescript-eslint/experimental-utils-2.34.0" = { @@ -1408,31 +1372,31 @@ let sha512 = "eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA=="; }; }; - "@typescript-eslint/experimental-utils-3.6.0" = { + "@typescript-eslint/experimental-utils-3.10.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "3.6.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.6.0.tgz"; - sha512 = "4Vdf2hvYMUnTdkCNZu+yYlFtL2v+N2R7JOynIOkFbPjf9o9wQvRwRkzUdWlFd2YiiUwJLbuuLnl5civNg5ykOQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz"; + sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/parser-3.6.0" = { + "@typescript-eslint/parser-3.10.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.6.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.6.0.tgz"; - sha512 = "taghDxuLhbDAD1U5Fk8vF+MnR0yiFE9Z3v2/bYScFb0N1I9SK8eKHkdJl1DAD48OGFDMFTeOTX0z7g0W6SYUXw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz"; + sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/types-3.6.0" = { + "@typescript-eslint/types-3.10.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "3.6.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.6.0.tgz"; - sha512 = "JwVj74ohUSt0ZPG+LZ7hb95fW8DFOqBuR6gE7qzq55KDI3BepqsCtHfBIoa0+Xi1AI7fq5nCu2VQL8z4eYftqg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz"; + sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -1444,40 +1408,40 @@ let sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "@typescript-eslint/typescript-estree-3.6.0" = { + "@typescript-eslint/typescript-estree-3.10.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "3.6.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.6.0.tgz"; - sha512 = "G57NDSABHjvob7zVV09ehWyD1K6/YUKjz5+AufObFyjNO4DVmKejj47MHjVHHlZZKgmpJD2yyH9lfCXHrPITFg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz"; + sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/visitor-keys-3.6.0" = { + "@typescript-eslint/visitor-keys-3.10.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "3.6.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.6.0.tgz"; - sha512 = "p1izllL2Ubwunite0ITjubuMQRBGgjdVYwyG7lXPX8GbrA6qF0uwSRz9MnXZaHMxID4948gX0Ez8v9tUDi/KfQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz"; + sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "abab-2.0.3" = { + "abab-2.0.4" = { name = "abab"; packageName = "abab"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz"; - sha512 = "tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz"; + sha512 = "Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ=="; }; }; - "acorn-7.3.1" = { + "acorn-7.4.0" = { name = "acorn"; packageName = "acorn"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz"; - sha512 = "tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz"; + sha512 = "+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="; }; }; "acorn-globals-6.0.0" = { @@ -1516,13 +1480,13 @@ let sha512 = "01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg=="; }; }; - "ajv-6.12.3" = { + "ajv-6.12.4" = { name = "ajv"; packageName = "ajv"; - version = "6.12.3"; + version = "6.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz"; - sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz"; + sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ=="; }; }; "ansi-colors-4.1.1" = { @@ -1723,15 +1687,6 @@ let sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; - "async-limiter-1.0.1" = { - name = "async-limiter"; - packageName = "async-limiter"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; - }; - }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -1768,31 +1723,31 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.0" = { + "aws4-1.10.1" = { name = "aws4"; packageName = "aws4"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz"; - sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"; + sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; }; }; - "axios-0.19.2" = { + "axios-0.20.0" = { name = "axios"; packageName = "axios"; - version = "0.19.2"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; - sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz"; + sha512 = "ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA=="; }; }; - "babel-jest-26.1.0" = { + "babel-jest-26.3.0" = { name = "babel-jest"; packageName = "babel-jest"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.1.0.tgz"; - sha512 = "Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.3.0.tgz"; + sha512 = "sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -1813,13 +1768,13 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-26.1.0" = { + "babel-plugin-jest-hoist-26.2.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "26.1.0"; + version = "26.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz"; - sha512 = "qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz"; + sha512 = "B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA=="; }; }; "babel-preset-current-node-syntax-0.1.3" = { @@ -1831,13 +1786,13 @@ let sha512 = "uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ=="; }; }; - "babel-preset-jest-26.1.0" = { + "babel-preset-jest-26.3.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz"; - sha512 = "na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz"; + sha512 = "5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw=="; }; }; "balanced-match-1.0.0" = { @@ -1894,22 +1849,13 @@ let sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; - "bl-1.2.2" = { + "bl-4.0.3" = { name = "bl"; packageName = "bl"; - version = "1.2.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; - sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; - }; - }; - "bl-4.0.2" = { - name = "bl"; - packageName = "bl"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz"; - sha512 = "j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ=="; + url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz"; + sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="; }; }; "brace-expansion-1.1.11" = { @@ -1948,13 +1894,13 @@ let sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; }; - "browserslist-4.13.0" = { + "browserslist-4.14.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz"; - sha512 = "MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz"; + sha512 = "pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ=="; }; }; "bser-2.1.1" = { @@ -2029,13 +1975,13 @@ let sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; }; }; - "caniuse-lite-1.0.30001099" = { + "caniuse-lite-1.0.30001119" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001099"; + version = "1.0.30001119"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz"; - sha512 = "sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001119.tgz"; + sha512 = "Hpwa4obv7EGP+TjkCh/wVvbtNJewxmtg4yVJBLFnxo35vbPapBr138bUWENkb5j5L9JZJ9RXLn4OrXRG/cecPQ=="; }; }; "capture-exit-2.0.0" = { @@ -2434,15 +2380,6 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; - }; - }; "debug-4.1.1" = { name = "debug"; packageName = "debug"; @@ -2596,13 +2533,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff-sequences-26.0.0" = { + "diff-sequences-26.3.0" = { name = "diff-sequences"; packageName = "diff-sequences"; - version = "26.0.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.0.0.tgz"; - sha512 = "JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg=="; + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.3.0.tgz"; + sha512 = "5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig=="; }; }; "doctrine-3.0.0" = { @@ -2641,13 +2578,22 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "electron-to-chromium-1.3.496" = { + "electron-to-chromium-1.3.555" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.496"; + version = "1.3.555"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.496.tgz"; - sha512 = "TXY4mwoyowwi4Lsrq9vcTUYBThyc1b2hXaTZI13p8/FRhY2CTaq5lK+DVjhYkKiTLsKt569Xes+0J5JsVXFurQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.555.tgz"; + sha512 = "/55x3nF2feXFZ5tdGUOr00TxnUjUgdxhrn+eCJ1FAcoAt+cKQTjQkUC5XF4frMWE1R5sjHk+JueuBalimfe5Pg=="; + }; + }; + "emittery-0.7.1" = { + name = "emittery"; + packageName = "emittery"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz"; + sha512 = "d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ=="; }; }; "emoji-regex-7.0.3" = { @@ -2758,13 +2704,13 @@ let sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; }; }; - "escalade-3.0.1" = { + "escalade-3.0.2" = { name = "escalade"; packageName = "escalade"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz"; - sha512 = "DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz"; + sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="; }; }; "escape-string-regexp-1.0.5" = { @@ -2794,22 +2740,13 @@ let sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; }; - "eslint-7.4.0" = { + "eslint-7.7.0" = { name = "eslint"; packageName = "eslint"; - version = "7.4.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.4.0.tgz"; - sha512 = "gU+lxhlPHu45H3JkEGgYhWhkR9wLHHEXC9FbWFnTlEkbKyZKWgWRLgf61E8zWmBuI6g5xKBph9ltg3NtZMVF8g=="; - }; - }; - "eslint-7.5.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz"; - sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz"; + sha512 = "1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg=="; }; }; "eslint-config-google-0.14.0" = { @@ -2821,13 +2758,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-23.18.0" = { + "eslint-plugin-jest-23.20.0" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "23.18.0"; + version = "23.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.18.0.tgz"; - sha512 = "wLPM/Rm1SGhxrFQ2TKM/BYsYPhn7ch6ZEK92S2o/vGkAAnDXM0I4nTIo745RIX+VlCRMFgBuJEax6XfTHMdeKg=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.20.0.tgz"; + sha512 = "+6BGQt85OREevBDWCvhqj1yYA4+BFK4XnRZSGJionuEYmcglMZYLNNBBemwzbqUAckURaHdJSBcjHPyrtypZOw=="; }; }; "eslint-scope-5.1.0" = { @@ -2857,22 +2794,13 @@ let sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; - "espree-7.1.0" = { + "espree-7.3.0" = { name = "espree"; packageName = "espree"; - version = "7.1.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.1.0.tgz"; - sha512 = "dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw=="; - }; - }; - "espree-7.2.0" = { - name = "espree"; - packageName = "espree"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz"; - sha512 = "H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g=="; + url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz"; + sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw=="; }; }; "esprima-4.0.1" = { @@ -2911,13 +2839,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.1.0" = { + "estraverse-5.2.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"; - sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; }; }; "esutils-2.0.3" = { @@ -2992,13 +2920,13 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-26.1.0" = { + "expect-26.4.2" = { name = "expect"; packageName = "expect"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-26.1.0.tgz"; - sha512 = "QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw=="; + url = "https://registry.npmjs.org/expect/-/expect-26.4.2.tgz"; + sha512 = "IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA=="; }; }; "ext-1.4.0" = { @@ -3181,13 +3109,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.5.10" = { + "follow-redirects-1.13.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.5.10"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz"; + sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="; }; }; "for-in-1.0.2" = { @@ -3235,15 +3163,6 @@ let sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; }; - "fs-extra-8.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; - }; - }; "fs-extra-9.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -3352,13 +3271,13 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-stream-5.1.0" = { + "get-stream-5.2.0" = { name = "get-stream"; packageName = "get-stream"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; - sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; "get-value-2.0.6" = { @@ -3496,13 +3415,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.1.3" = { + "har-validator-5.1.5" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.3"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; "has-flag-3.0.0" = { @@ -3586,13 +3505,13 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "highlight.js-10.1.1" = { + "highlight.js-10.1.2" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz"; - sha512 = "b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.2.tgz"; + sha512 = "Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA=="; }; }; "hosted-git-info-2.8.8" = { @@ -3874,13 +3793,13 @@ let sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; - "is-docker-2.0.0" = { + "is-docker-2.1.1" = { name = "is-docker"; packageName = "is-docker"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz"; - sha512 = "pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ=="; + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; + sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; }; }; "is-extendable-0.1.1" = { @@ -4162,40 +4081,40 @@ let sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; }; }; - "jest-26.1.0" = { + "jest-26.4.2" = { name = "jest"; packageName = "jest"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-26.1.0.tgz"; - sha512 = "LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw=="; + url = "https://registry.npmjs.org/jest/-/jest-26.4.2.tgz"; + sha512 = "LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw=="; }; }; - "jest-changed-files-26.1.0" = { + "jest-changed-files-26.3.0" = { name = "jest-changed-files"; packageName = "jest-changed-files"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.1.0.tgz"; - sha512 = "HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw=="; + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.3.0.tgz"; + sha512 = "1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g=="; }; }; - "jest-cli-26.1.0" = { + "jest-cli-26.4.2" = { name = "jest-cli"; packageName = "jest-cli"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.1.0.tgz"; - sha512 = "Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.2.tgz"; + sha512 = "zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw=="; }; }; - "jest-config-26.1.0" = { + "jest-config-26.4.2" = { name = "jest-config"; packageName = "jest-config"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-26.1.0.tgz"; - sha512 = "ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-26.4.2.tgz"; + sha512 = "QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A=="; }; }; "jest-diff-25.5.0" = { @@ -4207,13 +4126,13 @@ let sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; }; }; - "jest-diff-26.1.0" = { + "jest-diff-26.4.2" = { name = "jest-diff"; packageName = "jest-diff"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.1.0.tgz"; - sha512 = "GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.2.tgz"; + sha512 = "6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ=="; }; }; "jest-docblock-26.0.0" = { @@ -4225,31 +4144,31 @@ let sha512 = "RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w=="; }; }; - "jest-each-26.1.0" = { + "jest-each-26.4.2" = { name = "jest-each"; packageName = "jest-each"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-26.1.0.tgz"; - sha512 = "lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-26.4.2.tgz"; + sha512 = "p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA=="; }; }; - "jest-environment-jsdom-26.1.0" = { + "jest-environment-jsdom-26.3.0" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz"; - sha512 = "dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw=="; + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz"; + sha512 = "zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA=="; }; }; - "jest-environment-node-26.1.0" = { + "jest-environment-node-26.3.0" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.1.0.tgz"; - sha512 = "DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.3.0.tgz"; + sha512 = "c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw=="; }; }; "jest-get-type-25.2.6" = { @@ -4261,67 +4180,67 @@ let sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; }; }; - "jest-get-type-26.0.0" = { + "jest-get-type-26.3.0" = { name = "jest-get-type"; packageName = "jest-get-type"; - version = "26.0.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz"; - sha512 = "zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg=="; + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="; }; }; - "jest-haste-map-26.1.0" = { + "jest-haste-map-26.3.0" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.1.0.tgz"; - sha512 = "WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.3.0.tgz"; + sha512 = "DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA=="; }; }; - "jest-jasmine2-26.1.0" = { + "jest-jasmine2-26.4.2" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz"; - sha512 = "1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ=="; + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz"; + sha512 = "z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA=="; }; }; - "jest-leak-detector-26.1.0" = { + "jest-leak-detector-26.4.2" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz"; - sha512 = "dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz"; + sha512 = "akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA=="; }; }; - "jest-matcher-utils-26.1.0" = { + "jest-matcher-utils-26.4.2" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz"; - sha512 = "PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz"; + sha512 = "KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q=="; }; }; - "jest-message-util-26.1.0" = { + "jest-message-util-26.3.0" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.1.0.tgz"; - sha512 = "dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.3.0.tgz"; + sha512 = "xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA=="; }; }; - "jest-mock-26.1.0" = { + "jest-mock-26.3.0" = { name = "jest-mock"; packageName = "jest-mock"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.1.0.tgz"; - sha512 = "1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.3.0.tgz"; + sha512 = "PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q=="; }; }; "jest-pnp-resolver-1.2.2" = { @@ -4342,94 +4261,94 @@ let sha512 = "Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A=="; }; }; - "jest-resolve-26.1.0" = { + "jest-resolve-26.4.0" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "26.1.0"; + version = "26.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.1.0.tgz"; - sha512 = "KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.4.0.tgz"; + sha512 = "bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg=="; }; }; - "jest-resolve-dependencies-26.1.0" = { + "jest-resolve-dependencies-26.4.2" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz"; - sha512 = "fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz"; + sha512 = "ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ=="; }; }; - "jest-runner-26.1.0" = { + "jest-runner-26.4.2" = { name = "jest-runner"; packageName = "jest-runner"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.1.0.tgz"; - sha512 = "elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.2.tgz"; + sha512 = "FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g=="; }; }; - "jest-runtime-26.1.0" = { + "jest-runtime-26.4.2" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.1.0.tgz"; - sha512 = "1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.2.tgz"; + sha512 = "4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ=="; }; }; - "jest-serializer-26.1.0" = { + "jest-serializer-26.3.0" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.1.0.tgz"; - sha512 = "eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.3.0.tgz"; + sha512 = "IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow=="; }; }; - "jest-snapshot-26.1.0" = { + "jest-snapshot-26.4.2" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.1.0.tgz"; - sha512 = "YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.2.tgz"; + sha512 = "N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg=="; }; }; - "jest-util-26.1.0" = { + "jest-util-26.3.0" = { name = "jest-util"; packageName = "jest-util"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-26.1.0.tgz"; - sha512 = "rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz"; + sha512 = "4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw=="; }; }; - "jest-validate-26.1.0" = { + "jest-validate-26.4.2" = { name = "jest-validate"; packageName = "jest-validate"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.1.0.tgz"; - sha512 = "WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.2.tgz"; + sha512 = "blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ=="; }; }; - "jest-watcher-26.1.0" = { + "jest-watcher-26.3.0" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.1.0.tgz"; - sha512 = "ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.3.0.tgz"; + sha512 = "XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ=="; }; }; - "jest-worker-26.1.0" = { + "jest-worker-26.3.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "26.1.0"; + version = "26.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz"; - sha512 = "Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz"; + sha512 = "Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw=="; }; }; "js-tokens-4.0.0" = { @@ -4459,13 +4378,13 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsdom-16.3.0" = { + "jsdom-16.4.0" = { name = "jsdom"; packageName = "jsdom"; - version = "16.3.0"; + version = "16.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-16.3.0.tgz"; - sha512 = "zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz"; + sha512 = "lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w=="; }; }; "jsesc-0.5.0" = { @@ -4486,13 +4405,13 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "json-parse-better-errors-1.0.2" = { - name = "json-parse-better-errors"; - packageName = "json-parse-better-errors"; - version = "1.0.2"; + "json-parse-even-better-errors-2.3.0" = { + name = "json-parse-even-better-errors"; + packageName = "json-parse-even-better-errors"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.0.tgz"; + sha512 = "o3aP+RsWDJZayj1SbHNQAI8x0v3T3SKiGoZlNYfbUP1S3omJQ6i9CnqADqkSPaOAxwua4/1YWx5CM7oiChJt2Q=="; }; }; "json-schema-0.2.3" = { @@ -4513,6 +4432,15 @@ let sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; + "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-stable-stringify-without-jsonify-1.0.1" = { name = "json-stable-stringify-without-jsonify"; packageName = "json-stable-stringify-without-jsonify"; @@ -4540,15 +4468,6 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "jsonfile-4.0.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; - }; - }; "jsonfile-6.0.1" = { name = "jsonfile"; packageName = "jsonfile"; @@ -4558,6 +4477,15 @@ let sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg=="; }; }; + "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"; @@ -4684,13 +4612,13 @@ let sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; }; - "lodash-4.17.19" = { + "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; - version = "4.17.19"; + version = "4.17.20"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz"; - sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; + sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; }; }; "lodash.sortby-4.7.0" = { @@ -4720,13 +4648,13 @@ let sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; - "lunr-2.3.8" = { + "lunr-2.3.9" = { name = "lunr"; packageName = "lunr"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz"; - sha512 = "oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg=="; + url = "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz"; + sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; "make-dir-2.1.0" = { @@ -4774,13 +4702,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "marked-1.0.0" = { + "marked-1.1.1" = { name = "marked"; packageName = "marked"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.0.0.tgz"; - sha512 = "Wo+L1pWTVibfrSr+TTtMuiMfNzmZWiOPeO7rZsQUY5bgsxpHesBEcIWJloWVTFnrMXnf/TL30eTFSGJddmQAng=="; + url = "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz"; + sha512 = "mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="; }; }; "merge-stream-2.0.0" = { @@ -4918,22 +4846,22 @@ let sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; }; }; - "mqtt-4.1.0" = { + "mqtt-4.2.1" = { name = "mqtt"; packageName = "mqtt"; - version = "4.1.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.1.0.tgz"; - sha512 = "dBihVZzaB8p9G/2ktSfamiaHmMnpCpP2du08317ZuEX1kBAbZOG9aMJQ11EChXnOX3GKUeiZYaSITueceQKT2A=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz"; + sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; }; }; - "mqtt-packet-6.3.2" = { + "mqtt-packet-6.4.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "6.3.2"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.3.2.tgz"; - sha512 = "i56+2kN6F57KInGtjjfUXSl4xG8u/zOvfaXFLKFAbBXzWkXOmwcmjaSCBPayf2IQCkQU0+h+S2DizCo3CF6gQA=="; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.4.0.tgz"; + sha512 = "dNd1RPyBolklOR27hgHhy3TxkDk31ZaDu4ljAgJoHlnVsdACH8guwEZhpk3ZMn6GAdH6ENDLgtE285FHIiXzxA=="; }; }; "ms-2.0.0" = { @@ -5017,13 +4945,13 @@ let sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; - "node-abi-2.18.0" = { + "node-abi-2.19.1" = { name = "node-abi"; packageName = "node-abi"; - version = "2.18.0"; + version = "2.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.18.0.tgz"; - sha512 = "yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz"; + sha512 = "HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A=="; }; }; "node-int64-0.4.0" = { @@ -5044,22 +4972,22 @@ let sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; }; }; - "node-notifier-7.0.1" = { + "node-notifier-8.0.0" = { name = "node-notifier"; packageName = "node-notifier"; - version = "7.0.1"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.1.tgz"; - sha512 = "VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz"; + sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; }; }; - "node-releases-1.1.59" = { + "node-releases-1.1.60" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.59"; + version = "1.1.60"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz"; - sha512 = "H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz"; + sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; }; }; "noop-logger-0.1.1" = { @@ -5233,13 +5161,13 @@ let sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; }; }; - "onetime-5.1.0" = { + "onetime-5.1.2" = { name = "onetime"; packageName = "onetime"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; - sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; "optionator-0.8.3" = { @@ -5323,13 +5251,13 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; - "parse-json-5.0.0" = { + "parse-json-5.1.0" = { name = "parse-json"; packageName = "parse-json"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz"; - sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"; + sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; }; }; "parse5-5.1.1" = { @@ -5494,13 +5422,13 @@ let sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; }; }; - "pretty-format-26.1.0" = { + "pretty-format-26.4.2" = { name = "pretty-format"; packageName = "pretty-format"; - version = "26.1.0"; + version = "26.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz"; - sha512 = "GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz"; + sha512 = "zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA=="; }; }; "process-nextick-args-2.0.1" = { @@ -5674,13 +5602,13 @@ let sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; }; - "regenerator-runtime-0.13.5" = { + "regenerator-runtime-0.13.7" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.5"; + version = "0.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; }; }; "regenerator-transform-0.14.5" = { @@ -5782,22 +5710,22 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; - "request-promise-core-1.1.3" = { + "request-promise-core-1.1.4" = { name = "request-promise-core"; packageName = "request-promise-core"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; }; }; - "request-promise-native-1.0.8" = { + "request-promise-native-1.0.9" = { name = "request-promise-native"; packageName = "request-promise-native"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ=="; + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; "require-directory-2.1.1" = { @@ -5989,13 +5917,13 @@ let sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; - "serialport-9.0.0" = { + "serialport-9.0.1" = { name = "serialport"; packageName = "serialport"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-9.0.0.tgz"; - sha512 = "4kQqIM0XhT6QECyzJtPdSsDWRFt8u3/vscQxb+z4TrAMiPDkDGBTLDaXmCxarXDa1s7EeK1IyxMce9wzWPFzAQ=="; + url = "https://registry.npmjs.org/serialport/-/serialport-9.0.1.tgz"; + sha512 = "35Ms8dqjtAb73lptfEZG2l/nFZOxHt3hUjCHvl+g3Mu737gzFLDpSBrRywBJw4G4eS5ozZ3YcthwYnop1WO+ng=="; }; }; "set-blocking-2.0.0" = { @@ -6079,13 +6007,13 @@ let sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; - "simple-concat-1.0.0" = { + "simple-concat-1.0.1" = { name = "simple-concat"; packageName = "simple-concat"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; - sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; }; }; "simple-get-3.1.0" = { @@ -6277,13 +6205,13 @@ let sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; - "split2-3.1.1" = { + "split2-3.2.2" = { name = "split2"; packageName = "split2"; - version = "3.1.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz"; - sha512 = "emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q=="; + url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; + sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; "sprintf-js-1.0.3" = { @@ -6466,15 +6394,6 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strip-json-comments-3.1.0" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; - sha512 = "e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="; - }; - }; "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -6493,13 +6412,13 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-7.1.0" = { + "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; - sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; "supports-hyperlinks-2.1.0" = { @@ -6754,13 +6673,13 @@ let sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; - "type-2.0.0" = { + "type-2.1.0" = { name = "type"; packageName = "type"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.0.0.tgz"; - sha512 = "KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="; + url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz"; + sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="; }; }; "type-check-0.3.2" = { @@ -6835,31 +6754,31 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typedoc-0.17.8" = { + "typedoc-0.19.0" = { name = "typedoc"; packageName = "typedoc"; - version = "0.17.8"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc/-/typedoc-0.17.8.tgz"; - sha512 = "/OyrHCJ8jtzu+QZ+771YaxQ9s4g5Z3XsQE3Ma7q+BL392xxBn4UMvvCdVnqKC2T/dz03/VXSLVKOP3lHmDdc/w=="; + url = "https://registry.npmjs.org/typedoc/-/typedoc-0.19.0.tgz"; + sha512 = "Rn68JwgDDYyIWl3HXeSsLZcsvxd2anISjhKu64PvID7RETeS2Iwnc4cH60yqc8/N50Xo1d3MHPGYinCPhMMliQ=="; }; }; - "typedoc-default-themes-0.10.2" = { + "typedoc-default-themes-0.11.1" = { name = "typedoc-default-themes"; packageName = "typedoc-default-themes"; - version = "0.10.2"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.10.2.tgz"; - sha512 = "zo09yRj+xwLFE3hyhJeVHWRSPuKEIAsFK5r2u47KL/HBKqpwdUSanoaz5L34IKiSATFrjG5ywmIu98hPVMfxZg=="; + url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.1.tgz"; + sha512 = "1yl8pbhjrLywqGJx9TfT+wzP+ntudPYjgJdpCj+s5ed2etBkqZPOCBMKwpaN9o6pdoFQF195PggqWTLVEkaRQQ=="; }; }; - "typedoc-plugin-markdown-2.3.1" = { + "typedoc-plugin-markdown-2.4.2" = { name = "typedoc-plugin-markdown"; packageName = "typedoc-plugin-markdown"; - version = "2.3.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.3.1.tgz"; - sha512 = "7rlmg1tLjddYy11uznHCAlyoOpxdWnFXqGEZ7j2mJ4KJg2avwWgEpw6SFZVofgPCGn36zklpFS51lHxYSRTLVQ=="; + url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.4.2.tgz"; + sha512 = "BBH+9/Uq5XbsqfzCDl8Jq4iaLXRMXRuAHZRFarAZX7df8+F3vUjDx/WHWoWqbZ/XUFzduLC2Iuy2qwsJX8SQ7A=="; }; }; "typedoc-plugin-no-inherit-1.1.10" = { @@ -6880,31 +6799,22 @@ let sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; }; }; - "typescript-3.9.6" = { + "typescript-4.0.2" = { name = "typescript"; packageName = "typescript"; - version = "3.9.6"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz"; - sha512 = "Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz"; + sha512 = "e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ=="; }; }; - "uglify-js-3.10.0" = { + "uglify-js-3.10.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.0"; + version = "3.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; - sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; - }; - }; - "ultron-1.1.1" = { - name = "ultron"; - packageName = "ultron"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; - sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz"; + sha512 = "GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow=="; }; }; "unc-path-regex-0.1.2" = { @@ -6970,15 +6880,6 @@ let sha512 = "2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A=="; }; }; - "universalify-0.1.2" = { - name = "universalify"; - packageName = "universalify"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; - }; - }; "universalify-1.0.0" = { name = "universalify"; packageName = "universalify"; @@ -7060,13 +6961,13 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-7.0.3" = { + "uuid-8.3.0" = { name = "uuid"; packageName = "uuid"; - version = "7.0.3"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; - sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz"; + sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="; }; }; "v8-compile-cache-2.1.1" = { @@ -7078,13 +6979,13 @@ let sha512 = "8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="; }; }; - "v8-to-istanbul-4.1.4" = { + "v8-to-istanbul-5.0.1" = { name = "v8-to-istanbul"; packageName = "v8-to-istanbul"; - version = "4.1.4"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz"; - sha512 = "Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ=="; + url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz"; + sha512 = "mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q=="; }; }; "validate-npm-package-license-3.0.4" = { @@ -7150,15 +7051,6 @@ let sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; }; }; - "websocket-stream-5.5.2" = { - name = "websocket-stream"; - packageName = "websocket-stream"; - version = "5.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.5.2.tgz"; - sha512 = "8z49MKIHbGk3C4HtuHWDtYX8mYej1wWabjthC/RupM9ngeukU4IWoM46dgth1UOS/T4/IqgEdCDJuMe2039OQQ=="; - }; - }; "whatwg-encoding-1.0.5" = { name = "whatwg-encoding"; packageName = "whatwg-encoding"; @@ -7177,13 +7069,13 @@ let sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; }; - "whatwg-url-8.1.0" = { + "whatwg-url-8.2.1" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.1.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz"; - sha512 = "vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.1.tgz"; + sha512 = "ZmVCr6nfBeaMxEHALLEGy0LszYjpJqf6PVNQUQ1qd9Et+q7Jpygd4rGGDXgHjD8e99yLFseD69msHDM4YwPZ4A=="; }; }; "which-1.3.1" = { @@ -7312,15 +7204,6 @@ let sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; }; - "ws-3.3.3" = { - name = "ws"; - packageName = "ws"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; - sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; - }; - }; "ws-7.3.1" = { name = "ws"; packageName = "ws"; @@ -7384,41 +7267,45 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "zigbee-herdsman-0.12.108" = { + "zigbee-herdsman-0.12.127" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.12.108"; + version = "0.12.127"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.108.tgz"; - sha512 = "5xPgCYFAu/Q8mibEzB2be/nkkyCjMNKox+sYnaNNbUm0w25YRcI3FWuxE+wl9v7UVopZ8P9Wfou+XGsFbdaWRA=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.127.tgz"; + sha512 = "NbNwX+83byss1tQpZXydpo9iYuHa3RV88X2vHpmoNnv4WuHBjnSbmL/1sdiUB1URBIGeFgC9MxLiTtqxMyCehQ=="; }; }; - "zigbee-herdsman-converters-12.0.147" = { + "zigbee-herdsman-converters-12.0.178" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "12.0.147"; + version = "12.0.178"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.147.tgz"; - sha512 = "WlNkN5xG+HdS1hZ5jTjR2vFii1OfOqTFUEQ+uZg06L7V1TucHRPlQ4AMY0WUQksnX2uuRqwehA3iuyszZjBAOg=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.178.tgz"; + sha512 = "SOATRwJU8NCWay194BCzDr0+HkgF4ANv8Qw8Xmqbz60YZWsNh9y8tYrVbIbcTdiZKLGzambrmY66DgOntiTxNA=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.14.2"; + version = "1.14.4"; src = ./.; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."argparse-1.0.10" sources."async-3.2.0" - sources."async-limiter-1.0.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bindings-1.5.0" - sources."bl-1.2.2" + (sources."bl-4.0.3" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."brace-expansion-1.1.11" + sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."callback-stream-1.1.0" sources."color-3.0.0" @@ -7450,7 +7337,7 @@ let sources."event-emitter-0.3.5" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -7468,6 +7355,7 @@ let sources."glossy-0.1.7" sources."help-me-1.1.0" sources."humanize-duration-3.23.1" + sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -7482,7 +7370,9 @@ let sources."isarray-1.0.0" sources."js-yaml-3.14.0" sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-1.0.1" sources."json-stable-stringify-without-jsonify-1.0.1" + sources."jsonify-0.0.0" sources."kuler-2.0.0" sources."leven-2.1.0" sources."logform-2.2.0" @@ -7490,8 +7380,12 @@ let sources."minimist-1.2.5" sources."mkdir-recursive-0.4.0" sources."moment-2.27.0" - sources."mqtt-4.1.0" - sources."mqtt-packet-6.3.2" + sources."mqtt-4.2.1" + (sources."mqtt-packet-6.4.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."ms-2.1.2" sources."nan-2.14.1" sources."next-tick-1.0.0" @@ -7516,7 +7410,7 @@ let sources."safe-buffer-5.1.2" sources."semver-7.3.2" sources."simple-swizzle-0.2.2" - (sources."split2-3.1.1" // { + (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -7532,13 +7426,11 @@ let sources."triple-beam-1.3.0" sources."type-1.2.0" sources."typedarray-0.0.6" - sources."ultron-1.1.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unix-dgram-2.0.3" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" - sources."websocket-stream-5.5.2" (sources."winston-3.3.3" // { dependencies = [ sources."readable-stream-3.6.0" @@ -7547,55 +7439,59 @@ let sources."winston-syslog-2.4.4" sources."winston-transport-4.4.0" sources."wrappy-1.0.2" - sources."ws-3.3.3" + sources."ws-7.3.1" sources."xtend-4.0.2" - (sources."zigbee-herdsman-0.12.108" // { + (sources."zigbee-herdsman-0.12.127" // { dependencies = [ - sources."@babel/cli-7.10.4" + sources."@babel/cli-7.10.5" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.10.4" - sources."@babel/core-7.10.4" - sources."@babel/generator-7.10.4" + sources."@babel/compat-data-7.11.0" + sources."@babel/core-7.11.4" + sources."@babel/generator-7.11.4" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" - sources."@babel/helper-create-class-features-plugin-7.10.4" + sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" - sources."@babel/helper-define-map-7.10.4" - sources."@babel/helper-explode-assignable-expression-7.10.4" + sources."@babel/helper-define-map-7.10.5" + sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-regex-7.10.5" + sources."@babel/helper-remap-async-to-generator-7.11.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.4" - sources."@babel/plugin-proposal-async-generator-functions-7.10.4" + sources."@babel/parser-7.11.4" + sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.10.4" sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.11.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.10.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" @@ -7609,7 +7505,7 @@ let sources."@babel/plugin-transform-arrow-functions-7.10.4" sources."@babel/plugin-transform-async-to-generator-7.10.4" sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.11.1" sources."@babel/plugin-transform-classes-7.10.4" sources."@babel/plugin-transform-computed-properties-7.10.4" sources."@babel/plugin-transform-destructuring-7.10.4" @@ -7620,51 +7516,53 @@ let sources."@babel/plugin-transform-function-name-7.10.4" sources."@babel/plugin-transform-literals-7.10.4" sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.5" sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.10.5" sources."@babel/plugin-transform-modules-umd-7.10.4" sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" sources."@babel/plugin-transform-new-target-7.10.4" sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.5" sources."@babel/plugin-transform-property-literals-7.10.4" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.10.4" + sources."@babel/plugin-transform-typescript-7.11.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.10.4" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-env-7.11.0" + sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.10.4" - sources."@babel/runtime-7.10.4" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.4" - sources."@babel/types-7.10.4" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" - (sources."@jest/console-26.1.0" // { + (sources."@jest/console-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."slash-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-26.1.0" // { + (sources."@jest/core-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" @@ -7678,46 +7576,50 @@ let sources."rimraf-3.0.2" sources."slash-3.0.0" sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" ]; }) - (sources."@jest/environment-26.1.0" // { + (sources."@jest/environment-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."@jest/fake-timers-26.1.0" // { + (sources."@jest/fake-timers-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."@jest/globals-26.1.0" // { + (sources."@jest/globals-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."@jest/reporters-26.1.0" // { + (sources."@jest/reporters-26.4.1" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" @@ -7725,29 +7627,31 @@ let sources."has-flag-4.0.0" sources."slash-3.0.0" sources."source-map-0.6.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."@jest/source-map-26.1.0" // { + (sources."@jest/source-map-26.3.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@jest/test-result-26.1.0" // { + (sources."@jest/test-result-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - sources."@jest/test-sequencer-26.1.0" - (sources."@jest/transform-26.1.0" // { + sources."@jest/test-sequencer-26.4.2" + (sources."@jest/transform-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" sources."chalk-4.1.0" @@ -7759,7 +7663,7 @@ let sources."micromatch-4.0.2" sources."slash-3.0.0" sources."source-map-0.6.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" ]; }) @@ -7770,20 +7674,20 @@ let sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - sources."@serialport/binding-abstract-9.0.0" - sources."@serialport/binding-mock-9.0.0" - sources."@serialport/bindings-9.0.0" - sources."@serialport/parser-byte-length-9.0.0" - sources."@serialport/parser-cctalk-9.0.0" - sources."@serialport/parser-delimiter-9.0.0" - sources."@serialport/parser-readline-9.0.0" - sources."@serialport/parser-ready-9.0.0" - sources."@serialport/parser-regex-9.0.0" - sources."@serialport/stream-9.0.0" - sources."@sinonjs/commons-1.8.0" + sources."@serialport/binding-abstract-9.0.1" + sources."@serialport/binding-mock-9.0.1" + sources."@serialport/bindings-9.0.1" + sources."@serialport/parser-byte-length-9.0.1" + sources."@serialport/parser-cctalk-9.0.1" + sources."@serialport/parser-delimiter-9.0.1" + sources."@serialport/parser-readline-9.0.1" + sources."@serialport/parser-ready-9.0.1" + sources."@serialport/parser-regex-9.0.1" + sources."@serialport/stream-9.0.1" + sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" sources."@types/babel__core-7.1.9" sources."@types/babel__generator-7.6.1" @@ -7796,36 +7700,36 @@ let sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/jest-26.0.4" + sources."@types/jest-26.0.10" sources."@types/json-schema-7.0.5" sources."@types/nedb-1.8.10" - sources."@types/node-14.0.22" + sources."@types/node-14.6.2" sources."@types/normalize-package-data-2.4.0" - sources."@types/prettier-2.0.2" + sources."@types/prettier-2.1.0" sources."@types/serialport-8.0.1" sources."@types/stack-utils-1.0.1" sources."@types/yargs-15.0.5" sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-3.6.0" // { + (sources."@typescript-eslint/eslint-plugin-3.10.1" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.6.0" - sources."@typescript-eslint/parser-3.6.0" - sources."@typescript-eslint/types-3.6.0" - (sources."@typescript-eslint/typescript-estree-3.6.0" // { + sources."@typescript-eslint/experimental-utils-3.10.1" + sources."@typescript-eslint/parser-3.10.1" + sources."@typescript-eslint/types-3.10.1" + (sources."@typescript-eslint/typescript-estree-3.10.1" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-3.6.0" - sources."abab-2.0.3" - sources."acorn-7.3.1" + sources."@typescript-eslint/visitor-keys-3.10.1" + sources."abab-2.0.4" + sources."acorn-7.4.0" sources."acorn-globals-6.0.0" sources."acorn-jsx-5.2.0" sources."acorn-walk-7.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -7855,24 +7759,25 @@ let sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" - (sources."babel-jest-26.1.0" // { + sources."aws4-1.10.1" + (sources."babel-jest-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."slash-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.1.0" + sources."babel-plugin-jest-hoist-26.2.0" sources."babel-preset-current-node-syntax-0.1.3" - sources."babel-preset-jest-26.1.0" + sources."babel-preset-jest-26.3.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -7888,7 +7793,7 @@ let sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - (sources."bl-4.0.2" // { + (sources."bl-4.0.3" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -7900,14 +7805,14 @@ let ]; }) sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.13.0" + sources."browserslist-4.14.0" sources."bser-2.1.1" sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001099" + sources."caniuse-lite-1.0.30001119" sources."capture-exit-2.0.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -7948,11 +7853,7 @@ let ]; }) sources."core-util-is-1.0.2" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) + sources."cross-spawn-6.0.5" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -7989,12 +7890,13 @@ let ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.496" + sources."electron-to-chromium-1.3.555" + sources."emittery-0.7.1" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."escalade-3.0.1" + sources."escalade-3.0.2" sources."escape-string-regexp-1.0.5" (sources."escodegen-1.14.3" // { dependencies = [ @@ -8005,7 +7907,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.4.0" // { + (sources."eslint-7.7.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -8021,18 +7923,19 @@ let sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."strip-ansi-6.0.0" - sources."strip-json-comments-3.1.0" - sources."supports-color-7.1.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-7.2.0" + sources."which-2.0.2" ]; }) sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.1.0" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -8050,16 +7953,17 @@ let ]; }) sources."expand-template-2.0.3" - (sources."expect-26.1.0" // { + (sources."expect-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-get-type-26.0.0" - sources."supports-color-7.1.0" + sources."jest-get-type-26.3.0" + sources."supports-color-7.2.0" ]; }) sources."extend-3.0.2" @@ -8097,7 +8001,7 @@ let sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" + sources."fs-extra-9.0.1" sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" @@ -8126,7 +8030,7 @@ let ]; }) sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" sources."has-unicode-2.0.1" @@ -8136,7 +8040,7 @@ let sources."kind-of-4.0.0" ]; }) - sources."highlight.js-10.1.1" + sources."highlight.js-10.1.2" sources."hosted-git-info-2.8.8" sources."html-encoding-sniffer-2.0.1" sources."html-escaper-2.0.2" @@ -8177,7 +8081,7 @@ let sources."kind-of-5.1.0" ]; }) - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -8209,7 +8113,7 @@ let sources."has-flag-4.0.0" sources."make-dir-3.1.0" sources."semver-6.3.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) (sources."istanbul-lib-source-maps-4.0.0" // { @@ -8218,40 +8122,44 @@ let ]; }) sources."istanbul-reports-3.0.2" - (sources."jest-26.1.0" // { + (sources."jest-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-26.1.0" - sources."supports-color-7.1.0" + sources."jest-cli-26.4.2" + sources."supports-color-7.2.0" ]; }) - (sources."jest-changed-files-26.1.0" // { + (sources."jest-changed-files-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" sources."execa-4.0.3" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."has-flag-4.0.0" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" + sources."which-2.0.2" ]; }) - (sources."jest-config-26.1.0" // { + (sources."jest-config-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" @@ -8261,10 +8169,10 @@ let sources."fill-range-7.0.1" sources."has-flag-4.0.0" sources."is-number-7.0.0" - sources."jest-get-type-26.0.0" + sources."jest-get-type-26.3.0" sources."micromatch-4.0.2" - sources."pretty-format-26.1.0" - sources."supports-color-7.1.0" + sources."pretty-format-26.4.2" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" ]; }) @@ -8275,50 +8183,54 @@ let sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."jest-docblock-26.0.0" - (sources."jest-each-26.1.0" // { + (sources."jest-each-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" - sources."supports-color-7.1.0" + sources."jest-get-type-26.3.0" + sources."pretty-format-26.4.2" + sources."supports-color-7.2.0" ]; }) - (sources."jest-environment-jsdom-26.1.0" // { + (sources."jest-environment-jsdom-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."jest-environment-node-26.1.0" // { + (sources."jest-environment-node-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."jest-get-type-25.2.6" - (sources."jest-haste-map-26.1.0" // { + (sources."jest-haste-map-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."braces-3.0.2" @@ -8330,56 +8242,60 @@ let sources."has-flag-4.0.0" sources."is-number-7.0.0" sources."micromatch-4.0.2" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" ]; }) - (sources."jest-jasmine2-26.1.0" // { + (sources."jest-jasmine2-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."pretty-format-26.1.0" - sources."supports-color-7.1.0" + sources."pretty-format-26.4.2" + sources."supports-color-7.2.0" ]; }) - (sources."jest-leak-detector-26.1.0" // { + (sources."jest-leak-detector-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" - sources."supports-color-7.1.0" + sources."jest-get-type-26.3.0" + sources."pretty-format-26.4.2" + sources."supports-color-7.2.0" ]; }) - (sources."jest-matcher-utils-26.1.0" // { + (sources."jest-matcher-utils-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."diff-sequences-26.0.0" + sources."diff-sequences-26.3.0" sources."has-flag-4.0.0" - sources."jest-diff-26.1.0" - sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" - sources."supports-color-7.1.0" + sources."jest-diff-26.4.2" + sources."jest-get-type-26.3.0" + sources."pretty-format-26.4.2" + sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-26.1.0" // { + (sources."jest-message-util-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" sources."chalk-4.1.0" @@ -8390,90 +8306,97 @@ let sources."is-number-7.0.0" sources."micromatch-4.0.2" sources."slash-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" ]; }) - (sources."jest-mock-26.1.0" // { + (sources."jest-mock-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - (sources."jest-resolve-26.1.0" // { + (sources."jest-resolve-26.4.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."slash-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."jest-resolve-dependencies-26.1.0" // { + (sources."jest-resolve-dependencies-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."jest-runner-26.1.0" // { + (sources."jest-runner-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-26.1.0" // { + (sources."jest-runtime-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."slash-3.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - sources."jest-serializer-26.1.0" - (sources."jest-snapshot-26.1.0" // { + sources."jest-serializer-26.3.0" + (sources."jest-snapshot-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."diff-sequences-26.0.0" + sources."diff-sequences-26.3.0" sources."has-flag-4.0.0" - sources."jest-diff-26.1.0" - sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" + sources."jest-diff-26.4.2" + sources."jest-get-type-26.3.0" + sources."pretty-format-26.4.2" sources."semver-7.3.2" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."jest-util-26.1.0" // { + (sources."jest-util-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" sources."chalk-4.1.0" @@ -8483,13 +8406,14 @@ let sources."has-flag-4.0.0" sources."is-number-7.0.0" sources."micromatch-4.0.2" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" ]; }) - (sources."jest-validate-26.1.0" // { + (sources."jest-validate-26.4.2" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."camelcase-6.0.0" @@ -8497,40 +8421,41 @@ let sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-get-type-26.0.0" - sources."pretty-format-26.1.0" - sources."supports-color-7.1.0" + sources."jest-get-type-26.3.0" + sources."pretty-format-26.4.2" + sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-26.1.0" // { + (sources."jest-watcher-26.3.0" // { dependencies = [ - sources."@jest/types-26.1.0" + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" sources."ansi-styles-4.2.1" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-26.1.0" // { + (sources."jest-worker-26.3.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jsdom-16.3.0" + sources."jsdom-16.4.0" sources."jsesc-2.5.2" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json5-2.1.3" - sources."jsonfile-4.0.0" + sources."jsonfile-6.0.1" sources."jsprim-1.4.1" sources."kind-of-6.0.3" sources."kleur-3.0.3" @@ -8539,15 +8464,15 @@ let sources."levn-0.4.1" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" sources."loose-envify-1.4.0" - sources."lunr-2.3.8" + sources."lunr-2.3.9" sources."make-dir-2.1.0" sources."makeerror-1.0.11" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."marked-1.0.0" + sources."marked-1.1.1" sources."merge-stream-2.0.0" sources."micromatch-3.1.10" sources."mime-db-1.44.0" @@ -8566,15 +8491,16 @@ let sources."natural-compare-1.4.0" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-abi-2.18.0" + sources."node-abi-2.19.1" sources."node-int64-0.4.0" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-7.0.1" // { + (sources."node-notifier-8.0.0" // { dependencies = [ sources."semver-7.3.2" + sources."which-2.0.2" ]; }) - sources."node-releases-1.1.59" + sources."node-releases-1.1.60" sources."noop-logger-0.1.1" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" @@ -8595,7 +8521,7 @@ let sources."object.assign-4.1.0" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.2" sources."optionator-0.9.1" sources."p-each-series-2.1.0" sources."p-finally-1.0.0" @@ -8603,7 +8529,7 @@ let sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" - sources."parse-json-5.0.0" + sources."parse-json-5.1.0" sources."parse5-5.1.1" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -8647,7 +8573,7 @@ let sources."rechoir-0.6.2" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpp-3.1.0" @@ -8667,8 +8593,8 @@ let sources."uuid-3.4.0" ]; }) - sources."request-promise-core-1.1.3" - (sources."request-promise-native-1.0.8" // { + sources."request-promise-core-1.1.4" + (sources."request-promise-native-1.0.9" // { dependencies = [ sources."tough-cookie-2.5.0" ]; @@ -8688,7 +8614,7 @@ let sources."sane-4.1.0" sources."saxes-5.0.1" sources."semver-5.7.1" - sources."serialport-9.0.0" + sources."serialport-9.0.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -8700,7 +8626,7 @@ let sources."shelljs-0.8.4" sources."shellwords-0.1.1" sources."signal-exit-3.0.3" - sources."simple-concat-1.0.0" + sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."sisteransi-1.0.5" sources."slash-2.0.0" @@ -8774,7 +8700,7 @@ let (sources."supports-hyperlinks-2.1.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."symbol-tree-3.2.4" @@ -8815,25 +8741,19 @@ let sources."type-detect-4.0.8" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."typedoc-0.17.8" - sources."typedoc-default-themes-0.10.2" - (sources."typedoc-plugin-markdown-2.3.1" // { - dependencies = [ - sources."fs-extra-9.0.1" - sources."jsonfile-6.0.1" - sources."universalify-1.0.0" - ]; - }) + sources."typedoc-0.19.0" + sources."typedoc-default-themes-0.11.1" + sources."typedoc-plugin-markdown-2.4.2" sources."typedoc-plugin-no-inherit-1.1.10" sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-3.9.6" - sources."uglify-js-3.10.0" + sources."typescript-4.0.2" + sources."uglify-js-3.10.2" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" sources."union-value-1.0.1" - sources."universalify-0.1.2" + sources."universalify-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -8849,9 +8769,9 @@ let sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-7.0.3" + sources."uuid-8.3.0" sources."v8-compile-cache-2.1.1" - (sources."v8-to-istanbul-4.1.4" // { + (sources."v8-to-istanbul-5.0.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -8864,12 +8784,8 @@ let sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - (sources."whatwg-url-8.1.0" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) - sources."which-2.0.2" + sources."whatwg-url-8.2.1" + sources."which-1.3.1" sources."which-module-2.0.0" sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" @@ -8906,32 +8822,30 @@ let sources."yargs-parser-18.1.3" ]; }) - (sources."zigbee-herdsman-converters-12.0.147" // { + (sources."zigbee-herdsman-converters-12.0.178" // { dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.10.5" // { + (sources."@babel/core-7.11.4" // { dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" sources."semver-5.7.1" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.10.5" // { + (sources."@babel/generator-7.11.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" (sources."@babel/highlight-7.10.4" // { @@ -8939,7 +8853,7 @@ let sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.4" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.10.4" @@ -8952,14 +8866,12 @@ let sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.10.5" // { + (sources."@babel/traverse-7.11.0" // { dependencies = [ - sources."debug-4.1.1" sources."globals-11.12.0" - sources."ms-2.1.2" ]; }) - sources."@babel/types-7.10.5" + sources."@babel/types-7.11.0" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" (sources."@istanbuljs/load-nyc-config-1.1.0" // { @@ -8968,21 +8880,21 @@ let ]; }) sources."@istanbuljs/schema-0.1.2" - sources."@jest/console-26.1.0" - (sources."@jest/core-26.1.0" // { + sources."@jest/console-26.3.0" + (sources."@jest/core-26.4.2" // { dependencies = [ sources."rimraf-3.0.2" ]; }) - sources."@jest/environment-26.1.0" - sources."@jest/fake-timers-26.1.0" - sources."@jest/globals-26.1.0" - sources."@jest/reporters-26.1.0" - sources."@jest/source-map-26.1.0" - sources."@jest/test-result-26.1.0" - sources."@jest/test-sequencer-26.1.0" - sources."@jest/transform-26.1.0" - sources."@jest/types-26.1.0" + sources."@jest/environment-26.3.0" + sources."@jest/fake-timers-26.3.0" + sources."@jest/globals-26.4.2" + sources."@jest/reporters-26.4.1" + sources."@jest/source-map-26.3.0" + sources."@jest/test-result-26.3.0" + sources."@jest/test-sequencer-26.4.2" + sources."@jest/transform-26.3.0" + sources."@jest/types-26.3.0" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" sources."@types/babel__core-7.1.9" @@ -8993,33 +8905,23 @@ let sources."@types/graceful-fs-4.1.3" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" - sources."@types/istanbul-reports-1.1.2" + sources."@types/istanbul-reports-3.0.0" sources."@types/json-schema-7.0.5" - sources."@types/node-14.0.23" + sources."@types/node-14.6.2" sources."@types/normalize-package-data-2.4.0" - sources."@types/prettier-2.0.2" + sources."@types/prettier-2.1.0" sources."@types/stack-utils-1.0.1" sources."@types/yargs-15.0.5" sources."@types/yargs-parser-15.0.0" sources."@typescript-eslint/experimental-utils-2.34.0" - (sources."@typescript-eslint/typescript-estree-2.34.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" - ]; - }) - sources."abab-2.0.3" - sources."acorn-7.3.1" + sources."@typescript-eslint/typescript-estree-2.34.0" + sources."abab-2.0.4" + sources."acorn-7.4.0" sources."acorn-globals-6.0.0" sources."acorn-jsx-5.2.0" sources."acorn-walk-7.2.0" - (sources."agent-base-6.0.1" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" - ]; - }) - sources."ajv-6.12.3" + sources."agent-base-6.0.1" + sources."ajv-6.12.4" sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -9041,13 +8943,13 @@ let sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" - sources."axios-0.19.2" - sources."babel-jest-26.1.0" + sources."aws4-1.10.1" + sources."axios-0.20.0" + sources."babel-jest-26.3.0" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.1.0" + sources."babel-plugin-jest-hoist-26.2.0" sources."babel-preset-current-node-syntax-0.1.3" - sources."babel-preset-jest-26.1.0" + sources."babel-preset-jest-26.3.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -9059,7 +8961,7 @@ let }) sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - sources."bl-4.0.2" + sources."bl-4.0.3" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" @@ -9077,7 +8979,7 @@ let sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."char-regex-1.0.2" @@ -9118,7 +9020,7 @@ let }) sources."dashdash-1.14.1" sources."data-urls-2.0.0" - sources."debug-3.1.0" + sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decimal.js-10.2.0" sources."decode-uri-component-0.2.0" @@ -9133,7 +9035,7 @@ let }) sources."delayed-stream-1.0.0" sources."detect-newline-3.1.0" - sources."diff-sequences-26.0.0" + sources."diff-sequences-26.3.0" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { dependencies = [ @@ -9141,6 +9043,7 @@ let ]; }) sources."ecc-jsbn-0.1.2" + sources."emittery-0.7.1" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -9154,22 +9057,17 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.5.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" - ]; - }) + sources."eslint-7.7.0" sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-23.18.0" + sources."eslint-plugin-jest-23.20.0" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.0" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -9192,9 +9090,10 @@ let sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" + sources."ms-2.0.0" ]; }) - (sources."expect-26.1.0" // { + (sources."expect-26.4.2" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -9226,7 +9125,7 @@ let sources."find-up-4.1.0" sources."flat-cache-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.5.10" + sources."follow-redirects-1.13.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -9247,7 +9146,7 @@ let sources."graceful-fs-4.2.4" sources."growly-1.3.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -9264,12 +9163,7 @@ let sources."html-encoding-sniffer-2.0.1" sources."html-escaper-2.0.2" sources."http-signature-1.2.0" - (sources."https-proxy-agent-5.0.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" - ]; - }) + sources."https-proxy-agent-5.0.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" @@ -9298,7 +9192,7 @@ let sources."kind-of-5.1.0" ]; }) - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -9324,69 +9218,64 @@ let (sources."istanbul-lib-report-3.0.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) - (sources."istanbul-lib-source-maps-4.0.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.2" + sources."supports-color-7.2.0" ]; }) + sources."istanbul-lib-source-maps-4.0.0" sources."istanbul-reports-3.0.2" - (sources."jest-26.1.0" // { + (sources."jest-26.4.2" // { dependencies = [ - sources."jest-cli-26.1.0" + sources."jest-cli-26.4.2" ]; }) - (sources."jest-changed-files-26.1.0" // { + (sources."jest-changed-files-26.3.0" // { dependencies = [ sources."execa-4.0.3" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" ]; }) - sources."jest-config-26.1.0" - sources."jest-diff-26.1.0" + sources."jest-config-26.4.2" + sources."jest-diff-26.4.2" sources."jest-docblock-26.0.0" - sources."jest-each-26.1.0" - sources."jest-environment-jsdom-26.1.0" - sources."jest-environment-node-26.1.0" - sources."jest-get-type-26.0.0" - sources."jest-haste-map-26.1.0" - sources."jest-jasmine2-26.1.0" - sources."jest-leak-detector-26.1.0" - sources."jest-matcher-utils-26.1.0" - sources."jest-message-util-26.1.0" - sources."jest-mock-26.1.0" + sources."jest-each-26.4.2" + sources."jest-environment-jsdom-26.3.0" + sources."jest-environment-node-26.3.0" + sources."jest-get-type-26.3.0" + sources."jest-haste-map-26.3.0" + sources."jest-jasmine2-26.4.2" + sources."jest-leak-detector-26.4.2" + sources."jest-matcher-utils-26.4.2" + sources."jest-message-util-26.3.0" + sources."jest-mock-26.3.0" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - sources."jest-resolve-26.1.0" - sources."jest-resolve-dependencies-26.1.0" - sources."jest-runner-26.1.0" - sources."jest-runtime-26.1.0" - sources."jest-serializer-26.1.0" - sources."jest-snapshot-26.1.0" - sources."jest-util-26.1.0" - (sources."jest-validate-26.1.0" // { + sources."jest-resolve-26.4.0" + sources."jest-resolve-dependencies-26.4.2" + sources."jest-runner-26.4.2" + sources."jest-runtime-26.4.2" + sources."jest-serializer-26.3.0" + sources."jest-snapshot-26.4.2" + sources."jest-util-26.3.0" + (sources."jest-validate-26.4.2" // { dependencies = [ sources."camelcase-6.0.0" ]; }) - sources."jest-watcher-26.1.0" - (sources."jest-worker-26.1.0" // { + sources."jest-watcher-26.3.0" + (sources."jest-worker-26.3.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jsdom-16.3.0" + sources."jsdom-16.4.0" sources."jsesc-2.5.2" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -9399,7 +9288,7 @@ let sources."levn-0.4.1" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -9422,13 +9311,13 @@ let ]; }) sources."mkdirp-0.5.5" - sources."ms-2.0.0" + sources."ms-2.1.2" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" sources."node-int64-0.4.0" sources."node-modules-regexp-1.0.0" - sources."node-notifier-7.0.1" + sources."node-notifier-8.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -9451,7 +9340,7 @@ let sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.2" sources."optionator-0.9.1" sources."p-each-series-2.1.0" sources."p-finally-1.0.0" @@ -9459,7 +9348,7 @@ let sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" - sources."parse-json-5.0.0" + sources."parse-json-5.1.0" sources."parse5-5.1.1" sources."pascalcase-0.1.1" sources."path-exists-4.0.0" @@ -9472,7 +9361,7 @@ let sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-26.1.0" // { + (sources."pretty-format-26.4.2" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -9504,8 +9393,8 @@ let sources."uuid-3.4.0" ]; }) - sources."request-promise-core-1.1.3" - (sources."request-promise-native-1.0.8" // { + sources."request-promise-core-1.1.4" + (sources."request-promise-native-1.0.9" // { dependencies = [ sources."tough-cookie-2.5.0" ]; @@ -9569,6 +9458,7 @@ let sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" + sources."ms-2.0.0" sources."source-map-0.5.7" ]; }) @@ -9624,7 +9514,7 @@ let (sources."supports-hyperlinks-2.1.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."symbol-tree-3.2.4" @@ -9668,9 +9558,9 @@ let sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-7.0.3" + sources."uuid-8.3.0" sources."v8-compile-cache-2.1.1" - (sources."v8-to-istanbul-4.1.4" // { + (sources."v8-to-istanbul-5.0.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -9683,11 +9573,7 @@ let sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - (sources."whatwg-url-8.1.0" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) + sources."whatwg-url-8.2.1" sources."which-2.0.2" sources."which-module-2.0.0" sources."word-wrap-1.2.3" diff --git a/third_party/nixpkgs/pkgs/shells/dash/default.nix b/third_party/nixpkgs/pkgs/shells/dash/default.nix index f9dd578ad9..030e5695b2 100644 --- a/third_party/nixpkgs/pkgs/shells/dash/default.nix +++ b/third_party/nixpkgs/pkgs/shells/dash/default.nix @@ -1,18 +1,19 @@ -{ autoreconfHook, lib, stdenv, fetchurl }: +{ stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.11.1"; + name = "dash-0.5.11.2"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "048n1rbw3v1ffzsw5mkc6zzvvf1csq7pcri7jraaqag38vqq3j3k"; + sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; }; hardeningDisable = [ "format" ]; # Temporary fix until a proper one is accepted upstream - patches = lib.lists.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; - nativeBuildInputs = lib.lists.optional stdenv.isDarwin autoreconfHook; + patches = stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; meta = with stdenv.lib; { homepage = "http://gondor.apana.org.au/~herbert/dash/"; diff --git a/third_party/nixpkgs/pkgs/shells/elvish/default.nix b/third_party/nixpkgs/pkgs/shells/elvish/default.nix index 64dd3cd70c..2cb45f33f7 100644 --- a/third_party/nixpkgs/pkgs/shells/elvish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/elvish/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "elvish"; - version = "0.14.0"; + version = "0.14.1"; excludedPackages = [ "website" ]; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "1jsxhnm82pjzwvcjq7vrlldyjnv5j6c83a13dj6zphlqq99z68l4"; + sha256 = "05wp3cx4s2cjf60yncdpmycs5h4z1dlin56dmljmfwz4z099079b"; }; vendorSha256 = "1f971n17h9bc0qcgs9ipiaw0x9807mz761fqm605br4ch1kp0897"; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 351799099b..09d2f6aac1 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "100r26dx57wdzdpf6lgsgw0py33k3nsx73pa1qjcipwv00a106sr"; + sha256 = "08r6f71cy4j22k0mllm134x4dfixaircpaz5arrj93xsbp38nk92"; }; - cargoSha256 = "0ch79zsnqb5n9r7jq6figpmqp2cs2p9a3m7fg3sd04m797ki9chr"; + cargoSha256 = "15kvl490abxdv6706zs7pv0q5fhghmdvlfbn19037sldkcsfl86b"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.nushell.sh/"; license = licenses.mit; maintainers = with maintainers; [ filalex77 johntitor marsam ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/shells/rssh/default.nix b/third_party/nixpkgs/pkgs/shells/rssh/default.nix deleted file mode 100644 index b2bec51a95..0000000000 --- a/third_party/nixpkgs/pkgs/shells/rssh/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -# CAVEATS: -# - Have only tested this with rsync, scp, and sftp. cvs support should work, but chroot integration is unlikely to function without further work -# - It is compiled without rdist support because rdist is ludicrously ancient (and not already in nixpkgs) - -{ stdenv, fetchurl, openssh, rsync, cvs }: - -stdenv.mkDerivation rec { - pname = "rssh"; - version = "2.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/rssh/rssh/${version}/${pname}-${version}.tar.gz"; - sha256 = "f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9"; - }; - - patches = [ - ./fix-config-path.patch - - # Patches from AUR - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-fail-logging.patch?h=rssh"; - name = "0001-fail-logging.patch"; - sha256 = "d30f2f4fdb1b57f94773f5b0968a4da3356b14a040efe69ec1e976c615035c65"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-info-to-debug.patch?h=rssh"; - name = "0002-info-to-debug.patch"; - sha256 = "86f6ecf34f62415b0d6204d4cbebc47322dc2ec71732d06aa27758e35d688fcd"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0003-man-page-spelling.patch?h=rssh"; - name = "0003-man-page-spelling.patch"; - sha256 = "455b3bbccddf1493999d00c2cd46e62930ef4fd8211e0b7d3a89d8010d6a5431"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0004-mkchroot.patch?h=rssh"; - name = "0004-mkchroot.patch"; - sha256 = "f7fd8723d2aa94e64e037c13c2f263a52104af680ab52bfcaea73dfa836457c2"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0005-mkchroot-arch.patch?h=rssh"; - name = "0005-mkchroot-arch.patch"; - sha256 = "ac8894c4087a063ae8267d2fdfcde69c2fe6b67a8ff5917e4518b8f73f08ba3f"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0006-mkchroot-symlink.patch?h=rssh"; - name = "0006-mkchroot-symlink.patch"; - sha256 = "bce98728cb9b55c92182d4901c5f9adf49376a07c5603514b0004e3d1c85e9c7"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0007-destdir.patch?h=rssh"; - name = "0007-destdir.patch"; - sha256 = "7fa03644f81dc37d77cc7e2cad994f17f91b2b8a49b1a74e41030a4ac764385e"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0008-rsync-protocol.patch?h=rssh"; - name = "0008-rsync-protocol.patch"; - sha256 = "0c772afe9088eeded129ead86775ef18e58c318bbc58fc3e2585e7ff09cc5e91"; - }) - ]; - - # Run this after to avoid conflict with patches above - postPatch = '' - sed -i '/chmod u+s/d' Makefile.in - ''; - - - buildInputs = [ openssh rsync cvs ]; - - configureFlags = [ - "--with-sftp-server=${openssh}/libexec/sftp-server" - "--with-scp=${openssh}/bin/scp" - "--with-rsync=${rsync}/bin/rsync" - "--with-cvs=${cvs}/bin/cvs" - ]; - - - meta = with stdenv.lib; { - description = "A restricted shell for use with OpenSSH, allowing only scp and/or sftp"; - longDescription = '' - rssh also includes support for rsync and cvs. For example, if you have a server which you only want to allow users to copy files off of via scp, without providing shell access, you can use rssh to do that. - ''; - homepage = "http://www.pizzashack.org/rssh/"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ arobyn ]; - knownVulnerabilities = [ - "CVE-2019-1000018" - "CVE-2019-3463" - "CVE-2019-3464" - ]; - }; - - passthru = { - shellPath = "/bin/rssh"; - }; -} diff --git a/third_party/nixpkgs/pkgs/shells/rssh/fix-config-path.patch b/third_party/nixpkgs/pkgs/shells/rssh/fix-config-path.patch deleted file mode 100644 index eecffb376a..0000000000 --- a/third_party/nixpkgs/pkgs/shells/rssh/fix-config-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur rssh-2.3.4/Makefile.in rssh-2.3.4-fixed/Makefile.in ---- rssh-2.3.4/Makefile.in 2012-11-27 11:19:34.000000000 +1100 -+++ rssh-2.3.4-fixed/Makefile.in 2015-11-11 21:13:58.516651742 +1100 -@@ -186,7 +186,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = nostdinc --ourdefs = -DPATH_RSSH_CONFIG=\"@sysconfdir@/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\" -+ourdefs = -DPATH_RSSH_CONFIG=\"/etc/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\" - ourflags = @defcflags@ @static@ - AM_CFLAGS = $(ourflags) - nodist_rssh_SOURCES = main.c pathnames.h config.h diff --git a/third_party/nixpkgs/pkgs/shells/xonsh/default.nix b/third_party/nixpkgs/pkgs/shells/xonsh/default.nix index 5d6a8a6065..e775ab04dc 100644 --- a/third_party/nixpkgs/pkgs/shells/xonsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/xonsh/default.nix @@ -8,17 +8,18 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.19"; + version = "0.9.22"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1s7nb23zh4may4k3c9yfiizfdflm97hf5q2aww4j6ibykgcydv64"; + sha256 = "04yd8y4lksmxbgl6v6bw1k32r8v5mia3sm8y9v39cgfzjbkvys1p"; }; LC_ALL = "en_US.UTF-8"; + postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix index c1d02f3cd4..325bae4f9c 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "antibody"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "0ldvihpm14h0gcn7iz5yxg1wbfv24flx6y8khdanw21lf9nmp59z"; + sha256 = "0icag53svzdm7yvzp855fp0f7q0g0jkfmjaa1sj6mmb01c1xgzi1"; }; vendorSha256 = "0z8fma3v2dph8nv3q4lmv43s6p5sc338xb7kcmnpwcc0iw7b4vyj"; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 8fc189fbf1..cc4c790336 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,70 +1,68 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-08-20"; + version = "2020-09-20"; pname = "oh-my-zsh"; - rev = "03b6a72576cb0f0b53abde25d409e8026d5c4ee9"; + rev = "93c837fec8e9fe61509b9dff9e909e84f7ebe32d"; - src = fetchgit { inherit rev; - url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0bm043r3pffbv74drrv2xa66rsadrrsayscwwnfgp24svdmx7a6z"; + src = fetchFromGitHub { + inherit rev; + owner = "ohmyzsh"; + repo = "ohmyzsh"; + sha256 = "1ww50c1xf64z1m0sy30xaf2adr87cqr5yyv9jrqr227j97vrwj04"; }; - pathsToLink = [ "/share/oh-my-zsh" ]; - - phases = "installPhase"; - installPhase = '' - outdir=$out/share/oh-my-zsh - template=templates/zshrc.zsh-template + outdir=$out/share/oh-my-zsh + template=templates/zshrc.zsh-template - mkdir -p $outdir - cp -r $src/* $outdir - cd $outdir + mkdir -p $outdir + cp -r * $outdir + cd $outdir - rm LICENSE.txt - rm -rf .git* + rm LICENSE.txt + rm -rf .git* - chmod -R +w templates + chmod -R +w templates - # Change the path to oh-my-zsh dir and disable auto-updating. - sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ - -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ - $template + # Change the path to oh-my-zsh dir and disable auto-updating. + sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ + -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ + $template - chmod +w oh-my-zsh.sh + chmod +w oh-my-zsh.sh - # Both functions expect oh-my-zsh to be in ~/.oh-my-zsh and try to - # modify the directory. - cat >> oh-my-zsh.sh <<- EOF + # Both functions expect oh-my-zsh to be in ~/.oh-my-zsh and try to + # modify the directory. + cat >> oh-my-zsh.sh <<- EOF - # Undefine functions that don't work on Nix. - unfunction uninstall_oh_my_zsh - unfunction upgrade_oh_my_zsh - EOF + # Undefine functions that don't work on Nix. + unfunction uninstall_oh_my_zsh + unfunction upgrade_oh_my_zsh + EOF - # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source - # them, if found. - cat >> $template <<- EOF + # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source + # them, if found. + cat >> $template <<- EOF - # Load the variables. - if [ -f ~/.zsh_variables ]; then - . ~/.zsh_variables - fi + # Load the variables. + if [ -f ~/.zsh_variables ]; then + . ~/.zsh_variables + fi - # Load the functions. - if [ -f ~/.zsh_funcs ]; then - . ~/.zsh_funcs - fi + # Load the functions. + if [ -f ~/.zsh_funcs ]; then + . ~/.zsh_funcs + fi - # Load the aliases. - if [ -f ~/.zsh_aliases ]; then - . ~/.zsh_aliases - fi - EOF + # Load the aliases. + if [ -f ~/.zsh_aliases ]; then + . ~/.zsh_aliases + fi + EOF ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh index 0146cac849..738c081073 100755 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh @@ -5,7 +5,6 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')" latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" -url="$(nix-instantiate --eval -E "with import ./. {}; oh-my-zsh.src.url" | tr -d '"')" if [ ! "null" = "${latestSha}" ]; then latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index 5b1c380548..491951e612 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -309,8 +309,12 @@ in rec { name = attrs.name or "${attrs.pname}-${attrs.version}"; # If the packager hasn't specified `outputsToInstall`, choose a default, - # which is the name of `p.bin or p.out or p`; - # if he has specified it, it will be overridden below in `// meta`. + # which is the name of `p.bin or p.out or p` along with `p.man` when + # present. + # + # If the packager has specified it, it will be overridden below in + # `// meta`. + # # Note: This default probably shouldn't be globally configurable. # Services and users should specify outputs explicitly, # unless they are comfortable with this default. @@ -338,6 +342,32 @@ in rec { validity.handled ({ overrideAttrs = f: mkDerivation (attrs // (f attrs)); + + # A derivation that always builds successfully and whose runtime + # dependencies are the original derivations build time dependencies + # This allows easy building and distributing of all derivations + # needed to enter a nix-shell with + # nix-build shell.nix -A inputDerivation + inputDerivation = derivation (derivationArg // { + # Add a name in case the original drv didn't have one + name = derivationArg.name or "inputDerivation"; + # This always only has one output + outputs = [ "out" ]; + + # Propagate the original builder and arguments, since we override + # them and they might contain references to build inputs + _derivation_original_builder = derivationArg.builder; + _derivation_original_args = derivationArg.args; + + builder = stdenv.shell; + # The bash builtin `export` dumps all current environment variables, + # which is where all build input references end up (e.g. $PATH for + # binaries). By writing this to $out, Nix can find and register + # them as runtime dependencies (since Nix greps for store paths + # through $out to find them) + args = [ "-c" "export > $out" ]; + }); + inherit meta passthru; } // # Pass through extra attributes that are not inputs, but diff --git a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix index 74a6777d94..91e067e7be 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.195"; + version = "1.196"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy"; + sha256 = "0c79rycgpna8910as6blw3z3sajzzakz4qlvr6js2yr8zq2d0ylg"; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/wmutils-libwm/default.nix b/third_party/nixpkgs/pkgs/tools/X11/wmutils-libwm/default.nix new file mode 100644 index 0000000000..72022621af --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/X11/wmutils-libwm/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libxcb }: + +stdenv.mkDerivation rec { + pname = "wmutils-libwm"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "wmutils"; + repo = "libwm"; + rev = "v${version}"; + sha256 = "1lpbqrilhffpzc0b7vnp08jr1wr96lndwc7y0ck8hlbzlvm662l0"; + }; + + buildInputs = [ libxcb ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "A small library for X window manipulation"; + homepage = "https://github.com/wmutils/libwm"; + license = licenses.isc; + maintainers = with maintainers; [ bhougland ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix index 6fe433daf8..7f46e017c3 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -90,9 +90,12 @@ in buildPythonApplication rec { "--with-vsock" ]; + dontWrapGApps = true; preFixup = '' - gappsWrapperArgs+=( + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" --set XPRA_INSTALL_PREFIX "$out" + --set XPRA_COMMAND "$out/bin/xpra" --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]} ) diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix b/third_party/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix index 712f47fb2c..e43043d78f 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXinerama ]; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - buildPhase = '' gcc -O2 -Wall fakeXinerama.c -fPIC -o libfakeXinerama.so.1.0 -shared ''; @@ -20,6 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib cp libfakeXinerama.so.1.0 $out/lib + ln -s libfakeXinerama.so.1.0 $out/lib/libXinerama.so.1.0 ln -s libXinerama.so.1.0 $out/lib/libXinerama.so.1 ln -s libXinerama.so.1 $out/lib/libXinerama.so ''; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix index ad2995b4ca..759613553f 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix @@ -1,5 +1,14 @@ -{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, pixman, xcbutil, xcbutilimage -, libseccomp, libjpeg, libpng, libXpm }: +{ stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, pixman +, xcbutil +, xcbutilimage +, libjpeg +, libpng +, libXpm +}: stdenv.mkDerivation rec { pname = "xwallpaper"; @@ -15,7 +24,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ pixman xcbutilimage xcbutil libseccomp libjpeg libpng libXpm ]; + buildInputs = [ pixman xcbutilimage xcbutil libjpeg libpng libXpm ]; meta = with stdenv.lib; { homepage = "https://github.com/stoeckmann/xwallpaper"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix index 2254f2e22d..30badb175a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.6"; + version = "2.8.7"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "0zbs8vzbh89wxf36h9mvhin2p85n3jrsq6l5i40q1zkzgwi3648n"; + sha256 = "0bwzrrm07v2lpsja0r0z7nj3jrf814w57mmk8lbdk9dsb3i07x4w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix index 4783e98204..58b2852bac 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ansible/default.nix @@ -1,7 +1,22 @@ -{ python3Packages, fetchurl }: +{ python3Packages, fetchurl, fetchFromGitHub }: rec { - ansible = ansible_2_9; + ansible = ansible_2_10; + + # The python module stays at v2.9.x until the related package set has caught up. Therefore v2.10 gets an override + # for now. + ansible_2_10 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { + pname = "ansible"; + version = "2.10.0"; + + # TODO: migrate to fetchurl, when release becomes available on releases.ansible.com + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0k9rs5ajx0chaq0xr1cj4x7fr5n8kd4y856miss6k01iv2m7yx42"; + }; + })); ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; @@ -14,14 +29,4 @@ rec { sha256 = "19ga0c9qs2b216qjg5k2yknz8ksjn8qskicqspg2d4b8x2nr1294"; }; })); - - ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.7.18"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; - }; - })); } diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index ef6f760de5..1efbff221a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "aws-vault"; - version = "5.4.4"; + version = "6.0.0"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "0qmxq2jd7dg5fp9giw6xd96q2l2df3sxksc0rwmrgx2rjx6iyivn"; + sha256 = "0ssm58ksk5jb28w1ipa57spzf6wixjy1m7flw61ls8k86cy7qb7c"; }; - vendorSha256 = "0jlraq480llamns6yw8yjkzxsndyqiyzy120djni8sw5h0bz65j7"; + vendorSha256 = "0lxm7nkzf9j9id7m46gqn26prb1jfl34gy1fycr0578absdvsrjd"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index 84b5d7ebeb..6bc3296289 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.109"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.137"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "eca463ca5447d7db2eeebd268217b7e73f7e9a22b750505a3efd655dc189ac84"; + sha256 = "0g745lvmi30di3bbpbca2bkqqzk7g6l3ssmbpi8pvgy0wrfhij69"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index c264c86260..471034fa51 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -8,12 +8,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev40"; + version = "2.0.0dev52"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "6b3f96c5e985597053850f0c2761d503d4c18bfe"; - sha256 = "1ffx86m3b592kj331800qbcz5f532z8kzf1wmd04i4bfiqvqn4h8"; + rev = "f115f16d8130957776f232bbb7505ff6c4f18e8c"; + hash = "sha256-wi9ezv6uIvCNFYJX6z0zQO7/VREhe1Sn/CakIgDRp1c="; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -29,13 +29,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.0.36"; # N.B: if you change this, change botocore to a matching version too + version = "2.0.48"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256:05c9lss7jg7bwaij1nxwg50grah68zamcixy8jiw3hpc1vdighql"; + hash = "sha256-83EKaKv3ZKOD2hzdsJO7/djbzr4V8LpHxqBl9HFhk1U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 192a788b93..3743cad11a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.10.1"; + version = "2.11.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "03mard9cyffn109c1p0hrdi4cjxbwyk98677qrira9yvy6rw04bg"; + sha256 = "11jmgc73b0w725rq89j6hk6gh67nfdbzp3rmywmrnah683d6xbpx"; }; # put packages that needs to be overriden in the py package scope @@ -105,10 +105,13 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-sql azure-mgmt-sqlvirtualmachine azure-mgmt-storage + azure-mgmt-synapse azure-mgmt-trafficmanager azure-mgmt-web azure-multiapi-storage azure-storage-blob + azure-synapse-accesscontrol + azure-synapse-spark colorama cryptography Fabric diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 1ff7436943..8d17c9ff20 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -139,8 +139,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.1.0" "zip" - "1pgxl2gzc1dm7akcqm6fl0y35sb3jdgcz6d7k6vsq93gb3gzrrwv"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.2.0" "zip" + "ddfe4c0c55f0e3fd1f66dd82c1d4a3d872ce124639b9a77fcd172daf464438a5"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.5.0" "zip" "1nh626jg459p9f96glv74dph3vmpybm5cs8rrj1s65kn3m8jf591"; @@ -160,8 +160,8 @@ let azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; - azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.0.0" "zip" - "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; + azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" + "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.15.0" "zip" "03ysr8kx0gavjrxsi9wqrgxpg3g17nvii7z68qfm0k2mv6ryj3z7"; @@ -187,8 +187,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.11.0" "zip" - "0193y0w5lcrayf8g0sxaj57w52kixdk3x5b8kga5is4pdjq7c6k2"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.12.0" "zip" + "7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; @@ -229,6 +229,9 @@ let azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; + azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.3.0" "zip" + "0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy"; + azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip" "1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77"; @@ -238,8 +241,8 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.0.0" "zip" "1qisnwn0gqfsa3h5x0fdbsgdjwn92hdbg71gdijrja0kryb328k5"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.2.0" "zip" - "1r5ww9ndya6sifafrbp4cr5iyyaww2ns7wrbqm6hc6aqxcpf30qq"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b2" "zip" + "10kpfzgsyh648a9z194vysgfl5887qwwamyd1r32zfqi9fr4js5l"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip" "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm"; @@ -265,8 +268,11 @@ let azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.6.0" "zip" - "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5i"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip" + "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5a"; + + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.4.1" "zip" + "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -297,6 +303,26 @@ let }; }); + azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { + version = "0.2.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; + extension = "zip"; + }; + }); + + azure-synapse-spark = super.azure-synapse-spark.overrideAttrs(oldAttrs: rec { + version = "0.2.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1qijqp6llshqas422lnqvpv45iv99n7f13v86znql40y3jp5n3ir"; + extension = "zip"; + }; + }); + azure-keyvault = super.azure-keyvault.overrideAttrs(oldAttrs: rec { version = "1.1.0"; src = super.fetchPypi { diff --git a/third_party/nixpkgs/pkgs/tools/admin/cli53/default.nix b/third_party/nixpkgs/pkgs/tools/admin/cli53/default.nix index 0ba4593f6a..4978603c19 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/cli53/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/cli53/default.nix @@ -14,8 +14,6 @@ buildGoPackage { sha256 = "0bhczmzrgf7ypnhhzdrgnvg8cw8ch1x1d0cgajc5kklq9ixv9ygi"; }; - goDeps = ./deps.nix; - meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; homepage = "https://github.com/barnybug/cli53"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/cli53/deps.nix b/third_party/nixpkgs/pkgs/tools/admin/cli53/deps.nix deleted file mode 100644 index 4742bc0085..0000000000 --- a/third_party/nixpkgs/pkgs/tools/admin/cli53/deps.nix +++ /dev/null @@ -1,93 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -[ - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "3e7014382cdc91695381614d0110a3cff997ba72"; - sha256 = "1xnjhmb31k63k13aiiiispc7vkgnlxkbihslwwfsjc7b86vrllm5"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "20b96f641a5ea98f2f8619ff4f3e061cff4833bd"; - sha256 = "0mp18hlhnazg3sd02fhv88kbbipmhcrkb6n8imq8gk2dvmxk64ch"; - }; - } - { - goPackagePath = "github.com/gucumber/gucumber"; - fetch = { - type = "git"; - url = "https://github.com/gucumber/gucumber"; - rev = "71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc"; - sha256 = "1h1d9j515v1nyqsyb73v4ahlvm9n6z7hgl2ld8dryr4sw8q7ybw3"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "e4205768578dc90c2669e75a2f8a8bf77e3083a4"; - sha256 = "0247qcc9i41wrm73ivqs2wvy3vi3nb44m3nh27lnhd4a0ilir6wv"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/shiena/ansicolor"; - fetch = { - type = "git"; - url = "https://github.com/shiena/ansicolor"; - rev = "a422bbe96644373c5753384a59d678f7d261ff10"; - sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; - sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 27ea33b603..74cc3f3f17 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1p3dzzbf840csqlgxyykmyg13z0nkzy4nkqq9y8jlpdm745vcryv"; + sha256 = "1yclffhr76jd5rzqi37bpdj524lmywmgcfr9r0ahacfkp1hxdn3v"; }; - vendorSha256 = "1msid4857wsh4qp1f7nyrmpzjv3sklh49cl7a9c1a3qr9m99w4yb"; + vendorSha256 = "133g2d7l1szmpxjdg28yjm3pw6galwq8948rvalnh932kxngkxys"; doCheck = false; @@ -36,6 +36,6 @@ buildGoModule rec { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd Chili-Man ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 442df88795..41fc026092 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "0w0lgc3db9r1knd7hp98ycxfbfxbpfrb0vf4vxcqxlvlkjcrvg1z"; + sha256 = "01bll978dis8pqvgrbigzgszkx3kjm6acrw44z6j7algw3an352r"; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 60ba024fd5..5a51ace3b9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1b9pm0k298w7scsi493a2xlikiqqbb8vwcy9j71421kyvlj4g7yr"; + sha256 = "1l2r9pgyzih7xgrr2ygm0mcl97kyp1wfvybwhbn1i0kbb72nagk1"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1f6kkcwxg419kw58521n4ms68hspx7mj87syj4xzxdwgkwg92ws7"; + sha256 = "1qbkdfa7dzysp7crv9ph476hbabl3qiszs067f20dadqssqs1v4r"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "301.0.0"; + version = "306.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix index e5bc573661..18ec4ba463 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: buildGoModule rec { pname = "lego"; - version = "3.7.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "03824c5nfii7cc6mr1hdkyd4jjy8vpn08lnj4c6pc61s3i6gacc6"; + sha256 = "1s3sh4n12g7ylkpmxqjcpdw3gqhdjbh9r09h2rsrm30xr4qaqpng"; }; - vendorSha256 = "14453iiya6algkympyvwm03qgjcwk79z8bbrij7qhnp52qfrbmrp"; + vendorSha256 = "0p2pibid2d761whfk7zgq230lyqi2f0wmfvxqkjzrd1sba40r9bp"; doCheck = false; @@ -27,4 +27,6 @@ buildGoModule rec { homepage = "https://go-acme.github.io/lego/"; maintainers = teams.acme.members; }; + + passthru.tests.lego = nixosTests.acme; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index 2e8ff96d41..3d62e39c6e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.4"; + version = "4.6"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0fk42spz57nfmwy6xn02nnlkq01111x03psjq003k2785ah4xk1h"; + sha256 = "011fsyafmpis6j0aq7vwd56m2mcb9v3rn4f246ms5nx6zgmga0ip"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 77779c39f5..7d2523b407 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,58 +1,178 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.6.1"; + version = "2.10.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.6.1-linux-x64.tar.gz"; - sha256 = "12f81wj8r3pmxj2l8qhcgnmy2m0a6bfzrvq9avl3444h2w29qpy2"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-linux-x64.tar.gz"; + sha256 = "0pxm90vmha265zc4b1ip2f3iryslkwxznn4kb8l3ma6gibz1zav3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.13.0-linux-amd64.tar.gz"; - sha256 = "03l7ybc9ca63vdm7a2zsvgc8zz8ip973sfxsjqf3bb277r04mnpb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-linux-amd64.tar.gz"; + sha256 = "1l4kszzw1w862sfd4jnz66lwnp02p4kl1fwvj5ab81qfwzwg0cfx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.13.0-linux-amd64.tar.gz"; - sha256 = "0ivdiib3a1c1r2ppxmj6blgq26s05s3081969j0j9jlscpa79lap"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-linux-amd64.tar.gz"; + sha256 = "1gzjdafx5zsqrb5r3amskak51ajcpqbbfw45939jdsdll8vclw7g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.2.0-linux-amd64.tar.gz"; - sha256 = "0w6ys5bmry1b8ndzj167cz3a8fc6mbl5v9v2almrmd3q6fycm4gj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-linux-amd64.tar.gz"; + sha256 = "0myvx2glqnx29l4wd5vx4gm773zrcmwcjvs2b1yv63fl10md9sv7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.4.0-linux-amd64.tar.gz"; - sha256 = "0id3mji08hk76kffz46dlbl2r11kgv5jvlmw869dssg2d0wliv82"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-linux-amd64.tar.gz"; + sha256 = "12cajd8jiqy11s880vsv20gqfm44g160x7fxm93agjl7wng32ad6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.2.2-linux-amd64.tar.gz"; - sha256 = "07asdmmacxazg65d5hphjxzb5j5d2dcc95wjbxx3wwc1swqma4aq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-linux-amd64.tar.gz"; + sha256 = "0k429fh477f84kmnhyl5s9p0yym7d6sdq7hy7wqx6psxp4rf5h9x"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-linux-amd64.tar.gz"; + sha256 = "045z7qj23bq71nxfjk1vvnfbjcnqfkcbxbpjz72q0hw4xn7dq6jz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-linux-amd64.tar.gz"; + sha256 = "16d0jd3429pr4vlrzrv32w2fa53j7gyqq5lc78gw9j4v3mc3scvz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-linux-amd64.tar.gz"; + sha256 = "0gz4kpddaf9p25lfnp70p6197wrfgsiys7s4vdy75z8dyd4sbiv0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-linux-amd64.tar.gz"; + sha256 = "0n2532gfb5i53raya07rn8wcp15rc07jfg8wsm2lfzj7a4mp2p6c"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-linux-amd64.tar.gz"; + sha256 = "16l1a30rkg9l6yh68qv61dgm3h3gdgpsdacvnfg1ra0fvvfs9477"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-linux-amd64.tar.gz"; + sha256 = "1m2w8gsksr36pprxr6v3v4y3n7x5ycbcdfywv67yxmbi4lxyy3ar"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-linux-amd64.tar.gz"; + sha256 = "01vnbgck1ffj4jg8ghmkjp63xq3r9q3459vy03xpzm14l1i6agwv"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-linux-amd64.tar.gz"; + sha256 = "1g05kqymbkrxf48iskn9w12kxy880allhqm9a7p4g7mx0174yfhm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-linux-amd64.tar.gz"; + sha256 = "1fa5i283nisa6cq02fcrsgwkw7bwnh2j3agjbqyvv2xiss34i7hw"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-linux-amd64.tar.gz"; + sha256 = "0ihiag248c30dz4z2b559689zqwp52p0m7pv7jqpk86xwvimbsn1"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0jwvdsb26bhsqcbrsw9ss54xgpccl830hhbwnbz8ql8yndd35srg"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-linux-amd64.tar.gz"; + sha256 = "1wr4p312xwqi0icn153iv2j88rp37wkf8hc5y4pmdr61vd0kpw7w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-linux-amd64.tar.gz"; + sha256 = "0xq3as94i9ah9dv1cabgdqjg68yg7laksfzpf81s6kcv742cnnqi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-linux-amd64.tar.gz"; + sha256 = "1av7fj1jlhhqplqq60d6hzzidlhsvr41z9p1x3mvz5frwijxr1ab"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-linux-amd64.tar.gz"; + sha256 = "1bgw5xw6f01whxlm5358xn6v9wqz9mxg3dvb5vi7rfs9wwxykr4g"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.6.1-darwin-x64.tar.gz"; - sha256 = "17jf9xwpwpbqk5r20i14j1z4i4rbbx781k0zqyc9yskmv5q4mmwr"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-darwin-x64.tar.gz"; + sha256 = "1fzqylx7pmrpvsxrmhlx56v9i9zkid96zrj9hsc26qhx5w7k600w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.13.0-darwin-amd64.tar.gz"; - sha256 = "18mjf9gm8siskg9jh65x4qp4w8p4wnp19bxxk4jfbq27icdk7ws9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-darwin-amd64.tar.gz"; + sha256 = "05dxpdwdg8cd1a6d3xh8dkns5wkvpr0v11bb4zdzv38x6wxnqx0z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.13.0-darwin-amd64.tar.gz"; - sha256 = "14iwz1gm34irs9jlpwc4ig1wc8k4aaxq8mz3g22yrvwddrsc4rcw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "1jbnx1wpzh2k127ixh9j0ghlqhj3sc1s17cp3ax3q9gq3cadcl5i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.2.0-darwin-amd64.tar.gz"; - sha256 = "0zaxp2n1w5djwyq1afhd3v887dh0yj53jz449riqp19dpyfqf7h7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0lpf3cqi3kss7hmr8a3y6gmwjl854vmva4f9p9q7147rxr8aw5f9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.4.0-darwin-amd64.tar.gz"; - sha256 = "1kzs7k7as9r1vbj746wqz9iph13zfzzw8nsk3waq8aq1hmgh2g1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-darwin-amd64.tar.gz"; + sha256 = "0qwjrhmspibjr17kgswfcgbdhmkicqrjd1md6azingdr5wp7cwwm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.2.2-darwin-amd64.tar.gz"; - sha256 = "0hwdghij7g9h58nwimfmaz91lz38wibkrdzwqhi7d426m53g6f5c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-darwin-amd64.tar.gz"; + sha256 = "0rwgbpif7l3ayh363cz0k2dir36a87x0bszspq3nm3xbwmd190f0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-darwin-amd64.tar.gz"; + sha256 = "0943r8x70gxxkfn0rhcx2b9zya44k28j5s8z2m8jn2i1fvqvahq5"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-darwin-amd64.tar.gz"; + sha256 = "1nvqjc1zrxfn2r1wdh2sdr2vimar5836bhscqsiaw4i6mjdsggfy"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-darwin-amd64.tar.gz"; + sha256 = "05x0qlv3xkkvs71ixzmc21ck85w9f4a4dxrwmgkq6c0nhy3npbnj"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-darwin-amd64.tar.gz"; + sha256 = "1m80l75r2w46m7191igjan4ipfkhc9ld1xlybncd628qlcf2jpqz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0dan0qqvaxfh90db14s7adjjy670lz15bbm6a8fjfyj4fdhsbwyn"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-darwin-amd64.tar.gz"; + sha256 = "1gznv5d10pxbkyl4hbd4c9skkgkypfs1xg0jjmszkwxcjzvhc4l3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-darwin-amd64.tar.gz"; + sha256 = "08w8by7h9nlgvyap2in6yy21dk46fxvl93h4ghaw7xxjjs2l3dfi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "0qjszd30r3094p5m7v5gynx2kxh9xf9878mxdc2wnswpkpw3v5pb"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-darwin-amd64.tar.gz"; + sha256 = "1a19lmxi8r8h4yfll0k97kvq0lgkzwvrwf52ny4zl67bc9g4jr5p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "11vfjkmhrq7q4j6h5d2sdzan3ziyhl5qhc0fhfnsz2pxss549zab"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "1ny1m6pb44k77gqf97km3gkb7dwhilkmqi2zy4hdl20js1ijsh7p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-darwin-amd64.tar.gz"; + sha256 = "1vm2pfj93wi6q7kcrqwy9190mx0jn2p96algcd5gms48a4m8bgpb"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-darwin-amd64.tar.gz"; + sha256 = "0mnmlvyppfndq1rwy4k40j0syy590v2lg75kg0rnf16qlpffskn9"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-darwin-amd64.tar.gz"; + sha256 = "0q9qbqalask628cbi3347pjbnm3304c8qhx7h8icqxxh59mjnhr7"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-darwin-amd64.tar.gz"; + sha256 = "1gxiqq6hk77s1n3q3p92p0yykpihw2k8lv01dra015fjha6pyl19"; } ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix index c0547f0c0c..231bdc0996 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -29,6 +29,7 @@ in stdenv.mkDerivation { license = with licenses; [ asl20 ]; platforms = builtins.attrNames data.pulumiPkgs; maintainers = with maintainers; [ + ghuntley peterromfeldhk jlesquembre ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh index cc31bce849..5e0c721959 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -1,19 +1,34 @@ #!/usr/bin/env bash - -VERSION="2.6.1" - # Bash 3 compatible for Darwin + +# Version of Pulumi from +# https://www.pulumi.com/docs/get-started/install/versions/ +VERSION="2.10.2" + +# Grab latest release ${VERSION} from +# https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - # https://github.com/pulumi/pulumi-aws/releases - "aws=2.13.0" - # https://github.com/pulumi/pulumi-gcp/releases - "gcp=3.13.0" - # https://github.com/pulumi/pulumi-random/releases - "random=2.2.0" - # https://github.com/pulumi/pulumi-kubernetes/releases - "kubernetes=2.4.0" - # https://github.com/pulumi/pulumi-postgresql/releases - "postgresql=2.2.2"); + "auth0=1.1.0" + "aws=3.4.0" + "cloudflare=2.6.0" + "consul=2.5.0" + "datadog=2.8.0" + "digitalocean=2.8.0" + "docker=2.3.0" + "gcp=3.25.0" + "github=2.0.0" + "gitlab=2.6.0" + "hcloud=0.2.0" + "kubernetes=2.6.1" + "mailgun=2.2.0" + "mysql=2.2.1" + "openstack=2.6.0" + "packet=3.1.0" + "postgresql=2.4.0" + "random=2.3.1" + "vault=2.4.0" + "vsphere=2.10.0" + ); function genMainSrc() { local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-$1-x64.tar.gz" diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix index 35d65b5e65..83b69b12fe 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pyyaml pyzmq requests - tornado_4 + tornado ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix index e2cfa806f9..0c6e9dc0ab 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix @@ -1,19 +1,19 @@ { lib -, pythonPackages +, python3Packages , salt }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "salt-pepper"; version = "0.7.5"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w"; }; - buildInputs = with pythonPackages; [ setuptools setuptools_scm salt ]; - checkInputs = with pythonPackages; [ - pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado_4 + buildInputs = with python3Packages; [ setuptools setuptools_scm salt ]; + checkInputs = with python3Packages; [ + pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado ]; meta = with lib; { @@ -21,5 +21,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/saltstack/pepper"; maintainers = [ maintainers.pierrer ]; license = licenses.asl20; + broken = true; # ModuleNotFoundError: No module named 'pytestsalt' }; } diff --git a/third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix new file mode 100644 index 0000000000..fc68184be3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/archivers/bomutils/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "bomutils"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "hogliux"; + repo = pname; + rev = version; + sha256 = "1i7nhbq1fcbrjwfg64znz8p4l7662f7qz2l6xcvwd5z93dnmgmdr"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/hogliux/bomutils"; + description = "Open source tools to create bill-of-materials files used in macOS installers"; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix index 5dab195014..da26639fcb 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/innoextract/default.nix @@ -3,11 +3,11 @@ , withGog ? false, unar ? null }: stdenv.mkDerivation rec { - name = "innoextract-1.8"; + name = "innoextract-1.9"; src = fetchurl { url = "https://constexpr.org/innoextract/files/${name}.tar.gz"; - sha256 = "0saj50n8ds85shygy4mq1h6s99510r9wgjjdll4dmvhra4lzcy2y"; + sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; }; buildInputs = [ python lzma boost ]; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix new file mode 100644 index 0000000000..333b0dcabc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/archivers/maxcso/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, libuv, lz4, zlib }: + +stdenv.mkDerivation rec { + pname = "maxcso"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "unknownbrackets"; + repo = "maxcso"; + rev = "v${version}"; + sha256 = "10r0vb3ndpq1pw5224d48nim5xz8jj94zhlfy29br6h6jblq8zap"; + }; + + buildInputs = [ libuv lz4 zlib ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/unknownbrackets/maxcso"; + description = + "A fast ISO to CSO compression program for use with PSP and PS2 emulators, which uses multiple algorithms for best compression ratio"; + maintainers = with maintainers; [ david-sawatzke ]; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.isc; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix index da01602cca..51f75ee923 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - version = "1.13.1"; + version = "1.13.2"; pname = "wimlib"; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27"; + sha256 = "0id9ym3hzij4kpdrk0sz3ijxp5r0z1md5jch83pml9hdy1zbx5bj"; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index f075f503ae..4ab394516a 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.07.28"; + version = "2020.08.09"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "05nsakvnx1jz2k9bvabpw5v3js28ng9z7n6ch58brd3qxc2p76zv"; + sha256 = "1j7jkv2fdrhyyjavffb5nrs8p9mfp8zqqravcad1ayv1z2wxr8vl"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix index 776eca9999..56551891a4 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -31,6 +31,7 @@ , enableAlternatives ? false , enableCheck ? false, liboggz ? null , enableCopyArtifacts ? false +, enableExtraFiles ? false , bashInteractive, bash-completion }: @@ -100,6 +101,7 @@ let externalTestArgs.beets = (beets.override { enableAlternatives = false; enableCopyArtifacts = false; + enableExtraFiles = false; }).overrideAttrs (stdenv.lib.const { doInstallCheck = false; }); @@ -110,6 +112,7 @@ let alternatives = callPackage ./alternatives-plugin.nix pluginArgs; check = callPackage ./check-plugin.nix pluginArgs; copyartifacts = callPackage ./copyartifacts-plugin.nix pluginArgs; + extrafiles = callPackage ./extrafiles-plugin.nix pluginArgs; }; in pythonPackages.buildPythonApplication rec { @@ -156,7 +159,9 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives plugins.alternatives - ++ optional enableCopyArtifacts plugins.copyartifacts; + ++ optional enableCopyArtifacts plugins.copyartifacts + ++ optional enableExtraFiles plugins.extrafiles + ; buildInputs = [ imagemagick diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/extrafiles-plugin.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/extrafiles-plugin.nix new file mode 100644 index 0000000000..7d0e446ce6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/extrafiles-plugin.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, beets, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + pname = "beets-extrafiles"; + version = "0.0.7"; + + src = fetchFromGitHub { + repo = "beets-extrafiles"; + owner = "Holzhaus"; + rev = "v${version}"; + sha256 = "0ah7mgax9zrhvvd5scf2z0v0bhd6xmmv5sdb6av840ixpl6vlvm6"; + }; + + postPatch = '' + sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py + sed -i -e '/namespace_packages/d' setup.py + ''; + + nativeBuildInputs = [ beets ]; + + preCheck = '' + HOME=$TEMPDIR + ''; + + meta = { + homepage = "https://github.com/Holzhaus/beets-extrafiles"; + description = "A plugin for beets that copies additional files and directories during the import process"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/mutagen-1.43.patch b/third_party/nixpkgs/pkgs/tools/audio/beets/mutagen-1.43.patch index 84cf1bab03..d0d448c15e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/mutagen-1.43.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/mutagen-1.43.patch @@ -1,8 +1,10 @@ -Backport https://github.com/beetbox/mediafile/commit/b3343c4ee08d1251ae5e2344401a2f5892b4e868 +Backport +https://github.com/beetbox/mediafile/commit/b3343c4ee08d1251ae5e2344401a2f5892b4e868 +https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4 to Beets 1.4.9. diff --git i/setup.py w/setup.py -index 79278f8..b8d6068 100755 +index 79278f8b..b8d60687 100755 --- i/setup.py +++ w/setup.py @@ -87,7 +87,7 @@ setup( @@ -15,9 +17,18 @@ index 79278f8..b8d6068 100755 'musicbrainzngs>=0.4', 'pyyaml', diff --git i/test/test_mediafile.py w/test/test_mediafile.py -index 36a2c53..54ef9dd 100644 +index 36a2c53a..0ddde44e 100644 --- i/test/test_mediafile.py +++ w/test/test_mediafile.py +@@ -888,7 +888,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase): + 'bitrate': 109312, + 'format': u'WavPack', + 'samplerate': 44100, +- 'bitdepth': 0, ++ 'bitdepth': 16, + 'channels': 1, + } + @@ -912,7 +912,7 @@ class AIFFTest(ReadWriteTestBase, unittest.TestCase): 'bitrate': 705600, 'format': u'AIFF', diff --git a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix index 2aa01dfe07..a228c23651 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix @@ -2,13 +2,18 @@ , ocamlPackages , libao, portaudio, alsaLib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg -, libvorbis, speex, libtheora, libopus, fdk_aac +, libvorbis, speex, libtheora, libopus , faad2, flac, ladspaH, ffmpeg, frei0r, dssi }: let pname = "liquidsoap"; - version = "1.3.4"; + version = "1.4.2"; + + ocaml-ffmpeg = fetchurl { + url = "https://github.com/savonet/ocaml-ffmpeg/releases/download/v0.4.2/ocaml-ffmpeg-0.4.2.tar.gz"; + sha256 = "1lx5s1avds9fsh77828ifn71r2g89rxakhs8pp995a675phm9viw"; + }; packageFilters = map (p: "-e '/ocaml-${p}/d'" ) [ "gstreamer" "shine" "aacplus" "schroedinger" @@ -19,10 +24,17 @@ stdenv.mkDerivation { name = "${pname}-full-${version}"; src = fetchurl { - url = "https://github.com/savonet/${pname}/releases/download/${version}/${pname}-${version}-full.tar.bz2"; - sha256 = "11l1h42sljfxcdhddc8klya4bk99j7a1pndwnzvscb04pvmfmlk0"; + url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}-full.tar.gz"; + sha256 = "0wkwnzj1a0vizv7sr1blwk5gzm2qi0n02ndijnq1i50cwrgxs1a4"; }; + # Use ocaml-srt and ocaml-fdkaac from nixpkgs + # Use ocaml-ffmpeg at 0.4.2 for compatibility with ffmpeg 4.3 + prePatch = '' + rm -rf ocaml-srt*/ ocaml-fdkaac*/ ocaml-ffmpeg*/ + tar xzf ${ocaml-ffmpeg} + ''; + preConfigure = /* we prefer system-wide libs */ '' sed -i "s|gsed|sed|" Makefile make bootstrap @@ -42,10 +54,12 @@ stdenv.mkDerivation { [ which ocamlPackages.ocaml ocamlPackages.findlib libao portaudio alsaLib libpulseaudio libjack2 libsamplerate libmad taglib lame libogg - libvorbis speex libtheora libopus fdk_aac + libvorbis speex libtheora libopus faad2 flac ladspaH ffmpeg frei0r dssi ocamlPackages.xmlm ocamlPackages.ocaml_pcre ocamlPackages.camomile + ocamlPackages.fdkaac + ocamlPackages.srt ocamlPackages.sedlex_2 ocamlPackages.menhir ]; hardeningDisable = [ "format" "fortify" ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/qastools/default.nix b/third_party/nixpkgs/pkgs/tools/audio/qastools/default.nix index 86ef7f050b..55dbba007f 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/qastools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/qastools/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qastools"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitLab { owner = "sebholt"; repo = pname; rev = "v${version}"; - sha256 = "0px4fcn8dagivq5fyi5gy84yj86f6x0lk805mc4ry58d0wsbn68v"; + sha256 = "19hn64hnvryfmrkdg6rqyzahdbqf1s5y3dcca389jj6sdx93b3ip"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix index 57ab854a33..ee6ae0a293 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.30.1"; in +let version = "0.31"; in with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - sha256 = "0z9rpmmi6mbm48ynd6izr0f8l3cklfyar6gjy0c8z9zal1ac9r55"; + sha256 = "03kmmdlgg0p5z39bhckkf91mmq55wghb93ghqvv9f9gaby1diw4z"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix index a439bbf41b..1f379feece 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }: +{ stdenv, fetchurl +, attr, e2fsprogs +, curl, librsync, libthreadar +, gpgme, libgcrypt, openssl +, bzip2, lzo, xz, zlib +}: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.9"; + version = "2.6.10"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "1jzqq54w1dix2qdlj4hr9dpq9fnp23h102bk8d2gq6k7n2zgaj6v"; + sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n"; }; - buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ optionals stdenv.isLinux [ attr e2fsprogs ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ + curl librsync libthreadar + gpgme libgcrypt openssl + bzip2 lzo xz zlib + ] ++ optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-birthtime" @@ -23,7 +33,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' - rm -r "$out"/share/dar # Disable html help + # Disable html help + rm -r "$out"/share/dar ''; enableParallelBuilding = true; @@ -33,6 +44,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dar.linux.free.fr"; description = "Disk ARchiver, allows backing up files into indexed archives"; + maintainers = with maintainers; [ izorkin ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/backup/dump/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dump/default.nix new file mode 100644 index 0000000000..38564e109d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/backup/dump/default.nix @@ -0,0 +1,24 @@ +# Tested with simple dump and restore -i, but complains that +# /nix/store/.../etc/dumpdates doesn't exist. + +{ stdenv, fetchurl, pkgconfig, + e2fsprogs, ncurses, readline }: + +stdenv.mkDerivation rec { + pname = "dump"; + version = "0.4b46"; + + src = fetchurl { + url = "mirror://sourceforge/dump/dump-${version}.tar.gz"; + sha256 = "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0"; + }; + + buildInputs = [ e2fsprogs pkgconfig ncurses readline ]; + + meta = with stdenv.lib; { + homepage = "https://dump.sourceforge.io/"; + description = "Linux Ext2 filesystem dump/restore utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ falsifian ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix index 6d6da3c987..c12cc1198c 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -46,9 +46,8 @@ pythonPackages.buildPythonApplication rec { librsync ]; - propagatedBuildInputs = [ - backblaze-b2 - ] ++ (with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ + b2sdk boto cffi cryptography @@ -65,7 +64,7 @@ pythonPackages.buildPythonApplication rec { future ] ++ stdenv.lib.optionals (!isPy3k) [ enum - ]); + ]; checkInputs = [ gnupg # Add 'gpg' to PATH. diff --git a/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix b/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix index 81e16ad005..e69823ab45 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix @@ -1,6 +1,14 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ stdenv, python37, fetchFromGitHub }: -python3Packages.buildPythonApplication rec { +let + python = python37.override { + self = python; + packageOverrides = self: super: { + tornado = super.tornado_4; + }; + }; + +in with python.pkgs; buildPythonApplication rec { version = "2.1.19"; name = "grab-site-${version}"; @@ -11,7 +19,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix index 4c338eed4b..bfeafd0875 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.6.2"; + version = "0.7.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1wz4sqjcih1m4bjxxdrsggai931q72zz8ikf2rwkp4alz12wr355"; + sha256 = "1ngm0vbx6ryks68bp0zarvncc36gbpkkqavxb3sfph9p959b9hif"; }; - vendorSha256 = "1npxr7gp59xv38zdx1diilfxij6lb0cmvsnzvjx6n8g0326gf2ii"; + vendorSha256 = "07p2ka5rbasrgjfd4k2jn0ffshjp39kilz9b714ykyi1qflczr9b"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix new file mode 100644 index 0000000000..16563c3809 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix @@ -0,0 +1,96 @@ +{ stdenv +, lib +, fetchFromGitHub +, bluez-tools +, cinnamon +, gnome3 +, gobject-introspection +, intltool +, pavucontrol +, python3Packages +, utillinux +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "blueberry"; + version = "1.3.9"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "0llvz1h2dmvhvwkkvl0q4ggi1nmdbllw34ppnravs5lybqkicyw9"; + }; + + nativeBuildInputs = [ + gobject-introspection + python3Packages.wrapPython + wrapGAppsHook + ]; + + buildInputs = [ + bluez-tools + cinnamon.xapps + gnome3.gnome-bluetooth + python3Packages.python + utillinux + ]; + + pythonPath = with python3Packages; [ + dbus-python + pygobject3 + setproctitle + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -a etc usr/* $out + + # Fix paths + substituteInPlace $out/bin/blueberry \ + --replace /usr/lib/blueberry $out/lib/blueberry + substituteInPlace $out/bin/blueberry-tray \ + --replace /usr/lib/blueberry $out/lib/blueberry + substituteInPlace $out/etc/xdg/autostart/blueberry-obex-agent.desktop \ + --replace /usr/lib/blueberry $out/lib/blueberry + substituteInPlace $out/etc/xdg/autostart/blueberry-tray.desktop \ + --replace Exec=blueberry-tray Exec=$out/bin/blueberry-tray + substituteInPlace $out/lib/blueberry/blueberry-obex-agent.py \ + --replace /usr/share $out/share + substituteInPlace $out/lib/blueberry/blueberry-tray.py \ + --replace /usr/share $out/share + substituteInPlace $out/lib/blueberry/blueberry.py \ + --replace '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \ + --replace /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \ + --replace /usr/lib/blueberry $out/lib/blueberry \ + --replace /usr/share $out/share + substituteInPlace $out/lib/blueberry/rfkillMagic.py \ + --replace /usr/bin/rfkill ${utillinux}/bin/rfkill \ + --replace /usr/sbin/rfkill ${utillinux}/bin/rfkill \ + --replace /usr/lib/blueberry $out/lib/blueberry + substituteInPlace $out/share/applications/blueberry.desktop \ + --replace Exec=blueberry Exec=$out/bin/blueberry + + glib-compile-schemas --strict $out/share/glib-2.0/schemas + + runHook postInstall + ''; + + dontWrapGApps = true; + + postFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + wrapPythonProgramsIn $out/lib "$out $pythonPath" + ''; + + meta = with lib; { + description = "Bluetooth configuration tool"; + homepage = "https://github.com/linuxmint/blueberry"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix b/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix new file mode 100644 index 0000000000..3f6105ca50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitLab +, meson +, python3 +, ninja +}: + +stdenv.mkDerivation rec { + pname = "bzip2-unstable"; + version = "2020-08-11"; + + src = fetchFromGitLab { + owner = "federicomenaquintero"; + repo = "bzip2"; + rev = "15255b553e7c095fb7a26d4dc5819a11352ebba1"; + sha256 = "sha256-BAyz35D62LWi47B/gNcCSKpdaECHBGSpt21vtnk3fKs="; + }; + + postPatch = '' + patchShebangs install_links.py + ''; + + nativeBuildInputs = [ + meson + python3 + ninja + ]; + + outputs = [ "bin" "dev" "out" "man" ]; + + mesonFlags = [ + "-Ddocs=disabled" + ]; + + strictDeps = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "High-quality data compression program"; + license = licenses.bsdOriginal; + platforms = platforms.all; + maintainers = []; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index 9c9f91f9c1..8ce434741a 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, gnugrep +{ stdenv, fetchFromGitHub, fetchpatch, cmake, bash, gnugrep , fixDarwinDylibNames , file , legacySupport ? false @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ bash ]; patches = [ ./playtests-darwin.patch @@ -29,11 +30,7 @@ stdenv.mkDerivation rec { # work fine, and I'm not sure how to write the condition. ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; - postPatch = - # Patch shebangs for playTests - '' - patchShebangs programs/zstdgrep - '' + stdenv.lib.optionalString (!static) '' + postPatch = stdenv.lib.optionalString (!static) '' substituteInPlace build/cmake/CMakeLists.txt \ --replace 'message(SEND_ERROR "You need to build static library to build tests")' "" substituteInPlace build/cmake/tests/CMakeLists.txt \ @@ -60,6 +57,8 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' runHook preCheck + # Patch shebangs for playTests + patchShebangs ../programs/zstdgrep ctest -R playTests # The only relatively fast test. runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix index eaf9ac634a..edfcaa0d8f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "035b6y49nzgswf5n70aph8pm48sbv9nqwlnp3wwbq892c39kk4xn"; + sha256 = "1psh8k7g7rb0gn7aygbjv86kxyi9xq07barxksa99nnmq3lc2kjg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix index 206e68ce1c..bab8df1280 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bashmount"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "1idjyl5dr8a72w3lg15qx03wgc5mj2ga2v2jkyb8v9gi5ahl03mn"; + sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index 26158b0361..ee2af363a5 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages +{ stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages , fuseSupport ? false, fuse3 ? null }: assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2020-04-04"; + version = "2020-08-25"; - src = fetchgit { - url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d"; - sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs-tools"; + rev = "487ddeb03c574e902c5b749b4307e87e2150976a"; + sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid"; }; postPatch = '' @@ -29,10 +30,10 @@ stdenv.mkDerivation { buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio - zstd lz4 python3Packages.pytest + zstd lz4 python3Packages.pytest udev valgrind ] ++ stdenv.lib.optional fuseSupport fuse3; - doCheck = true; + doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 767730c403..9b9fe9a5aa 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -121,10 +121,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.4"; + version = "15.2.5"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0jy5dp4r1bqk1l7nrv8l8zpl984k61p3vkvf73ygcn03bxyjjlax"; + sha256 = "05p7ssbfypf5x8bry361rrnyaihf89xzbqzhygdyrg7w1rxpna8d"; }; in rec { ceph = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix index 2ab168a19a..af30751b88 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "f2fs-tools"; - version = "1.13.0"; + version = "1.14.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; - sha256 = "0h6wincsvg6s232ajxblg66r5nx87v00a4w7xkbxgbl1qyny477j"; + sha256 = "06ss05n87i1c3149qb3n7j1qp2scv3g2adx0v6ljkl59ab9b5saj"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix index 3559579fe8..e8d60f835b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/f3/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchFromGitHub -, parted, udev +{ stdenv, lib, fetchFromGitHub +, parted, systemd ? null }: stdenv.mkDerivation rec { pname = "f3"; version = "7.2"; - enableParallelBuilding = true; - src = fetchFromGitHub { owner = "AltraMayor"; repo = pname; @@ -15,24 +13,45 @@ stdenv.mkDerivation rec { sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy"; }; - buildInputs = [ parted udev ]; + postPatch = '' + sed -i 's/-oroot -groot//' Makefile - patchPhase = "sed -i 's/-oroot -groot//' Makefile"; + for f in f3write.h2w log-f3wr; do + substituteInPlace $f \ + --replace '$(dirname $0)' $out/bin + done + ''; - buildFlags = [ "all" # f3read, f3write - "extra" # f3brew, f3fix, f3probe - ]; + buildInputs = [ + parted + ] + ++ lib.optional stdenv.isLinux systemd; - installFlags = [ "PREFIX=$(out)" - "install" - "install-extra" - ]; + enableParallelBuilding = true; - meta = { + buildFlags = [ + "all" # f3read, f3write + ] + ++ lib.optional stdenv.isLinux "extra"; # f3brew, f3fix, f3probe + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + installTargets = [ + "install" + ] + ++ lib.optional stdenv.isLinux "install-extra"; + + postInstall = '' + install -Dm555 -t $out/bin f3write.h2w log-f3wr + install -Dm444 -t $out/share/doc/${pname} LICENSE README.rst + ''; + + meta = with lib; { description = "Fight Flash Fraud"; homepage = "http://oss.digirati.com.br/f3/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index ba5f4a3dd7..11a3615a84 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 ]; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) podman; }; meta = with stdenv.lib; { description = "FUSE implementation for overlayfs"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index 70a0aff118..bed971229c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,42 +1,43 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }: +{ stdenv +, buildGoModule +, fetchFromGitHub +, openssl +, pandoc +, pkg-config +}: -let - 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 { +buildGoModule rec { pname = "gocryptfs"; - version = "1.7.1"; - - goPackagePath = "github.com/rfjakob/gocryptfs"; - - nativeBuildInputs = [ pandoc pkgconfig ]; - buildInputs = [ openssl ]; + version = "1.8.0"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "1zhzhvjhvi6xzib985bsnj9yzp4zsnm91m1679nbab6vm3kanq06"; + sha256 = "1acalwrr5xqhpqca3gypj0s68w6vpckxmg5z5gfgh8wx6nqx4aw9"; }; - postPatch = "rm -r tests"; + runVend = true; + vendorSha256 = "0z3y51sgr1rmr23jpc5h5d5lw14p3qzv48rc7zj7qa4rd5cfhsgi"; + + nativeBuildInputs = [ pandoc pkg-config ]; + buildInputs = [ openssl ]; buildFlagsArray = '' -ldflags= -X main.GitVersion=${version} - -X main.GitVersionFuse=${goFuseVersion} + -X main.GitVersionFuse=[vendored] + -X main.BuildDate=unknown ''; - goDeps = ./deps.nix; + subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; postBuild = '' - pushd go/src/github.com/rfjakob/gocryptfs/Documentation/ + pushd 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 + pandoc MANPAGE-STATFS.md -s -t man -o $out/share/man/man1/statfs.1 popd ''; @@ -44,7 +45,7 @@ buildGoPackage rec { description = "Encrypted overlay filesystem written in Go"; license = licenses.mit; homepage = "https://nuetzlich.net/gocryptfs/"; - maintainers = with maintainers; [ flokli offline ]; + maintainers = with maintainers; [ flokli offline prusnak ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/deps.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/deps.nix deleted file mode 100644 index cebad12327..0000000000 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/hanwen/go-fuse"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/go-fuse"; - rev = "161a164844568ebf4bfaa68c90ba3a9f2914dda4"; - sha256 = "1r0rs76k9zg60i02jlcqxi7m4ivla1xwv3ijwav7pfbyyr1yqhsx"; - }; - } - { - goPackagePath = "github.com/jacobsa/crypto"; - fetch = { - type = "git"; - url = "https://github.com/jacobsa/crypto"; - rev = "9f44e2d11115452dad8f404f029574422855f46a"; - sha256 = "18c3cx8izxdajq22zdq0n19j9d2l6iickd3mz39j5h96kw7l5qmy"; - }; - } - { - goPackagePath = "github.com/pkg/xattr"; - fetch = { - type = "git"; - url = "https://github.com/pkg/xattr"; - rev = "7782c2d6871d6e659e1563dc19c86b845264a6fc"; - sha256 = "1j3z5b9nwgkxia925rkiq8n5avhf4zhmsdbpn2s3xb16a2w66prd"; - }; - } - { - goPackagePath = "github.com/rfjakob/eme"; - fetch = { - type = "git"; - url = "https://github.com/rfjakob/eme"; - rev = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770"; - sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9"; - }; - } - { - goPackagePath = "github.com/sabhiram/go-gitignore"; - fetch = { - type = "git"; - url = "https://github.com/sabhiram/go-gitignore"; - rev = "d3107576ba9425fc1c85f4b3569c4631b805a02e"; - sha256 = "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a1f597ede03a7bef967a422b5b3a5bd08805a01e"; - sha256 = "0yiczljll72ip2vkxgd6052rhpaba37a68vf6si3v8s8s3g870lc"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "e225da77a7e68af35c70ccbf71af2b83e6acac3c"; - sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "61b9204099cb1bebc803c9ffb9b2d3acd9d457d9"; - sha256 = "110carnw1rxk9awbcdbg5is0zl28vynm649y7rza36pg1vlv8rrh"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix index 72ed4f0ee1..6de0d586ad 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/idsk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "idsk"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { repo = "idsk"; owner = "cpcsdk"; rev = "v${version}"; - sha256 = "0b4my5cz5kbzh4n65jr721piha6zixaxmfiss2zidip978k9rb6f"; + sha256 = "05zbdkb9s6sfkni6k927795w2fqdhnf3i7kgl27715sdmmdab05d"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix index 3ae898d4ba..e2cb603ca3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/lizardfs/raw/bfcd5bcf/debian/patches/spdlog.patch"; sha256 = "0j44rb816i6kfh3y2qdha59c4ja6wmcnlrlq29il4ybxn42914md"; }) + # Fix https://github.com/lizardfs/lizardfs/issues/655 + # (Remove upon update to 3.13) + (fetchpatch { + url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch"; + sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv"; + }) ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/third_party/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index b05abd72ba..6ba29cb98d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py sed -i -e '/find_library/,/find_library/ { - c libudev = "${systemd.lib}/lib/libudev.so.1" + c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1" }' blivet/pyudev.py ''; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/third_party/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index ffed57e634..36525e6fa3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup - substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/orangefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/orangefs/default.nix index 37f4026799..8c1378d97b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/orangefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/orangefs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "orangefs"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "http://download.orangefs.org/current/source/orangefs-${version}.tar.gz"; - sha256 = "15669f5rcvn44wkas0mld0qmyclrmhbrw4bbbp66sw3a12vgn4sm"; + sha256 = "0c2yla615j04ygclfavh8g5miqhbml2r0zs2c5mvkacf9in7p7sq"; }; nativeBuildInputs = [ bison flex perl autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix index 81cd1191b0..816aa1498c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/rar2fs/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rar2fs"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "137hv2fhlbdca6qyf4vjv1sl87g02zn137ja0fdjbzcc9y1n96d3"; + sha256 = "03m20bnlm70xamrxnswxs4fzc2lr2wr6f7jq6b3a8sdwq3pqbzzx"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix index 896d472b83..158097d381 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libaal}: -let version = "2.0.0"; in +let version = "2.0.1"; in stdenv.mkDerivation rec { pname = "reiser4progs"; inherit version; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; - sha256 = "00kx9prz3d5plp1hn4xdkkd99cw42sanlsjnjhj0fsrlmi9yfs8n"; + sha256 = "1r7m95mnp6xmp1j5k99jhmz6g9y2qq7cghlmdxsfbr3xviqfs45d"; }; buildInputs = [libaal]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/securefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/securefs/default.nix index c5a5af212d..c8efa4d61a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/securefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/securefs/default.nix @@ -4,13 +4,14 @@ stdenv.mkDerivation rec { pname = "securefs"; - version = "0.8.3"; + version = "0.11.1"; src = fetchFromGitHub { - sha256 = "0nf0bd163gz844mikqab2mh7xjlj31ixa6hi85qxdifyjpfjv7y4"; + sha256 = "1sxfgqgy63ml7vg7zj3glvra4wj2qmfv9jzmpm1jqy8hq7qlqlsx"; rev = version; repo = "securefs"; owner = "netheril96"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix new file mode 100644 index 0000000000..4feca6a040 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, python3, makeWrapper }: + +python3.pkgs.buildPythonApplication rec { + + pname = "ubidump"; + version = "unstable-2019-09-11"; + + src = fetchFromGitHub { + owner = "nlitsme"; + repo = pname; + rev = "0691f1a9a38604c2baf8c9af6b826eb2632af74a"; + sha256 = "1hiivlgni4r3nd5n2rzl5qzw6y2wpjpmyls5lybrc8imd6rmj3w2"; + }; + + propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ]; + + patchPhase = '' + sed -i '1s;^;#!${python3.interpreter}\n;' ubidump.py + patchShebangs ubidump.py + ''; + + installPhase = '' + install -D -m755 ubidump.py $out/bin/ubidump + wrapProgram $out/bin/ubidump --set PYTHONPATH $PYTHONPATH + ''; + + installCheckPhase = '' + $out/bin/ubidump -h > /dev/null + ''; + + meta = with stdenv.lib; { + description = "View or extract the contents of UBIFS images"; + homepage = "https://github.com/nlitsme/ubidump"; + license = licenses.mit; + maintainers = with maintainers; [ sgo ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix new file mode 100644 index 0000000000..cb09fdcf13 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, zlib, ncurses, fuse}: + +stdenv.mkDerivation rec { + name = "wiimms-iso-tools"; + version = "3.02a"; + + src = fetchurl { + url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${version}.tar.bz2"; + sha256 = "074cvcaqz23xyihslc6n64wwxwcnl6xp7l0750yb9pc0wrqxmj69"; + }; + + buildInputs = [ zlib ncurses fuse ]; + + patches = [ ./fix-paths.diff ]; + postPatch = '' + patchShebangs setup.sh + patchShebangs gen-template.sh + patchShebangs gen-text-file.sh + ''; + + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + INSTALL_PATH = "$out"; + + installPhase = '' + mkdir "$out" + patchShebangs install.sh + ./install.sh --no-sudo + ''; + + meta = with stdenv.lib; { + homepage = "https://wit.wiimm.de"; + description = "A set of command line tools to manipulate Wii and GameCube ISO images and WBFS containers"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ nilp0inter ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff b/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff new file mode 100644 index 0000000000..4a545e92a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff @@ -0,0 +1,12 @@ +diff -r -u wiimms-iso-tools.source-3.02a.patched/setup.sh wiimms-iso-tools.source-3.02a/setup.sh +--- wiimms-iso-tools.source-3.02a.patched/setup.sh 2020-06-02 23:48:18.651495869 +0200 ++++ wiimms-iso-tools.source-3.02a/setup.sh 2020-06-02 23:48:29.758162513 +0200 +@@ -57,7 +57,7 @@ + + #-------------------------------------------------- + +-INSTALL_PATH=/usr/local ++ INSTALL_PATH="$out" + + if [[ -d $INSTALL_PATH/bin ]] + then diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix index f8e78d0171..a43c7a16d9 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/dcraw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper, libiconv }: +{stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: stdenv.mkDerivation rec { name = "dcraw-9.28.0"; @@ -9,12 +9,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; - buildInputs = [ libjpeg lcms2 gettext jasper ]; + buildInputs = [ libjpeg lcms2 gettext ]; + # Jasper is disabled because the library is abandoned and has many + # CVEs. patchPhase = '' substituteInPlace install \ --replace 'prefix=/usr/local' 'prefix=$out' \ - --replace gcc '$CC' + --replace gcc '$CC' \ + --replace '-ljasper' '-DNO_JASPER=1' ''; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix index dd2dcc1f5b..6a3d9a29db 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig , perl, flex, bison, readline, libexif , x11Support ? true, SDL -, svgSupport ? true, inkscape_0 +, svgSupport ? true, inkscape , asciiArtSupport ? true, aalib , gifSupport ? true, giflib , tiffSupport ? true, libtiff @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ perl flex bison readline libexif ] ++ optional x11Support SDL - ++ optional svgSupport inkscape_0 + ++ optional svgSupport inkscape ++ optional asciiArtSupport aalib ++ optional gifSupport giflib ++ optional tiffSupport libtiff diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix index b167a73466..ccc4a23cb5 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.1"; + version = "2.9.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "13axx7nwchn6ysgpvlw3fib474q4nrwv3qn20g3q03ldid0xvjah"; + sha256 = "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix index fc1892317f..ce2a87981e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix @@ -20,11 +20,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "5.2.8"; + version = "5.4.0"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "0dxc52d17mpyb2xm24da1nvhlacryv0irwa0q5l1cjj0rx67d9k0"; + sha256 = "0iwwliq5a6qcawbpxk4d7l17fpkq9xxcz05kwblx37rr7bq84h7b"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index bfb50c45f4..4507c4fed8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchsvn -, pkgconfig +, pkg-config , libjpeg , libpng , flex @@ -27,14 +27,8 @@ stdenv.mkDerivation { sha256 = "1m7ks6k53gsjsdazgf22g16dfgj3pqvqy9mhxzlwszv5808sj5w5"; }; - postPatch = '' - # Install libnetpbm.so symlink to correct destination - substituteInPlace lib/Makefile \ - --replace '/sharedlink' '/lib' - ''; - nativeBuildInputs = [ - pkgconfig + pkg-config flex makeWrapper ]; @@ -48,6 +42,14 @@ stdenv.mkDerivation { libtiff ] ++ lib.optional enableX11 libX11; + enableParallelBuilding = true; + + postPatch = '' + # Install libnetpbm.so symlink to correct destination + substituteInPlace lib/Makefile \ + --replace '/sharedlink' '/lib' + ''; + configurePhase = '' runHook preConfigure @@ -72,8 +74,6 @@ stdenv.mkDerivation { runHook postConfigure ''; - enableParallelBuilding = true; - installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix index f9042645be..df6fb7bcda 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook -, autoconf-archive, libXfixes, libXcursor }: +, autoconf-archive, libXfixes, libXcursor, libXcomposite }: stdenv.mkDerivation rec { pname = "scrot"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj"; + sha256 = "12xq6glg70icwsvbnfw9gm4dahlbnrc7b6adpd0mpf89h4sj2gds"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; - buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ]; + buildInputs = [ giblib xlibsWrapper libXfixes libXcursor libXcomposite ]; meta = with stdenv.lib; { homepage = "https://github.com/resurrecting-open-source-projects/scrot"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix index 374e090af6..a885060994 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix @@ -10,8 +10,11 @@ rustPlatform.buildRustPackage rec { rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432"; sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr"; }; - sourceRoot = "source/svgbob_cli"; + postPatch = '' + substituteInPlace ../svgbob/src/lib.rs \ + --replace '#![deny(warnings)]' "" + ''; cargoSha256 = "1y9jsnxmz51zychmmzp6mi29pb5ks2qww7lk5bshkhp56v51sm8d"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/swfdec/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/swfdec/default.nix deleted file mode 100644 index d721d06ad5..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/swfdec/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{stdenv, fetchurl -, cairo, pango, glib, liboil, zlib, gstreamer, gst-plugins-base -, gst-plugins-good , gtk2, libsoup, alsaLib, pkgconfig -}: - -stdenv.mkDerivation rec { - pname = "swfdec"; - version = "0.8.4"; - - src = fetchurl { - url = "http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-${version}.tar.gz"; - sha256 = "00nqrd0fzf0g76rn80d7h56n6hxv7x1x6k89zj45bj564lzwc3vs"; - }; - - buildInputs = [ - cairo glib liboil pango zlib gstreamer gst-plugins-base gst-plugins-good - gtk2 libsoup alsaLib pkgconfig - ]; - - postInstall = '' - mkdir "$out/bin" - cp tools/.libs/swfdec-extract "$out/bin" - cp tools/.libs/dump "$out/bin/swfdec-dump" - cp player/.libs/swfplay "$out/bin/swfplay" - ''; - - enableParallelBuilding = true; - - meta = { - inherit version; - description = "Decoder/renderer for Macromedia Flash animations"; - license = stdenv.lib.licenses.lgpl21 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - homepage = "https://swfdec.freedesktop.org/wiki/"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix index 2b332bd325..a434b38453 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1ivhm6js0ylnxwp84jmm2vmnl4iy1cwr3m9imx7lmcl0i3c8b9if"; + sha256 = "1algvndpl63g3yzp3hhbgm7839njpbmw954nsiwf0j591spz4lph"; }; # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 doCheck = false; - cargoSha256 = "15zdnr95a363w4rddv1fbz796m01430gzly5p953m23g2mbxdmp0"; + cargoSha256 = "1jccaln72aqa9975nbs95gimndqx5kgfkjmh40z6chx1hvn4m2ga"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix index 0993a39983..eb7598dce2 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland, wrapGAppsHook +, fetchpatch +}: stdenv.mkDerivation rec { pname = "wdisplays"; version = "1.0"; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook ]; buildInputs = [ gtk3 epoxy wayland ]; @@ -15,6 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y"; }; + patches = [ + # Fixes `Gdk-Message: 10:26:38.752: Error reading events from display: Success` + # https://github.com/cyclopsian/wdisplays/pull/20 + (fetchpatch { + url = "https://github.com/cyclopsian/wdisplays/commit/5198a9c94b40ff157c284df413be5402f1b75118.patch"; + sha256 = "1xwphyn0ksf8isy9dz3mfdhmsz4jv02870qz5615zs7aqqfcwn85"; + }) + ]; + meta = let inherit (stdenv) lib; in { description = "A graphical application for configuring displays in Wayland compositors"; homepage = "https://github.com/cyclopsian/wdisplays"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix index a02a97739b..3ca9a7b5e8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "yafaray-core"; - version = "3.4.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "YafaRay"; repo = "Core"; rev = "v${version}"; - sha256 = "140vnaihz09rdvp0mqgrs26b3a2fv5wm49ar6817p4qklfx71l0g"; + sha256 = "05r08ynm6p9jq9l3v1v3lqkrfx3bm6zlqcxm1yk7mdv1zv2yxikd"; }; preConfigure = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "http://www.yafaray.org"; maintainers = with maintainers; [ hodapp ]; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 2e812d9b7b..69ff9c1fe5 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, - python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, + python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, fcitx, gettext }: let japanese_usage_dictionary = fetchFromGitHub { @@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec { sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; }; - nativeBuildInputs = [ gyp which ninja python pkgconfig ]; + nativeBuildInputs = [ gyp which ninja python pkgconfig qt5.wrapQtAppsHook ]; buildInputs = [ protobuf gtk2 zinnia qt5.qtbase libxcb fcitx gettext ]; postUnpack = '' @@ -57,7 +57,7 @@ in clangStdenv.mkDerivation rec { ''; configurePhase = '' - export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 use_fcitx5=0" + export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 use_fcitx5=0 zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model" cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc ''; @@ -79,6 +79,8 @@ in clangStdenv.mkDerivation rec { install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool + wrapQtApp $out/lib/mozc/mozc_tool + install -D -m 755 out_linux/Release/fcitx-mozc.so $out/lib/fcitx/fcitx-mozc.so install -D -m 644 unix/fcitx/fcitx-mozc.conf $out/share/fcitx/addon/fcitx-mozc.conf install -D -m 644 unix/fcitx/mozc.conf $out/share/fcitx/inputmethod/mozc.conf diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix new file mode 100644 index 0000000000..b34206e6cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitHub +, gettext +, xorg +, pkgconfig +, wrapGAppsHook +, ibus +, gtk3 +, go +}: + +stdenv.mkDerivation rec { + pname = "ibus-bamboo"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "BambooEngine"; + repo = pname; + rev = "v${version}"; + sha256 = "0bjcc2dm6c6s0v271nyslmwf5z0xxpcbvmk4lyirs48hc1bzv3n6"; + }; + + nativeBuildInputs = [ + gettext + pkgconfig + wrapGAppsHook + go + ]; + + buildInputs = [ + xorg.libX11 + xorg.xorgproto + xorg.libXtst + xorg.libXi + ]; + + preConfigure = '' + export GOCACHE="$TMPDIR/go-cache" + sed -i "s,/usr,$out," bamboo.xml + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + + meta = with stdenv.lib; { + isIbusEngine = true; + description = "A Vietnamese IME for IBus"; + homepage = "https://github.com/BambooEngine/ibus-bamboo"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ superbo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index bd34f2c49a..41a04d0183 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig -, protobuf, ibus, gtk2, zinnia, qt5, libxcb }: +, protobuf, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }: let japanese_usage_dictionary = fetchFromGitHub { @@ -21,7 +21,7 @@ in clangStdenv.mkDerivation rec { maintainers = with maintainers; [ gebner ericsagnes ]; }; - nativeBuildInputs = [ which ninja python gyp pkgconfig ]; + nativeBuildInputs = [ which ninja python gyp pkgconfig qt5.wrapQtAppsHook ]; buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; src = fetchFromGitHub { @@ -50,7 +50,7 @@ in clangStdenv.mkDerivation rec { ''; configurePhase = '' - export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc" + export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model" cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc ''; @@ -70,6 +70,7 @@ in clangStdenv.mkDerivation rec { install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool + wrapQtApp $out/lib/mozc/mozc_tool install -d $out/share/doc/mozc install -m 644 data/installer/*.html $out/share/doc/mozc/ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index d760e9d320..4d2f37b865 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, skktools }: +{ stdenv, fetchurl, libiconv, skktools }: let # kana to kanji @@ -31,7 +31,7 @@ stdenv.mkDerivation { pname = "skk-dicts-unstable"; version = "2017-10-26"; srcs = [ small medium large edict assoc ]; - nativeBuildInputs = [ skktools ]; + nativeBuildInputs = [ skktools ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; phases = [ "installPhase" ]; installPhase = '' @@ -68,6 +68,6 @@ stdenv.mkDerivation { homepage = "https://github.com/skk-dev/dict"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix index 8a7423eea1..b150521396 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -8,14 +8,14 @@ # dependencies on a Ruby interpreter etc. # - We for the moment do not package them to keep the dependencies slim. # Probably, shall package the newer tools as skktools-extra in the future. -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "skktools"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "skk-dev"; repo = "skktools"; - rev = "c8816fe720604d4fd79f3552e99e0430ca6f2769"; - sha256 = "11v1i5gkxvfsipigc1w1m16ijzh85drpl694kg6ih4jfam1q4vdh"; + rev = "skktools-${stdenv.lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1zway8jsm18279xq8zlpr84iqiw373x3v0ysay74n9bjqxbl234a"; }; # # See "12.2. Package naming" # name = "skktools-unstable-${version}"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/antimicroX/default.nix b/third_party/nixpkgs/pkgs/tools/misc/antimicroX/default.nix index 23418ced82..cb5496d450 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/antimicroX/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/antimicroX/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "antimicroX"; - version = "3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "juliagoda"; repo = "antimicroX"; rev = version; - sha256 = "0li22sjl95233azxhyda36idnfzbb4b02wf57hnpnba6qvrlpwwl"; + sha256 = "05asxlkgb4cgvpcyksw1cx8cz8nzi8hmw8b91lw92892j7a2r7wj"; }; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig itstool ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix b/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix new file mode 100644 index 0000000000..29538f9401 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "asciinema-scenario"; + version = "0.1.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-ubiVpKFU81Ot9V9oMexWSiUXHepoJ6nXtrWVAFhgcYw="; + }; + + cargoSha256 = "109ij5h31bhn44l0wywgpnnlfjgyairxr5l19s6bz47sbka0xyxk"; + + meta = with stdenv.lib; { + description = "Create asciinema videos from a text file."; + homepage = "https://github.com/garbas/asciinema-scenario/"; + maintainers = with maintainers; [ garbas ]; + license = with licenses; [ mit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix new file mode 100644 index 0000000000..2105ad0ae0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix @@ -0,0 +1,29 @@ +{ buildPythonApplication, fetchurl, lib +, dateutil, argcomplete, argh, psycopg2, boto3 +}: + +buildPythonApplication rec { + pname = "barman"; + version = "2.11"; + + outputs = [ "out" "man" ]; + src = fetchurl { + url = "mirror://sourceforge/pgbarman/${version}/barman-${version}.tar.gz"; + sha256 = "0w5lh4aavab9ynfy2mq09ga6j4vss4k0vlc3g6f5a9i4175g9pmr"; + }; + + propagatedBuildInputs = [ dateutil argh psycopg2 boto3 argcomplete ]; + + # Tests are not present in tarball + checkPhase = '' + $out/bin/barman --help > /dev/null + ''; + + meta = with lib; { + homepage = "https://www.2ndquadrant.com/en/resources/barman/"; + description = "Backup and Disaster Recovery Manager for PostgreSQL"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/bashcards/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bashcards/default.nix index ecaabb43c1..3e91b9741c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bashcards/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bashcards/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bashcards"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "rpearce"; repo = pname; rev = "v${version}"; - sha256 = "1zbijbcm9lrqwiax37li0jjqcaxf469wh5d423frain56z1qknxl"; + sha256 = "1rpqrh0022sbrjvd55a0jvpdqhhka5msf8dsz6adbbmxy3xzgdid"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix index bdf68d708a..7cec0cab99 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -14,7 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; - postPatch = "patchShebangs ."; + postPatch = '' + substituteInPlace install.py \ + --replace 'platform.version()' '"Nix"' + + patchShebangs . + ''; buildPhase = "./build.py"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix b/third_party/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix index e5ad56376c..eddcba1c9c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - postPatch = "patchShebangs ."; + postPatch = '' + substituteInPlace configure \ + --replace 'platform.dist()[0]' '"nix"' + patchShebangs . + ''; buildPhase = "./build.py"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix index 8273d60bd5..afb41d8b6e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix @@ -11,6 +11,9 @@ python2Packages.buildPythonApplication rec { sha256 = "0p0pdwvyf9b4czi1pnhclm1ih8kw78nk2sj4if5hwi7s5423wk5q"; }; + # tests fail only on hydra. + doCheck = false; + meta = with stdenv.lib; { description = "bmap-related tools"; homepage = "https://github.com/intel/bmap-tools"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index ccdb8bcd70..62ca179cfd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -1,29 +1,37 @@ { stdenv , rustPlatform -, fetchFromGitHub +, fetchCrate , installShellFiles , makeWrapper , coreutils , libiconv +, xcbuild +, zlib , Security }: rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.20.0"; + version = "1.0.0"; - src = fetchFromGitHub { - owner = "Canop"; - repo = pname; - rev = "v${version}"; - sha256 = "0by4cln9ljaphqk5hz56mcavz9kc5s42zlxx33nf3idqrszfcarf"; + src = fetchCrate { + inherit pname version; + sha256 = "1dc6lb6ihj4s0mcp1say16j9yr61jdbzhmayxxsm4ansngbzmw45"; }; - cargoSha256 = "1i5zq310k8gv9877rcrvash3aw1cyf3g0741qnky71d565s3n910"; + cargoSha256 = "0nqmincayjv1snxz94i14fypc9dv69fxfqqdz3qbcvc2cs62zayg"; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + xcbuild # The cc crate attempts to run xcbuild. + ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + libiconv + Security + zlib + ]; postPatch = '' substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/' diff --git a/third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix index ac2f3f3411..30845759a2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "catimg"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "posva"; repo = pname; rev = version; - sha256 = "0g9ywbgy162wiam9hc3yqpq5q4gyxa8fj4jskr3fdz8z8jjaabzz"; + sha256 = "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index a87aa33ab1..d7b7646afe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "0m8ik01y1lag3mgg3g4rxvzndh86b972hv2702dqs28l5zy5h3mv"; + sha256 = "16sv1kbd66rllnnl851y3x54wkl0p7g0qsblprvfr9715svk1835"; }; - vendorSha256 = "18s60k7y64z12lx9lgj13fl1jh0aiqinwxrsz751d2iqhgdi2jja"; + vendorSha256 = "1i9d672mzmb97s26n0v01m70g4viyl9pdk25haxr6ny4rab2wbi7"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix index 084d51d2a3..1c38e7c3b8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cht.sh/default.nix @@ -9,15 +9,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2019-08-06"; + version = "unstable-2020-08-06"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "f507ba51d6bc1ae6c7df808cadbe4f8603951b6b"; - sha256 = "0r7x9a3qzzkbd1m5zdlkpmhx0p7b7ja42190s7fidls3dsm710g0"; + rev = "9f99bec1f0293e84d6d8a990a1940c1422e3b0ce"; + sha256 = "1n4lgzsgg4502zh113d7pb1hw6bykqx6vpfp8j08z7y5clmdiwa6"; }; # Fix ".cht.sh-wrapped" in the help message diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix index e35d528325..2b9cbfe103 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cloc"; - version = "1.86"; + version = "1.88"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = version; - sha256 = "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w"; + sha256 = "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw"; }; setSourceRoot = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff b/third_party/nixpkgs/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff new file mode 100644 index 0000000000..aed9112682 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 86fec9e..b9d0341 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ elseif(WIN32 AND ${OpenCL_LIBRARIES} MATCHES "OpenCL.lib") + set(OpenCL_LIBRARIES ${OpenCL_LIBRARIES} cfgmgr32.lib) + endif() + +-FIND_PATH(HPP_FOUND CL/cl.hpp PATHS ${OpenCL_INCLUDE_DIRS}) ++FIND_PATH(HPP_FOUND CL/cl2.hpp PATHS ${OpenCL_INCLUDE_DIRS}) + if(NOT HPP_FOUND) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + include(BuildCLHpp) +diff --git a/include/clpeak.h b/include/clpeak.h +index c090d31..0d9d5e2 100644 +--- a/include/clpeak.h ++++ b/include/clpeak.h +@@ -1,14 +1,10 @@ + #ifndef CLPEAK_HPP + #define CLPEAK_HPP + +-#define __CL_ENABLE_EXCEPTIONS +- +-#include +- + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/common.h b/include/common.h +index 91318cb..6aaca04 100644 +--- a/include/common.h ++++ b/include/common.h +@@ -1,7 +1,11 @@ + #ifndef COMMON_H + #define COMMON_H + +-#include ++#define CL_HPP_ENABLE_EXCEPTIONS ++#define CL_HPP_MINIMUM_OPENCL_VERSION 120 ++#define CL_HPP_TARGET_OPENCL_VERSION 120 ++#include ++ + #if defined(__APPLE__) || defined(__MACOSX) || defined(__FreeBSD__) + #include + #endif +diff --git a/src/clpeak.cpp b/src/clpeak.cpp +index 8708463..4a47842 100644 +--- a/src/clpeak.cpp ++++ b/src/clpeak.cpp +@@ -3,7 +3,7 @@ + + #define MSTRINGIFY(...) #__VA_ARGS__ + +-static const char *stringifiedKernels = ++static const std::string stringifiedKernels = + #include "global_bandwidth_kernels.cl" + #include "compute_sp_kernels.cl" + #include "compute_hp_kernels.cl" +@@ -65,7 +65,7 @@ int clPeak::runAll() + + cl::Context ctx(CL_DEVICE_TYPE_ALL, cps); + vector devices = ctx.getInfo(); +- cl::Program::Sources source(1, make_pair(stringifiedKernels, (strlen(stringifiedKernels) + 1))); ++ cl::Program::Sources source(1, stringifiedKernels); + cl::Program prog = cl::Program(ctx, source); + + for (size_t d = 0; d < devices.size(); d++) diff --git a/third_party/nixpkgs/pkgs/tools/misc/clpeak/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clpeak/default.nix new file mode 100644 index 0000000000..b021703b80 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/clpeak/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, ocl-icd, opencl-clhpp }: + +stdenv.mkDerivation rec { + pname = "clpeak"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "krrishnarraj"; + repo = "clpeak"; + rev = version; + fetchSubmodules = true; + sha256 = "1wkjpvn4r89c3y06rv7gfpwpqw6ljmqwz0w0mljl9y5hn1r4pkx2"; + }; + + patches = [ + # The cl.hpp header was removed from opencl-clhpp. This patch + # updates clpeak to use the new cp2.hpp header. The patch comes + # from the following PR and was updated to apply against more + # recent versions: https://github.com/krrishnarraj/clpeak/pull/46 + ./clpeak-clhpp2.diff + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ ocl-icd opencl-clhpp ]; + + meta = with stdenv.lib; { + description = "A tool which profiles OpenCL devices to find their peak capacities"; + homepage = "https://github.com/krrishnarraj/clpeak/"; + license = licenses.unlicense; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix new file mode 100644 index 0000000000..945f4c61f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "cod"; + version = "unstable-2020-09-10"; + + goPackagePath = "cod"; + + src = fetchFromGitHub { + owner = "dim-an"; + repo = pname; + rev = "ae68da08339471dd278d6df79abbfd6fe89a10fe"; + sha256 = "1l3gn9v8dcy72f5xq9hwbkvkis0vp4dp8qyinsrii3acmhksg9v6"; + }; + + vendorSha256 = "1arllkiz1hk12hq5b2zpg3f8i9lxl66mil5sdv8gnhflmb37vbv3"; + + buildFlagsArray = [ "-ldflags=-X main.GitSha=${src.rev}" ]; + + doCheck = false; + + meta = with lib; { + description = "Tool for generating Bash/Zsh autocompletions based on `--help` output"; + homepage = src.meta.homepage; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/colorpicker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/colorpicker/default.nix new file mode 100644 index 0000000000..3de5d33617 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/colorpicker/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkg-config, gtk2 }: + +stdenv.mkDerivation rec { + pname = "colorpicker"; + version = "git-2018-01-14"; + + src = fetchFromGitHub { + owner = "Ancurio"; + repo = "colorpicker"; + rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17"; + sha256 = "1kj1dpb79llrfpszraaz6r7ci114zqi5rmqxwsvq2dnnpjxyi29r"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk2 ]; + + installPhase = '' + install -Dt $out/bin colorpicker + ''; + + meta = with stdenv.lib; { + description = "Click on a pixel on your screen and print its color value in RGB"; + homepage = "https://github.com/Ancurio/colorpicker"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix index 65482fabb1..dba42e4bfe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, curl, jansson, autoconf, automake -, aesni ? true }: +, aesni ? stdenv.hostPlatform.aesSupport }: let rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; @@ -28,6 +28,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix index 930f1f59a8..141df33322 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.11"; + version = "4.11.1"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "0lbizfnf3qwsiz2ggia6ff7sjjj8gwhys8bm6wixdc4n0qlycp5v"; + sha256 = "0g4qmzb2ff0rqszzpsal465hcslnpdl4nhghv59qvhamkkqnks4b"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 324b31a186..011c543208 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "156"; + version = "160"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1irmsa0g0hggxijqyy7mghc8zy82cr6zn8qil253pm426j7gf7vm"; + sha256 = "1nshcgq31nrbh4r70i5azs7s0wfc4llb60ka1w8rncy22rg8rabc"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix index 1096cce496..3fb2a5d76a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "direnv"; - version = "2.21.3"; + version = "2.22.0"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; + sha256 = "06z85r99w0nr093fawva6sysdlrdsfjjf7asx96k1sjv56sb306m"; }; # we have no bash at the moment for windows diff --git a/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix b/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix new file mode 100644 index 0000000000..43214c8663 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix @@ -0,0 +1,27 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "discocss"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "mlvzk"; + repo = pname; + rev = "v${version}"; + sha256 = "1818jca3sw2ngw1n488q82w5rakx4cxgknnkmsaa0sz4h8gldfy8"; + }; + + dontBuild = true; + + installPhase = '' + install -m755 -D ./discocss $out/bin/discocss + ''; + + meta = with lib; { + description = "A tiny Discord css-injector"; + homepage = "https://github.com/mlvzk/discocss"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mlvzk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix new file mode 100644 index 0000000000..70316399e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "duf"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "duf"; + rev = "v${version}"; + sha256 = "1akziaa5wjszflyylvnw284pz1aqngl40civzfabjz94pvyjkp76"; + }; + + vendorSha256 = "1aj7rxlylgvxdnnfnfzh20v2jvs8falvjjishxd8rdk1jgfpipl8"; + + meta = with lib; { + homepage = "https://github.com/muesli/duf/"; + description = "Disk Usage/Free Utility"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix index 75e8d5d488..238ff73ba3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "181xlm0zj9pb73ijwf202kwwm2jji0m11ynsbaxl44alva3xpvmk"; + sha256 = "1rcbxqcxr8v5faa52psjsjjlnkia5cwc3b1cwka9f5cxwhdwg7hr"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1ypphm9n6wri5f03fj65i5p6lb11qj5zp8ddvybanaypv5llkfcb"; + cargoSha256 = "1q15xy15hk6r3sai9wry2jm57dhinx6r84yxg9fwvq354613k645"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/eva/default.nix b/third_party/nixpkgs/pkgs/tools/misc/eva/default.nix index 06b7b0a520..e59c2387a3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/eva/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/eva/default.nix @@ -21,6 +21,12 @@ rustPlatform.buildRustPackage rec { url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; }) + + # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` + (fetchpatch { + url = "https://github.com/NerdyPepper/eva/commit/ccfb3d327567dbaf03b2283c7e684477e2e84590.patch"; + sha256 = "003yxqlyi8jna0rf05q2a006r2pkz6pcwwfl3dv8zb6p83kk1kgj"; + }) ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix index 13c8b3f1d4..fd6baadb68 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -57,6 +57,6 @@ buildRustPackage rec { ''; homepage = "https://the.exa.website"; license = licenses.mit; - maintainers = with maintainers; [ ehegnes lilyball globin zowoq ]; + maintainers = with maintainers; [ ehegnes lilyball globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix index 89a05815f5..31b47a31ca 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; preFixup = '' - installManPage "$src/doc/fd.1" + installManPage doc/fd.1 installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish} installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd diff --git a/third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix index 3419a8d285..4041a9abdb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "fet-sh"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "6gk"; repo = "fet.sh"; rev = "v${version}"; - sha256 = "15336cayv3rb79y7f0v0qvn6nhr5aqr8479ayp0r0sihn5mkfg35"; + sha256 = "02izkwfph4i62adwns4q4w1pfcmdsczm8ghagx5yb9315ww3adzn"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix index 6b190fcf84..2f92dc6d9b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"; }; + mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ]; nativeBuildInputs = [ meson pkgconfig ninja ]; buildInputs = [ libftdi1 libusb1 pciutils ]; @@ -27,7 +28,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz ]; platforms = platforms.all; - # https://github.com/flashrom/flashrom/issues/125 - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index 28c005b7ab..2f49d0e57e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "153c7hafmzwxa24h923irfhzaqqd8wbr2aaab6l3hjhgx5q8s5bf"; + sha256 = "0w96f86i2jlzjk2plf8jbdw4q748khbhhjkbzfb8dkq2lhc9i80h"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix index ec977d4857..d24ff0e051 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fx_cast_bridge"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb"; - sha256 = "1mjpwd27b0cpigz4cc2mdl97d78rj5ikn2bqfdic50lqjciaqi1b"; + sha256 = "0kd58vzsq1qzl7qsh1qv25ylxvr5y37li03gjb48x4vhd85slzz5"; }; nativeBuildInputs = [ dpkg ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index 2278e11339..d9fe6ac819 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }: buildGoModule rec { pname = "fzf"; @@ -27,6 +27,13 @@ buildGoModule rec { echo "Failed to replace vim base_dir path with $out" exit 1 fi + + # Has a sneaky dependency on perl + # Include first args to make sure we're patching the right thing + substituteInPlace shell/key-bindings.zsh \ + --replace " perl -ne " " ${perl}/bin/perl -ne " + substituteInPlace shell/key-bindings.bash \ + --replace " perl -n " " ${perl}/bin/perl -n " ''; preInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix index 7a8b16c55e..34548abd81 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -2,23 +2,22 @@ buildGoPackage rec { pname = "git-town"; - version = "7.3.0"; - - goPackagePath = "github.com/Originate/git-town"; + version = "7.4.0"; + goPackagePath = "github.com/git-town/git-town"; src = fetchFromGitHub { - owner = "Originate"; + owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "166g9i79hqga8k5wvs0b84q6rqniizzsd39v37s9w16axgdrm6nb"; + sha256 = "05s2hp4xn0bs3y6rgqkpgz0k8q8yfpwkw5m8vwim95hk6n41ps18"; }; - buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; + buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; meta = with stdenv.lib; { description = "Generic, high-level git support for git-flow workflows"; homepage = "http://www.git-town.com/"; - maintainers = [ maintainers.allonsy ]; + maintainers = [ maintainers.allonsy maintainers.blaggacao ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/godu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/godu/default.nix new file mode 100644 index 0000000000..37511d2e84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/godu/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "godu"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "viktomas"; + repo = pname; + rev = "v${version}"; + sha256 = "1fp8iq4x0qiswksznnd6qh7c6g5pwglzz6ga11a7vgic0201wsvb"; + }; + + patches = [ ./go-mod.patch ]; + + vendorSha256 = "1zq7b0zn24cbrjssk4g03i90szp1ms7ila4khwcm7hp9n1py245s"; + + meta = with lib; { + description = "Utility helping to discover large files/folders"; + homepage = "https://github.com/viktomas/godu"; + license = licenses.mit; + maintainers = with maintainers; [ rople380 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/godu/go-mod.patch b/third_party/nixpkgs/pkgs/tools/misc/godu/go-mod.patch new file mode 100644 index 0000000000..2b3efe6be6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/godu/go-mod.patch @@ -0,0 +1,33 @@ +diff --git a/go.mod b/go.mod +index cf8f2fb..e405e03 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,5 +5,6 @@ go 1.14 + require ( + github.com/gdamore/tcell v1.1.1 + github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd ++ github.com/mattn/go-isatty v0.0.12 // indirect + github.com/stretchr/testify v1.3.0 + ) +diff --git a/go.sum b/go.sum +index 23c1232..e25c87e 100644 +--- a/go.sum ++++ b/go.sum +@@ -8,6 +8,8 @@ github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd h1:1e+0Z+T4t1mKL5xxv + github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd/go.mod h1:qkLSc0A5EXSP6B04TrN4oQoxqFI7A8XvoXSlJi8cwk8= + github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 h1:5MnxBC15uMxFv5FY/J/8vzyaBiArCOkMdFT9Jsw78iY= + github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4= ++github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= ++github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= + github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= + github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= + github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +@@ -16,6 +18,8 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= + github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= + github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= ++golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg= ++golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY= \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index 9e9f3c8478..8d81713e7b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -19,6 +19,10 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; + buildFlagsArray = [ + "-ldflags=-X main.Version=${version} -X main.Commit=${version} -X main.BuildDate=1970-01-01" + ]; + meta = with lib; { license = licenses.mit; homepage = "https://github.com/gotify/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index 4e00a4ddd4..63cdb61dd3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool +{ stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ./fix-bash-completion.patch ]; - nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; + nativeBuildInputs = [ bison flex python3 pkgconfig autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix new file mode 100644 index 0000000000..bf0daa38ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, libXrandr, libX11, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "hacksaw"; + version = "1.0.4"; + + nativeBuildInputs = [ pkg-config python3 ]; + + buildInputs = [ libXrandr libX11 ]; + + src = fetchCrate { + inherit pname version; + sha256 = "1l6i91xb81p1li1j2jm0r2rx8dbzl2yh468cl3dw0lqpqy4i65hx"; + }; + + cargoSha256 = "01draql3x71h7xl2xcc69dv7vpi3smnajhrvaihs5vij81pyfrzk"; + + meta = with lib; { + description = "Lightweight selection tool for usage in screenshot scripts etc."; + homepage = "https://github.com/neXromancers/hacksaw"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ TethysSvensson ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix index 34405ccc7b..6389d41cdf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix @@ -6,6 +6,7 @@ , makeWrapper , udev , stdenv +, lib , wrapGAppsHook }: let @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock index 0ba32818d2..489fa555c5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -5,8 +5,8 @@ GEM public_suffix (>= 2.0.2, < 5.0) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.12.2) - html-proofer (3.15.3) + ffi (1.13.1) + html-proofer (3.16.0) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -16,14 +16,14 @@ GEM yell (~> 2.0) mercenary (0.4.0) mini_portile2 (2.4.0) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) - parallel (1.19.1) - public_suffix (4.0.4) + parallel (1.19.2) + public_suffix (4.0.6) rainbow (3.0.0) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) yell (2.2.2) diff --git a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix index c5836bc74b..bdd0bbc20c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; html-proofer = { dependencies = ["addressable" "mercenary" "nokogumbo" "parallel" "rainbow" "typhoeus" "yell"]; @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18afz6rz72j8hnfgzhyr21wh1rfy1x41iyhbcgaq0r1bd7ng1vni"; + sha256 = "18s8l3nys0lvdkqpfg3c1rd84c5j4dmlx503wnksw9skbzn7l93m"; type = "gem"; }; - version = "3.15.3"; + version = "3.16.0"; }; mercenary = { groups = ["default"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; type = "gem"; }; - version = "1.10.9"; + version = "1.10.10"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -89,20 +89,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; type = "gem"; }; - version = "1.19.1"; + version = "1.19.2"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.4"; + version = "4.0.6"; }; rainbow = { groups = ["default"]; @@ -120,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; yell = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ili2c/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ili2c/default.nix index 43eed8367c..2bda116e66 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ili2c/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ili2c/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, ant, makeWrapper, jre }: +{ stdenv, fetchFromGitHub, jdk8, ant, makeWrapper, jre8 }: +let jdk = jdk8; jre = jre8; in stdenv.mkDerivation rec { pname = "ili2c"; version = "5.0.8"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix deleted file mode 100644 index 53b1763ad6..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/kdecoration-viewer/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, mkDerivation -, cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: - -mkDerivation { - name = "kdecoration-viewer-2018-07-24"; - - src = fetchFromGitHub { - owner = "KDE"; - repo = "kdecoration-viewer"; - rev = "6e50b39c651bbf92fd7e7116d43bf57288254288"; - sha256 = "01v6i081vx0mydqvnj05xli86m52v6bxxc3z1zlyyap9cfhag7lj"; - }; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; - - meta = with stdenv.lib; { - description = "Allows to preview a KDecoration plugin"; - longDescription = '' - kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under - $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview. - ''; - homepage = "https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/"; - license = licenses.gpl2; - maintainers = [ maintainers.gnidorah ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix index 231e660f58..8a13ef5dfd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lesspipe/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lesspipe"; - version = "1.84"; + version = "1.85"; buildInputs = [ perl ]; preConfigure = "patchShebangs ."; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "wofr06"; repo = "lesspipe"; rev = version; - sha256 = "124ffhzrikr88ab14rk6753n8adxijpmg7q3zx7nmqc52wpkfd8q"; + sha256 = "1v1jdkdq1phc93gdr6mjlk98gipxrkkq4bj8kks0kfdvjgdwkdaa"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix index 8c544d3f0d..99ac31f6a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix @@ -37,6 +37,8 @@ in (rustPlatform.buildRustPackage rec { inherit sha256; }; + outputs = [ "out" "man" "doc" ]; + inherit cargoSha256; doCheck = false; @@ -68,7 +70,4 @@ in (rustPlatform.buildRustPackage rec { nixos = nixosTests.lorri; }; }; -}).overrideAttrs (old: { - # add man and doc outputs to put our documentation into - outputs = old.outputs or [ "out" ] ++ [ "man" "doc" ]; }) diff --git a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix index 73dcbd3bc3..415c55fb61 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai"; + sha256 = "006fy87jrb77cpa6bywchcvq1p74vlpy151q1j4nsj8npbr02krj"; }; - cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr"; + cargoSha256 = "0mrvcca9y0vylcrbfxxba45v05qxd8z91vb4in88px60xah0dy3q"; nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix index 8b1cb938fb..d86f824b87 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl ]; + + # The mbuffer configure scripts fails to recognize the correct + # objdump binary during cross-building for foreign platforms. + # The correct objdump is exposed via the environment variable + # $OBJDUMP, which should be used in such cases. + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}' + ''; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix index 1e5a68d9e7..39f9b47f46 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -2,21 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "0fgnhm0b1sd6n12fa2cwlb5b8q4jjm9lqik4lx3l2hv5pkp3dcmb"; + sha256 = "155x745jakfcpr6kmp24cy8xwdhv81jdfjjhd149bnw5ilg0z037"; }; - preInstall = '' + postInstall = '' + substituteInPlace mcfly.bash --replace '$(which mcfly)' $out/bin/mcfly + substituteInPlace mcfly.zsh --replace '$(which mcfly)' $out/bin/mcfly + substituteInPlace mcfly.fish --replace '(which mcfly)' $out/bin/mcfly install -Dm644 -t $out/share/mcfly mcfly.bash install -Dm644 -t $out/share/mcfly mcfly.zsh + install -Dm644 -t $out/share/mcfly mcfly.fish ''; - cargoSha256 = "11vc4r3cx5amkrmh4hhc174bca02a87i7hfjb33adjvipphfm83f"; + cargoSha256 = "0y6sjbzg5qqqip9sc9ajyd5ra3n2wwvarj6nhpzjhh05kqz3qja4"; meta = with stdenv.lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 5da2a366cf..8e2503d06d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -3,27 +3,26 @@ , fetchFromGitHub , pkg-config , zlib -, openssl , Security }: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "1h4872jb0xz8yzs02q8wfvqrp20y7kdva5ka6bh6nq4jrnnky8zb"; + sha256 = "1abmg2zk1qipqdl1yfj8ibm1w8n7fazxqccsg1gq4xzlhhfp3m2l"; }; - cargoSha256 = "1vq1rrav9r9z4y0v7hpn0fcq64slq4zrm2pybmnmb7h9nfxxyr6k"; + cargoSha256 = "0l750067x8k92ngg32bb8mnbq09aj65sdnpzdhij9n1mh90rkck9"; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ pkg-config zlib ]; - buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "For when you really just want to serve some files over HTTP right now!"; @@ -31,5 +30,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ nequissimus zowoq ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/98181 }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index bdc3ac4dde..ec6be6eba2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, gnome3, libnotify, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: +, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib +, gnome2, gnome3, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let - - version = "1.17.0"; + version = "1.22.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib + at-spi2-atk + at-spi2-core atk cairo cups @@ -22,6 +23,8 @@ let gnome3.gtk gnome2.pango libnotify + libsecret + libuuid libxcb nspr nss @@ -46,7 +49,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "085xq1ik8kyza1kq9kn0pf98zk6g2qa21clxhn48rgnqk20aninv"; + sha256 = "1wbjj2w4dii644lprvmwnlval53yqh4y0f58cad657jjw8101rd9"; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; @@ -62,20 +65,30 @@ in stdenv.mkDerivation { buildCommand = '' IFS=$'\n' - dpkg -x $src $out - cp -av $out/usr/* $out + + # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here + dpkg --fsys-tarfile $src | tar --extract + + mkdir -p $out + mv usr/* $out + + # cp -av $out/usr/* $out rm -rf $out/share/lintian - #The node_modules are bringing in non-linux files/dependencies + + # The node_modules are bringing in non-linux files/dependencies find $out -name "*.app" -exec rm -rf {} \; || true find $out -name "*.dll" -delete find $out -name "*.exe" -delete + # Otherwise it looks "suspicious" chmod -R g-w $out + for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do echo "Manipulating file: $file" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/share/mongodb-compass "$file" || true + patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true done + wrapGAppsHook $out/bin/mongodb-compass ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix index 49f9c6bc03..b3665bb6dc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mpdscribble/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, boost, libgcrypt, systemd, mpd_clientlib, curl }: stdenv.mkDerivation rec { pname = "mpdscribble"; - version = "0.22"; + version = "0.23"; src = fetchurl { url = - "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; - sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; + "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"; + sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib curl glib ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ]; meta = with stdenv.lib; { - description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; + description = "A Music Player Daemon (MPD) client which submits information about tracks being played to a scrobbler (e.g. last.fm)"; homepage = "https://www.musicpd.org/clients/mpdscribble/"; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ maintainers.sohalt ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix index cf90e93929..20d7110944 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mstflint"; - version = "4.14.0-1"; + version = "4.14.0-3"; src = fetchFromGitHub { owner = "Mellanox"; repo = pname; rev = "v${version}"; - sha256 = "0xrwx623vl17cqzpacil74m2fi4xrshgvvzxiplz1wq47gq7wp1i"; + sha256 = "0zy9npyzf7dkxlfl9mx6997aa61mk23ixpjb01ckb1wvav5k6z82"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix index c5096ea357..ca75bf34dd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mutagen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mutagen"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "0gn0ra2fbnggp82h910hz34b2l5fk7f0p9dk7zl50wxrkydfzrk3"; + sha256 = "11wp94khj9bzmadij0nq6i6q0x9z6h0zy4a6fhf322y5nxsmvcgy"; }; vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix index 3a3a1a7703..883e353b0b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "noti"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "variadico"; repo = "noti"; rev = version; - sha256 = "0bcwfyd93fx0rzjc9jgg4pvvqbpxwizr044yqqa5rx70gaasz7qa"; + sha256 = "12r9wawwl6x0rfv1kahwkamfa0pjq24z60az9pn9nsi2z1rrlwkd"; }; buildInputs = lib.optional stdenv.isDarwin Cocoa; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix index a3cf6ad07d..593a8cfc63 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ntfy"; version = "2.7.0"; @@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec { sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv"; }; - checkInputs = with pythonPackages; [ + checkInputs = with python3Packages; [ mock ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ requests ruamel_yaml appdirs sleekxmpp dns emoji @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { ]; checkPhase = '' - HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test + HOME=$(mktemp -d) ${python3Packages.python.interpreter} setup.py test ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index 3b9623d5ad..5429ecea2c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -1,8 +1,8 @@ -{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools +{ stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools , python, git }: -with stdenv.lib; +let jdk = jdk8; jre = jdk8.jre; in stdenv.mkDerivation rec { pname = "opentsdb"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix b/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix index 46b2fd444e..e44999d1c3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "oppai-ng"; - version = "3.2.3"; + version = "3.3.0"; src = fetchFromGitHub { owner = "Francesco149"; repo = pname; rev = version; - sha256 = "1wrnpnx1yl0pdzmla4knlpcwy7baamy2wpdypnbdqxrn0zkw7kzk"; + sha256 = "0ymprwyv92pr58851wzryymhfznnpwcbg4m1yri0c9cyzvabwmfk"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index 568afb5040..fd1bfc7f8c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -39,13 +39,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2020.4"; + version = "2020.5"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "0s13cjrpx5r1dc9j9c9924zak45wl9nlbg9hiwgpsal80l92c39n"; + sha256 = "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/pandoc-plantuml-filter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pandoc-plantuml-filter/default.nix new file mode 100644 index 0000000000..61a0f14d59 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/pandoc-plantuml-filter/default.nix @@ -0,0 +1,26 @@ +{ buildPythonApplication +, fetchPypi +, pandocfilters +, lib +}: + +buildPythonApplication rec { + pname = "pandoc-plantuml-filter"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "08673mfwxsw6s52mgglbdz7ybb68svqyr3s9w97d7rifbwvvc9ia"; + }; + + propagatedBuildInputs = [ + pandocfilters + ]; + + meta = with lib; { + homepage = "https://github.com/timofurrer/pandoc-plantuml-filter"; + description = "Pandoc filter which converts PlantUML code blocks to PlantUML images."; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index d11c41195c..e99f2aa12d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200722"; + name = "parallel-20200822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0vqd8nhf4lkvbfy7nnibxjkpzpfandpklqm0hrix5vki5x7x80a8"; + sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 5b139bf492..8689e6467f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.15"; + version = "1.2020.16"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0dvm24ihdr71giz0mihg7wjqf2nrkk7a52vbbzimrvbilaih6s8v"; + sha256 = "0k9dligb0b2kc8rl9k5wp9sh8z1kb8g97v5pfiiwa321lp8y6wpp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index 63acdbfc13..4af7a0009a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "1x4x93c8qqalrhaah1rmrspr4gjcgf1sg6kplf9rg1c42mk672f8"; + sha256 = "16pajhzr4aahyhdzkp9g3ld2insnlk2z2w2pfab8bghw4f69j5xf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix index 96d1a5fc6a..158b56e2a5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix @@ -2,34 +2,29 @@ python3Packages.buildPythonApplication rec { pname = "pubs"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "pubs"; repo = "pubs"; rev = "v${version}"; - sha256 = "16zwdqfbmlla6906g3a57a4nj8wnl11fq78r20qms717bzv211j0"; + sha256 = "0npgsyxj7kby5laznk5ilkrychs3i68y57gphwk48w8k9fvnl3zc"; }; - patches = [ - # Fix for bibtexparser 1.1.0 - (fetchpatch { - url = "https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch"; - sha256 = "1n7zrk119v395jj8wqg8wlymc9l9pq3v752yy3kam9kflc0aashp"; - }) - # Fix test broken by PyYAML 5.1 - (fetchpatch { - url = "https://github.com/pubs/pubs/pull/194/commits/c3cb713ae76528eeeaaeb948fe319a76ab3934d8.patch"; - sha256 = "05as418m7wzs65839bb91b2jrs8l68z8ldcjcd9cn4b9fcgsf3rk"; - }) - ]; - propagatedBuildInputs = with python3Packages; [ - argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 + argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six + beautifulsoup4 ]; checkInputs = with python3Packages; [ pyfakefs mock ddt ]; + # Disabling git tests because they expect git to be preconfigured + # with the user's details. See + # https://github.com/NixOS/nixpkgs/issues/94663 + preCheck = '' + rm tests/test_git.py + ''; + meta = with stdenv.lib; { description = "Command-line bibliography manager"; homepage = "https://github.com/pubs/pubs"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix new file mode 100644 index 0000000000..6ebbeb39c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "rargs"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "lotabout"; + repo = pname; + rev = "v${version}"; + sha256 = "188gj05rbivci1z4z29vwdwxlj2w01v5i4avwrxjnj1dd6mmlbxd"; + }; + + cargoSha256 = "0qzkhx0n28f5wy4fral3adn499q3f10q71cd544s4ghqwqn4khc9"; + + doCheck=false; # `rargs`'s test depends on the deprecated `assert_cli` crate, which in turn is not in Nixpkgs + + meta = with stdenv.lib; { + description = "xargs + awk with pattern matching support"; + homepage = "https://github.com/lolabout/rargs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ pblkt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix index 995a8b5eb1..6be32e2147 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 -, qtbase, qttools, makeWrapper, qmake -, withEspeak ? false, espeak ? null, qt5 }: +{ stdenv, fetchurl, pkgconfig, cryptopp +, libusb1, qtbase, qttools, makeWrapper +, qmake, withEspeak ? false, espeak ? null +, qt5 }: let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { pname = "rockbox-utility"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; - sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; + sha256 = "0zm9f01a810y7aq0nravbsl0vs9vargwvxnfl4iz9qsqygwlj69y"; }; - buildInputs = [ libusb1 qtbase qttools ] + buildInputs = [ cryptopp libusb1 qtbase qttools ] ++ stdenv.lib.optional withEspeak espeak; nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { preConfigure = '' cd rbutil/rbutilqt + lrelease rbutilqt.pro ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index e04d37ba3c..d1aaf23a6e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.2"; + version = "2020.4"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "nuEBEVFqr9J+Nf98GZkvNNYOtpMUjKzYrzCc1T2cR3A="; + sha256 = "019hjmfjhnvlrnb056fvznnsasnyw5awd594aa2126nbsi1j45dc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/sd-mux-ctrl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sd-mux-ctrl/default.nix new file mode 100644 index 0000000000..b87a83fcdf --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/sd-mux-ctrl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake, pkgconfig, libftdi1, popt}: + +stdenv.mkDerivation rec { + pname = "sd-mux-ctrl-unstable"; + version = "2020-02-17"; + + src = fetchgit { + url = "https://git.tizen.org/cgit/tools/testlab/sd-mux"; + rev = "9dd189d973da64e033a0c5c2adb3d94b23153d94"; + sha256 = "0fxl8m1zkkyxkc2zi8930m0njfgnd04a22acny6vljnzag2shjvg"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ libftdi1 popt ]; + + postInstall = '' + install -D -m 644 ../doc/man/sd-mux-ctrl.1 $out/share/man/man1/sd-mux-ctrl.1 + ''; + + meta = with stdenv.lib; { + description = "Tool for controlling multiple sd-mux devices"; + homepage = "https://wiki.tizen.org/SD_MUX"; + license = licenses.asl20; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix new file mode 100644 index 0000000000..312b402ae6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub +, makeWrapper +, curl +, jq +, mpv +}: + +stdenv.mkDerivation rec { + pname = "somafm-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "rockymadden"; + repo = "somafm-cli"; + rev = "v${version}"; + sha256 = "1h5p9qsczgfr450sklh2vkllcpzb7nicbs8ciyvkavh3d7hds0yy"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -m0755 -D src/somafm $out/bin/somafm + wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}"; + ''; + + meta = with stdenv.lib; { + description = "Listen to SomaFM in your terminal via pure bash"; + homepage = "https://github.com/rockymadden/somafm-cli"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix index a1e6f57ce3..90c3c69652 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ stdenv, lib, fetchurl, makeWrapper , dpkg, patchelf , gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd , libXdamage, expat }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ - ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 for binary in StarUML Brackets-node; do ${patchelf}/bin/patchelf \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix index a8376356e8..8433866928 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix @@ -14,8 +14,6 @@ buildGoPackage rec { sha256 = "1iq643brha5q6w2v1hz5l3d1z0pqzqr43gpwih4cnx3m5br0wg2k"; }; - goDeps = ./deps.nix; - # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178 # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time. buildFlagsArray = [ ''-ldflags= diff --git a/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/deps.nix b/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/deps.nix deleted file mode 100644 index 93c984337e..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/deps.nix +++ /dev/null @@ -1,102 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/getlantern/context"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/context"; - rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775"; - sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b"; - }; - } - { - goPackagePath = "github.com/getlantern/errors"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/errors"; - rev = "e24b7f4ff7c70be59bbefca6b7695d68cda8b399"; - sha256 = "1wshagslgl3r07gniq0g55cqgi1j1gk0yrri5ywjz7wm8da42qcr"; - }; - } - { - goPackagePath = "github.com/getlantern/golog"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/golog"; - rev = "cca714f7feb5df8e455f409b549d384441ac4578"; - sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q"; - }; - } - { - goPackagePath = "github.com/getlantern/hex"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/hex"; - rev = "083fba3033ad473db3dd31c9bb368473d37581a7"; - sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77"; - }; - } - { - goPackagePath = "github.com/getlantern/hidden"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/hidden"; - rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7"; - sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi"; - }; - } - { - goPackagePath = "github.com/getlantern/ops"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/ops"; - rev = "37353306c90844c8e0591956f56611f46299d202"; - sha256 = "0q8j2963jqf3p7fcnsfinkvz71mfylrkk2xjar775zjx5a23sa5i"; - }; - } - { - goPackagePath = "github.com/getlantern/systray"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/systray"; - rev = "e31397f8c6928d98a8a9a7e80087aebcf0090beb"; - sha256 = "0ahb6qjd2c43nbbg0ssm76ilbzs9dq43a89f7fj6c029nympjmqn"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/oxtoacart/bpool"; - fetch = { - type = "git"; - url = "https://github.com/oxtoacart/bpool"; - rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6"; - sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "8e24a49d80f82323e1c4db1b5da3e0f31171a151"; - sha256 = "0zsdnyb8dy98jw6f9yn6g5gdhaqwk39hqridr0mh4dhwvwvlj724"; - }; - } -] \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix index 311f43fdb2..4f0677846e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "tealdeer"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "dbrgn"; repo = "tealdeer"; rev = "v${version}"; - sha256 = "0l16qqkrya22nnm4j3dxyq4gb85i3c07p10s00bpqcvki6n6v6r8"; + sha256 = "1f37qlw4nxdhlqlqzzb4j11gsv26abk2nk2qhbzj77kp4v2b125x"; }; - cargoSha256 = "0jvgcf493rmkrh85j0fkf8ffanva80syyxclzkvkrzvvwwj78b5l"; + cargoSha256 = "0g5fjj677qzhw3nw7f3n5gghsj2y811bdclxpy8aq2n58gbwvhvc"; buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/teleconsole/default.nix b/third_party/nixpkgs/pkgs/tools/misc/teleconsole/default.nix index 374bf9b54b..47a792a3f9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/teleconsole/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/teleconsole/default.nix @@ -13,7 +13,16 @@ buildGoPackage rec { sha256 = "01552422n0bj1iaaw6pvg9l1qr66r69sdsngxbcdjn1xh3mj74sm"; }; - goDeps = ./deps.nix; + srcTeleport = fetchFromGitHub { + owner = "gravitational"; + repo = "teleport"; + rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; + sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; + }; + + preBuild = '' + cp -r ${srcTeleport} ./go/src/github.com/gravitational/teleport + ''; CGO_ENABLED = 1; buildFlags = [ "-ldflags" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/teleconsole/deps.nix b/third_party/nixpkgs/pkgs/tools/misc/teleconsole/deps.nix deleted file mode 100644 index f13529d4b2..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/teleconsole/deps.nix +++ /dev/null @@ -1,13 +0,0 @@ -[ - # Teleport v2.0.0-alpha.4 required for build. - # See https://github.com/gravitational/teleconsole/blob/09591f227c2a8df4c68af8bc4adfadfc596f4ed2/Makefile#L8 - { - goPackagePath = "github.com/gravitational/teleport"; - fetch = { - type = "git"; - url = "https://github.com/gravitational/teleport"; - rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; - sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix index 0aba67647e..8df030eafa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,33 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost, binutils }: stdenv.mkDerivation rec { pname = "thin-provisioning-tools"; - version = "0.7.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "jthornber"; repo = "thin-provisioning-tools"; rev = "v${version}"; - sha256 = "175mk3krfdmn43cjw378s32hs62gq8fmq549rjmyc651sz6jnj0g"; + sha256 = "1iwg04rhmdhijmlk5hfl8wvv83115lzb65if6cc1glkkfva8jfjp"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ expat libaio boost ]; - - patches = [ - (fetchpatch { - # a) Fix build if limits.h provides definition for PAGE_SIZE, as musl does w/musl per XSI[1] although it's apparently optional [2]. - # This value is only provided when it's known to be a constant, to avoid the need to discover the value dynamically. - # b) If not using system-provided (kernel headers, or libc headers, or something) use the POSIX approach of querying the value - # dynamically using sysconf(_SC_PAGE_SIZE) instead of hardcoded value that hopefully is correct. - # [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html - # [2] http://www.openwall.com/lists/musl/2015/09/11/8 - url = "https://raw.githubusercontent.com/void-linux/void-packages/a0ece13ad7ab2aae760e09e41e0459bd999a3695/srcpkgs/thin-provisioning-tools/patches/musl.patch"; - sha256 = "1m8r3vhrnsy8drgs0svs3fgpi3mmxzdcqsv6bmvc0j52cvfqvhvy"; - extraPrefix = ""; # empty means add 'a/' and 'b/' - }) - ]; + buildInputs = [ expat libaio boost binutils ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 578d2ba42e..b7b38766db 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "5.4.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1v57dqkrh67cmj1ish650z8yk737hm1qynqr5yv0vlna86gwhrhs"; + sha256 = "0nxqi2rykfxhvn8jzprklsc47iilxp1pmm2f17ikfyf5dgi69whb"; }; - cargoSha256 = "00vxrv8lbdwwbdbaqb4rq0w3bc8n9qwk9zgb1j656lyswib7g1d3"; + cargoSha256 = "05afmz2n006331hc8yi2mq9kj574xi1iq6gr983jj75ix7n40rgg"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix index c07de47e47..91203e5f7b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wootility/default.nix @@ -9,14 +9,14 @@ }: let pname = "wootility"; - version = "3.5.10"; + version = "3.5.12"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage"; - sha256 = "1bhk4jcziis01lyn8dmx93abd6p41gmbrysphcd5810l7zcfz59y"; + sha256 = "13bhckk25fzq9r9cdsg3yqjd4kn47asqdx8kw0in8iky4ri41vnc"; }; profile = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 07dae0b960..e3b64939a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.07.28"; + version = "2020.09.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1if7xyi7g9rpni1jbs7gv5m12s34qdb15dpfbbjn8120h16y7cqz"; + sha256 = "1pkw3hnkddk1kqv0in152q1k4jjgbmf2xvc9j3r5nd38z6f7j6mc"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytree/default.nix index 0400e59d22..b8818ba6e5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytree/default.nix @@ -22,16 +22,6 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'gzip' 'gzip -n' ''; - preBuild = '' - makeFlagsArray+=(CC="cc" - ADD_CFLAGS="" - COLOR="-DCOLOR_SUPPORT" - CLOCK="-DCLOCK_SUPPORT" - READLINE="-DREADLINE_SUPPORT" - CFLAGS="-D_GNU_SOURCE -DWITH_UTF8 $(ADD_CFLAGS) $(COLOR) $(CLOCK) $(READLINE)" - LDFLAGS="-lncursesw -lreadline") - ''; - installFlags = [ "DESTDIR=${placeholder "out"}" ]; preInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 8ebbe75d68..01454b4825 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -20,11 +20,11 @@ let inherit (stdenv) lib; in stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0rbr72741q7fqkr9qmvgj2mi6192ayz7bl935q2bsnqils4wsa3f"; + sha256 = "1yimlaqvhq34gw6wkqgil0qq8x9zbfzh4psqihjr2d9jaa2wygwy"; }; nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index 4740b3ac55..a6b0a93324 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "3.1.0"; + version = "3.1.1"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0nb3qzpggyp61lchvprnklby5mf5n0xpn9z8vlhh99pz1k9sqdq1"; + sha256 = "1yhc8j67phrj5xgx09b5h7c67pgc4wj4jnkmkq0r3s6j7jn43vv8"; }; propagatedBuildInputs = diff --git a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix index b690b63ef4..61746ebfcc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,24 +5,22 @@ buildGoModule rec { pname = "amass"; - version = "3.8.2"; + version = "3.10.3"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0hm5h8glva0d9mj870j56bc721w4br7dzwhns096rgzyv93m7rx0"; + sha256 = "1vjplwjv0vwwxdpbky7i6dz3phl7yfcbr8fwrbsb47bmj0ldkapc"; }; - vendorSha256 = "1g3jbdx7m5m56ifcc1p6hgz2wzmb287cyyaiz03ffdvwd3k73k4j"; - - doCheck = false; + vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w"; outputs = [ "out" "wordlists" ]; postInstall = '' mkdir -p $wordlists - cp -R $src/examples/wordlists/*.txt $wordlists + cp -R examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 31efdaddb7..1048b3e498 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -1,17 +1,29 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.16.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "074bgdgv6flg5xjzk7sxgqsy89ygnx7swhaqz75vvrcpx9ldysvz"; + sha256 = "0qzmkhrg7pqgblmva7xcww6zc4rryba6kkfkhj05mvd31z3c1rz8"; }; - cargoSha256 = "0aq3k64g04l03h42cnnpljqffkkl1gdg6r5rqi237h0jrhci8c7w"; + cargoSha256 = "0iakw42nip0vxq50jjk73r0xl7xp426szb091ap4isad3zxq6saj"; + cargoPatches = [ + # Fixes rDNS support for systems using `systemd-networkd` from v246. + # See https://github.com/imsnif/bandwhich/pull/184 for context + (fetchpatch { + url = "https://github.com/imsnif/bandwhich/commit/19e485a1ce9f749c121d235147e3117cc847379e.patch"; + sha256 = "03hg73gwlfq0l36k3aq7cfak3js7j05ssfpdbfiiwqq7lynm83jr"; + }) + (fetchpatch { + url = "https://github.com/imsnif/bandwhich/commit/35f03b716832fba9a735628d1c728d3e305f75c8.patch"; + sha256 = "1bv837wc1dgg26s640f3lfya28ypnjs0675dykzxxxv5y9ns58l3"; + }) + ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix new file mode 100644 index 0000000000..2caeb437f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "bgpq4"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "bgp"; + repo = pname; + rev = version; + sha256 = "1n6d6xq7vafx1la0fckqv0yjr245ka9dgbcqaz9m6dcdk0fdlkks"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + description = "BGP filtering automation tool"; + homepage = "https://github.com/bgp/bgpq4"; + license = licenses.bsd2; + maintainers = with maintainers; [ vincentbernat ]; + platforms = with platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix b/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix index 0a8ae10eb1..6c8254c797 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { pname = "chrony"; - version = "3.5"; + version = "3.5.1"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf"; + sha256 = "19ywl8a3lb2id7lcna5hp2g4pjnfwdc9ihr0fk6i9m45vdq2za0v"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix b/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix index 82c9db9043..ea03f8878b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix @@ -1,7 +1,14 @@ -{ stdenv, python3Packages }: +{ stdenv, python3 }: let - inherit (python3Packages) buildPythonApplication fetchPypi iowait psutil pyzmq tornado_4 mock; + python = python3.override { + self = python; + packageOverrides = self: super: { + tornado = super.tornado_4; + }; + }; + + inherit (python.pkgs) buildPythonApplication fetchPypi iowait psutil pyzmq tornado mock six; in buildPythonApplication rec { @@ -23,7 +30,7 @@ buildPythonApplication rec { doCheck = false; # weird error - propagatedBuildInputs = [ iowait psutil pyzmq tornado_4 ]; + propagatedBuildInputs = [ iowait psutil pyzmq tornado six ]; meta = with stdenv.lib; { description = "A process and socket manager"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix index c26af7743c..4447ab0f04 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny"; + sha256 = "0cbbih035h40hhl7ykmyh9q9nzdqq1p8hmvzd4358cigz1gjc3j2"; }; - vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh"; + vendorSha256 = "0s7mhbjfpfmzqf48d7k0d416m39x6fh5ds4q3xnvhcfx5kmdymq6"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index 9658fd5e46..29bc6140b5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.0.12"; + version = "8.3.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0j0cdxblh0h68a55jvljzahj851yba354xv2w5gg9hjzjd38769x"; + sha256 = "118lx0phq68rxv71s5gy00qzzrp00qwh6kr85dx83nn1sbp54xx9"; }; - vendorSha256 = "1d6gg7c0rb45zy9rilacn2xyr3kcb7acsh389hk6lppipmhpzr5a"; + vendorSha256 = "0qfrc3c4fsg3w2zcpdr93ilknxhshcysvin029va154sq3zmggbn"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix index 9a8a245a79..8e151bc2ea 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.71.1"; + version = "7.72.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "097jnkbayscifgzgl7v8kwd7m2crpvbyaazac3ab1yal0pca8llx"; + sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix index b2c4d46a8c..f8147cb161 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "curlie"; - version = "1.3.1"; + version = "1.5.4"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "09v8alrbw6qva3q3bcqxnyjm7svagfxqvhdff7cqf5pbmkxnhln9"; + sha256 = "0z92gz39m0gk8j7l2nwa5vrfr3mq160vr1b15sy13jwi1zspc7hx"; }; - vendorSha256 = "1mxgf004czf65a2mv99gfp27g98xhllmfcz4ynfv66nfkbfz6a8n"; + vendorSha256 = "1qnl15b9cs6xi8z368a9n34v3wr2adwp376cjzhyllni7sf6v1mm"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index c3d07ddca9..c811920969 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -65,7 +65,7 @@ in buildGoPackage rec { wrapProgram "$out/bin/agent" \ --set PYTHONPATH "$out/${python.sitePackages}" \ - --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib + --prefix LD_LIBRARY_PATH : ${lib.getLib systemd}/lib ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix index 63e19e924f..a3d819e8dc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsperf/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.3.1"; + version = "2.3.4"; # The same as the initial commit of the new GitHub repo (only readme changed). src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "0yxwm5xi9ry154ayzn2h27bnwwc202bsna8h6i4a65pn76nrn81w"; + sha256 = "1lyci2vdl6g0s5pqs7dkq7pxdahcpkzh614wmy5fwi2f3334y0d1"; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 52c7161f8e..8f279ff688 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.29.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "164l97x1g20a61jkb2dwwmf63md3np9x2m59dri3qf22k4rl4l0d"; + sha256 = "14iwwg1iqfxjhpw9p3ddq53l901v9l9n2r60q9q6jls8hfqcgsnj"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix index 07c7dda644..2caf18d9a4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "0v6m0c329wmba2fihnqvrmfnrb5b1l4nm6xr0dsjiwsjpclrmy86"; + sha256 = "112w4x79zywy6i5vfr04057p9vschflhdhs7b2mhkcba5gigkrxx"; }; - cargoSha256 = "130kjjig5jsv3kdywj6ag2s55d5hwsslpcnaanrqyl70a6pvgpb2"; + cargoSha256 = "1bfbg5fzwp8drm0vp16503qd5mgjfw7z9p292xgdx0i20s4wfrkk"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix b/third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix new file mode 100644 index 0000000000..3daa6a983b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/goreplay/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, libpcap }: + +buildGoPackage rec { + pname = "goreplay"; + version = "1.1.0"; + rev = "v${version}"; + + goPackagePath = "github.com/buger/goreplay"; + + src = fetchFromGitHub { + inherit rev; + owner = "buger"; + repo = "goreplay"; + sha256 = "07nsrx5hwmk6l8bqp48gqk40i9bxf0g4fbmpqbngx6j5f7lpbk2n"; + }; + + buildInputs = [ libpcap ]; + + meta = { + homepage = "https://github.com/buger/goreplay"; + license = stdenv.lib.licenses.lgpl3Only; + description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic."; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix b/third_party/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix index 262234ca67..a736aa4df1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/guardian-agent/default.nix @@ -20,6 +20,7 @@ buildGoPackage rec { goPackagePath = "github.com/StanfordSNR/guardian-agent"; + deleteVendor = true; goDeps = ./deps.nix; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/hping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hping/default.nix index 1ef02b599e..daa0ba38e9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/hping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/hping/default.nix @@ -1,50 +1,41 @@ -{ stdenv, fetchurl, libpcap, tcl }: +{ stdenv, fetchFromGitHub, libpcap, withTcl ? true, tcl }: stdenv.mkDerivation rec { pname = "hping"; - version = "20051105"; + version = "2014-12-26"; - src = fetchurl { - url = "http://www.hping.org/hping3-${version}.tar.gz"; - sha256 = "1s5f9xd1msx05ibhwaw37jmc7l9fahcxxslqz8a83p0i5ak739pm"; + src = fetchFromGitHub { + owner = "antirez"; + repo = pname; + rev = "3547c7691742c6eaa31f8402e0ccbb81387c1b99"; # there are no tags/releases + sha256 = "0y0n1ybij3yg9lfgzcwfmjz1sjg913zcqrv391xx83dm0j80sdpb"; }; - buildInputs = [ libpcap tcl ]; + buildInputs = [ libpcap ] ++ stdenv.lib.optional withTcl tcl; - configurePhase = '' - MANPATH="$out/share/man" ./configure - sed -i -r -e 's|/usr(/s?bin)|'"$out"'\1|g' Makefile - ''; - - TCLSH = "${tcl}/bin/tclsh"; - - prePatch = '' - sed -i -e '/#if.*defined(__i386__)/a \ - || defined(__x86_64__) \\ - ' bytesex.h - - sed -i -e 's|#include.*net/bpf.h|#include |' \ + postPatch = '' + substituteInPlace Makefile.in --replace "gcc" "$CC" + substituteInPlace version.c --replace "RELEASE_DATE" "\"$version\"" + '' + stdenv.lib.optionalString stdenv.isLinux '' + sed -i -e 's|#include |#include |' \ libpcap_stuff.c script.c - - sed -i -r -e 's|"(/usr/(local/)?)?bin/"|"${tcl}/bin"|g' \ - -e 's!/usr/(local/)?(lib|include)!${tcl}/\2!g' \ - configure ''; - preInstall = '' - mkdir -vp "$out/sbin" "$out/share/man/man8" - ''; + configureFlags = [ (if withTcl then "TCLSH=${tcl}/bin/tclsh" else "--no-tcl") ]; - postInstall = '' - ln -vs hping3.8.gz "$out/share/man/man8/hping.8.gz" - ln -vs hping3.8.gz "$out/share/man/man8/hping2.8.gz" + installPhase = '' + install -Dm755 hping3 -t $out/sbin + ln -s $out/sbin/hping3 $out/sbin/hping + ln -s $out/sbin/hping3 $out/sbin/hping2 + install -Dm644 docs/hping3.8 -t $out/share/man/man8 + ln -s hping3.8.gz $out/share/man/man8/hping.8.gz + ln -s hping3.8.gz $out/share/man/man8/hping2.8.gz ''; meta = with stdenv.lib; { description = "A command-line oriented TCP/IP packet assembler/analyzer"; homepage = "http://www.hping.org/"; - license = licenses.gpl2; - platforms = platforms.all; - broken = stdenv.isDarwin; + license = licenses.gpl2Only; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix index 681d5d0e7a..4371d37391 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -2,11 +2,11 @@ let wrapper = stdenv.mkDerivation rec { pname = "wrapper"; - version = "3.5.35"; + version = "3.5.43"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2"; + sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b"; }; buildInputs = [ jdk ]; @@ -32,11 +32,11 @@ in stdenv.mkDerivation rec { pname = "i2p"; - version = "0.9.42"; + version = "0.9.47"; src = fetchurl { url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2"; - sha256 = "04y71hzkdpjzbac569rhyg1zfx37j0alggbl9gnkaqfbprb2nj1h"; + sha256 = "0krcdm73qing7z918wpml9sk6dn0284wps2ghkmlrdaklfkavk6v"; }; buildInputs = [ jdk ant gettext which ]; @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { homepage = "https://geti2p.net"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ maintainers.joelmo ]; + maintainers = with maintainers; [ joelmo ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2p/i2p.patch b/third_party/nixpkgs/pkgs/tools/networking/i2p/i2p.patch index 74031eb7ae..3bb4da7291 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2p/i2p.patch +++ b/third_party/nixpkgs/pkgs/tools/networking/i2p/i2p.patch @@ -19,7 +19,7 @@ index eb4995dfe..0186cede3 100644 # Try using the Java binary that I2P was installed with. # If it's not found, try looking in the system PATH. --JAVA=$(which %JAVA_HOME/bin/java || which java) +-JAVA=$(which "%JAVA_HOME"/bin/java || which java) +JAVA=%JAVA% if [ -z $JAVA ] || [ ! -x $JAVA ]; then diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index b686ea4d04..08c40a4ac8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub , boost, zlib, openssl , upnpSupport ? true, miniupnpc ? null -, aesniSupport ? false -, avxSupport ? false +, aesniSupport ? stdenv.hostPlatform.aesSupport +, avxSupport ? stdenv.hostPlatform.avxSupport }: assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.32.1"; + version = "2.33.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "15ng2c7i3jxmhpc2q0dl8arc72qbsq9y9paz5hgln907yy7dqx7c"; + sha256 = "1zsp4pml5pq8p1ipvarnlcfwcscch13iz1gzza5qm0yl01dl9qpk"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipgrep/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipgrep/default.nix index 6ea930fcca..d9fc41e94b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ipgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ipgrep/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - version = "1.0"; +python3Packages.buildPythonApplication rec { + version = "1.0.1"; pname = "ipgrep"; + disabled = python3Packages.isPy27; + src = fetchFromGitHub { owner = "jedisct1"; repo = pname; rev = version; - sha256 = "1qaxvbqdalvz05aplhhrg7s4h7yx4clbfd50k46bgavhgcqqv8n3"; + hash = "sha256-NrhcUFQM+L66KaDRRpAoC+z5s54a+1fqEepTRXVZ5Qs="; }; patchPhase = '' - mkdir -p ${pname} + mkdir -p ${pname} substituteInPlace setup.py \ --replace "'scripts': []" "'scripts': { '${pname}.py' }" ''; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ pycares urllib3 requests diff --git a/third_party/nixpkgs/pkgs/tools/networking/kail/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kail/default.nix index e7c9b49967..497afb459e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kail/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kail/default.nix @@ -20,6 +20,7 @@ buildGoPackage rec { # git checkout # dep init # dep2nix + deleteVendor = true; goDeps = ./deps.nix; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix index 076953161a..11ebe228be 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.0.20"; + version = "2.1.3"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "0ijzw56hbac24dhrgjd0hjgf45072imyzq3mcgsirdl3xqjc6x12"; + sha256 = "1zdfvicpll7a5iw6p12pmdcg8y30mr0j5miycn0nhjp8yzi9hdc5"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix index 3bd61a0bd4..53568615a6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lftp"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz" "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz" ]; - sha256 = "0jq2g8h1bx06ya9fsja748vwb2qrca4wsfrgi3fmaa8hznpgqsar"; + sha256 = "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix index 6f94e0c63c..e4f2f16857 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, python2Packages, gettext }: +{ stdenv, lib, fetchFromGitHub, python3Packages, gettext }: -python2Packages.buildPythonApplication rec { +with python3Packages; + +buildPythonApplication rec { pname = "linkchecker"; - version = "9.4.0"; + version = "unstable-2020-08-15"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "1vbwl2vb8dyzki27z3sl5yf9dhdd2cpkg10vbgaz868dhpqlshgs"; + rev = "0086c28b3a419faa60562f2713346996062c03c2"; + sha256 = "0am5id8vqlqn1gb9jri0vjgiq5ffgrjq8yzdk1zc98gn2n0397wl"; }; nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = [ ConfigArgParse argcomplete + beautifulsoup4 dnspython pyxdg requests ]; - checkInputs = with python2Packages; [ + checkInputs = [ parameterized pytest ]; @@ -29,21 +32,14 @@ python2Packages.buildPythonApplication rec { postPatch = '' sed -i 's/^requests.*$/requests>=2.2/' requirements.txt sed -i "s/'request.*'/'requests >= 2.2'/" setup.py - sed -i 's~/usr/lib/python2.7/argparse.py~~g' po/Makefile ''; checkPhase = '' - runHook preCheck - - # the mime test fails for me... - rm tests/test_mimeutil.py ${lib.optionalString stdenv.isDarwin '' # network tests fails on darwin rm tests/test_network.py ''} - make test PYTESTOPTS="--tb=short" TESTS="tests/test_*.py tests/logger/test_*.py" - - runHook postCheck + pytest --ignore=tests/checker/{test_telnet,telnetserver}.py -k 'not TestLoginUrl' ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 935cadbd7b..9cf5f91cd6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -115,6 +115,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/mailutils/"; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = platforms.gnu ++ platforms.linux; + platforms = platforms.gnu ++ platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix deleted file mode 100644 index b9d873fad6..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/mitmproxy/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, fetchpatch }: - -with python3Packages; - -buildPythonPackage rec { - pname = "mitmproxy"; - version = "5.1.1"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "1lirlckpvd3c6s6q3p32w4k4yfna5mlgr1x9g39lhzzq0sdiz3lk"; - }; - - postPatch = '' - # remove dependency constraints - sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py - ''; - - doCheck = (!stdenv.isDarwin); - - # examples.complex.xss_scanner doesn't import correctly with pytest5 - checkPhase = '' - export HOME=$(mktemp -d) - export LC_CTYPE=en_US.UTF-8 - pytest --ignore test/examples \ - -k 'not test_find_unclaimed_URLs and not test_tcp' - ''; - - propagatedBuildInputs = [ - blinker brotli certifi cffi - click cryptography flask h11 - h2 hpack hyperframe itsdangerous - jinja2 kaitaistruct ldap3 markupsafe - passlib protobuf publicsuffix2 pyasn1 - pycparser pyopenssl pyparsing pyperclip - ruamel_yaml setuptools six sortedcontainers - tornado urwid werkzeug wsproto zstandard - ]; - - checkInputs = [ - beautifulsoup4 flask pytest - requests glibcLocales - asynctest parver pytest-asyncio - hypothesis - ]; - - meta = with stdenv.lib; { - description = "Man-in-the-middle proxy"; - homepage = "https://mitmproxy.org/"; - license = licenses.mit; - maintainers = with maintainers; [ fpletz kamilchm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix index 533f2adab7..6264672cfa 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mozwire/default.nix @@ -1,18 +1,19 @@ { rustPlatform, stdenv, fetchFromGitHub, Security }: + rustPlatform.buildRustPackage rec { pname = "MozWire"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "NilsIrl"; repo = pname; rev = "v${version}"; - sha256 = "1slfb6m22vzglnrxahlhdcwzwpf3b817mskdx628s92mjzngzyih"; + sha256 = "07icgswmfvrvlm3mkm78pbbk6m2hb73j7ffj7r77whzb11v027v1"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0b00j8vn1vvvphcyv8li7i73pq66sq6dr4wc1w4s3pppa151xr55"; + cargoSha256 = "10lhz7bdlfqj7wgsqnsxdfskms33pvj176fhf4kwci7nb8vgai4b"; meta = with stdenv.lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix index 98fa6cc29f..d8c37ff587 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ncftp/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' + find -name Makefile.in | xargs sed -i '/^TMPDIR=/d' + find . -name '*.sh' -or -name '*.in' -or -name '*.c' -or -name configure | xargs sed -i \ -e 's@/bin/ls@${coreutils}/bin/ls@g' \ -e 's@/bin/rm@${coreutils}/bin/rm@g' diff --git a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix index e9772b193d..f02370ab69 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oneshot"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2"; + sha256 = "11xmvqj7md970rjhkg1zj2w6yqpw6cj83aw37a82sfdn90kyhg9d"; }; - vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy"; + vendorSha256 = "1cxr96yrrmz37r542mc5376jll9lqjqm18k8761h9jqfbzmh9rkp"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index a5e46c6bc5..40fc9e9066 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -29,6 +29,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/adrienverge/openfortivpn"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix index 1748a2d21d..64e6757891 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = if hpnSupport then fetchurl { url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "0lwr7xzhy8m4y0vzi1a78ddhag3qp6cba0c37mnhivbhb67dkywp"; + sha256 = "1ssdwgdxnvjwigisqi8c053znps5a4jf7bzsi99y0xyfzbw0x55k"; } else fetchurl { diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix deleted file mode 100644 index eccf38f39f..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/seeks/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ fetchgit, stdenv, zlib, bzip2, docbook2x, pcre, curl, libxml2, libevent, perl -, pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv, autoconf, automake -, libtool, seeks_confDir ? "" -}: - -stdenv.mkDerivation { - name = "seeks-0.4.1"; - - src = fetchgit { - url = "git://github.com/beniz/seeks.git"; - rev = "1168b3a2f3111c3fca31dd961135194c3e8df5fd"; - sha256 = "18s2pxal9a2aayv63hc19vnkx5a5y9rhbipdpvkinbni5283iiar"; - }; - - buildInputs = - [ zlib bzip2 docbook2x pcre curl libxml2 libevent perl pkgconfig - protobuf tokyocabinet tokyotyrant opencv autoconf automake libtool - ]; - - configureFlags = - [ # Enable the built-in web server providing a web search interface. - "--enable-httpserv-plugin=yes" - "--with-libevent=${libevent.dev}" - ]; - - preConfigure = '' - ./autogen.sh - ''; - - postInstall = stdenv.lib.optionalString (seeks_confDir != "") '' - ln -svf ${seeks_confDir}/config $out/etc/seeks/config - ln -svf ${seeks_confDir}/cf-config $out/etc/seeks/cf-config - ln -svf ${seeks_confDir}/httpserv-config $out/etc/seeks/httpserv-config - ln -svf ${seeks_confDir}/img-websearch-config $out/etc/seeks/img-websearch-config - ln -svf ${seeks_confDir}/lsh-config $out/etc/seeks/lsh-config - ln -svf ${seeks_confDir}/query-capture-config $out/etc/seeks/query-capture-config - ln -svf ${seeks_confDir}/udb-service-config $out/etc/seeks/udb-service-config - ln -svf ${seeks_confDir}/uri-capture-config $out/etc/seeks/uri-capture-config - ln -svf ${seeks_confDir}/websearch-config $out/etc/seeks/websearch-config - ''; - - # FIXME: Test suite needs . - doCheck = false; - - meta = { - description = "Seeks, a social web search engine"; - - longDescription = - '' Seeks is a free and open technical design and application for - enabling social websearch. Its specific purpose is to regroup users - whose queries are similar so they can share both the query results - and their experience on these results. On this basis, Seeks allows - for true real-time, decentralized, websearch to emerge. - - In the long term, there is no need for web crawlers and third-party - web indexes as users can push content directly to search groups. - ''; - - license = stdenv.lib.licenses.agpl3Plus; - - homepage = "http://www.seeks-project.info/"; - - maintainers = [ - stdenv.lib.maintainers.matejc - ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice - broken = true; # 2018-04-11 - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix b/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix index c6b479dd25..4939e75661 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix @@ -2,14 +2,14 @@ , pkgconfig, libsoup, meson, ninja }: let - version = "2.4"; + version = "2.5"; in stdenv.mkDerivation rec { pname = "phodav"; inherit version; src = fetchurl { url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; - sha256 = "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx"; + sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix index ab5ff481ec..e2a0c900c5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "radsecproxy"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "12pvwd7v3iswki3riycxaiiqxingg4bqnkwc5ay3j4n2kzynr1qg"; + sha256 = "1g7q128cip1dac9jad58rd96afx4xz7x7vsiv0af8iyq2ivqvs2m"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix index 5f7247248e..d1cc334577 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix @@ -15,7 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlags = [ "--tags" "release" ]; + buildFlagsArray = [ + "-ldflags=-X main.tag=v${version}" + ]; meta = with stdenv.lib; { description = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix index 7ad0f1e862..22b291ec44 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "shadowsocks-libev"; - version = "3.3.4"; + version = "3.3.5"; # Git tag includes CMake build files which are much more convenient. src = fetchFromGitHub { owner = "shadowsocks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "05f1vvd0r0wanbb61rf4p6y991jp7625l0i223v23r2ji43y3i5a"; + sha256 = "1iqpmhxk354db1x08axg6wrdy9p9a4mz0h9351i3mf3pqd1v6fdw"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index bbc054f874..9726cde61e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.14"; + version = "1.8.18"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "0fcpmdshl52lg44b94h7pbikq91ppvmkdgd8993hgvzjyl0pchs5"; + sha256 = "1kxf0qcyg5mhddrzwv0hd1fy901wl0ydmxi6b1k2217xmgiyi2s6"; }; - cargoSha256 = "1vvcsadp2kycqjsmgy48szxzqg6s1jpdlzppfgffm8r71dcppyjj"; + cargoSha256 = "0vmd4sjagyhrc7q7fszwcjh4nhhmhckmx48i1h2xhr68bwncmyif"; SODIUM_USE_PKG_CONFIG = 1; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix new file mode 100644 index 0000000000..be3a2f77d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "shadowsocks-v2ray-plugin"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "shadowsocks"; + repo = "v2ray-plugin"; + rev = "v${version}"; + sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; + }; + + vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; + + meta = with lib; { + description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; + homepage = "https://github.com/shadowsocks/v2ray-plugin/"; + license = licenses.mit; + maintainers = [ maintainers.ahrzb ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix index 21b6bd346f..7e85973cbd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "siege-4.0.6"; + name = "siege-4.0.7"; src = fetchurl { url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "03w0iska74nb6r8wnljn7inasbq7qflf55vjmxnb9jrc4pi7mpnw"; + sha256 = "1y3dnl1ziw0c0d4nw30aj0sdmjvarn4xfxgfkswffwnkm8z5p9xz"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 93367ea267..60cb341325 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) podman; }; meta = with stdenv.lib; { homepage = "https://github.com/rootless-containers/slirp4netns"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/toss/default.nix b/third_party/nixpkgs/pkgs/tools/networking/toss/default.nix new file mode 100644 index 0000000000..9752dcc4f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/toss/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "toss"; + version = "1.1"; + src = fetchFromGitHub { + owner = "zerotier"; + repo = pname; + rev = version; + sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r"; + }; + preInstall = "export DESTDIR=$out/bin"; + meta = with stdenv.lib; + src.meta // { + description = "Dead simple LAN file transfers from the command line"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ehmry ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix index 5dd5f3c153..f0d2cd9a0d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "14p6jadw4yij45rrwjbyf1lq3zpsni4sph88c6mlwlf8w830s3q8"; + sha256 = "108zx2x5q23cq0fzxmix31xcw62k3r1wlb55612c15ilz9c5xm32"; }; sourceRoot = "source/native"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix index 39a7b11f09..9b33d53e54 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -9,13 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1xqywn2qdmjjq0csrqxh9p2rnizdrr1f99zdx87z7f3fyyc0fbwz"; }; - # https://github.com/NLnetLabs/unbound/pull/90 - postPatch = '' - substituteInPlace validator/val_secalgo.c \ - --replace '&nettle_secp_256r1' 'nettle_get_secp_256r1()' \ - --replace '&nettle_secp_384r1' 'nettle_get_secp_384r1()' - ''; - outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB buildInputs = [ openssl nettle expat libevent ]; @@ -30,6 +23,8 @@ stdenv.mkDerivation rec { "--with-rootkey-file=${dns-root-data}/root.key" "--enable-pie" "--enable-relro-now" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [ + "--disable-flto" ]; installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix index ab3f5eb3ef..fac43cabab 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -1,24 +1,24 @@ -{ callPackage, fetchFromGitHub, fetchurl +{ lib, fetchFromGitHub, fetchurl, linkFarm, buildGoModule, runCommand, makeWrapper, nixosTests , assetOverrides ? {} -, ... } @ args: +}: -callPackage ./generic.nix (rec { - version = "4.26.0"; +let + version = "4.28.2"; src = fetchFromGitHub { owner = "v2ray"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "069wm0n44i4l9pnrhwf60ssld65p6gfj4wfc68hrhj4zi4jvlyds"; + sha256 = "0q2gpnx7nrnrdkc8fq1ghbki8yyh11hs5bw8rb48jsrnigrg73b8"; }; - vendorSha256 = "1520h69z0inbsrw5505cxbinqakvwcrdx3pisrwnp9lv4jsrzzsr"; + vendorSha256 = "1ghpb5ijpmmq1qysjifj6ss1zk1h2l55r6w7l4a01bp8sxncxarc"; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202007080004"; - geoipSha256 = "1j4qg831dhxdy7brgxn4ca69cvwr3zsgizidlzasbkdn2rwai17y"; + geoipRev = "202009160005"; + geoipSha256 = "00hilqqnpfyvxxaiamwmkdpzid763xgig1vk4rxv76npwyixsmj4"; in fetchurl { url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ callPackage ./generic.nix (rec { # MIT licensed "geosite.dat" = let - geositeRev = "20200708125309"; - geositeSha256 = "1pr4137ri3v3r880yx5sqf2p7qfn8g7s555q51x3smkjzkyrskcy"; + geositeRev = "20200918144814"; + geositeSha256 = "08zdw20wdksp96436j3my145qvyvr9a15lj8j4wdagr64iap5nx7"; in fetchurl { url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; @@ -35,4 +35,55 @@ callPackage ./generic.nix (rec { } // assetOverrides; -} // args) + assetsDrv = linkFarm "v2ray-assets" (lib.mapAttrsToList (name: path: { + inherit name path; + }) assets); + + core = buildGoModule rec { + pname = "v2ray-core"; + inherit version src; + + inherit vendorSha256; + + doCheck = false; + + buildPhase = '' + runHook preBuild + + go build -o v2ray v2ray.com/core/main + go build -o v2ctl v2ray.com/core/infra/control/main + + runHook postBuild + ''; + + installPhase = '' + install -Dm755 v2ray v2ctl -t $out/bin + ''; + }; + +in runCommand "v2ray-${version}" { + inherit version; + + buildInputs = [ assetsDrv core ]; + nativeBuildInputs = [ makeWrapper ]; + + meta = { + homepage = "https://www.v2ray.com/en/index.html"; + description = "A platform for building proxies to bypass network restrictions"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ servalcatty ]; + }; + + passthru = { + updateScript = ./update.sh; + tests = { + simple-vmess-proxy-test = nixosTests.v2ray; + }; + }; + +} '' + for file in ${core}/bin/*; do + makeWrapper "$file" "$out/bin/$(basename "$file")" \ + --set-default V2RAY_LOCATION_ASSET ${assetsDrv} + done +'' diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix deleted file mode 100644 index 4499e91425..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/generic.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, linkFarm, buildGoModule, runCommand, makeWrapper - -# Version specific args -, version, src, assets, vendorSha256 -, ... }: - -let - assetsDrv = linkFarm "v2ray-assets" (lib.mapAttrsToList (name: path: { - inherit name path; - }) assets); - - core = buildGoModule rec { - pname = "v2ray-core"; - inherit version src; - - inherit vendorSha256; - - doCheck = false; - - buildPhase = '' - runHook preBuild - - go build -o v2ray v2ray.com/core/main - go build -o v2ctl v2ray.com/core/infra/control/main - - runHook postBuild - ''; - - installPhase = '' - install -Dm755 v2ray v2ctl -t $out/bin - ''; - }; - -in runCommand "v2ray-${version}" { - inherit version; - - buildInputs = [ assetsDrv core ]; - nativeBuildInputs = [ makeWrapper ]; - - meta = { - homepage = "https://www.v2ray.com/en/index.html"; - description = "A platform for building proxies to bypass network restrictions"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ servalcatty ]; - }; - -} '' - for file in ${core}/bin/*; do - makeWrapper "$file" "$out/bin/$(basename "$file")" \ - --set-default V2RAY_LOCATION_ASSET ${assetsDrv} - done -'' diff --git a/third_party/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix new file mode 100644 index 0000000000..9511c214c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/vpn-slice/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonApplication, python3Packages, fetchFromGitHub }: + +buildPythonApplication rec { + pname = "vpn-slice"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "dlenski"; + repo = pname; + rev = "v${version}"; + sha256 = "1z2mdl3arzl95zrj4ir57f762gcimmmq5nk91j679cshxz4snxyr"; + }; + + propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ]; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/dlenski/vpn-slice"; + description = + "vpnc-script replacement for easy and secure split-tunnel VPN setup"; + license = licenses.gpl3; + maintainers = with maintainers; [ jdbaldry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 6cd3682c3f..a9f0d7e77d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200513"; + version = "1.0.20200827"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "1rvnr4hk17xa2sp48icbhdnd3l69fiwwlxnn3587p1slrlms808l"; + sha256 = "1d8rs1g6zy3kz327cc3hzkk5a44278x9p32gxasz6i94bq0b2bs3"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wstunnel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wstunnel/default.nix index 2488d874e6..161b08a7d3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wstunnel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wstunnel/default.nix @@ -2,28 +2,21 @@ , classy-prelude, cmdargs, connection, hslogger, mtl, network , network-conduit-tls, stdenv, streaming-commons, text , unordered-containers, websockets +, hspec, iproute , lib, fetchFromGitHub, fetchpatch }: mkDerivation rec { pname = "wstunnel"; - version = "unstable-2019-01-28"; + version = "unstable-2020-07-12"; src = fetchFromGitHub { owner = "erebe"; repo = pname; - rev = "78cc5a5f1aa4dbcb25fa9b0efc9cfef3640672e4"; - sha256 = "17y3yn7qg1h7jx9xs041sw63g51vyns236f60d2m2mghi49lm9i2"; + rev = "093a01fa3a34eee5efd8f827900e64eab9d16c05"; + sha256 = "17p9kq0ssz05qzl6fyi5a5fjbpn4bxkkwibb9si3fhzrxc508b59"; }; - patches = [ - # Support GHC 8.6 https://github.com/erebe/wstunnel/pull/18 - (fetchpatch { - url = "https://github.com/erebe/wstunnel/commit/8f348fea4dbf75874d5d930334377843763335ab.patch"; - sha256 = "0a66jx7k97j3iyr7j5npbyq1lkhzz74r81mkas4nig7z3hny1gn9"; - }) - ]; - isLibrary = false; isExecutable = true; @@ -31,13 +24,14 @@ mkDerivation rec { async base base64-bytestring binary bytestring classy-prelude connection hslogger mtl network network-conduit-tls streaming-commons text unordered-containers websockets + iproute ]; executableHaskellDepends = [ base bytestring classy-prelude cmdargs hslogger text ]; - testHaskellDepends = [ base text ]; + testHaskellDepends = [ base text hspec ]; homepage = "https://github.com/erebe/wstunnel"; description = "UDP and TCP tunnelling over WebSocket"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/zap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zap/default.nix index 2d8902f690..f12578b273 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zap/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, ant, runtimeShell }: +{ stdenv, fetchFromGitHub, jdk8, ant, runtimeShell }: +let jdk = jdk8; in stdenv.mkDerivation rec { pname = "zap"; version = "2.7.0"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix index 720c43ccc2..945c96ae85 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, deepin }: +{ stdenv, fetchurl, readline }: let version = "1.5c"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { description = "SSH and Telnet client with ZMODEM file transfer capability"; homepage = "http://zssh.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; - maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal + maintainers = [ ]; # required by deepin-terminal platforms = stdenv.lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix b/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix new file mode 100644 index 0000000000..c4d1930a0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, rustPlatform, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "manix"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "mlvzk"; + repo = pname; + rev = "v${version}"; + sha256 = "0fv3sgzwjsgq2h1177r8r1cl5zrfja4ll801sd0bzj3nzmkyww7p"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + + cargoSha256 = "0f2q3bj1cmpbma0fjhc2lc92j4al78fhrx3yc37kmbgzaza0yan5"; + + meta = with stdenv.lib; { + description = "A Fast Documentation Searcher for Nix"; + homepage = "https://github.com/mlvzk/manix"; + license = [ licenses.mpl20 ]; + maintainers = [ maintainers.mlvzk ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix new file mode 100644 index 0000000000..6b825919b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-kcov/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-kcov"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "kennytm"; + repo = pname; + rev = "v${version}"; + sha256 = "0hqplgj3i8js42v2kj44khk543a93sk3n6wlfpv3c84pdqlm29br"; + }; + + cargoSha256 = "1dzm33cfriwgq4zvg6l6y76d5lp9hpcywdkwpl92qyjqg1hx8a1w"; + doCheck = false; + + meta = with lib; { + description = "Cargo subcommand to run kcov to get coverage report on Linux"; + homepage = "https://github.com/kennytm/cargo-kcov"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ saschagrunert ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix index d85a03fe49..62f73565b9 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-update/default.nix @@ -2,11 +2,13 @@ , rustPlatform , fetchFromGitHub , cmake +, pkg-config +, installShellFiles +, ronn , curl , libgit2 , libssh2 , openssl -, pkg-config , Security , zlib }: @@ -25,10 +27,22 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v4.1.1.patch ]; cargoSha256 = "1yaawp015gdnlfqkdmqsf95gszz0h5j1vpfjh763y7kk0bp7zswl"; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; + buildInputs = [ libgit2 libssh2 openssl zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ]; + postBuild = '' + # Man pages contain non-ASCII, so explicitly set encoding to UTF-8. + HOME=$TMPDIR \ + RUBYOPT="-E utf-8:utf-8" \ + ronn -r --organization="cargo-update developers" man/*.md + ''; + + postInstall = '' + installManPage man/*.1 + ''; + meta = with stdenv.lib; { description = "A cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index e569d5a3de..cff6122fe6 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2020-03-17"; + version = "2020-09-06"; src = fetchFromGitHub { - owner = "rycee"; + owner = "nix-community"; repo = "home-manager"; - rev = "5969551a5cc52f9470b5ff5ca01327bf4bda82c1"; - sha256 = "0f4kz83a1kp3ci8zi5hvp8fp34wi73arpykl4d9vlywdk6w36bnd"; + rev = "249650a07ee2d949fa599f3177a8c234adbd1bee"; + sha256 = "0x858b7i15kx74aqwgi2n5ls7zjhcky95z9vbxfdlawmaz371dma"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix index 39b34bf153..0e2cec6852 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.12.1"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "070zgay0cbw6jrkcfp4qql9f9ydd41ilwk39xdrp939b23gp112d"; + sha256 = "0793j35fcv6bbz2pkd5rcsmx37hb1f0y48r4758cbfnl9rbp9y4z"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 41ec023408..18a1da8ce5 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "1q4fzjlaiwsm028cwcw7xgcbdkccw18f2mf1vh7lz42l1bxy8bk4"; + sha256 = "0jmxafvxzqg65zg5cnjd2nsz1mmw06mc7qz3lbs5h2gkxiah8264"; }; - vendorSha256 = "1bsb05qhr9zm8yar8mdi3mw0i5ak1s5x0i8qkz5fd6wcqnsw2jjw"; + vendorSha256 = "0yvzwbm0xb1h45x96h658avbjz9w79aaa6z042xpvjqc4wsr8155"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix index 417962733a..8356e43e2e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-du"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; rev = "v${version}"; - sha256 = "149d60mid29s5alv5m3d7jrhyzc6cj7b6hpiq399gsdwzgxr00wq"; + sha256 = "0h8ya0nn65hbyi3ssmrjarfxadx2sa61sspjlrln8knk7ppxk3mq"; }; - cargoSha256 = "1a6svl89dcdb5fpvs2i32i6agyhl0sx7kkkw70rqr17fyzl5psai"; + cargoSha256 = "0d86bn6myr29bwrzw3ihnzg1yij673s80bm1l8srk2k2szyfwwh5"; doCheck = true; checkInputs = [ nix graphviz ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix index edc8e8bf1a..f1f575a81b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix @@ -21,10 +21,16 @@ in stdenv.mkDerivation rec { }; patches = [ - # Fix compatibility with nixUnstable: https://github.com/msteen/nix-prefetch/pull/8 + # Fix compatibility with nixUnstable + # https://github.com/msteen/nix-prefetch/pull/9 (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/817a7695d98663386fa27a6c04d1617e0a83e1ab.patch"; - sha256 = "1zfgvafg30frwrh56k2wj4g76cljyjylm47ll60ms0yfx55spa7x"; + url = "https://github.com/msteen/nix-prefetch/commit/2722cda48ab3f4795105578599b29fc99518eff4.patch"; + sha256 = "037m388sbl72kyqnk86mw7lhjhj9gzfglw3ri398ncfmmkq8b7r4"; + }) + # https://github.com/msteen/nix-prefetch/pull/12 + (fetchpatch { + url = "https://github.com/msteen/nix-prefetch/commit/de96564e9f28df82bccd0584953094e7dbe87e20.patch"; + sha256 = "0mxai6w8cfs7k8wfbsrpg5hwkyb0fj143nm0v142am0ky8ahn0d9"; }) ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix new file mode 100644 index 0000000000..0ef3602c59 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "nix-template"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jonringer"; + repo = pname; + rev = "v${version}"; + sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig"; + }; + + cargoSha256 = "13y3b60xnry71999kygvkr29gkyjss3ga3rzb43ajah4qp90rsqs"; + + meta = with lib; { + description = "Make creating nix expressions easy"; + homepage = "https://github.com/jonringer/nix-template/"; + changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}"; + license = licenses.cc0; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index 0503677031..2acf5d194e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -195,14 +195,14 @@ in rec { }); nixUnstable = lib.lowPrio (callPackage common rec { - name = "nix-2.4${suffix}"; - suffix = "pre20200721_ff314f1"; + name = "nix-3.0${suffix}"; + suffix = "pre20200829_f156513"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "ff314f186e3f91d87af6ad96c0ae3b472494b940"; - hash = "sha256-QibpLo4/gf2xYGoeQcgjZzH/qy5TBRVH+QCHgqOwur0="; + rev = "f15651303f8596bf34c67fc8d536b1e9e7843a87"; + hash = "sha256-HqM3Z4DLdMrf+0PPZL9ysctGg+K+i3S/IHA1GsJj0Ro="; }; inherit storeDir stateDir confDir boehmgc; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix index 922546009f..935f6553f9 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli"; + sha256 = "0kca4442mla8j9980gi8kgp0vgm0f15hcjd0w0wdj8rlmkx9yf2l"; }; makeWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix index fe7f41c4d0..02bc599f47 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/protontricks/default.nix @@ -1,18 +1,24 @@ -{ stdenv, lib, buildPythonApplication, fetchFromGitHub -, setuptools_scm, vdf -, wine, winetricks, zenity +{ stdenv +, lib +, buildPythonApplication +, fetchFromGitHub +, setuptools_scm +, vdf +, wine +, winetricks +, zenity , pytest }: buildPythonApplication rec { pname = "protontricks"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "083ncg6yjd7s3dx91zd52w166x709mnxknwwr78ggka8d8vlyi0b"; + sha256 = "0ri4phi1rna9snrxa6gl23walyack09mgax7zpjqfpxivwls3ach"; }; # Fix interpreter in mock run.sh for tests @@ -47,7 +53,7 @@ buildPythonApplication rec { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3; - platforms = with platforms; linux; maintainers = with maintainers; [ metadark ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix index fee282de52..8acf57570d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib , pkgconfig, autoreconfHook -, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua +, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages }: stdenv.mkDerivation rec { @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] diff --git a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix index 3fc19c12e8..ad3bb6eeb1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix @@ -2,17 +2,22 @@ , fetchurl , appimageTools , makeWrapper -, electron +, electron_9 , openssl }: +let + electron = electron_9; + +in + stdenv.mkDerivation rec { pname = "1password"; - version = "0.8.0"; + version = "0.8.7"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "1r26vyx724h3k6p340bg3lmcxwyvgxj2kqvwczq784583hpq3lq9"; + sha256 = "1101q5yavzl8imf8gqa3h929gcyy6lh7dy2dw0zs52qdcrb4z49j"; }; nativeBuildInputs = [ makeWrapper ]; @@ -51,6 +56,8 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeLibs}" ''; + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { description = "Multi-platform password manager"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/1password-gui/update.sh b/third_party/nixpkgs/pkgs/tools/security/1password-gui/update.sh new file mode 100755 index 0000000000..7703aba998 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/1password-gui/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused common-updater-scripts + +version="$(curl -sL https://onepassword.s3.amazonaws.com/linux/debian/dists/edge/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)-[0-9]+/\1/p' | head -n1)" +update-source-version _1password-gui "$version" diff --git a/third_party/nixpkgs/pkgs/tools/security/age/default.nix b/third_party/nixpkgs/pkgs/tools/security/age/default.nix index 8a6d008551..4eb88211d6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/age/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/age/default.nix @@ -2,21 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-beta4"; + version = "1.0.0-beta5"; vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; - doCheck = false; - - subPackages = [ - "cmd/age" - "cmd/age-keygen" - ]; - src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "0pp6zn4rdypyxn1md9ppisiwiapkfkbh08rzfl3qwn0998wx6gnb"; + sha256 = "1hdbxd359z8zvnz7h8c4pa16nc7r8db36lx3gpks38lpi0r8hzqk"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix index a8ca38e1f1..17cb0308a1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix @@ -1,4 +1,4 @@ -{ lib +{ stdenv , buildGoModule , fetchFromGitHub , pkg-config @@ -24,9 +24,10 @@ buildGoModule rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; + buildInputs = [ libpcap libusb1 ] + ++ stdenv.lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; - meta = with lib; { + meta = with stdenv.lib; { description = "A man in the middle tool"; longDescription = '' BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more. diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix index 4e087ee631..d10a938ea0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -6,6 +6,7 @@ , makeDesktopItem , makeWrapper , stdenv +, lib , udev , wrapGAppsHook }: @@ -16,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.20.1"; + x86_64-linux = "1.22.1"; }.${system} or ""; sha256 = { - x86_64-linux = "1lywslkpgg9rxwz7kwfknkgdi0r47j14i420r5yxgkaizb7ww27z"; + x86_64-linux = "1pbcrkafyjjcsd27s99g511llkz05d9qkny7g15wp6piyyv89k3n"; }.${system} or ""; meta = with stdenv.lib; { @@ -72,7 +73,7 @@ let ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix index ebf65b0723..c2bb832418 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub +{ stdenv, rustPlatform, fetchFromGitHub, nixosTests , pkgconfig, openssl , Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: @@ -35,6 +35,8 @@ in rustPlatform.buildRustPackage rec { runHook postCheck ''; + passthru.tests = nixosTests.bitwarden; + meta = with stdenv.lib; { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/bitwarden_rs"; diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix index 7c71506c88..8efa1e4bfd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.15.1"; + version = "2.16.0b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1wvpg2awdbpbzhxhrf1iv1mjjc1ah54kswnznc7w5zbh9512dyx8"; + sha256 = "1p10a5rp2ymx675sbigwrkkfjvpk1lz3d43l2p2i1vbw153py3p1"; }; buildCommand = '' @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { mv web-vault vault ''; + passthru.tests = nixosTests.bitwarden; + meta = with stdenv.lib; { description = "Integrates the web vault into bitwarden_rs"; homepage = "https://github.com/dani-garcia/bw_web_builds"; diff --git a/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix b/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix index daeb5e0d39..878e4fc9fe 100644 --- a/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "clevis"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "1p522jjksxmdwjjxa32z2ij1g81ygpkmcx998d07g8pb6rfnknjy"; + sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd"; }; nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/creddump/default.nix b/third_party/nixpkgs/pkgs/tools/security/creddump/default.nix new file mode 100644 index 0000000000..d37c58a515 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/creddump/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitLab, python2, python2Packages }: + +python2Packages.buildPythonApplication rec { + pname = "creddump"; + version = "0.3"; + + src = fetchFromGitLab { + owner = "kalilinux"; + repo = "packages/creddump"; + # url-encoding workaround: https://github.com/NixOS/nixpkgs/issues/65796#issuecomment-517829019 + rev = "debian%2F${version}-1kali2"; # %2F = urlquote("/") + sha256 = "0r3rs2hggsvv619l3fh3c0jli6d3ryyj30ni3hz0nz670z5smzcf"; + }; + + # No setup.py is available + dontBuild = true; + doCheck = false; + propagatedBuildInputs = [ python2Packages.pycrypto ]; + + installPhase = '' + mkdir -p ${placeholder "out"}/bin + cp -r framework ${placeholder "out"}/bin/framework + cp pwdump.py ${placeholder "out"}/bin/pwdump + cp cachedump.py ${placeholder "out"}/bin/cachedump + cp lsadump.py ${placeholder "out"}/bin/lsadump + ''; + + meta = with stdenv.lib; { + description = "Python tool to extract various credentials and secrets from Windows registry hives"; + homepage = "https://gitlab.com/kalilinux/packages/creddump"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.fishi0x01 ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index f3d4c3d9f8..847d5d0caf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.9.1"; + version = "3.10.3"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "1hfl70k4xz3kxylffybixgklv04sl47knbyd96h8rnmnhscniwzl"; + sha256 = "15wmg67wwwgrs8q45r1z98k9v7mf2bfgsa40gcf8dr18ilnfpbn4"; }; vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6"; diff --git a/third_party/nixpkgs/pkgs/tools/security/encryptr/default.nix b/third_party/nixpkgs/pkgs/tools/security/encryptr/default.nix index b4c2bef2cf..62311a41da 100644 --- a/third_party/nixpkgs/pkgs/tools/security/encryptr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/encryptr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype +{ stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype , pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes , libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr , expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin mv -v $out/bin/encryptr{-bin,} cp -v lib* $out/lib - ln -sv ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 + ln -sv ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath $out/lib:${rpath} \ diff --git a/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix b/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix index 6377e829aa..c27f82d705 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, gamin }: +{ stdenv, fetchFromGitHub, python3 }: let version = "0.11.1"; in diff --git a/third_party/nixpkgs/pkgs/tools/security/fierce/default.nix b/third_party/nixpkgs/pkgs/tools/security/fierce/default.nix index 5d12a00081..13146c3373 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fierce/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fierce/default.nix @@ -11,8 +11,16 @@ python3.pkgs.buildPythonApplication rec { sha256 = "11yaz8ap9swx95j3wpqh0b6jhw6spqgfnsyn1liw9zqi4jwgiax7"; }; + postPatch = '' + substituteInPlace requirements.txt --replace 'dnspython==1.16.0' 'dnspython' + ''; + propagatedBuildInputs = [ python3.pkgs.dns ]; + # tests require network access + doCheck = false; + pythonImportsCheck = [ "fierce" ]; + meta = with stdenv.lib; { homepage = "https://github.com/mschwager/fierce"; description = "DNS reconnaissance tool for locating non-contiguous IP space"; diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix b/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix index 7c095cffa3..48271a2f5b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.20"; + version = "2.2.23"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4"; + sha256 = "0p6ss4f3vlkf91pmp27bmvfr5bdxxi0pb3dmxpqljglbsx4mxd8h"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -38,8 +38,10 @@ stdenv.mkDerivation rec { ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch ]; postPatch = '' - sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \ - configure doc/dirmngr.texi doc/gnupg.info-1 + sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 + # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update + sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am + sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in '' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) '' sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 4f90bace89..15ad1c70a8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -1,5 +1,8 @@ -{ stdenv, makeWrapper -, buildGoModule, fetchFromGitHub, installShellFiles +{ stdenv +, makeWrapper +, buildGoModule +, fetchFromGitHub +, installShellFiles , git , gnupg , xclip @@ -9,7 +12,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.9.2"; + version = "1.10.1"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -17,20 +20,22 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "066dphw8xq0g72kj64sdai2yyllnr6ca27bfy5sxhk8x69j97rvz"; + sha256 = "0dhh64mxfhk610wr7bpakzgmc4a4iyhfkkl3qhjp6a46g9iygana"; }; - vendorSha256 = "1wn20bh7ma4pblsf6qnlbz5bx4p9apig3d1yz7cpsqv4z3w07baw"; + vendorSha256 = "07wv6yahx4yzr3h1x93x4r5rvw8wbfk836f04b4r9xjbnpq7lb2a"; doCheck = false; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; - wrapperPath = stdenv.lib.makeBinPath ([ - git - gnupg - xclip - ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard); + wrapperPath = stdenv.lib.makeBinPath ( + [ + git + gnupg + xclip + ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard + ); postInstall = '' for shell in bash fish zsh; do @@ -42,16 +47,18 @@ buildGoModule rec { ''; postFixup = '' - wrapProgram $out/bin/gopass \ - --prefix PATH : "${wrapperPath}" + for bin in $out/bin/*; do + wrapProgram $bin \ + --prefix PATH : "${wrapperPath}" + done ''; meta = with stdenv.lib; { - description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; - homepage = "https://www.gopass.pw/"; - license = licenses.mit; - maintainers = with maintainers; [ andir rvolosatovs ]; - platforms = platforms.unix; + description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ andir rvolosatovs ]; + platforms = platforms.unix; longDescription = '' gopass is a rewrite of the pass password manager in Go with the aim of diff --git a/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix b/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix index f829d56d6f..7c5a2d5a4c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix @@ -13,8 +13,6 @@ buildGoPackage rec { goPackagePath = "github.com/AdRoll/hologram"; - goDeps = ./deps.nix; - preConfigure = '' sed -i 's|cacheTimeout != 3600|cacheTimeout != 0|' cmd/hologram-server/main.go ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/hologram/deps.nix b/third_party/nixpkgs/pkgs/tools/security/hologram/deps.nix deleted file mode 100644 index a9b66da2a9..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/hologram/deps.nix +++ /dev/null @@ -1,110 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; - sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; - }; - } - { - goPackagePath = "github.com/aybabtme/rgbterm"; - fetch = { - type = "git"; - url = "https://github.com/aybabtme/rgbterm"; - rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; - sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"; - }; - } - { - goPackagePath = "github.com/vaughan0/go-ini"; - fetch = { - type = "git"; - url = "https://github.com/vaughan0/go-ini"; - rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; - sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4"; - sha256 = "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"; - }; - } - { - goPackagePath = "github.com/goamz/goamz"; - fetch = { - type = "git"; - url = "https://github.com/goamz/goamz"; - rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; - sha256 = "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"; - }; - } - { - goPackagePath = "github.com/nmcclain/asn1-ber"; - fetch = { - type = "git"; - url = "https://github.com/go-asn1-ber/asn1-ber"; - rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; - sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-asn1-ber/asn1-ber"; - rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; - sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; - }; - } - { - goPackagePath = "github.com/peterbourgon/g2s"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/g2s"; - rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; - sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"; - }; - } - { - goPackagePath = "github.com/nmcclain/ldap"; - fetch = { - type = "git"; - url = "https://github.com/go-ldap/ldap"; - rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29"; - sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "3f8f870ec9939e32b3372abf74d24e468bcd285d"; - sha256 = "0a4hycs3d87s50z4prf5h6918r0fa2rvrrwlbffs430ilc4y8ghv"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix b/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix index ce86e11710..71146b15ea 100644 --- a/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/honggfuzz/default.nix @@ -5,14 +5,20 @@ let honggfuzz = stdenv.mkDerivation rec { pname = "honggfuzz"; - version = "2.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "${version}"; - sha256 = "0ycpx087mhv5s7w01chg2b6rfb3zgfpp9in0x73kpv7y4dcvg7gw"; + sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33"; }; + + postPatch = '' + substituteInPlace hfuzz_cc/hfuzz-cc.c \ + --replace '"clang' '"${clang}/bin/clang' + ''; + enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix b/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix index d6e8a521a2..c177726bbb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; - version = "1628"; + version = "1637"; src = fetchurl { url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; - sha256 = "18wywbsdp5sjrapznk2ydbmx0whz513dhybn1lls24xfl7kp9s58"; + sha256 = "09z3wbv38dc8wnw1q961s6bcd0kvz2xkjp6dxg4kn914fwzlqfnx"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/jwt-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/jwt-cli/default.nix index be3de71f25..728ea0a92d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jwt-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jwt-cli/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "0pmxis3m3madwnmswz9hn0i8fz6a9bg11slgrrwql7mx23ijqf6y"; + sha256 = "07mnkr7hi29fyyyn7llb30p4ndiqz4gf1lnhm44qm09alaxmfvws"; }; - cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2"; + cargoSha256 = "0jkzy7ssg9v9phhlldq6s4rfs3sn17y2r1k0jr10g9j15lzixa04"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + doInstallCheck = true; + installCheckPhase = "$out/bin/jwt --version"; + meta = with stdenv.lib; { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; diff --git a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix index 14f2059cf5..191b4f3515 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1zp4gpbqhivmp7lpm10xb6ahx1z7nsijz7pi5i0bndv0y9mr609p"; + sha256 = "1hjcx651nqj1plxw4i2nv72zc0igd8pl31dy2zwm5yyky6dl7qla"; }; - cargoSha256 = "1inqz4whqw9mb3m22kv44f255m3cjr66pc5ncdw2rgpy3zjh4p3z"; + cargoSha256 = "11fw097r4mim3rgb0db7naqlf3ws0bavqdd4z84mpdg6714dga0n"; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; @@ -27,6 +27,8 @@ rustPlatform.buildRustPackage rec { checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ]; postInstall = '' + mkdir -p $out/share/kbs2 + cp -r contrib/ $out/share/kbs2 for shell in bash fish zsh; do $out/bin/kbs2 --completions $shell > kbs2.$shell installShellCompletion kbs2.$shell diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix index aabe1fcebb..20c1bb8f7f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev +{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev , dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , runtimeShell, gsettings-desktop-schemas }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - udev.lib + (lib.getLib udev) libappindicator-gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix index 0d59c34ee9..5bf7358fa7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix @@ -6,13 +6,13 @@ let in buildPythonApplication rec { pname = "lesspass-cli"; - version = "9.0.0"; + version = "9.1.9"; src = fetchFromGitHub { owner = repo; repo = repo; rev = version; - sha256 = "1mdv0c0fn4d72iigy8hz4s7kf7q3pg4gjjadxwxyjwsalapnsapk"; + sha256 = "126zk248s9r72qk9b8j27yvb8gglw49kazwz0sd69b5kkxvhz2dh"; }; sourceRoot = "source/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/security/minica/default.nix b/third_party/nixpkgs/pkgs/tools/security/minica/default.nix new file mode 100644 index 0000000000..20ae3878a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/minica/default.nix @@ -0,0 +1,34 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "minica"; + version = "1.0.2"; + + goPackagePath = "github.com/jsha/minica"; + + src = fetchFromGitHub { + owner = "jsha"; + repo = "minica"; + rev = "v${version}"; + sha256 = "18518wp3dcjhf3mdkg5iwxqr3326n6jwcnqhyibphnb2a58ap7ny"; + }; + + buildFlagsArray = '' + -ldflags= + -X main.BuildVersion=${version} + ''; + + meta = with lib; { + description = "A simple tool for generating self signed certificates."; + longDescription = '' + Minica is a simple CA intended for use in situations where the CA + operator also operates each host where a certificate will be used. It + automatically generates both a key and a certificate when asked to + produce a certificate. + ''; + homepage = "https://github.com/jsha/minica/"; + license = licenses.mit; + maintainers = with maintainers; [ m1cr0man ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix new file mode 100644 index 0000000000..9eb670102f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix @@ -0,0 +1,76 @@ +{ lib +, rustPlatform +, fetchCrate +, pinentry +, openssl +, pkgconfig +, makeWrapper +, cargo + +# rbw-fzf +, withFzf ? false, fzf, perl + +# rbw-rofi +, withRofi ? false, rofi, xclip + +# pass-import +, withPass ? false, pass +}: + +rustPlatform.buildRustPackage rec { + pname = "rbw"; + version = "0.4.6"; + + src = fetchCrate { + inherit version; + crateName = "${pname}"; + sha256 = "0vq7cwk3i57fvn54q2rgln74j4p9vqm5zyhap94s73swjywicwk0"; + }; + + cargoSha256 = "1h253ncick2v9aki5rf1bdrg5rj3h4nrvx5q01gw03cgwnqvyiiy"; + + nativeBuildInputs = [ + pkgconfig + makeWrapper + ]; + + postPatch = '' + substituteInPlace src/pinentry.rs \ + --replace "Command::new(\"pinentry\")" "Command::new(\"${pinentry}/bin/pinentry\")" + '' + lib.optionalString withFzf '' + patchShebangs bin/rbw-fzf + substituteInPlace bin/rbw-fzf \ + --replace fzf ${fzf}/bin/fzf \ + --replace perl ${perl}/bin/perl + '' + lib.optionalString withRofi '' + patchShebangs bin/rbw-rofi + substituteInPlace bin/rbw-rofi \ + --replace rofi ${rofi}/bin/rofi \ + --replace xclip ${xclip}/bin/xclip + '' + lib.optionalString withRofi '' + patchShebangs bin/pass-import + substituteInPlace bin/pass-import \ + --replace pass ${pass}/bin/pass + ''; + + preConfigure = '' + export OPENSSL_INCLUDE_DIR="${openssl.dev}/include" + export OPENSSL_LIB_DIR="${openssl.out}/lib" + ''; + + postInstall = lib.optionalString withFzf '' + cp bin/rbw-fzf $out/bin + '' + lib.optionalString withRofi '' + cp bin/rbw-rofi $out/bin + '' + lib.optionalString withPass '' + cp bin/pass-import $out/bin + ''; + + meta = with lib; { + description = "Unofficial command line client for Bitwarden"; + homepage = "https://crates.io/crates/rbw"; + license = licenses.mit; + maintainers = with maintainers; [ albakham luc65r ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/rhash/default.nix b/third_party/nixpkgs/pkgs/tools/security/rhash/default.nix index 863b03a117..394dd89484 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rhash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rhash/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { - version = "1.3.9"; + version = "1.4.0"; pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "06i49x1l21h2q7pfnf4crbmjyg8b9ad0qs10ywyyn5sjpi0c21wq"; + sha256 = "18zgr1bjzz8v6rckz2q2hx9f2ssbv8qfwclzpbyjaz0c1c9lqqar"; }; nativeBuildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix new file mode 100644 index 0000000000..2a2e8c7ec6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, nmap +}: + +rustPlatform.buildRustPackage rec { + pname = "rustscan"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "RustScan"; + repo = pname; + rev = "${version}"; + sha256 = "0rkqsh4i58cf18ad97yr4f68s5jg6z0ybz4bw8607lz7cjkfvjay"; + }; + + cargoSha256 = "0mj214f2md7kjknmcayc5dcfmlk2b8mqkn7kxzdis8qv9a5xcbk8"; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")' + ''; + + checkFlags = [ + "--skip=infer_ulimit_lowering_no_panic" + "--skip=google_dns_runs" + "--skip=parse_correct_ips_or_hosts" + ]; + + meta = with lib; { + description = "Faster Nmap Scanning with Rust"; + homepage = "https://github.com/RustScan/RustScan"; + license = licenses.gpl3Only; + maintainers = [ maintainers.SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 940e67013e..fc52662e53 100644 --- a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.26.2"; + version = "2.27.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "0y5gvdrdr6i9spdwsxvzs1bxs32icxpkqxnglp1bf4gglc580d87"; + sha256 = "15ddzab93iqwbvxnaw5wp4dzwlxjqxvyy1c4w37jm69zkczylrmc"; }; runVend = true; - vendorSha256 = "1kzihyx44sx6php4z58fzy6c3g0y713939yzxpgk3n03snn2x8sf"; + vendorSha256 = "1w7vnpv36lhxpaljdhslbckkr7p81nzc91a0503wk8nrrc4ljsyy"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix index 6b389a379d..a54433b92c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -1,32 +1,46 @@ -{ stdenv, fetchFromGitLab, lib, darwin -, git, nettle, llvmPackages, cargo, rustc -, rustPlatform, pkgconfig, glib -, openssl, sqlite, capnproto -, ensureNewerSourcesForZipFilesHook, pythonSupport ? true, pythonPackages ? null +{ stdenv +, fetchFromGitLab +, lib +, darwin +, git +, nettle +# Use the same llvmPackages version as Rust +, llvmPackages_10 +, cargo +, rustc +, rustPlatform +, pkg-config +, glib +, openssl +, sqlite +, capnproto +, ensureNewerSourcesForZipFilesHook +, pythonSupport ? true +, pythonPackages ? null }: assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; - repo = pname; + repo = "sequoia"; rev = "v${version}"; - sha256 = "18acv0185y51yz6jwchi1vf701shz37z5qmnzpq6z419lpjdaskd"; + sha256 = "1870wd03c3x0da9p3jmkvfx8am87ak0dcsvp2qkjvglbl396kd8y"; }; - cargoSha256 = "1jazwpv5mrsd0hxfavk0lvq8n26iglzl8pggw311ysi0lwabjq0y"; + cargoSha256 = "0bb51vdppdjhsxbfy3lyqvw5r5j58r3wi0qb68m2a45k3za7liss"; nativeBuildInputs = [ - pkgconfig + pkg-config cargo rustc git - llvmPackages.libclang - llvmPackages.clang + llvmPackages_10.libclang + llvmPackages_10.clang ensureNewerSourcesForZipFilesHook capnproto ] ++ @@ -54,27 +68,24 @@ rustPlatform.buildRustPackage rec { "build-release" ]; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages_10.libclang}/lib"; - # Please check if this is still needed when updating. - # Exlude tests for sequoia-store, they often error with 'Too many open files' Hydra. - CARGO_TEST_ARGS = " --all --exclude sequoia-store"; + # Sometimes, tests fail on CI (ofborg) & hydra without this + CARGO_TEST_ARGS = "--workspace --exclude sequoia-store"; + # Without this, the examples won't build postPatch = '' - # otherwise, the check fails because we delete the `.git` in the unpack phase - substituteInPlace openpgp-ffi/Makefile \ - --replace 'git grep' 'grep -R' - # Without this, the check fails substituteInPlace openpgp-ffi/examples/Makefile \ --replace '-O0 -g -Wall -Werror' '-g' substituteInPlace ffi/examples/Makefile \ --replace '-O0 -g -Wall -Werror' '-g' ''; + preInstall = lib.optionalString pythonSupport '' export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" '' + lib.optionalString (!pythonSupport) '' - export installFlags="PYTHON=disable" + export makeFlags="PYTHON=disable" ''; # Don't use buildRustPackage phases, only use it for rust deps setup diff --git a/third_party/nixpkgs/pkgs/tools/security/sops/default.nix b/third_party/nixpkgs/pkgs/tools/security/sops/default.nix index 8ec324b354..7557fa6a6d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sops/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sops"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "mozilla"; repo = pname; - sha256 = "01skk6vdfki4a88z0snl1pby09im406qhnsfa0d2l8gp6nz8pq6j"; + sha256 = "0xl53rs8jzq5yz4wi0vzsr6ajsaf2x2n1h3x7krk02a9839y6f18"; }; - vendorSha256 = "0475y95qma5m346ng898n80xv2rxzndx89c9ygjcvjs513yzcba2"; + vendorSha256 = "1cpm06dyc6lb3a9apfggyi16alb2yijvyan1gbrl8r9fwlqvdpjk"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix b/third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix index bad1c9fd16..6c2298f672 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sshguard/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "sshguard"; src = fetchurl { url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz"; - sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06"; + sha256 = "0rrwmx91ifvc61wkld8gjkmfsq0ixxmf7m8fg4addkkxwvk04pc7"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 50a7844356..eb999b5ced 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.5.0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1bdhcsx7hwz4kb68jrrrzlbr7k744g0pym996dq1p5rvz05j3pqc"; + sha256 = "149if5s4rdpxgzakh8s79j1fcfcqk1w7gvgchc044xlicl1r49ic"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index 6b14a83433..b8a70eb82f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -1,30 +1,30 @@ { stdenv, fetchurl, unzip }: let - version = "1.3.0"; + version = "1.5.3"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1crfj4gd1qwwa2xidd0pjffv0n6hf5hbhv6568m6zc1ig0qqm6yq"; + sha256 = "1chhi7piq04j8rgk15rcszqqp37xd9cjj67plr5pgvdps3s1zihy"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0pyf0kyvxpmx3fwfvin1r0x30r9byx9lyi81894q06xrhiwbqc0l"; + sha256 = "0jbnvypapang025wfyj6i70jdz3g29ggg7rzmg8xh6gfyhwk3vmb"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "113vnpz9n6y7z2k9jqpfpxqxqbrmd9bhny79yaxqzkfdqw8vyv3g"; + sha256 = "1m54258lfdr79p2j8janbkhp0a8bs8xbrcr51lqx2s620n7sfbya"; }; i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; - sha256 = "0d191qai0bpl7cyivca26wqgycsj2dz08809z147d1vnrz321v6w"; + sha256 = "038qkkhlwj86fz9vpcycvv5nb41y8mqypqvhfp0ia11birp8xlsr"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1bk5y3knc42mh07gnnn6p109qz908014620h1s0348wp4qfdy49w"; + sha256 = "1vivkwcy9j9zs7w65k7y8chix8jnii5pz8zck6rlpwgz5vs0h04k"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix b/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix index 2751689209..a4505360b5 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.13"; + version = "1.0.25"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "1mrzl5ry5janifykp58gf5g7xw7522wvpp8hgq2hpfx52z6my1bj"; + sha256 = "0sxwrckv2j1283h888pyyxply2g93x6jn6cghqh207igmcg4iaj3"; }; buildInputs = [ makeWrapper ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e "s#/usr/\[local/\]#$out/#g" \ -e "s#/usr/{td}#$out/#g" \ + -e "s#THEME_DIR: str = \"\"#THEME_DIR: str = \"$out/share/bpytop/themes\"#" \ ./bpytop.py ''; diff --git a/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix b/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix index f625a441ba..278ab9056a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix @@ -8,12 +8,12 @@ let plugins = callPackage ./plugins.nix args; in stdenv.mkDerivation rec { - version = "5.11.0"; + version = "5.12.0"; pname = "collectd"; src = fetchurl { url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; - sha256 = "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p"; + sha256 = "1mh97afgq6qgmpvpr84zngh58m0sl1b4wimqgvvk376188q09bjv"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix b/third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix index 838873b755..6c8e9c56cd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ddrescueview/default.nix @@ -1,20 +1,24 @@ { stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk-pixbuf, glib, gtk2, libX11, pango }: -stdenv.mkDerivation rec { - name = "ddrescueview-0.4alpha3"; +let + versionBase = "0.4"; + versionSuffix = "alpha4"; +in stdenv.mkDerivation rec { + pname = "ddrescueview"; + version = "${versionBase}${versionSuffix}"; + name = "ddrescueview-0.4alpha4"; src = fetchurl { - name = "${name}.tar.xz"; - url = "mirror://sourceforge/ddrescueview/ddrescueview-source-0.4%7Ealpha3.tar.xz"; - sha256 = "0603jisxkswfyh93s3i20f8ns4yf83dmgmy0lg5001rvaw9mkw9j"; + name = "ddrescueview-${versionBase}${versionSuffix}.tar.xz"; + url = "mirror://sourceforge/ddrescueview/ddrescueview-source-${versionBase}~${versionSuffix}.tar.xz"; + sha256 = "0v159nlc0lrqznbbwi7zda619is5h2rjk55gz6cl807j0kd19ycc"; }; + sourceRoot = "ddrescueview-source-${versionBase}~${versionSuffix}/source"; nativeBuildInputs = [ fpc lazarus ]; buildInputs = [ atk cairo gdk-pixbuf glib gtk2 libX11 pango ]; - sourceRoot = "source"; - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = '' @@ -24,9 +28,8 @@ stdenv.mkDerivation rec { 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 + mkdir -p "$out/share" + cp -ar applications icons man $out/share ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix index 01fd10d677..170f3109a0 100644 --- a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { - sha256 = "1n0m2w133bpbbpc1imp89xlinmny7xaz1w87cs18p1lnk2w043lc"; + sha256 = "1rink4xxh7f2ckqfl4pc3ljm9rfb5c4npsqzlys4f2snmq4d0h39"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix index 80789681fc..77a85e0147 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.21"; + version = "3.22"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "0v8bq79n2nfnrs8pw2f3a93f8k691dnfzd5qxb5srwak4y2za7hn"; + sha256 = "16p17l1xbqqkgppvwmfaywknhk4ybafnx8hm56ffd8bls9vaqw5m"; }; buildInputs = [ python zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix b/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix index 35fb630d23..76654d1453 100644 --- a/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.5"; + version = "1.6.6"; pname = "freeipmi"; src = fetchurl { url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; - sha256 = "1ncf1s84752xaq07h36wrxa5ww1167s2bizkww0igxv8djyddwk1"; + sha256 = "1ava5s0babfwx6dqi87phzyzjjgyah7avhljrxrjwn2cniwh38yg"; }; buildInputs = [ libgcrypt readline libgpgerror ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix index c9adf5377e..fe4622f338 100644 --- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix @@ -1,23 +1,22 @@ -{ lib, fetchurl, stdenv, ncurses, -IOKit, python3 }: +{ lib, fetchFromGitHub, stdenv, autoreconfHook +, ncurses, IOKit, python3 +}: stdenv.mkDerivation rec { pname = "htop"; - version = "2.2.0"; + version = "3.0.1"; - src = fetchurl { - url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; + src = fetchFromGitHub { + owner = "htop-dev"; + repo = pname; + rev = version; + sha256 = "0kjlphdvwwbj91kk91s4ksc954d3c2bznddzx2223jmb1bn9rcsa"; }; - nativeBuildInputs = [ python3 ]; - buildInputs = - [ ncurses ] ++ - lib.optionals stdenv.isDarwin [ IOKit ]; + nativeBuildInputs = [ autoreconfHook python3 ]; - prePatch = '' - patchShebangs scripts/MakeHeader.py - ''; + buildInputs = [ ncurses + ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index e5316e028d..f1bb1f9d62 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -1,6 +1,7 @@ { stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig , CoreFoundation, IOKit, libossp_uuid , curl, libcap, libuuid, lm_sensors, zlib, fetchpatch +, nixosTests , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -14,14 +15,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.23.2"; + version = "1.25.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1vv92plk9dxk6fl76ik1zralpzc35ymrfyrf1cr6pv8q3agyy5k4"; + sha256 = "0wsgs0slqmj9q5prwlx7d4692lc4c42g0sv35r33vlxnfdwimfh5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -36,12 +37,6 @@ in stdenv.mkDerivation rec { patches = [ ./no-files-in-etc-and-var.patch - ] ++ stdenv.lib.optionals (!stdenv.cc.isGNU) [ - # fix memcpy typo for non-gnu. Remove with the next release. - (fetchpatch { - url = "https://github.com/netdata/netdata/commit/da7f267196b489e9a75724b68897e8f2e6137d72.patch"; - sha256 = "1j2sa06j6v491nw58bjx5nqqyfi1n2n9z3p3jiy4yh74m3asldlv"; - }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; @@ -77,12 +72,13 @@ in stdenv.mkDerivation rec { rm -r $out/sbin ''; + passthru.tests.netdata = nixosTests.netdata; + meta = { description = "Real-time performance monitoring tool"; - homepage = "https://my-netdata.io/"; + homepage = "https://www.netdata.cloud/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; }; - } diff --git a/third_party/nixpkgs/pkgs/tools/system/nvtop/default.nix b/third_party/nixpkgs/pkgs/tools/system/nvtop/default.nix index cd9ec7c708..59636fb5dc 100644 --- a/third_party/nixpkgs/pkgs/tools/system/nvtop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/nvtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }: +{ stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "nvtop"; @@ -6,22 +6,26 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Syllo"; - repo = "nvtop"; + repo = "nvtop"; rev = version; sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4"; }; cmakeFlags = [ "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" - "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so" + "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so" "-DCMAKE_BUILD_TYPE=Release" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ ncurses nvidia_x11 cudatoolkit ]; + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + buildInputs = [ ncurses cudatoolkit ]; + + postFixup = '' + addOpenGLRunpath $out/bin/nvtop + ''; meta = with stdenv.lib; { - description = "A (h)top like like task monitor for NVIDIA GPUs"; + description = "A (h)top like task monitor for NVIDIA GPUs"; homepage = "https://github.com/Syllo/nvtop"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix index 4bbe2bdcee..1814d4b976 100644 --- a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }: +{ stdenv, fetchurl, pkgconfig, zlib, kmod, which +, static ? stdenv.targetPlatform.isStatic +}: stdenv.mkDerivation rec { name = "pciutils-3.7.0"; # with release-date database @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib kmod which ]; makeFlags = [ - "SHARED=yes" + "SHARED=${if static then "no" else "yes"}" "PREFIX=\${out}" "STRIP=" "HOST=${stdenv.hostPlatform.system}" diff --git a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix index 159b41fd1c..69f5237731 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "rocm-smi"; - version = "3.5.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROC-smi"; rev = "rocm-${version}"; - sha256 = "189mpvmcv46nfwshyc1wla6k71kbraldik5an20g4v9s13ycrpx9"; + sha256 = "00g9cbni73x9da05lx7hiffp303mdkj1wpxiavfylr4q4z84yhrz"; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix index f4941df8eb..5d9196fcc1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, autoreconfHook +, mailutils, inetutils , IOKit ? null , ApplicationServices ? null }: let @@ -24,6 +25,10 @@ in stdenv.mkDerivation rec { patches = [ ./smartmontools.patch ]; postPatch = "cp -v ${driverdb} drivedb.h"; + configureFlags = [ + "--with-scriptpath=${stdenv.lib.makeBinPath [ mailutils inetutils ]}" + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/system/storebrowse/default.nix b/third_party/nixpkgs/pkgs/tools/system/storebrowse/default.nix deleted file mode 100644 index 4324fba87e..0000000000 --- a/third_party/nixpkgs/pkgs/tools/system/storebrowse/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, fetchhg, go, sqlite}: - -stdenv.mkDerivation rec { - name = "storebrowse-20130318212204"; - - src = fetchurl { - url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-775928f68e53.tar.gz?uuid=775928f68e53"; - name = "${name}.tar.gz"; - sha256 = "1yb8qbw95d9561s10k12a6lwv3my8h52arsbfcpizx74dwfsv7in"; - }; - - # This source has license BSD - srcGoSqlite = fetchhg { - url = "https://code.google.com/p/gosqlite/"; - rev = "5baefb109e18"; - sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk"; - }; - - buildPhase = '' - PATH=${go}/bin:$PATH - mkdir $TMPDIR/go - export GOPATH=$TMPDIR/go - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "export GOARM=5"} - - GOSQLITE=$GOPATH/src/code.google.com/p/gosqlite - mkdir -p $GOSQLITE - cp -R $srcGoSqlite/* $GOSQLITE/ - export CGO_CFLAGS=-I${sqlite.dev}/include - export CGO_LDFLAGS=-L${sqlite.out}/lib - go build -ldflags "-r ${sqlite.out}/lib" -o storebrowse - ''; - - installPhase = '' - mkdir -p $out/bin - cp storebrowse $out/bin - ''; - - meta = { - homepage = "http://viric.name/cgi-bin/storebrowse"; - license = stdenv.lib.licenses.agpl3Plus; - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix index d9953b7cdb..9939f9ea15 100644 --- a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.14"; + version = "0.11.19"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0sqka2ns9xqma9wa67in4vrd15q0rz62gblmzniq5i4xppykc55j"; + sha256 = "0s08qahjc68h5qhnahmb9z19l51p5sw2pmzrlknq1j5900zpa2x5"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix index c0a94457e6..ae9e29b6f1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -1,34 +1,64 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, dbus, dbus-glib, libxml2, autoconf-archive }: +{ autoconf +, autoconf-archive +, automake +, dbus +, dbus-glib +, docbook_xml_dtd_412 +, docbook-xsl-nons +, fetchFromGitHub +, gtk-doc +, libevdev +, libtool +, libxml2 +, lzma +, pkgconfig +, stdenv +, upower +}: stdenv.mkDerivation rec { pname = "thermald"; - version = "2.2"; + version = "2.3"; + + outputs = [ "out" "devdoc" ]; src = fetchFromGitHub { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "1nrhv3bypyc48h9smj5cpq63rawm6vqyg3cwkhpz69rgjnf1283m"; + sha256 = "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 autoconf-archive ]; + nativeBuildInputs = [ + autoconf + autoconf-archive + automake + docbook-xsl-nons + docbook_xml_dtd_412 + gtk-doc + libtool + pkgconfig + ]; - patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; - - preConfigure = '' - export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" - ./autogen.sh - ''; + buildInputs = [ + dbus + dbus-glib + libevdev + libxml2 + lzma + upower + ]; configureFlags = [ "--sysconfdir=${placeholder "out"}/etc" "--localstatedir=/var" + "--enable-gtk-doc" "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; + preConfigure = "NO_CONFIGURE=1 ./autogen.sh"; + postInstall = '' cp ./data/thermal-conf.xml $out/etc/thermald/ ''; @@ -36,7 +66,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; - license = licenses.gpl2; + changelog = "https://github.com/intel/thermal_daemon/blob/master/README.txt"; + license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix index 6e3024a3f7..084dd044fe 100644 --- a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; rev = version; - sha256 = "04nd5gq49y1k9xxrc9ll155k9j42ivscjzx405qyyxv7dpgyw131"; + sha256 = "0jz0pjibjiyg0rjmpihxxjhg9cbccvqfr5si5rji585l0zrpdwsg"; }; - cargoSha256 = "0ggpr2skl3d47y771npmbbqb9vga4y4iyry3qn0xj2hg9d7msf4l"; + cargoSha256 = "1zkx6sr5xlj7pb91bxvqjib5awscy1rmv4g89xb76dahac8fan6z"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; @@ -21,6 +21,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ bbigras ]; # doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19 + # see https://github.com/NixOS/nixpkgs/pull/88616 platforms = platforms.x86; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/choose/default.nix b/third_party/nixpkgs/pkgs/tools/text/choose/default.nix new file mode 100644 index 0000000000..2619273251 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/choose/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "choose"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "theryangeary"; + repo = pname; + rev = "v${version}"; + sha256 = "0j3861pxqw0lnamb201c7h5w7npzyiwwb6c1xzxjv72m2ccvz76j"; + }; + + cargoSha256 = "1p18926pfff1yayb2i28v0nz37j52hqqv7244yfrzgidi29kyvbc"; + + meta = with stdenv.lib; { + description = "A human-friendly and fast alternative to cut and (sometimes) awk"; + homepage = "https://github.com/theryangeary/choose"; + license = licenses.gpl3; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix new file mode 100644 index 0000000000..ae4e26e2ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "chroma"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "alecthomas"; + repo = "chroma"; + rev = "v${version}"; + sha256 = "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1"; + }; + + vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m"; + + subPackages = [ "cmd/chroma" ]; + + meta = with lib; { + homepage = "https://github.com/alecthomas/chroma"; + description = "A general purpose syntax highlighter in pure Go"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix b/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix new file mode 100644 index 0000000000..c84299c684 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, fetchurl, gzip, libiconv, nkf, perl, skk-dicts, which }: + +stdenv.mkDerivation { + pname = "cmigemo"; + version = "1.3e"; + + src = fetchFromGitHub { + owner = "koron"; + repo = "cmigemo"; + rev = "5c014a885972c77e67d0d17d367d05017c5873f7"; + sha256 = "0xrblwhaf70m0knkd5584iahaq84rlk0926bhdsrzmakpw77hils"; + }; + + nativeBuildInputs = [ gzip libiconv nkf perl which ]; + + postUnpack = '' + cp ${skk-dicts}/share/SKK-JISYO.L source/dict/ + ''; + + patches = [ ./no-http-tool-check.patch ]; + + makeFlags = [ "INSTALL=install" ]; + + buildPhase = if stdenv.isDarwin then "make osx-all" else "make gcc-all"; + + installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ]; + + meta = with stdenv.lib; { + description = "A tool that supports Japanese incremental search with Romaji"; + homepage = "https://www.kaoriya.net/software/cmigemo"; + license = licenses.mit; + maintainers = [ maintainers.cohei ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/cmigemo/no-http-tool-check.patch b/third_party/nixpkgs/pkgs/tools/text/cmigemo/no-http-tool-check.patch new file mode 100644 index 0000000000..518bfa0e61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/cmigemo/no-http-tool-check.patch @@ -0,0 +1,23 @@ +diff --git a/configure b/configure +index 4480261..2fb9b34 100755 +--- a/configure ++++ b/configure +@@ -28,18 +28,6 @@ do + esac + done + +-# Check HTTP access tool +-if CHECK_COMMAND curl ; then +- PROGRAM_HTTP="curl -O" +-elif CHECK_COMMAND wget ; then +- PROGRAM_HTTP="wget" +-elif CHECK_COMMAND fetch ; then +- PROGRAM_HTTP="fetch" +-else +- echo "ERROR: Require one of HTTP access tools (curl, wget or fetch)." +- exit 1 +-fi +- + # Check encoding filter + if CHECK_COMMAND qkc ; then + PROGRAM_ENCODEFILTER="qkc -q -u" diff --git a/third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix b/third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix index 7f706cf137..37336e63ef 100644 --- a/third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix @@ -14,8 +14,6 @@ buildGoPackage rec { sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny"; }; - goDeps = ./deps.nix; - meta = { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; diff --git a/third_party/nixpkgs/pkgs/tools/text/codesearch/deps.nix b/third_party/nixpkgs/pkgs/tools/text/codesearch/deps.nix deleted file mode 100644 index 2d1dad7063..0000000000 --- a/third_party/nixpkgs/pkgs/tools/text/codesearch/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by go2nix. -[ -] diff --git a/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix b/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix index 7a0240fc73..9e02265e2d 100644 --- a/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix @@ -1,37 +1,34 @@ -{ lib, python3, glibcLocales }: +{ lib, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "csvkit"; - version = "1.0.4"; + version = "1.0.5"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1830lb95rh1iyi3drlwxzb6y3pqkii0qiyzd40c1kvhvaf1s6lqk"; + sha256 = "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv"; }; + patches = [ + # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later. + (fetchpatch{ + url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch"; + sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7"; + }) + ]; + propagatedBuildInputs = with python3.pkgs; [ agate agate-excel agate-dbf - # sql test fail with agate-sql-0.5.4 - (agate-sql.overridePythonAttrs(old: rec { - version = "0.5.3"; - src = python3.pkgs.fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "1d6rbahmdix7xi7ma2v86fpk5yi32q5dba5vama35w5mmn2pnyw7"; - };})) + agate-sql six ]; checkInputs = with python3.pkgs; [ - glibcLocales nose + nose pytestCheckHook ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -e test_csvsql - ''; - meta = with lib; { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/discount/default.nix b/third_party/nixpkgs/pkgs/tools/text/discount/default.nix index 5a4dfd5de8..a2c6ec8a9e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/discount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/discount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.2.6"; + version = "2.2.7"; pname = "discount"; src = fetchFromGitHub { owner = "Orc"; repo = pname; rev = "v${version}"; - sha256 = "1y066jkxfas0vdixbqq66j9p00a102sbfgq5gbrblfczqjrmc38w"; + sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7"; }; patches = ./fix-configure-path.patch; diff --git a/third_party/nixpkgs/pkgs/tools/text/gist/default.nix b/third_party/nixpkgs/pkgs/tools/text/gist/default.nix index a4a26e139f..d2676b3799 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gist/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gist/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "gist"; - version = "5.1.0"; - source.sha256 = "0s69y6hi5iq5k6317j1kjmhi3mk586j1543q8wa608grwcmbq3fw"; + version = "6.0.0"; + source.sha256 = "0qnd1jqd7b04871v4l73grcmi7c0pivm8nsfrqvwivm4n4b3c2hd"; meta = with lib; { description = "Upload code to https://gist.github.com (or github enterprise)"; diff --git a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix index 9c0526c3e6..9921862b79 100644 --- a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1awb62y09kbkjhz22mdkrppd6w5aihd3l0ssvpil8c9hg8syjd9g"; + sha256 = "1f1vyhvc31yfxspv5lzw8qjd2w8x74s2fmij1921m307g84qxqbn"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix index 0d5f878af0..277c7417ce 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.20.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-1qxz6p7VaJ9eMcLQaTW/M4+Xo0WLihzyEAycbkjjPyA="; + hash = "sha256-O7LlbSkxcyHQiTHYB/QBJVlShzTSzud3VJDIQ1ScvM4="; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-/mAwlxed1MOFUA1jDSrgPzJuURbKzwucBWORVVHlrt8="; + cargoSha256 = "sha256-pvhYKyFraMI4w5nq6L8qs/ONSNDTHElhZnZmD5mmAZs="; checkInputs = [ ansi2html ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix index ead501763e..28f2c54729 100644 --- a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.8.0"; + version = "5.9.1"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "06y1l730xps196jbnxahmd5alc9ba5m8hakm9sc8hx1q5b9ylfih"; + sha256 = "1i9bcpfjnl2yjnfmf0ar1l62zwq01ph0yylz0dby8k2l7cvq5ci6"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix index b7864b05b6..bfa22a4fd1 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "10.3.0"; + version = "11.0.1"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0c6v7846lmkmbyfla07s35mpba4h09h0fx6pxqf0yvdjxmj46q8c"; + sha256 = "194ds9i1zd80ynzwgv7kprax0crh7bbchayawdcvg2lyr64a82xn"; }; nativeBuildInputs = with python3Packages; [ @@ -76,8 +76,6 @@ buildPythonApplication rec { src = ./liblept.patch; liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"; }) - # https://github.com/jbarlow83/OCRmyPDF/pull/596 - ./0001-Make-compatible-with-pdfminer.six-version-20200720.patch ]; makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/podiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/podiff/default.nix index bee2c7a1a8..b76dfd2256 100644 --- a/third_party/nixpkgs/pkgs/tools/text/podiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/podiff/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "podiff"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.1.tar.gz"; - sha256 = "1zz6bcmka5zvk2rq775qv122lqh54aijkxlghvx7z0r6kh880x59"; + url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.2.tar.gz"; + sha256 = "1l2b4hh53xlx28riigwarzkhxpv1pcz059xj1ka33ccvxc6c20k9"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix index ccd99a272b..05241033c6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "2.3.1"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz"; - sha256 = "04f9za35rwyr7mabk8f8izc0fgvc3sfx45v8dml1xmi634n174ds"; + sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w"; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix index 9a72e023d6..7bd8a74f45 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { installManPage $releaseDir/build/ripgrep-*/out/rg.1 installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish} - installShellCompletion --zsh "$src/complete/_rg" + installShellCompletion --zsh complete/_rg ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix index 43c945ac76..ec58cbdd1a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "shfmt"; @@ -17,6 +17,14 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + patches = [ + # fix failing test on go 1.15, remove with > 3.1.2 + (fetchpatch { + url = "https://github.com/mvdan/sh/commit/88956f97dae1f268af6c030bf2ba60762ebb488a.patch"; + sha256 = "1zg8i7kklr12zjkaxh8djd2bzkdx8klgfj271r2wivkc2x61shgv"; + }) + ]; + meta = with lib; { homepage = "https://github.com/mvdan/sh"; description = "A shell parser and formatter"; diff --git a/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix index 0026150774..5c6025b245 100644 --- a/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix @@ -19,19 +19,18 @@ , ibus , json-glib , pantheon -, libwnck3 , xorg }: stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.3.3"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "0ml57j6jagqvjlpgn1bcyx08h71kcxalh69y03y2lj84x5ib8qz3"; + sha256 = "1db3fbawh4qwdqby5ji4g26pksi4q253r5zvd3kv1m2ljmwrrwj0"; }; nativeBuildInputs = [ @@ -55,7 +54,6 @@ stdenv.mkDerivation rec { dbus ibus json-glib - libwnck3 xorg.libXtst pantheon.granite pantheon.elementary-gtk-theme @@ -83,6 +81,8 @@ stdenv.mkDerivation rec { Save your often used text snippets and then expand them whenever you type their abbreviation. For example:- "spr`" expands to "Snippet Pixie rules!" + + For non-accessible applications such as browsers and Electron apps, there's a shortcut (default is Ctrl+`) for opening a search window that pastes the selected snippet. ''; homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix b/third_party/nixpkgs/pkgs/tools/text/tab/default.nix index f7796c8a32..8a80c7ad10 100644 --- a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/tab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, python2 }: +{ stdenv, fetchFromBitbucket, python3 }: stdenv.mkDerivation rec { version = "7.2"; @@ -11,9 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1bm15lw0vp901dj2vsqx6yixmn7ls3brrzh1w6zgd1ksjzlm5aax"; }; - nativeBuildInputs = [ python2 ]; + checkInputs = [ python3 ]; - doCheck = true; + doCheck = !stdenv.isDarwin; + + preCheck = '' + substituteInPlace Makefile --replace "python2 go2.py" "python go.py" + ''; checkTarget = "test"; @@ -31,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://tkatchev.bitbucket.io/tab/"; license = licenses.boost; maintainers = with maintainers; [ mstarzyk ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix index 3f3cbd8efc..6f44c36026 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "2.5.1"; + version = "2.5.5"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "0z62rqcvcz8iy6ig7y05gn90m0pn99jc0ll9b82kdbr257kz91r1"; + sha256 = "0ba9h0m9c28rllym1djij3b97k4rj06nsgajmbxg5mpxfzplgxy2"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 65b2678dfc..8a63d82eac 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.3.2"; + version = "2.3.4"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0accs8ygg2h5hk8n4d5hs1fpxp9mlbzic6f4dwrygi463z7c3icc"; + sha256 = "0vk7kk2a2891vm46lss8q2893n2zdirlicac2f3xfkrbb5lhkicd"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix new file mode 100644 index 0000000000..12880b2e4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "vgrep"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "vrothberg"; + repo = pname; + rev = "v${version}"; + sha256 = "109j04my2xib8m52a0337996a27nvfgzackpg20zs3nzn66dmvb7"; + }; + + vendorSha256 = null; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + + meta = with lib; { + description = "User-friendly pager for grep/git-grep/ripgrep"; + homepage = "https://github.com/vrothberg/vgrep"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix b/third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix index 9180573541..852175c4f2 100644 --- a/third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/wgetpaste/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { - version = "2.29"; + version = "2.30"; pname = "wgetpaste"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2"; - sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22"; + sha256 = "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73"; }; # currently zsh-autocompletion support is not installed diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix index f875cc2631..7a01dc2ff0 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix @@ -12,7 +12,6 @@ let exes = [ "asciidoctor" "asciidoctor-pdf" - "asciidoctor-safe" "asciidoctor-epub3" ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix index 0d2e8004f5..c518ddeaf3 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.3.1"; + version = "2.4.0"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "0gp45vwm0hl8590014qrxlpw2rycxm7ir819d242mh38v3hdjgkz"; + sha256 = "1bp26x5mhbl25s9djlq6yani1vaqrgbi5mjljhwhj97iapwsd0yb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index a7c6407705..017066a2c2 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.2"; + version = "0.7.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "3ks1jfw4rjm0qb87ask7wx0xx1grxhbpg53r86q74zhsiqqi6xiza2czg75mydmgic1nr9ny43d5p44sl8ihhja9kwdx230nblx1176"; + sha512 = "2iw5x3lf5knnscp0ifgk50yj48p54cbd34h94qrxa9vdybg2nnipklrqmmqblf6l7qph98h7jvlyr99m5qlrki9lvjr1jcgbgp31pn0"; }; nativeBuildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix index 7a4b8010f0..b97652bb4a 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages +{ stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let @@ -6,8 +6,8 @@ let src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; - rev = "v2.2.2+satysfi"; - sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k"; + rev = "v2.3.1+satysfi"; + sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; }); otfm = ocamlPackages.otfm.overrideAttrs (o: { @@ -18,23 +18,29 @@ let sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p"; }; }); - yojson = ocamlPackages.yojson.overrideAttrs (o: { + yojson-with-position = ocamlPackages.buildDunePackage { + pname = "yojson-with-position"; + version = "1.4.2"; src = fetchFromGitHub { owner = "gfngfn"; - repo = "yojson"; - rev = "v1.4.1+satysfi"; - sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp"; + repo = "yojson-with-position"; + rev = "v1.4.2+satysfi"; + sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl"; }; - }); + useDune2 = true; + nativeBuildInputs = [ ocamlPackages.cppo ]; + propagatedBuildInputs = [ ocamlPackages.biniou ]; + inherit (ocamlPackages.yojson) meta; + }; in stdenv.mkDerivation rec { pname = "satysfi"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "gfngfn"; repo = "SATySFi"; rev = "v${version}"; - sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv"; + sha256 = "1y72by6d15bc6qb1lv1ch6cm1i74gyr0w127nnvs2s657snm0y1n"; fetchSubmodules = true; }; @@ -44,11 +50,11 @@ in $out/share/satysfi ''; - nativeBuildInputs = [ ruby dune ]; + nativeBuildInputs = [ ruby dune_2 ]; - buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [ + buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [ ocaml findlib menhir - batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re + batteries camlimages core_kernel ppx_deriving uutf omd cppo re ]); installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index 3b9c0581ec..23432e1d46 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.1.12"; + version = "0.1.15"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; - rev = "v${version}"; - sha256 = "0dycv135bkpf71iwlwh8rwwvn287d605nl7v8mjxlrsayiivdmn9"; + rev = "tectonic@${version}"; + sha256 = "0pzhdfsi4jsj9p5cv8ia4kc4inl7q7jsw694dfyxkcpka6ywyzsh"; }; - cargoSha256 = "1axrf7d01gmhvrap13rydfvwcsg0lk1zw7z1i7zzm898bc7c02qn"; + cargoSha256 = "017f1f49svx4inyv6xjx31lnb7dbl6gzwrrzpfz1gimqvdj2gm6j"; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix index 5fde58251e..1f6939e1b1 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2, libxslt, texlive -, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape_0 ? null, fontconfig ? null, ghostscript ? null +, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions inherit (texlive) scheme-basic epstopdf anysize appendix changebar @@ -16,7 +16,7 @@ assert enableAllFeatures -> imagemagick != null && transfig != null && - inkscape_0 != null && + inkscape != null && fontconfig != null && ghostscript != null; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \ -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \ -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \ - -e 's|cmd = "inkscape|cmd = "${inkscape_0}/bin/inkscape|g' \ + -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \ -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \ -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \ diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index a2651c63e1..cc6763e9ee 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -2,7 +2,7 @@ - source: ../../../../../doc/languages-frameworks/texlive.xml - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive */ -{ stdenv, lib, fetchurl, runCommand, writeText, buildEnv +{ stdenv, lib, fetchurl, fetchpatch, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min , makeWrapper, python, ruby, perl , useFixedHashes ? true @@ -57,6 +57,21 @@ let collection-plaingeneric = orig.collection-plaingeneric // { deps = orig.collection-plaingeneric.deps // { inherit (tl) xdvi; }; }; + + # TODO revert for texlive 2020 + arara = lib.recursiveUpdate orig.arara { + postUnpack = let + arara_jar_fix = fetchpatch { + url = "https://github.com/TeX-Live/texlive-source/commit/dbaf12f4a47dcd62bcc96346f65493fda3fec2c8.diff"; + sha256 = "148knr8k6sm6fpyj31kdq85yxvzvwp1prjha3f07q24kbar2l830"; + }; + in '' + if [ -f "$out"/scripts/arara/arara.sh ]; then + cd "$out"/scripts/ + patch -p4 <${arara_jar_fix} + fi + ''; + }; }); # overrides # tl = diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix index e7ea017ac1..758b24f98e 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix @@ -553,7 +553,7 @@ "adhocfilelist-2019"="l8ayz7mqaa5lma2bvqb2brc879y0viij"; "adhocfilelist.doc-2019"="gm20nhwq88s1cmch3pcgkqnyahb5gnri"; "adhocfilelist.source-2019"="3qx23im0z07cnk2bd5vrskl153zxy6ff"; -"arara-4.0.6"="qk5dq5f0il52m1gp8ckd7ilqbmpkvfmj"; +"arara-4.0.6"="6jhbdl9kh0d7iaq9qrl71kqzrmvvx9ya"; "arara.doc-4.0.6"="rvkrcair91scrk763igaj9mmi23n5j7x"; "arara.source-4.0.6"="s7rlspqx9dqsbixbnmnaz9hh7gwkmkfi"; "asymptote-2.49"="ka921kxzvyq3hi5frln4hh7qg1kfgch7"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix index 31baa431bf..76b9b285d1 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tikzit/default.nix @@ -2,13 +2,13 @@ mkDerivation { pname = "tikzit"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "tikzit"; repo = "tikzit"; - rev = "v2.1.5"; - sha256 = "1xrx7r8b6nb912k91pkdwaz2gijfq6lzssyqxard0591h2mycbcg"; + rev = "v2.1.6"; + sha256 = "0ba99pgv54pj1xvhrwn9db2w0v4h07vsjajcnhpa2smy88ypg32h"; }; nativeBuildInputs = [ qmake qttools flex bison ]; diff --git a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix index f883c423d0..ae7a45b562 100644 --- a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "xiph"; repo = "rav1e"; rev = "v${version}"; - sha256 = "0a9dryag4x35a2c45qiq1j5xk9ydcpw1g6kici85d2yrc2z3hwrx"; + sha256 = "0zwjg0sv504i1ahzfy2jgng6qwmyvcrvdrp4n3s90r4kvwjkv8xs"; }; - cargoSha256 = "1xaincrmpicp0skf9788w5631x1hxvifvq06hh5ribdz79zclzx3"; + cargoSha256 = "1mfzshcbxky27nskxhcyrj99wd3v5f597ymgv7nb67lzp5lsyb24"; nativeBuildInputs = [ nasm cargo-c ]; diff --git a/third_party/nixpkgs/pkgs/tools/video/untrunc/default.nix b/third_party/nixpkgs/pkgs/tools/video/untrunc/default.nix index 728b4ff011..1918f4e597 100644 --- a/third_party/nixpkgs/pkgs/tools/video/untrunc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/untrunc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "untrunc"; - version = "2018.01.13"; + version = "2020.02.09"; src = fetchFromGitHub { owner = "ponchio"; repo = "untrunc"; - rev = "3a2e6d0718faf06589f7b9d95c8f966348e537f7"; - sha256 = "03ka4lr69k7mikfpcpd95smzdj62v851ididnjyps5a0j06f8087"; + rev = "4eed44283168c727ace839ff7590092fda2e0848"; + sha256 = "0nfj67drc6bxqlkf8a1iazqhi0w38a7rjrb2bpa74gwq6xzygvbr"; }; buildInputs = [ gcc libav_12 ]; diff --git a/third_party/nixpkgs/pkgs/tools/video/vcsi/default.nix b/third_party/nixpkgs/pkgs/tools/video/vcsi/default.nix new file mode 100644 index 0000000000..84e6c2e6d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/video/vcsi/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, ffmpeg }: + +python3Packages.buildPythonApplication rec { + pname = "vcsi"; + version = "7.0.12"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0dks0yr2a0cpr32vrwhdrhsb4qyj7rz1yv44fjbr8z8j8p84yjx5"; + }; + + propagatedBuildInputs = with python3Packages; [ + numpy + pillow + jinja2 + texttable + parsedatetime + ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; + + meta = with lib; { + description = "Create video contact sheets"; + homepage = "https://github.com/amietn/vcsi"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix index 1f0c28d49b..cdb156f312 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "06sxjhjpd893fn945c1s4adri2bf7s50ddvcw5pnwb6qndzfljw6"; + sha256 = "0dx21ws4nzzizzjb0g172fzvjgwck88ikr5c2av08ii06rys1567"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix index 224e7b3308..d57a054a8b 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "rootlesskit"; - version = "0.3.0-alpha.2"; + version = "0.10.0"; goPackagePath = "github.com/rootless-containers/rootlesskit"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - sha256 = "11y4hcrpayyyi9j3b80ilccxs5bbwnqfpi5nsjgmjb9v01z35fw6"; + sha256 = "0jrzqaczd5zxlbvh0hjym8pc1d7y8c66gslq3d3l5vv4z7hz7yfr"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix new file mode 100644 index 0000000000..b499294765 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, cmake, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + pname = "xva-img"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "eriklax"; + repo = "xva-img"; + rev = version; + sha256 = "1w3wrbrlgv7h2gdix2rmrmpjyla365kam5621a1aqjzwjqhjkwyq"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl ]; + + meta = { + maintainers = with lib.maintainers; [ lheckemann willibutz globin ]; + description = "Tool for converting Xen images to raw and back"; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index d1eb331c5b..3337b66e9f 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -44,6 +44,7 @@ mapAliases ({ ammonite-repl = ammonite; # added 2017-05-02 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 arduino_core = arduino-core; # added 2015-02-04 + arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 @@ -87,6 +88,7 @@ mapAliases ({ coprthr = throw "coprthr has been removed."; # added 2019-12-08 corebird = throw "deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement."; coredumper = throw "coredumper has been removed: Abandoned by upstream."; # added 2019-11-16 + cryptol = throw "cryptol was remove for prolonged broken build"; # added 2020-08-21 cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 @@ -103,6 +105,7 @@ mapAliases ({ deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; debian_devscripts = debian-devscripts; # added 2016-03-23 + deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 desktop_file_utils = desktop-file-utils; # added 2018-02-25 devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 @@ -114,7 +117,6 @@ mapAliases ({ docker_compose = docker-compose; # 2018-11-10 draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 dwarf_fortress = dwarf-fortress; # added 2016-01-23 - emacsMelpa = emacs25Packages; # for backward compatibility emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 @@ -128,6 +130,7 @@ mapAliases ({ fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = ffado; # added 2018-05-01 + firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs"; firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 @@ -187,11 +190,6 @@ mapAliases ({ googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 - gst_plugins_bad = gst-plugins-bad; # added 2017-02 - gst_plugins_base = gst-plugins-base; # added 2017-02 - gst_plugins_good = gst-plugins-good; # added 2017-02 - gst_plugins_ugly = gst-plugins-ugly; # added 2017-02 - gst_python = gst-python; # added 2017-02 gtk_doc = gtk-doc; # added 2018-02-25 guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 @@ -214,10 +212,12 @@ mapAliases ({ idea = jetbrains; # added 2017-04-03 infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; + jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; jbuilder = dune; # added 2018-09-09 jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 + kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 @@ -326,6 +326,7 @@ mapAliases ({ nagiosPluginsOfficial = monitoring-plugins; ncat = nmap; # added 2016-01-26 netcat-openbsd = libressl.nc; # added 2018-04-25 + netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 @@ -456,6 +457,7 @@ mapAliases ({ phonon = throw "Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 quake3game = ioquake3; # added 2016-01-14 + qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 @@ -465,10 +467,13 @@ mapAliases ({ rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 + rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 rssglx = rss-glx; #added 2015-03-25 + rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25 recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; @@ -507,9 +512,11 @@ mapAliases ({ scim = sc-im; # added 2016-01-22 scollector = bosun; # added 2018-04-25 sdlmame = mame; # added 2019-10-30 + seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; shared_mime_info = shared-mime-info; # added 2018-02-25 skrooge2 = skrooge; # added 2017-02-18 + sky = throw "sky has been removed from nixpkgs (2020-09-16)"; skype = skypeforlinux; # added 2017-07-27 skydive = throw "skydive has been removed from nixpkgs (2019-09-10)"; slack-dark = slack; # added 2020-03-27 @@ -559,7 +566,9 @@ mapAliases ({ suil-qt5 = suil; # added 2018-05-01 surf-webkit2 = surf; # added 2017-04-02 sup = throw "deprecated in 2019-09-10: abandoned by upstream"; + swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 system_config_printer = system-config-printer; # added 2016-01-03 + systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 systemd_with_lvm2 = throw "obsolete, enabled by default via the lvm module"; # added 2020-07-12 systool = sysfsutils; # added 2018-04-25 tahoelafs = tahoe-lafs; # added 2018-03-26 @@ -594,6 +603,7 @@ mapAliases ({ torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28 torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28 trang = jing-trang; # added 2018-04-25 + transcribe = throw "transcribe has been removed after being marked a broken for over a year"; # added 2020-09-16 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; @@ -672,22 +682,13 @@ mapAliases ({ ocamlPackages_4_03 ocamlPackages_latest; - gst_all = { # added 2018-04-25 - inherit (pkgs) gstreamer gnonlin gst-python; - gstPluginsBase = pkgs.gst-plugins-base; - gstPluginsBad = pkgs.gst-plugins-bad; - gstPluginsGood = pkgs.gst-plugins-good; - gstPluginsUgly = pkgs.gst-plugins-ugly; - gst-plugins-base = pkgs.gst-plugins-base; - gst-plugins-bad = pkgs.gst-plugins-bad; - gst-plugins-good = pkgs.gst-plugins-good; - gst-plugins-ugly = pkgs.gst-plugins-ugly; - }; - # added 2019-08-01 mumble_git = pkgs.mumble; murmur_git = pkgs.murmur; + # added 2020-08-17 + zabbix44 = throw "Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; + # added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 5b0985e783..724b6f597c 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -121,7 +121,11 @@ in autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; - appimageTools = callPackage ../build-support/appimage { }; + appimageTools = callPackage ../build-support/appimage { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }; + + appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { }; ensureNewerSourcesHook = { year }: makeSetupHook {} (writeScript "ensure-newer-sources-hook.sh" '' @@ -180,6 +184,8 @@ in colorz = callPackage ../tools/misc/colorz { }; + colorpicker = callPackage ../tools/misc/colorpicker { }; + comedilib = callPackage ../development/libraries/comedilib { }; cpu-x = callPackage ../applications/misc/cpu-x { }; @@ -196,6 +202,8 @@ in hobbes = callPackage ../development/tools/hobbes { }; + html5validator = python36Packages.callPackage ../applications/misc/html5validator { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -210,6 +218,8 @@ in onesixtyone = callPackage ../tools/security/onesixtyone {}; + creddump = callPackage ../tools/security/creddump {}; + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; @@ -218,7 +228,7 @@ in archiver = callPackage ../applications/misc/archiver { }; - digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; + digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; grsync = callPackage ../applications/misc/grsync { }; @@ -256,6 +266,8 @@ in dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; + dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; + dotnet-netcore = dotnetCorePackages.netcore_2_1; dotnet-aspnetcore = dotnetCorePackages.aspnetcore_2_1; @@ -266,7 +278,7 @@ in dispad = callPackage ../tools/X11/dispad { }; - dupeguru = callPackage ../applications/misc/dupeguru { }; + dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; }; dump1090 = callPackage ../applications/radio/dump1090 { }; @@ -543,9 +555,7 @@ in _1password = callPackage ../applications/misc/1password { }; - _1password-gui = callPackage ../tools/security/1password-gui { - electron = electron_9; - }; + _1password-gui = callPackage ../tools/security/1password-gui { }; _6tunnel = callPackage ../tools/networking/6tunnel { }; @@ -573,7 +583,10 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act {}; + act = callPackage ../development/tools/misc/act { + # go 1.15 cannot connect to docker-for-mac https://github.com/docker/for-mac/issues/4855 + buildGoModule = if stdenv.isDarwin then buildGo114Module else buildGoModule; + }; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -608,7 +621,7 @@ in aescrypt = callPackage ../tools/misc/aescrypt { }; - acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; }; + acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; stdenv = gccStdenv; }; amass = callPackage ../tools/networking/amass { }; @@ -736,7 +749,7 @@ in arduino-mk = callPackage ../development/arduino/arduino-mk {}; - apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; arguments = callPackage ../development/libraries/arguments { }; @@ -761,8 +774,12 @@ in asciinema = callPackage ../tools/misc/asciinema {}; + asciinema-scenario = callPackage ../tools/misc/asciinema-scenario {}; + asciiquarium = callPackage ../applications/misc/asciiquarium {}; + ashuffle = callPackage ../applications/audio/ashuffle {}; + asls = callPackage ../development/tools/misc/asls { }; asymptote = callPackage ../tools/graphics/asymptote { @@ -822,7 +839,7 @@ in brakeman = callPackage ../development/tools/analysis/brakeman { }; - brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; + brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; boxes = callPackage ../tools/text/boxes { }; @@ -860,6 +877,8 @@ in automirror = callPackage ../tools/misc/automirror { }; + barman = python3Packages.callPackage ../tools/misc/barman { }; + bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; bashcards = callPackage ../tools/misc/bashcards { }; @@ -900,6 +919,8 @@ in calls = callPackage ../applications/networking/calls { }; + inherit (nodePackages) castnow; + certigo = callPackage ../tools/admin/certigo { }; catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; @@ -911,6 +932,8 @@ in withDriver = false; }; + chroma = callPackage ../tools/text/chroma { }; + clair = callPackage ../tools/admin/clair { }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; @@ -933,10 +956,16 @@ in cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { }; + cod = callPackage ../tools/misc/cod { }; + codespell = with python3Packages; toPythonApplication codespell; + coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; + cpuid = callPackage ../os-specific/linux/cpuid { }; + ctrtool = callPackage ../tools/archivers/ctrtool { }; crowbar = callPackage ../tools/security/crowbar { }; @@ -945,6 +974,8 @@ in crc32c = callPackage ../development/libraries/crc32c { }; + crcpp = callPackage ../development/libraries/crcpp { }; + cudd = callPackage ../development/libraries/cudd { }; cue = callPackage ../development/tools/cue { }; @@ -970,6 +1001,10 @@ in dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; + dot-http = callPackage ../development/tools/dot-http { + inherit (darwin.apple_sdk.frameworks) Security; + }; + doona = callPackage ../tools/security/doona { }; ecdsautils = callPackage ../tools/security/ecdsautils { }; @@ -1092,6 +1127,7 @@ in pass-wayland = callPackage ../tools/security/pass { waylandSupport = true; + pass = pass-wayland; }; passExtensions = recurseIntoAttrs pass.extensions; @@ -1140,6 +1176,8 @@ in wiiload = callPackage ../development/tools/wiiload { }; + wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; @@ -1166,6 +1204,7 @@ in androidndkPkgs = androidndkPkgs_18b; androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b"; + androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21"; androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; @@ -1223,6 +1262,7 @@ in axoloti = callPackage ../applications/audio/axoloti { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { @@ -1230,7 +1270,10 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - azureus = callPackage ../tools/networking/p2p/azureus { }; + azureus = callPackage ../tools/networking/p2p/azureus { + jdk = jdk8; + swt = swt_jdk8; + }; b3sum = callPackage ../tools/security/b3sum {}; @@ -1310,7 +1353,7 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; - birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; + birdtray = libsForQt514.callPackage ../applications/misc/birdtray { }; bitbucket-cli = python2Packages.bitbucket-cli; @@ -1350,12 +1393,19 @@ in then python.pkgs.tensorflow.libtensorflow else libtensorflow-bin; + libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { + inherit (linuxPackages) nvidia_x11; + cudaSupport = pkgs.config.cudaSupport or false; + }; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; bless = callPackage ../applications/editors/bless { }; blink1-tool = callPackage ../tools/misc/blink1-tool { }; + blis = callPackage ../development/libraries/science/math/blis { }; + bliss = callPackage ../applications/science/math/bliss { }; blobfuse = callPackage ../tools/filesystems/blobfuse { }; @@ -1478,11 +1528,14 @@ in ''; }); - caddy = callPackage ../servers/caddy { }; - caddy2 = callPackage ../servers/caddy/v2.nix { }; - traefik = callPackage ../servers/traefik { }; + caddy = callPackage ../servers/caddy { buildGoModule = buildGo114Module; }; # https://github.com/lucas-clemente/quic-go/issues/2614 + caddy1 = callPackage ../servers/caddy/v1.nix { buildGoModule = buildGo114Module; }; - calamares = libsForQt5.callPackage ../tools/misc/calamares { + # Traefik 2.2 uses go1.14, pinning can be removed with 2.3 + # https://github.com/containous/traefik/issues/7234#issuecomment-684950612 + traefik = callPackage ../servers/traefik { buildGoModule = buildGo114Module; }; + + calamares = libsForQt514.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; }; @@ -1587,6 +1640,8 @@ in colpack = callPackage ../applications/science/math/colpack { }; + commitizen = callPackage ../applications/version-management/commitizen {}; + compactor = callPackage ../applications/networking/compactor { }; consul = callPackage ../servers/consul { }; @@ -1702,6 +1757,8 @@ in dconf = callPackage ../development/libraries/dconf { }; + dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; + ddar = callPackage ../tools/backup/ddar { }; ddate = callPackage ../tools/misc/ddate { }; @@ -1757,6 +1814,8 @@ in discount = callPackage ../tools/text/discount { }; + discocss = callPackage ../tools/misc/discocss { }; + disk-filltest = callPackage ../tools/system/disk-filltest { }; diskscan = callPackage ../tools/misc/diskscan { }; @@ -1801,6 +1860,8 @@ in dua = callPackage ../tools/misc/dua { }; + duf = callPackage ../tools/misc/duf { }; + inherit (ocamlPackages) dune dune_2 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -1832,6 +1893,8 @@ in eksctl = callPackage ../tools/admin/eksctl { }; + electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; + element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { }; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { @@ -1896,6 +1959,8 @@ in filebench = callPackage ../tools/misc/filebench { }; + filebot = callPackage ../applications/video/filebot { }; + fileshare = callPackage ../servers/fileshare {}; fileshelter = callPackage ../servers/web-apps/fileshelter { }; @@ -1912,7 +1977,9 @@ in fsql = callPackage ../tools/misc/fsql { }; - fop = callPackage ../tools/typesetting/fop { }; + fop = callPackage ../tools/typesetting/fop { + jdk = openjdk8; + }; fondu = callPackage ../tools/misc/fondu { }; @@ -1994,18 +2061,25 @@ in gmic = callPackage ../tools/graphics/gmic { }; - gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; + gmic-qt = libsForQt514.callPackage ../tools/graphics/gmic-qt { }; gmic-qt-krita = gmic-qt.override { variant = "krita"; }; + gmt = callPackage ../applications/gis/gmt { + inherit (darwin.apple_sdk.frameworks) + Accelerate CoreGraphics CoreVideo; + }; + goa = callPackage ../development/tools/goa { }; gohai = callPackage ../tools/system/gohai { }; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; + godu = callPackage ../tools/misc/godu { }; + gosu = callPackage ../tools/misc/gosu { }; gotify-cli = callPackage ../tools/misc/gotify-cli { }; @@ -2020,7 +2094,9 @@ in gringo = callPackage ../tools/misc/gringo { }; - grobi = callPackage ../tools/X11/grobi { }; + grobi = callPackage ../tools/X11/grobi { + buildGoModule = buildGo114Module; + }; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; @@ -2114,6 +2190,8 @@ in numatop = callPackage ../os-specific/linux/numatop { }; + numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { }; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; @@ -2134,9 +2212,11 @@ in massren = callPackage ../tools/misc/massren { }; + maxcso = callPackage ../tools/archivers/maxcso {}; + medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt5.callPackage ../applications/misc/megasync { }; + megasync = libsForQt514.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; @@ -2202,6 +2282,8 @@ in nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nix-template = callPackage ../tools/package-management/nix-template { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -2234,6 +2316,8 @@ in obinskit = callPackage ../applications/misc/obinskit {}; + odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2486,18 +2570,22 @@ in biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; birdfont = callPackage ../tools/misc/birdfont { }; - xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { }; + xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; blastem = callPackage ../misc/emulators/blastem { inherit (python27Packages) pillow; }; + blueberry = callPackage ../tools/bluetooth/blueberry { }; + blueman = callPackage ../tools/bluetooth/blueman { }; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; bogofilter = callPackage ../tools/misc/bogofilter { }; + bomutils = callPackage ../tools/archivers/bomutils { }; + bsdbuild = callPackage ../development/tools/misc/bsdbuild { }; bsdiff = callPackage ../tools/compression/bsdiff { }; @@ -2532,6 +2620,8 @@ in bzip2 = callPackage ../tools/compression/bzip2 { }; + bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; + cabextract = callPackage ../tools/archivers/cabextract { }; cadaver = callPackage ../tools/networking/cadaver { @@ -2615,14 +2705,14 @@ in cksfv = callPackage ../tools/networking/cksfv { }; - clementine = libsForQt5.callPackage ../applications/audio/clementine { + clementine = libsForQt514.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; }; clementineUnfree = clementine.unfree; - mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; + mellowplayer = libsForQt514.callPackage ../applications/audio/mellowplayer { }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -2630,7 +2720,7 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_20_06_0; + citrix_workspace = citrix_workspace_20_09_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_19_6_0 @@ -2639,16 +2729,19 @@ in citrix_workspace_19_12_0 citrix_workspace_20_04_0 citrix_workspace_20_06_0 + citrix_workspace_20_09_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; + cmigemo = callPackage ../tools/text/cmigemo { }; + cmst = libsForQt5.callPackage ../tools/networking/cmst { }; cmt = callPackage ../applications/audio/cmt {}; codimd = callPackage ../servers/web-apps/codimd { - nodejs = nodejs-10_x; + nodejs = nodejs-12_x; }; colord = callPackage ../tools/misc/colord { }; @@ -2681,6 +2774,7 @@ in collectd = callPackage ../tools/system/collectd { libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; collectd-data = callPackage ../tools/system/collectd/data.nix { }; @@ -2744,6 +2838,8 @@ in ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; + hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; kkc = callPackage ../tools/inputmethods/ibus-engines/ibus-kkc { }; @@ -2790,6 +2886,12 @@ in biosdevname = callPackage ../tools/networking/biosdevname { }; + code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; + }; + code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk = true; + qtbase = qt5.qtbase; + }; + c14 = callPackage ../applications/networking/c14 { }; certstrap = callPackage ../tools/security/certstrap { }; @@ -2880,7 +2982,9 @@ in cudatoolkit_10 cudatoolkit_10_0 cudatoolkit_10_1 - cudatoolkit_10_2; + cudatoolkit_10_2 + cudatoolkit_11 + cudatoolkit_11_0; cudatoolkit = cudatoolkit_10; @@ -2897,7 +3001,9 @@ in cudnn_cudatoolkit_10 cudnn_cudatoolkit_10_0 cudnn_cudatoolkit_10_1 - cudnn_cudatoolkit_10_2; + cudnn_cudatoolkit_10_2 + cudnn_cudatoolkit_11 + cudnn_cudatoolkit_11_0; cudnn = cudnn_cudatoolkit_10; @@ -2943,9 +3049,7 @@ in davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { - jdk = jdk11; - }; + dbeaver = callPackage ../applications/misc/dbeaver { }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -3139,12 +3243,14 @@ in dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; dtc = callPackage ../development/compilers/dtc { }; + dt-schema = python3Packages.callPackage ../development/tools/dt-schema { }; + dub = callPackage ../development/tools/build-managers/dub { }; duc = callPackage ../tools/misc/duc { }; @@ -3243,7 +3349,7 @@ in sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; + strawberry = libsForQt514.callPackage ../applications/audio/strawberry { }; tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; @@ -3251,7 +3357,9 @@ in teamocil = callPackage ../tools/misc/teamocil { }; - the-way = callPackage ../development/tools/the-way { }; + the-way = callPackage ../development/tools/the-way { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; @@ -3319,14 +3427,10 @@ in cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; - emscriptenVersion = "1.39.1"; + choose = callPackage ../tools/text/choose { }; emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcompPackages = dontRecurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { }); - - emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; - emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; }; @@ -3344,17 +3448,21 @@ in elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { enableUnfree = false; utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; @@ -3375,6 +3483,7 @@ in python = python3; }; + embree = callPackage ../development/libraries/embree { }; embree2 = callPackage ../development/libraries/embree/2.x.nix { }; emem = callPackage ../applications/misc/emem { }; @@ -3451,7 +3560,7 @@ in f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = python2Packages.Fabric; + Fabric = with python3Packages; toPythonApplication Fabric; fail2ban = callPackage ../tools/security/fail2ban { }; @@ -3518,7 +3627,7 @@ in fdtools = callPackage ../tools/misc/fdtools { }; - featherpad = callPackage ../applications/editors/featherpad {}; + featherpad = qt5.callPackage ../applications/editors/featherpad {}; feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; @@ -3590,7 +3699,7 @@ in flashrom = callPackage ../tools/misc/flashrom { }; - flent = python3Packages.callPackage ../applications/networking/flent { }; + flent = python3Packages.callPackage ../applications/networking/flent { qt5 = qt514; }; flpsed = callPackage ../applications/editors/flpsed { }; @@ -3647,7 +3756,7 @@ in fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; - fontmatrix = callPackage ../applications/graphics/fontmatrix {}; + fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {}; foremost = callPackage ../tools/system/foremost { }; @@ -3721,7 +3830,9 @@ in fusuma = callPackage ../tools/inputmethods/fusuma {}; - fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { }); + fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }); inherit (fdbPackages) foundationdb51 @@ -3954,6 +4065,10 @@ in godot = callPackage ../development/tools/godot {}; + godot-headless = callPackage ../development/tools/godot/headless.nix { }; + + godot-server = callPackage ../development/tools/godot/server.nix { }; + goklp = callPackage ../tools/networking/goklp {}; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; @@ -3992,6 +4107,8 @@ in gopro = callPackage ../tools/video/gopro { }; + goreplay = callPackage ../tools/networking/goreplay { }; + gource = callPackage ../applications/version-management/gource { }; govc = callPackage ../tools/virtualization/govc { }; @@ -4217,7 +4334,7 @@ in hal-flash = callPackage ../os-specific/linux/hal-flash { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; + hal-hardware-analyzer = libsForQt514.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; @@ -4276,16 +4393,16 @@ in })); hdfview = callPackage ../tools/misc/hdfview { - javac = jdk; + javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 }; hdf_java = callPackage ../tools/misc/hdfjava { - javac = jdk; + javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 }; hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {}; heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; @@ -4364,15 +4481,18 @@ in i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; - i2p = callPackage ../tools/networking/i2p {}; + i2p = callPackage ../tools/networking/i2p { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; i2pd = callPackage ../tools/networking/i2pd { }; - i-score = libsForQt5.callPackage ../applications/audio/i-score { }; + i-score = libsForQt514.callPackage ../applications/audio/i-score { }; iasl = callPackage ../development/compilers/iasl { }; - iannix = libsForQt5.callPackage ../applications/audio/iannix { }; + iannix = libsForQt514.callPackage ../applications/audio/iannix { }; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; @@ -4489,7 +4609,9 @@ in ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + buildGoModule = buildGo114Module; + }; ipget = callPackage ../applications/networking/ipget { }; @@ -4527,6 +4649,8 @@ in isync = callPackage ../tools/networking/isync { }; + itm-tools = callPackage ../development/tools/misc/itm-tools { }; + ix = callPackage ../tools/misc/ix { }; jaaa = callPackage ../applications/audio/jaaa { }; @@ -4556,7 +4680,9 @@ in jid = callPackage ../development/tools/jid { }; jing = res.jing-trang; - jing-trang = callPackage ../tools/text/xml/jing-trang { }; + jing-trang = callPackage ../tools/text/xml/jing-trang { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -4693,6 +4819,8 @@ in kibana = kibana6; kibana-oss = kibana6-oss; + kibi = callPackage ../applications/editors/kibi { }; + kismet = callPackage ../applications/networking/sniffers/kismet { }; klick = callPackage ../applications/audio/klick { }; @@ -4705,31 +4833,31 @@ in krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; + partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; - krename = libsForQt5.callPackage ../applications/misc/krename { }; + krename = libsForQt514.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; - kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; + kronometer = libsForQt514.callPackage ../tools/misc/kronometer { }; krop = callPackage ../applications/graphics/krop { }; - kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; + kdiff3 = libsForQt514.callPackage ../tools/text/kdiff3 { }; kube-router = callPackage ../applications/networking/cluster/kube-router { }; kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; - peruse = libsForQt5.callPackage ../tools/misc/peruse { }; + peruse = libsForQt514.callPackage ../tools/misc/peruse { }; - ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; + ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { }; - kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kst = libsForQt514.callPackage ../tools/graphics/kst { gsl = gsl_1; }; - kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; + kstars = libsForQt514.callPackage ../applications/science/astronomy/kstars { }; kytea = callPackage ../tools/text/kytea { }; @@ -4775,7 +4903,6 @@ in liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg-full; - ocamlPackages = ocaml-ng.ocamlPackages_4_07; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -4879,6 +5006,8 @@ in minergate-cli = callPackage ../applications/misc/minergate-cli { }; + minica = callPackage ../tools/security/minica { }; + minidlna = callPackage ../tools/networking/minidlna { }; minisign = callPackage ../tools/security/minisign { }; @@ -4965,7 +5094,7 @@ in ninka = callPackage ../development/tools/misc/ninka { }; - nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; + nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; nodejs = hiPrio nodejs-12_x; @@ -5209,7 +5338,7 @@ in lzip = callPackage ../tools/compression/lzip { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { qt5 = qt514; }; xz = callPackage ../tools/compression/xz { }; lzma = xz; # TODO: move to aliases.nix @@ -5268,6 +5397,8 @@ in mandoc = callPackage ../tools/misc/mandoc { }; + manix = callPackage ../tools/nix/manix {}; + marktext = callPackage ../applications/misc/marktext { }; mawk = callPackage ../tools/text/mawk { }; @@ -5346,6 +5477,8 @@ in microcom = callPackage ../applications/misc/microcom { }; + microserver = callPackage ../servers/microserver { }; + midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; @@ -5385,9 +5518,7 @@ in mirrorbits = callPackage ../servers/mirrorbits { }; - mitmproxy = callPackage ../tools/networking/mitmproxy { - python3Packages = python37Packages; - }; + mitmproxy = with python3Packages; toPythonApplication mitmproxy; mjpegtools = callPackage ../tools/video/mjpegtools { }; @@ -5521,9 +5652,8 @@ in xnbd = callPackage ../tools/networking/xnbd { }; nccl = callPackage ../development/libraries/science/math/nccl { }; - nccl_cudatoolkit_9_0 = nccl.override { cudatoolkit = cudatoolkit_9_0; }; - nccl_cudatoolkit_9 = nccl.override { cudatoolkit = cudatoolkit_9; }; nccl_cudatoolkit_10 = nccl.override { cudatoolkit = cudatoolkit_10; }; + nccl_cudatoolkit_11 = nccl.override { cudatoolkit = cudatoolkit_11; }; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -5557,6 +5687,8 @@ in ncftp = callPackage ../tools/networking/ncftp { }; + ncgopher = callPackage ../applications/networking/ncgopher { }; + ncompress = callPackage ../tools/compression/ncompress { }; ndisc6 = callPackage ../tools/networking/ndisc6 { }; @@ -5573,6 +5705,8 @@ in netkittftp = callPackage ../tools/networking/netkit/tftp { }; + netlify-cli = nodePackages.netlify-cli; + netpbm = callPackage ../tools/graphics/netpbm { }; netrw = callPackage ../tools/networking/netrw { }; @@ -5619,7 +5753,7 @@ in inherit (callPackage ../servers/nextcloud {}) nextcloud17 nextcloud18 nextcloud19; - nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; + nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -5642,8 +5776,15 @@ in noip = callPackage ../tools/networking/noip { }; nomad = nomad_0_11; - nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { }; - nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { }; + # Nomad never updates major go versions within a release series and is unsupported + # on Go versions that it did not ship with. Due to historic bugs when compiled + # with different versions we pin Go for all versions. + nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { + buildGoPackage = buildGo114Package; + }; + nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { + buildGoPackage = buildGo114Package; + }; notable = callPackage ../applications/misc/notable { }; @@ -5663,6 +5804,8 @@ in pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; + pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; + pasystray = callPackage ../tools/audio/pasystray { }; phash = callPackage ../development/libraries/phash { }; @@ -5705,7 +5848,7 @@ in graphicalSupport = true; }; - nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; + nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; @@ -5807,7 +5950,7 @@ in ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { + olive-editor = libsForQt514.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; @@ -5958,7 +6101,7 @@ in overmind = callPackage ../applications/misc/overmind { }; - owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -5966,6 +6109,8 @@ in p2pvc = callPackage ../applications/video/p2pvc {}; + p3x-onenote = callPackage ../applications/office/p3x-onenote { }; + p7zip = callPackage ../tools/archivers/p7zip { }; packagekit = callPackage ../tools/package-management/packagekit { }; @@ -6272,7 +6417,10 @@ in profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; - projectlibre = callPackage ../applications/misc/projectlibre { }; + projectlibre = callPackage ../applications/misc/projectlibre { + jre = jre8; + jdk = jdk8; + }; projectm = libsForQt5.callPackage ../applications/audio/projectm { }; @@ -6353,6 +6501,8 @@ in pywal = with python3Packages; toPythonApplication pywal; + rbw = callPackage ../tools/security/rbw { }; + remarshal = callPackage ../development/tools/remarshal { }; rig = callPackage ../tools/misc/rig { @@ -6369,9 +6519,11 @@ in ucx = callPackage ../development/libraries/ucx {}; - openmodelica = callPackage ../applications/science/misc/openmodelica { }; + openmodelica = callPackage ../applications/science/misc/openmodelica { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - qarte = libsForQt5.callPackage ../applications/video/qarte { }; + qarte = libsForQt514.callPackage ../applications/video/qarte { }; qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { }; @@ -6395,7 +6547,9 @@ in qjoypad = callPackage ../tools/misc/qjoypad { }; - qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; + qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; + + qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { }; qpdf = callPackage ../development/libraries/qpdf { }; @@ -6407,7 +6561,7 @@ in qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; - qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + qtikz = libsForQt514.callPackage ../applications/graphics/ktikz { }; quickjs = callPackage ../development/interpreters/quickjs { }; @@ -6473,7 +6627,7 @@ in reredirect = callPackage ../tools/misc/reredirect { }; - retext = libsForQt5.callPackage ../applications/editors/retext { }; + retext = libsForQt514.callPackage ../applications/editors/retext { }; richgo = callPackage ../development/tools/richgo { }; @@ -6498,7 +6652,7 @@ in recutils = callPackage ../tools/misc/recutils { }; - recoll = callPackage ../applications/search/recoll { }; + recoll = libsForQt5.callPackage ../applications/search/recoll { }; redoc-cli = nodePackages.redoc-cli; @@ -6587,7 +6741,7 @@ in rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; - rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; + rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; @@ -6609,7 +6763,7 @@ in rshijack = callPackage ../tools/networking/rshijack { }; - rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; + rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { }; rss2email = callPackage ../applications/networking/feedreaders/rss2email { pythonPackages = python3Packages; @@ -6623,9 +6777,7 @@ in rubocop = callPackage ../development/tools/rubocop { }; - runelite = callPackage ../games/runelite { - jre = openjdk11; - }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; @@ -6637,6 +6789,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + rustscan = callPackage ../tools/security/rustscan { }; + rw = callPackage ../tools/misc/rw { }; rxp = callPackage ../tools/text/xml/rxp { }; @@ -6737,6 +6891,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + sd-mux-ctrl = callPackage ../tools/misc/sd-mux-ctrl { }; + sd-switch = callPackage ../os-specific/linux/sd-switch { }; sdate = callPackage ../tools/misc/sdate { }; @@ -6787,12 +6943,18 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { }; + sharutils = callPackage ../tools/archivers/sharutils { }; shelldap = callPackage ../tools/misc/shelldap { }; schema2ldif = callPackage ../tools/text/schema2ldif { }; + shen-sbcl = callPackage ../development/interpreters/shen-sbcl { }; + + shen-sources = callPackage ../development/interpreters/shen-sources { }; + shocco = callPackage ../tools/text/shocco { }; shopify-themekit = callPackage ../development/web/shopify-themekit { }; @@ -6819,7 +6981,7 @@ in sigal = callPackage ../applications/misc/sigal { }; - sigil = libsForQt5.callPackage ../applications/editors/sigil { }; + sigil = libsForQt514.callPackage ../applications/editors/sigil { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; @@ -6868,7 +7030,7 @@ in sleuthkit = callPackage ../tools/system/sleuthkit {}; - sleepyhead = libsForQt5.callPackage ../applications/misc/sleepyhead {}; + sleepyhead = libsForQt514.callPackage ../applications/misc/sleepyhead {}; slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; @@ -6878,6 +7040,8 @@ in conf = config.slstatus.conf or null; }; + sm64ex = callPackage ../games/sm64ex { }; + smartdns = callPackage ../tools/networking/smartdns { }; smartmontools = callPackage ../tools/system/smartmontools { @@ -6911,6 +7075,10 @@ in snort = callPackage ../applications/networking/ids/snort { }; + so = callPackage ../development/tools/so { + inherit (darwin.apple_sdk.frameworks) Security; + }; + soapui = callPackage ../applications/networking/soapui { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -6962,8 +7130,6 @@ in stm32loader = with python3Packages; toPythonApplication stm32loader; - storebrowse = callPackage ../tools/system/storebrowse { }; - stubby = callPackage ../tools/networking/stubby { }; syntex = callPackage ../tools/graphics/syntex {}; @@ -7022,7 +7188,7 @@ in subberthehut = callPackage ../tools/misc/subberthehut { }; - subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; + subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -7038,8 +7204,6 @@ in supertux-editor = callPackage ../applications/editors/supertux-editor { }; - super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { }; - svgbob = callPackage ../tools/graphics/svgbob { }; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; @@ -7107,8 +7271,6 @@ in swec = callPackage ../tools/networking/swec { }; - swfdec = callPackage ../tools/graphics/swfdec {}; - svnfs = callPackage ../tools/filesystems/svnfs { }; svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; @@ -7179,7 +7341,7 @@ in ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; @@ -7213,7 +7375,7 @@ in textadept = callPackage ../applications/editors/textadept { }; - texworks = libsForQt5.callPackage ../applications/editors/texworks { }; + texworks = libsForQt514.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; @@ -7313,6 +7475,8 @@ in torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + toss = callPackage ../tools/networking/toss { }; + tox-node = callPackage ../tools/networking/tox-node { }; toxvpn = callPackage ../tools/networking/toxvpn { }; @@ -7433,6 +7597,8 @@ in ua = callPackage ../tools/networking/ua { }; + ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; + ubridge = callPackage ../tools/networking/ubridge { }; ucl = callPackage ../development/libraries/ucl { }; @@ -7519,6 +7685,8 @@ in vbetool = callPackage ../tools/system/vbetool { }; + vcsi = callPackage ../tools/video/vcsi { }; + vde2 = callPackage ../tools/networking/vde2 { }; vboot_reference = callPackage ../tools/system/vboot_reference {}; @@ -7537,6 +7705,10 @@ in verilog = callPackage ../applications/science/electronics/verilog {}; + vgrep = callPackage ../tools/text/vgrep { }; + + vhd2vl = callPackage ../applications/science/electronics/vhd2vl { }; + video2midi = callPackage ../tools/audio/video2midi { pythonPackages = python3Packages; }; @@ -7586,6 +7758,8 @@ in vpnc = callPackage ../tools/networking/vpnc { }; + vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { }; + vp = callPackage ../applications/misc/vp { # Enable next line for console graphics. Note that # it requires `sixel` enabled terminals such as mlterm @@ -7910,7 +8084,7 @@ in wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; + wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; @@ -8019,6 +8193,7 @@ in xtreemfs = callPackage ../tools/filesystems/xtreemfs { boost = boost165; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; xurls = callPackage ../tools/text/xurls {}; @@ -8044,6 +8219,7 @@ in inherit (yarn2nix-moretea) yarn2nix mkYarnPackage + mkYarnModules fixup_yarn_lock; yasr = callPackage ../applications/audio/yasr { }; @@ -8214,8 +8390,6 @@ in tcsh = callPackage ../shells/tcsh { }; - rssh = callPackage ../shells/rssh { }; - rush = callPackage ../shells/rush { }; xonsh = callPackage ../shells/xonsh { }; @@ -8234,7 +8408,10 @@ in ### DEVELOPMENT / COMPILERS - abcl = callPackage ../development/compilers/abcl {}; + abcl = callPackage ../development/compilers/abcl { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; @@ -8314,6 +8491,7 @@ in avian = callPackage ../development/compilers/avian { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; bigloo = callPackage ../development/compilers/bigloo { }; @@ -8326,7 +8504,7 @@ in colm = callPackage ../development/compilers/colm { }; - colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; + colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; colmapWithCuda = colmap.override { cudaSupport = true; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; @@ -8369,6 +8547,7 @@ in }; }; + clang_11 = llvmPackages_11.clang; clang_10 = llvmPackages_10.clang; clang_9 = llvmPackages_9.clang; clang_8 = llvmPackages_8.clang; @@ -8400,7 +8579,9 @@ in cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert { }; + compcert = callPackage ../development/compilers/compcert { + inherit (coqPackages_8_10) coq; + }; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; computecpp = wrapCCWith rec { @@ -8423,7 +8604,7 @@ in ''; }; - cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; + copper = callPackage ../development/compilers/copper {}; inherit (callPackages ../development/compilers/crystal { inherit (llvmPackages_10) stdenv clang llvm; @@ -8959,7 +9140,7 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); - go = go_1_14; + go = go_1_15; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -9020,6 +9201,11 @@ in else openjdk8.override { headless = true; }; + jdk8 = openjdk8; + jdk8_headless = openjdk8_headless; + jre8 = openjdk8.jre; + jre8_headless = openjdk8_headless.jre; + openjdk11-bootstrap = if adoptopenjdk-hotspot-bin-11.meta.available then adoptopenjdk-hotspot-bin-11 @@ -9060,7 +9246,10 @@ in }; }; - /* current JDK */ + jdk11 = openjdk11; + jdk11_headless = openjdk11_headless; + + /* Latest JDK */ openjdk14 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } @@ -9076,22 +9265,18 @@ in else openjdk14.override { headless = true; }; - openjdk = openjdk8; - openjdk_headless = openjdk8_headless; - - jdk8 = openjdk8; - jre8 = openjdk8.jre; - jre8_headless = openjdk8_headless.jre; - - jdk11 = openjdk11; - jdk11_headless = openjdk11_headless; - jdk14 = openjdk14; jdk14_headless = openjdk14_headless; - jdk = jdk8; - jre = jre8; - jre_headless = jre8_headless; + /* default JDK */ + + jdk = jdk14; + # jdk14 lacks a jre output. See https://github.com/NixOS/nixpkgs/issues/79490 + jre = jdk14; + jre_headless = jdk14_headless; + + openjdk = openjdk14; + openjdk_headless = openjdk14_headless; inherit (callPackages ../development/compilers/graalvm { gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; @@ -9105,7 +9290,7 @@ in graalvm8-ee graalvm11-ee; - openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; + openshot-qt = libsForQt514.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; @@ -9135,7 +9320,9 @@ in jasmin = callPackage ../development/compilers/jasmin { }; - java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; + java-service-wrapper = callPackage ../tools/system/java-service-wrapper { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; @@ -9164,6 +9351,21 @@ in jwasm = callPackage ../development/compilers/jwasm { }; + knightos-kcc = callPackage ../development/tools/knightos/kcc { }; + + knightos-kimg = callPackage ../development/tools/knightos/kimg { + asciidoc = asciidoc-full; + imagemagick = imagemagick7Big; + }; + + knightos-kpack = callPackage ../development/tools/knightos/kpack { }; + + knightos-mkrom = callPackage ../development/tools/knightos/mkrom { + asciidoc = asciidoc-full; + }; + + knightos-scas = callPackage ../development/tools/knightos/scas { }; + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { @@ -9176,6 +9378,12 @@ in lizardfs = callPackage ../tools/filesystems/lizardfs { }; + lobster = callPackage ../development/compilers/lobster { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) + Cocoa AudioToolbox OpenGL Foundation ForceFeedback; + }; + lld = llvmPackages.lld; lld_5 = llvmPackages_5.lld; lld_6 = llvmPackages_6.lld; @@ -9183,6 +9391,7 @@ in lld_8 = llvmPackages_8.lld; lld_9 = llvmPackages_9.lld; lld_10 = llvmPackages_10.lld; + lld_11 = llvmPackages_11.lld; lldb = llvmPackages.lldb; lldb_5 = llvmPackages_5.lldb; @@ -9191,10 +9400,12 @@ in lldb_8 = llvmPackages_8.lldb; lldb_9 = llvmPackages_9.lldb; lldb_10 = llvmPackages_10.lldb; + lldb_11 = llvmPackages_11.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_11 = llvmPackages_11.llvm; llvm_10 = llvmPackages_10.llvm; llvm_9 = llvmPackages_9.llvm; llvm_8 = llvmPackages_8.llvm; @@ -9240,6 +9451,14 @@ in targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; }; + llvmPackages_11 = callPackage ../development/compilers/llvm/11 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_11.tools; + targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc7Stdenv; + }); + llvmPackages_latest = llvmPackages_10; llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; @@ -9250,7 +9469,9 @@ in manticore = callPackage ../development/compilers/manticore { }; - mercury = callPackage ../development/compilers/mercury { }; + mercury = callPackage ../development/compilers/mercury { + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; microscheme = callPackage ../development/compilers/microscheme { }; @@ -9303,16 +9524,21 @@ in mosml = callPackage ../development/compilers/mosml { }; - mozart2 = callPackage ../development/compilers/mozart { }; + mozart2 = callPackage ../development/compilers/mozart { + emacs = emacs-nox; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; nim = callPackage ../development/compilers/nim { }; + nim-unwrapped = nim.unwrapped; + nrpl = callPackage ../development/tools/nrpl { }; neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + nextpnr = libsForQt514.callPackage ../development/compilers/nextpnr { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -9333,10 +9559,15 @@ in ocaml-crunch = ocamlPackages.crunch.bin; - ocamlformat = callPackage ../development/tools/ocaml/ocamlformat { }; + inherit (callPackage ../development/tools/ocaml/ocamlformat { }) + ocamlformat # latest version + ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 + ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_15_0; orc = callPackage ../development/compilers/orc { }; + orocos-kdl = callPackage ../development/libraries/orocos-kdl { }; + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml.nix { }; @@ -9397,9 +9628,9 @@ in inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; }; - rocm-runtime = callPackage ../development/libraries/rocm-runtime { }; - - rocm-runtime-ext = callPackage ../development/libraries/rocm-runtime-ext { }; + rocm-runtime = callPackage ../development/libraries/rocm-runtime { + inherit (llvmPackages_rocm) clang-unwrapped llvm; + }; # Python >= 3.8 still gives a bunch of warnings. rocm-smi = python37.pkgs.callPackage ../tools/system/rocm-smi { }; @@ -9456,6 +9687,7 @@ in cargo-deps = callPackage ../tools/package-management/cargo-deps { }; cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + cargo-kcov = callPackage ../tools/package-management/cargo-kcov { }; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; cargo-license = callPackage ../tools/package-management/cargo-license { }; cargo-outdated = callPackage ../tools/package-management/cargo-outdated {}; @@ -9471,13 +9703,18 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; + cargo-cache = callPackage ../development/tools/rust/cargo-cache { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; + cargo-flash = callPackage ../development/tools/rust/cargo-flash { }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9497,6 +9734,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; + cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -9539,11 +9777,12 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; - scas = callPackage ../development/compilers/scas { }; - metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; - scalafix = callPackage ../development/tools/scalafix { }; + scalafix = callPackage ../development/tools/scalafix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; scalafmt = callPackage ../development/tools/scalafmt { }; sdcc = callPackage ../development/compilers/sdcc { @@ -9585,6 +9824,7 @@ in swiProlog = callPackage ../development/compilers/swi-prolog { inherit (darwin.apple_sdk.frameworks) Security; + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; swiPrologWithGui = swiProlog.override { withGui = true; }; @@ -9697,6 +9937,8 @@ in zulip = callPackage ../applications/networking/instant-messengers/zulip { }; + zulip-term = callPackage ../applications/networking/instant-messengers/zulip-term { }; + zulu8 = callPackage ../development/compilers/zulu/8.nix { }; zulu = callPackage ../development/compilers/zulu { }; @@ -9751,7 +9993,7 @@ in inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; + elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (beam.packages.erlang) rebar rebar3 @@ -9773,7 +10015,9 @@ in guile = guile_2_2; - inherit (callPackages ../applications/networking/cluster/hadoop { }) + inherit (callPackages ../applications/networking/cluster/hadoop { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) hadoop_2_7 hadoop_2_8 hadoop_2_9 @@ -9880,15 +10124,18 @@ in octave = callPackage ../development/interpreters/octave { python = python3; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octave-jit = callPackage ../development/interpreters/octave { python = python3; enableJIT = true; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { python = python3; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 })); ocropus = callPackage ../applications/misc/ocropus { }; @@ -9977,7 +10224,13 @@ in python2Packages = python2.pkgs; python3Packages = python3.pkgs; - pythonInterpreters = callPackage ./../development/interpreters/python {}; + pythonInterpreters = callPackage ./../development/interpreters/python { + # Overrides that apply to all Python interpreters + pkgs = pkgs.extend (final: _: { + qt5 = final.qt514; + libsForQt5 = final.libsForQt514; + }); + }; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; # Python package sets. @@ -10117,6 +10370,8 @@ in spark = callPackage ../applications/networking/cluster/spark { }; + sparkleshare = callPackage ../applications/version-management/sparkleshare { }; + spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; @@ -10130,7 +10385,7 @@ in ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; - supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { + supercollider = libsForQt514.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -10243,7 +10498,9 @@ in adtool = callPackage ../tools/admin/adtool { }; - inherit (callPackage ../development/tools/alloy { }) + inherit (callPackage ../development/tools/alloy { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) alloy4 alloy5 alloy; @@ -10254,26 +10511,34 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_7 ansible_2_8 - ansible_2_9; + ansible_2_9 + ansible_2_10; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; - antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; + antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { + jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731 + }; - antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; - antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; + antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; antlr3 = antlr3_5; - antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; + antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; antlr4 = antlr4_7; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_4; + apacheKafka = apacheKafka_2_5; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; @@ -10284,6 +10549,7 @@ in apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; }; apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; }; apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; + apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; }; kt = callPackage ../tools/misc/kt {}; @@ -10300,8 +10566,7 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9; - electron = electron_9; + electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -10337,7 +10602,7 @@ in bazel_0_26 = callPackage ../development/tools/build-managers/bazel/bazel_0_26 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10346,7 +10611,7 @@ in bazel_0_29 = callPackage ../development/tools/build-managers/bazel/bazel_0_29 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10356,7 +10621,7 @@ in bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10366,7 +10631,7 @@ in bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10388,6 +10653,8 @@ in bazelisk = callPackage ../development/tools/bazelisk { }; + rebazel = callPackage ../development/tools/rebazel { }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -10423,6 +10690,8 @@ in black = with python3Packages; toPythonApplication black; + black-macchiato = with python3Packages; toPythonApplication black-macchiato; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -10433,7 +10702,9 @@ in wxGTK = wxGTK30; }; - buck = callPackage ../development/tools/build-managers/buck { }; + buck = callPackage ../development/tools/build-managers/buck { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; buildkite-agent = buildkite-agent3; buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; @@ -10606,8 +10877,8 @@ in if stdenv.targetPlatform.isi686 then gcc6.cc else if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU - # Can only do this is in the native case, otherwise we might get infinite - # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. + # Can only do this is in the native case, otherwise we might get infinite + # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. then targetPackages.stdenv.cc.cc else gcc.cc; @@ -10769,17 +11040,23 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + fujprog = callPackage ../development/tools/misc/fujprog { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; - pmd = callPackage ../development/tools/analysis/pmd { }; + pmd = callPackage ../development/tools/analysis/pmd { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pmdk = callPackage ../development/libraries/pmdk { }; - jdepend = callPackage ../development/tools/analysis/jdepend { }; + jdepend = callPackage ../development/tools/analysis/jdepend { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; @@ -10810,6 +11087,8 @@ in gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; + gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer {}; gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { }; @@ -10837,7 +11116,7 @@ in gputils = callPackage ../development/tools/misc/gputils { }; gradleGen = callPackage ../development/tools/build-managers/gradle { - java = jdk; + java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 }; gradle = res.gradleGen.gradle_latest; gradle_4_10 = res.gradleGen.gradle_4_10; @@ -10939,7 +11218,7 @@ in kati = callPackage ../development/tools/build-managers/kati { }; - kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; + kcc = libsForQt514.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; @@ -10977,6 +11256,8 @@ in lazygit = callPackage ../development/tools/lazygit { }; + laminar = callPackage ../development/tools/continuous-integration/laminar { }; + Literate = callPackage ../development/tools/literate-programming/Literate {}; lcov = callPackage ../development/tools/analysis/lcov { }; @@ -11011,10 +11292,12 @@ in lttv = callPackage ../development/tools/misc/lttv { }; - massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; + massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + maven3 = callPackage ../development/tools/build-managers/apache-maven { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; @@ -11033,7 +11316,7 @@ in minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; - minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; + minizincide = qt514.callPackage ../development/tools/minizinc/ide.nix { }; mk = callPackage ../development/tools/build-managers/mk { }; @@ -11136,7 +11419,7 @@ in phantomjs = callPackage ../development/tools/phantomjs { }; - phantomjs2 = libsForQt5.callPackage ../development/tools/phantomjs2 { }; + phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -11191,7 +11474,7 @@ in pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; + qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -11202,7 +11485,7 @@ in lua = lua5; } // (config.radare or {}))) radare2 r2-for-cutter; - radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2/cutter.nix { }; + radare2-cutter = libsForQt514.callPackage ../development/tools/analysis/radare2/cutter.nix { }; ragel = ragelStable; @@ -11232,6 +11515,8 @@ in remake = callPackage ../development/tools/build-managers/remake { }; + replacement = callPackage ../development/tools/misc/replacement { }; + retdec = callPackage ../development/tools/analysis/retdec { stdenv = gcc8Stdenv; }; @@ -11358,6 +11643,12 @@ in strace = callPackage ../development/tools/misc/strace { }; + summon = callPackage ../development/tools/summon { }; + + svlint = callPackage ../development/tools/analysis/svlint { }; + + svls = callPackage ../development/tools/misc/svls { }; + swarm = callPackage ../development/tools/analysis/swarm { }; swiftformat = callPackage ../development/tools/swiftformat { }; @@ -11390,11 +11681,15 @@ in terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; + terraformer = callPackage ../development/tools/misc/terraformer { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; - texinfo = texinfo6; + texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; + texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; + # Temporarily use older version on Darwin until it works. + texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } ); @@ -11507,6 +11802,8 @@ in xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; + xxe-pe = callPackage ../applications/editors/xxe-pe { }; + xxdiff-tip = xxdiff; yaml2json = callPackage ../development/tools/yaml2json { }; @@ -11520,10 +11817,7 @@ in yodl = callPackage ../development/tools/misc/yodl { }; - yq = callPackage ../development/tools/yq { - inherit (python3Packages) - buildPythonApplication fetchPypi argcomplete pyyaml xmltodict pytest coverage flake8 toml; - }; + yq = python3.pkgs.toPythonApplication python3.pkgs.yq; yq-go = callPackage ../development/tools/yq-go { }; @@ -11581,8 +11875,6 @@ in appstream-glib = callPackage ../development/libraries/appstream-glib { }; - appstream-qt = libsForQt5.callPackage ../development/libraries/appstream/qt.nix { }; - apr = callPackage ../development/libraries/apr { }; aprutil = callPackage ../development/libraries/apr-util { @@ -11633,6 +11925,8 @@ in aubio = callPackage ../development/libraries/aubio { }; + audiality2 = callPackage ../development/libraries/audiality2 { }; + audiofile = callPackage ../development/libraries/audiofile { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; @@ -11671,6 +11965,7 @@ in belle-sip = callPackage ../development/libraries/belle-sip { stdenv = gcc8Stdenv; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; libbfd = callPackage ../development/libraries/libbfd { }; @@ -11959,9 +12254,12 @@ in dotconf = callPackage ../development/libraries/dotconf { }; + draco = callPackage ../development/libraries/draco { }; + # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) + amdvlk mesa vaapiIntel libvdpau-va-gl @@ -11975,8 +12273,6 @@ in duckdb = callPackage ../development/libraries/duckdb {}; - dxflib = callPackage ../development/libraries/dxflib {}; - easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; eccodes = callPackage ../development/libraries/eccodes { @@ -12072,6 +12368,7 @@ in openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; + rav1e = if stdenv.isDarwin then null else rav1e; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; @@ -12121,7 +12418,9 @@ in freeimage = callPackage ../development/libraries/freeimage { }; - freetts = callPackage ../development/libraries/freetts { }; + freetts = callPackage ../development/libraries/freetts { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; frog = res.languageMachines.frog; @@ -12184,7 +12483,9 @@ in gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - gephi = callPackage ../applications/science/misc/gephi { }; + gephi = callPackage ../applications/science/misc/gephi { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenGL; @@ -12407,9 +12708,7 @@ in gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { - python3Packages = python37Packages; - }; + grab-site = callPackage ../tools/backup/grab-site { }; grib-api = callPackage ../development/libraries/grib-api { }; @@ -12426,24 +12725,6 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }); - gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { }; - - gst-plugins-base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; - - gst-plugins-good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {}; - - gst-plugins-bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {}; - - gst-plugins-ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; - - gst-python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; - - gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { }; - - gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; - gusb = callPackage ../development/libraries/gusb { }; qt-mobility = callPackage ../development/libraries/qt-mobility {}; @@ -12659,9 +12940,9 @@ in haxor-news = callPackage ../applications/misc/haxor-news { }; - herqq = libsForQt5.callPackage ../development/libraries/herqq { }; + hdt = callPackage ../misc/hdt {}; - heyefi = haskellPackages.heyefi; + herqq = libsForQt514.callPackage ../development/libraries/herqq { }; hidapi = callPackage ../development/libraries/hidapi { }; @@ -12820,6 +13101,8 @@ in isocodes = callPackage ../development/libraries/iso-codes { }; + iso-flags = callPackage ../data/icons/iso-flags { }; + ispc = callPackage ../development/compilers/ispc { stdenv = llvmPackages_10.stdenv; llvmPackages = llvmPackages_10; @@ -12835,8 +13118,6 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; - jasper = callPackage ../development/libraries/jasper { }; - jama = callPackage ../development/libraries/jama { }; jansson = callPackage ../development/libraries/jansson { }; @@ -12881,7 +13162,7 @@ in let mkFrameworks = import ../development/libraries/kde-frameworks; attrs = { - inherit libsForQt5; + libsForQt5 = libsForQt514; inherit lib fetchurl; }; in @@ -13003,13 +13284,15 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; libav = libav_11; # branch 11 is API-compatible with branch 10 - libav_all = callPackage ../development/libraries/libav { }; + libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; libavc1394 = callPackage ../development/libraries/libavc1394 { }; libb2 = callPackage ../development/libraries/libb2 { }; + libbacktrace = callPackage ../development/libraries/libbacktrace { }; + libbap = callPackage ../development/libraries/libbap { inherit (ocaml-ng.ocamlPackages_4_06) bap ocaml findlib ctypes; }; @@ -13623,7 +13906,9 @@ in guile = guile_2_0; }; - libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { }; + libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; libmatroska = callPackage ../development/libraries/libmatroska { }; @@ -13787,6 +14072,8 @@ in libqalculate = callPackage ../development/libraries/libqalculate { }; + libqt5pas = callPackage ../development/compilers/fpc/libqt5pas.nix { }; + libroxml = callPackage ../development/libraries/libroxml { }; librsvg = callPackage ../development/libraries/librsvg { }; @@ -13851,6 +14138,8 @@ in libtheora = callPackage ../development/libraries/libtheora { }; + libthreadar = callPackage ../development/libraries/libthreadar { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -14175,6 +14464,8 @@ in micropython = callPackage ../development/interpreters/micropython { }; + MIDIVisualizer = callPackage ../applications/audio/midi-visualizer { }; + mimalloc = callPackage ../development/libraries/mimalloc { }; minizip = callPackage ../development/libraries/minizip { }; @@ -14233,6 +14524,8 @@ in inherit (darwin.stubs) setfile; }; + muparserx = callPackage ../development/libraries/muparserx { }; + mutest = callPackage ../development/libraries/mutest { }; mygpoclient = pythonPackages.mygpoclient; @@ -14282,6 +14575,8 @@ in nettle = callPackage ../development/libraries/nettle { }; + newman = callPackage ../development/web/newman {}; + newt = callPackage ../development/libraries/newt { }; nghttp2 = callPackage ../development/libraries/nghttp2 { }; @@ -14330,9 +14625,7 @@ in nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; - nvtop = callPackage ../tools/system/nvtop { - nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; - }; + nvtop = callPackage ../tools/system/nvtop { }; ocl-icd = callPackage ../development/libraries/ocl-icd { }; @@ -14365,7 +14658,9 @@ in openbabel = callPackage ../development/libraries/openbabel { }; - opencascade = callPackage ../development/libraries/opencascade { }; + opencascade = callPackage ../development/libraries/opencascade { + inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; + }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; @@ -14396,7 +14691,7 @@ in }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; }; opencv = opencv4; @@ -14572,8 +14867,9 @@ in python = python37; }; - protobuf = protobuf3_12; + protobuf = protobuf3_13; + protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { }; protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; @@ -14605,7 +14901,7 @@ in python-qt = callPackage ../development/libraries/python-qt { python = python27; - inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; + inherit (qt514) qmake qttools qtwebengine qtxmlpatterns; }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; @@ -14615,15 +14911,12 @@ in qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qca2-qt5 = qca2.override { qt = qt5.qtbase; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; qjson = callPackage ../development/libraries/qjson { }; - qoauth = callPackage ../development/libraries/qoauth { }; - - qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; + qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { libpng = libpng12; @@ -14688,11 +14981,28 @@ in inherit llvmPackages_5; }); + qt515 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.15) { + inherit newScope; + inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit bison; + inherit cups; + inherit dconf; + inherit harfbuzz; + inherit libGL; + inherit perl; + inherit gtk3; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; + }); + libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); + libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); + # TODO bump to 5.14 on darwin once it's not broken; see #95199 - qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt514; - libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt514; + qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt515; + libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -14703,15 +15013,16 @@ in inherit (kdeFrameworks.override { libsForQt5 = self; }) attica baloo bluez-qt kactivities kactivities-stats karchive kauth kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig - kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support + kconfigwidgets kcoreaddons kcrash kdav kdbusaddons kdeclarative kdelibs4support kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews kjobwidgets kjs kjsembed kmediaplayer knewstuff knotifications knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt - networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting - syndication threadweaver kirigami2 kholidays kpurpose kcontacts; + networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet + syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose + kcontacts kquickcharts; ### KDE PLASMA 5 @@ -14729,6 +15040,10 @@ in alkimia = callPackage ../development/libraries/alkimia { }; + appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + + dxflib = callPackage ../development/libraries/dxflib {}; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; @@ -14777,6 +15092,8 @@ in phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; + plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { @@ -14790,7 +15107,10 @@ in qmltermwidget = callPackage ../development/libraries/qmltermwidget { inherit (darwin.apple_sdk.libs) utmp; }; - qmlbox2d = libsForQt5.callPackage ../development/libraries/qmlbox2d { }; + + qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; + + qoauth = callPackage ../development/libraries/qoauth { }; qscintilla = callPackage ../development/libraries/qscintilla { withQt5 = true; @@ -14804,14 +15124,18 @@ in withQt5 = true; }; + qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; + qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; - qtstyleplugin-kvantum = libsForQt5.callPackage ../development/libraries/qtstyleplugin-kvantum { }; + qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; quazip = callPackage ../development/libraries/quazip { }; qwt = callPackage ../development/libraries/qwt/6.nix { }; + soqt = callPackage ../development/libraries/soqt { }; + telepathy = callPackage ../development/libraries/telepathy/qt { }; vlc = callPackage ../applications/video/vlc {}; @@ -14825,8 +15149,6 @@ in qtkeychain = callPackage ../development/libraries/qtkeychain { }; - qtpbfimageplugin = libsForQt5.callPackage ../development/libraries/qtpbfimageplugin { }; - qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; @@ -14849,7 +15171,10 @@ in range-v3 = callPackage ../development/libraries/range-v3 {}; - rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; rapidcheck = callPackage ../development/libraries/rapidcheck {}; @@ -14910,7 +15235,7 @@ in qrupdate = callPackage ../development/libraries/qrupdate { }; - qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; + qgnomeplatform = libsForQt514.callPackage ../development/libraries/qgnomeplatform { }; randomx = callPackage ../development/libraries/randomx { }; @@ -14919,8 +15244,8 @@ in resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { - javac = jdk; - jvm = jre; + javac = jdk8; + jvm = jre8; }; rlog = callPackage ../development/libraries/rlog { }; @@ -15125,8 +15450,6 @@ in soprano = callPackage ../development/libraries/soprano { }; - soqt = callPackage ../development/libraries/soqt { }; - sord = callPackage ../development/libraries/sord {}; soundtouch = callPackage ../development/libraries/soundtouch {}; @@ -15181,7 +15504,9 @@ in sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); - sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/analyzer.nix { }); + inherit (callPackage ../development/libraries/sqlite/tools.nix { + inherit (darwin.apple_sdk.frameworks) Foundation; + }) sqlite-analyzer sqldiff; sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { }; @@ -15228,8 +15553,7 @@ in stlport = callPackage ../development/libraries/stlport { }; streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; - - strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; + streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; subdl = callPackage ../applications/video/subdl { }; @@ -15446,7 +15770,9 @@ in vcg = callPackage ../development/libraries/vcg { }; - vid-stab = callPackage ../development/libraries/vid-stab { }; + vid-stab = callPackage ../development/libraries/vid-stab { + inherit (llvmPackages) openmp; + }; vigra = callPackage ../development/libraries/vigra { }; @@ -15481,7 +15807,7 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; - vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { + vtk_9 = libsForQt514.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -15520,7 +15846,7 @@ in }); }; - vtkWithQt5 = vtk.override { qtLib = qt5; }; + vtkWithQt5 = vtk.override { qtLib = qt514; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; @@ -15542,7 +15868,6 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947 }; websocketpp = callPackage ../development/libraries/websocket++ { }; @@ -15558,24 +15883,22 @@ in wt3 wt4; + wxformbuilder = callPackage ../development/tools/wxformbuilder { }; + wxGTK = wxGTK28; wxGTK30 = wxGTK30-gtk2; wxGTK31 = wxGTK31-gtk2; - wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { - inherit (gnome2) GConf; - }; + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; }; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; @@ -15588,7 +15911,6 @@ in wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { withGtk2 = true; - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; @@ -15782,7 +16104,9 @@ in gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { }; - javaCup = callPackage ../development/libraries/java/cup { }; + javaCup = callPackage ../development/libraries/java/cup { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; jdom = callPackage ../development/libraries/java/jdom { }; @@ -15813,6 +16137,9 @@ in smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { }; + swt_jdk8 = callPackage ../development/libraries/java/swt { + jdk = jdk8; + }; ### DEVELOPMENT / LIBRARIES / JAVASCRIPT @@ -15832,7 +16159,7 @@ in go = buildPackages.go_1_15; }; - buildGoPackage = buildGo114Package; + buildGoPackage = buildGo115Package; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; @@ -15841,7 +16168,7 @@ in go = buildPackages.go_1_15; }; - buildGoModule = buildGo114Module; + buildGoModule = buildGo115Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -15893,14 +16220,14 @@ in ### DEVELOPMENT / PERL MODULES perlInterpreters = callPackages ../development/interpreters/perl {}; - inherit (perlInterpreters) perl528 perl530 perldevel; + inherit (perlInterpreters) perl530 perl532 perldevel; - perl528Packages = recurseIntoAttrs perl528.pkgs; perl530Packages = recurseIntoAttrs perl530.pkgs; + perl532Packages = recurseIntoAttrs perl532.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl530; - perlPackages = perl530Packages; + perl = perl532; + perlPackages = perl532Packages; ack = perlPackages.ack; @@ -15922,6 +16249,7 @@ in withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; inherit (darwin) libobjc; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; rWrapper = callPackage ../development/r-modules/wrapper.nix { @@ -16006,18 +16334,26 @@ in cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; - cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { }; - cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { }; - cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { }; + cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; cassandra = cassandra_3_11; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { - java = jdk; + java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix { - java = jdk; + java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; apcupsd = callPackage ../servers/apcupsd { }; @@ -16060,6 +16396,11 @@ in erlang = erlangR21; }; + couchdb3 = callPackage ../servers/http/couchdb/3.nix { + spidermonkey = spidermonkey_68; + erlang = erlangR22; + }; + couchpotato = callPackage ../servers/couchpotato {}; dex-oidc = callPackage ../servers/dex { }; @@ -16116,9 +16457,14 @@ in biboumi = callPackage ../servers/xmpp/biboumi { }; - elasticmq = callPackage ../servers/elasticmq { }; + elasticmq = callPackage ../servers/elasticmq { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { }; + elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; eventstore = callPackage ../servers/nosql/eventstore { Nuget = dotnetPackages.Nuget; @@ -16157,9 +16503,13 @@ in gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { }; + grafana = callPackage ../servers/monitoring/grafana { + buildGoModule = buildGo114Module; + }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoPackage = buildGo114Package; + }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -16171,17 +16521,9 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; - /* This package duplicates a lot of functionality from haskellPackages - instead of using the packages we maintain there. Now, a recent update to - haskellPackages causes these tools to fail evaluation, and I have been - unable to mark them as "broken" in a way that ofBorg bot recognizes. Since - I don't want to merge code into master that generates evaluation errors, I - have no other idea but to comment them out entirely. + hasura-graphql-engine = haskellPackages.graphql-engine; - inherit (callPackage ../servers/hasura { }) - hasura-cli - hasura-graphql-engine; - */ + hasura-cli = callPackage ../servers/hasura/cli.nix { }; heapster = callPackage ../servers/monitoring/heapster { }; @@ -16255,9 +16597,9 @@ in mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; - mediatomb = callPackage ../servers/mediatomb { }; + mbtileserver = callPackage ../servers/mbtileserver { }; - meguca = callPackage ../servers/meguca { }; + mediatomb = callPackage ../servers/mediatomb { }; memcached = callPackage ../servers/memcached {}; @@ -16318,7 +16660,9 @@ in unit = callPackage ../servers/http/unit { }; - ncdns = callPackage ../servers/dns/ncdns { }; + ncdns = callPackage ../servers/dns/ncdns { + buildGoPackage = buildGo114Package; + }; nginx = nginxStable; @@ -16357,6 +16701,8 @@ in oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + openbgpd = callPackage ../servers/openbgpd { }; + openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; }; openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; }; @@ -16406,7 +16752,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - qpaeq = qt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; + qpaeq = libsForQt514.callPackage ../servers/pulseaudio/qpaeq.nix { }; pulseaudioFull = pulseaudio.override { x11Support = true; @@ -16622,7 +16968,10 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus = callPackage ../servers/monitoring/prometheus { + buildGoPackage = buildGo114Package; + go = go_1_14; + }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; @@ -16718,6 +17067,7 @@ in restya-board = callPackage ../servers/web-apps/restya-board { }; rethinkdb = callPackage ../servers/nosql/rethinkdb { + stdenv = clangStdenv; libtool = darwin.cctools; }; @@ -16757,7 +17107,7 @@ in enableMDNS = true; enableDomainController = true; enableRegedit = true; - enableCephFS = true; + enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64; enableGlusterFS = true; }); @@ -16897,7 +17247,9 @@ in xinetd = callPackage ../servers/xinetd { }; - zookeeper = callPackage ../servers/zookeeper { }; + zookeeper = callPackage ../servers/zookeeper { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; @@ -16946,11 +17298,11 @@ in server = server-pgsql; }; - zabbix44 = recurseIntoAttrs (zabbixFor "v44"); + zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30"); - zabbix = zabbix44; + zabbix = zabbix50; zipkin = callPackage ../servers/monitoring/zipkin { }; @@ -17127,6 +17479,8 @@ in fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; + firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; + fwts = callPackage ../os-specific/linux/fwts { }; gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; @@ -17149,7 +17503,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { + ffado = libsForQt514.callPackage ../os-specific/linux/ffado { inherit (pkgs.linuxPackages) kernel; }; libffado = ffado; @@ -17179,6 +17533,8 @@ in gmailctl = callPackage ../applications/networking/gmailctl {}; + gomp = callPackage ../applications/version-management/gomp { }; + gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value }; @@ -17421,6 +17777,22 @@ in ]; }; + linux-rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + + linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17429,6 +17801,14 @@ in ]; }; + linux_5_8 = callPackage ../os-specific/linux/kernel/linux-5.8.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17503,8 +17883,6 @@ in ddcci-driver = callPackage ../os-specific/linux/ddcci { }; - deepin-anything = callPackage ../os-specific/linux/deepin-anything { }; - digimend = callPackage ../os-specific/linux/digimend { }; dpdk = callPackage ../os-specific/linux/dpdk { }; @@ -17541,11 +17919,12 @@ in nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); - nvidia_x11_legacy304 = nvidiaPackages.legacy_304; - nvidia_x11_legacy340 = nvidiaPackages.legacy_340; - nvidia_x11_legacy390 = nvidiaPackages.legacy_390; - nvidia_x11_beta = nvidiaPackages.beta; - nvidia_x11 = nvidiaPackages.stable; + nvidia_x11_legacy304 = nvidiaPackages.legacy_304; + nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_legacy390 = nvidiaPackages.legacy_390; + nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; + nvidia_x11 = nvidiaPackages.stable; openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; @@ -17571,6 +17950,8 @@ in rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; + rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; openafs = callPackage ../servers/openafs/1.6/module.nix { }; @@ -17595,6 +17976,8 @@ in netatop = callPackage ../os-specific/linux/netatop { }; + oci-seccomp-bpf-hook = if stdenv.lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; @@ -17608,6 +17991,12 @@ in systemtap = callPackage ../development/tools/profiling/systemtap { }; + system76 = callPackage ../os-specific/linux/system76 { }; + + system76-acpi = callPackage ../os-specific/linux/system76-acpi { }; + + system76-io = callPackage ../os-specific/linux/system76-io { }; + tmon = callPackage ../os-specific/linux/tmon { }; tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; @@ -17652,23 +18041,32 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_7; + linuxPackages_latest = linuxPackages_5_8; linux_latest = linuxPackages_latest.kernel; - # Build the kernel modules for the some of the kernels. + # Realtime kernel packages. + linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; + linuxPackages-rt = linuxPackages-rt_5_4; + linux-rt = linuxPackages-rt.kernel; + linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; + linuxPackages-rt_latest = linuxPackages-rt_5_6; + linux-rt_latest = linuxPackages-rt_latest.kernel; + linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3; linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4; + # Build kernel modules for some of the kernels. 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_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7); + linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8); - # When adding to this list: + # When adding to the list above: # - Update linuxPackages_latest to the latest version # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. @@ -17831,7 +18229,12 @@ in lsscsi = callPackage ../os-specific/linux/lsscsi { }; - lvm2 = callPackage ../os-specific/linux/lvm2 { }; + lvm2 = callPackage ../os-specific/linux/lvm2 { + # udev is the same package as systemd which depends on cryptsetup + # which depends on lvm2 again. But we only need the libudev part + # which does not depend on cryptsetup. + udev = udev.override { cryptsetup = null; }; + }; lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 { enableDmeventd = true; enableCmdlib = true; @@ -17887,6 +18290,8 @@ in nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; + system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; @@ -17900,6 +18305,8 @@ in iferr = callPackage ../development/tools/iferr { }; + ginkgo = callPackage ../development/tools/ginkgo { }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; @@ -17948,6 +18355,8 @@ in gotop = callPackage ../tools/system/gotop { }; + go-migrate = callPackage ../development/tools/go-migrate { }; + gomodifytags = callPackage ../development/tools/gomodifytags { }; go-langserver = callPackage ../development/tools/go-langserver { }; @@ -17992,6 +18401,8 @@ in pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { }; + pam_gnupg = callPackage ../os-specific/linux/pam_gnupg { }; + pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { }; pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; @@ -18081,8 +18492,6 @@ in regionset = callPackage ../os-specific/linux/regionset { }; - rfkill = callPackage ../os-specific/linux/rfkill { }; - rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; riscv-pk = callPackage ../misc/riscv-pk { }; @@ -18153,12 +18562,26 @@ in sysstat = callPackage ../os-specific/linux/sysstat { }; systemd = callPackage ../os-specific/linux/systemd { - utillinux = utillinuxMinimal; # break the cyclic dependency + # break some cyclic dependencies + utillinux = utillinuxMinimal; + # provide a super minimal gnupg used for systemd-machined + gnupg = callPackage ../tools/security/gnupg/22.nix { + enableMinimal = true; + guiSupport = false; + pcsclite = null; + sqlite = null; + pinentry = null; + adns = null; + gnutls = null; + libusb1 = null; + openldap = null; + readline = null; + zlib = null; + bzip2 = null; + }; }; - udev = systemd; # TODO: move to aliases.nix - # standalone cryptsetup generator for systemd - systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; + udev = systemd; # TODO: move to aliases.nix systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; @@ -18204,6 +18627,7 @@ in ubootPine64 ubootPine64LTS ubootPinebook + ubootPinebookPro ubootQemuAarch64 ubootQemuArm ubootRaspberryPi @@ -18638,7 +19062,7 @@ in kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; - kde2-decoration = libsForQt5.callPackage ../data/themes/kde2 { }; + kde2-decoration = libsForQt514.callPackage ../data/themes/kde2 { }; kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; @@ -18714,6 +19138,10 @@ in marwaita = callPackage ../data/themes/marwaita { }; + marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; + + marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -18734,8 +19162,6 @@ in medio = callPackage ../data/fonts/medio { }; - mint-x-icons = callPackage ../data/icons/mint-x-icons { }; - mno16 = callPackage ../data/fonts/mno16 { }; mnist = callPackage ../data/machine-learning/mnist { }; @@ -18878,7 +19304,7 @@ in qogir-theme = callPackage ../data/themes/qogir { }; - qtcurve = libsForQt5.callPackage ../data/themes/qtcurve {}; + qtcurve = libsForQt514.callPackage ../data/themes/qtcurve {}; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; @@ -18943,7 +19369,7 @@ in qgo = libsForQt5.callPackage ../games/qgo { }; - qmc2 = libsForQt5.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -19095,6 +19521,8 @@ in vegeta = callPackage ../tools/networking/vegeta { }; + venta = callPackage ../data/themes/venta { }; + victor-mono = callPackage ../data/fonts/victor-mono { }; vimix-gtk-themes = callPackage ../data/themes/vimix {}; @@ -19131,7 +19559,7 @@ in zafiro-icons = callPackage ../data/icons/zafiro-icons { }; - zeal = libsForQt5.callPackage ../data/documentation/zeal { }; + zeal = libsForQt514.callPackage ../data/documentation/zeal { }; zilla-slab = callPackage ../data/fonts/zilla-slab { }; @@ -19181,7 +19609,7 @@ in ahoviewer = callPackage ../applications/graphics/ahoviewer { }; - airwave = callPackage ../applications/audio/airwave { }; + airwave = callPackage ../applications/audio/airwave { qt5 = qt514; }; akira-unstable = callPackage ../applications/graphics/akira { }; @@ -19199,7 +19627,7 @@ in msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = libsForQt5.callPackage ../applications/audio/amarok { }; + amarok = libsForQt514.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility amfora = callPackage ../applications/networking/browsers/amfora { }; @@ -19220,7 +19648,7 @@ in antfs-cli = callPackage ../applications/misc/antfs-cli {}; - antimony = libsForQt5.callPackage ../applications/graphics/antimony {}; + antimony = libsForQt514.callPackage ../applications/graphics/antimony {}; antiword = callPackage ../applications/office/antiword {}; @@ -19253,8 +19681,6 @@ in arion = callPackage ../applications/virtualization/arion { }; - arora = callPackage ../applications/networking/browsers/arora { }; - asuka = callPackage ../applications/networking/browsers/asuka { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -19299,7 +19725,7 @@ in bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - cadence = qt5.callPackage ../applications/audio/cadence { }; + cadence = libsForQt514.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; @@ -19377,7 +19803,7 @@ in bevelbar = callPackage ../applications/window-managers/bevelbar { }; - bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; + bibletime = libsForQt514.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { glew = glew110; @@ -19419,6 +19845,8 @@ in bgpq3 = callPackage ../tools/networking/bgpq3 { }; + bgpq4 = callPackage ../tools/networking/bgpq4 { }; + blackbox = callPackage ../applications/version-management/blackbox { }; bleachbit = callPackage ../applications/misc/bleachbit { }; @@ -19431,6 +19859,10 @@ in gtk = gtk3; }; + bluej = callPackage ../applications/editors/bluej/default.nix { + jdk = jetbrains.jdk; + }; + bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; blugon = callPackage ../applications/misc/blugon { }; @@ -19487,9 +19919,13 @@ in calculix = callPackage ../applications/science/math/calculix {}; - calibre = libsForQt5.callPackage ../applications/misc/calibre { }; + calibre-py2 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; - calligra = libsForQt5.callPackage ../applications/office/calligra { + calibre-py3 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; + + calibre = calibre-py3; + + calligra = libsForQt514.callPackage ../applications/office/calligra { inherit (kdeApplications) akonadi-calendar akonadi-contacts; openjpeg = openjpeg_1; poppler = poppler_0_61; @@ -19503,17 +19939,17 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; - carla = qt5.callPackage ../applications/audio/carla { }; + carla = libsForQt514.callPackage ../applications/audio/carla { }; castor = callPackage ../applications/networking/browsers/castor { }; catimg = callPackage ../tools/misc/catimg { }; - catt = python3Packages.callPackage ../applications/video/catt { }; + catt = callPackage ../applications/video/catt { }; cava = callPackage ../applications/audio/cava { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; + cb2bib = libsForQt514.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -19577,7 +20013,7 @@ in clightd = callPackage ../applications/misc/clight/clightd.nix { }; - clipgrab = qt5.callPackage ../applications/video/clipgrab { }; + clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { }; clipmenu = callPackage ../applications/misc/clipmenu { }; @@ -19604,11 +20040,11 @@ in cntr = callPackage ../applications/virtualization/cntr { }; - communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; + communi = libsForQt514.callPackage ../applications/networking/irc/communi { }; confclerk = callPackage ../applications/misc/confclerk { }; - copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + copyq = libsForQt514.callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { inherit (gnome2) libgnomeui GConf; @@ -19625,13 +20061,17 @@ in pygments = python27Packages.pygments; }; - csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { + csound-qt = libsForQt514.callPackage ../applications/audio/csound/csound-qt { python = python27; }; codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; + cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; }; + cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; }; + cudatext = cudatext-qt; + convos = callPackage ../applications/networking/irc/convos { }; comical = callPackage ../applications/graphics/comical { }; @@ -19640,11 +20080,13 @@ in convchain = callPackage ../tools/graphics/convchain {}; + cordless = callPackage ../applications/networking/instant-messengers/cordless { }; + coursera-dl = callPackage ../applications/misc/coursera-dl {}; coyim = callPackage ../applications/networking/instant-messengers/coyim {}; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { + cq-editor = libsForQt514.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; @@ -19664,7 +20106,7 @@ in curseradio = callPackage ../applications/audio/curseradio { }; - cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; + cutecom = libsForQt514.callPackage ../tools/misc/cutecom { }; cvs = callPackage ../applications/version-management/cvs { }; @@ -19720,7 +20162,7 @@ in dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; + dfilemanager = libsForQt514.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome2) libart_lgpl libgnomeui; @@ -19791,15 +20233,13 @@ in drawio = callPackage ../applications/graphics/drawio {}; - drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; - drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { + drawpile = libsForQt514.callPackage ../applications/graphics/drawpile { }; + drawpile-server-headless = libsForQt514.callPackage ../applications/graphics/drawpile { buildClient = false; buildServerGui = false; }; - droopy = callPackage ../applications/networking/droopy { - inherit (python3Packages) wrapPython; - }; + droopy = python37Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; @@ -19858,13 +20298,13 @@ in ekho = callPackage ../applications/audio/ekho { }; - electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; + electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { }; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; + electrum-ltc = libsForQt514.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; @@ -19872,11 +20312,31 @@ in elvis = callPackage ../applications/editors/elvis { }; - emacs = emacs26; - emacsPackages = emacs26Packages; - emacs-nox = emacs26-nox; + emacs = emacs27; + emacsPackages = emacs27Packages; + emacs-nox = emacs27-nox; + emacsWithPackages = emacsPackages.emacsWithPackages; - emacs26 = callPackage ../applications/editors/emacs { + emacs27 = callPackage ../applications/editors/emacs/27.nix { + # use override to enable additional features + libXaw = xorg.libXaw; + Xaw3d = null; + gconf = null; + alsaLib = null; + imagemagick = null; + acl = null; + gpm = null; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; + }; + + emacs27-nox = lowPrio (appendToName "nox" (emacs27.override { + withX = false; + withNS = false; + withGTK2 = false; + withGTK3 = false; + })); + + emacs26 = callPackage ../applications/editors/emacs/26.nix { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -19895,24 +20355,6 @@ in withGTK3 = false; })); - emacs25 = callPackage ../applications/editors/emacs/25.nix { - # use override to enable additional features - libXaw = xorg.libXaw; - Xaw3d = null; - gconf = null; - alsaLib = null; - imagemagick = null; - acl = null; - gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; - }; - - emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { - withX = false; - withGTK2 = false; - withGTK3 = false; - })); - emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit @@ -19944,12 +20386,10 @@ in }; }; - emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25); emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - - emacs25WithPackages = emacs25Packages.emacsWithPackages; + emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27); emacs26WithPackages = emacs26Packages.emacsWithPackages; - emacsWithPackages = emacsPackages.emacsWithPackages; + emacs27WithPackages = emacs27Packages.emacsWithPackages; inherit (gnome3) empathy; @@ -19963,6 +20403,8 @@ in epeg = callPackage ../applications/graphics/epeg { }; + epgstation = callPackage ../applications/video/epgstation { }; + inherit (gnome3) epiphany; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; @@ -19996,7 +20438,7 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; + evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; exercism = callPackage ../applications/misc/exercism { }; @@ -20098,13 +20540,15 @@ in foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; + foot = callPackage ../applications/misc/foot { }; + fossil = callPackage ../applications/version-management/fossil { }; freebayes = callPackage ../applications/science/biology/freebayes { }; freewheeling = callPackage ../applications/audio/freewheeling { }; - fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; + fritzing = libsForQt514.callPackage ../applications/science/electronics/fritzing { }; fsv = callPackage ../applications/misc/fsv { }; @@ -20127,7 +20571,7 @@ in geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; - ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; + ghostwriter = libsForQt514.callPackage ../applications/editors/ghostwriter { }; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; @@ -20162,7 +20606,7 @@ in gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { + goldendict = libsForQt514.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; @@ -20171,7 +20615,7 @@ in inherit (ocamlPackages) google-drive-ocamlfuse; google-musicmanager = callPackage ../applications/audio/google-musicmanager { - inherit (qt5) qtbase qtwebkit; + inherit (qt514) qtbase qtwebkit; # Downgrade to 1.34 to get libidn.so.11 libidn = (libidn.overrideAttrs (oldAttrs: { src = fetchurl { @@ -20187,6 +20631,8 @@ in gopher = callPackage ../applications/networking/gopher/gopher { }; + gophernotes = callPackage ../applications/editors/gophernotes { }; + goxel = callPackage ../applications/graphics/goxel { }; gpa = callPackage ../applications/misc/gpa { }; @@ -20197,7 +20643,7 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = qt5.callPackage ../applications/radio/gqrx { }; + gqrx = libsForQt514.callPackage ../applications/radio/gqrx { }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -20278,11 +20724,9 @@ in }); firefox-unwrapped = firefoxPackages.firefox; - firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; - firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; firefox-esr = firefox-esr-78; @@ -20324,7 +20768,7 @@ in redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; + flameshot = libsForQt514.callPackage ../tools/misc/flameshot { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); @@ -20348,15 +20792,20 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = qt5.callPackage ../applications/graphics/freecad { + freecad = libsForQt514.callPackage ../applications/graphics/freecad { mpi = openmpi; # pyside2 5.12 is broken under python 3.8 python3Packages = python37Packages; }; - freemind = callPackage ../applications/misc/freemind { }; + freemind = callPackage ../applications/misc/freemind { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - freenet = callPackage ../applications/networking/p2p/freenet { }; + freenet = callPackage ../applications/networking/p2p/freenet { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; @@ -20374,7 +20823,7 @@ in freerdpUnstable = freerdp; - friture = libsForQt5.callPackage ../applications/audio/friture { }; + friture = libsForQt514.callPackage ../applications/audio/friture { }; fte = callPackage ../applications/editors/fte { }; @@ -20468,17 +20917,17 @@ in opencv = python37Packages.opencv3; }; - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; + manuskript = libsForQt514.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; - mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; + mindforger = libsForQt514.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly {}; moe = callPackage ../applications/editors/moe { }; - multibootusb = qt5.callPackage ../applications/misc/multibootusb {}; + multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb { qt5 = qt514; }; praat = callPackage ../applications/audio/praat { }; @@ -20566,6 +21015,8 @@ in gollum = callPackage ../applications/misc/gollum { }; + gonic = callPackage ../servers/gonic { }; + googleearth = callPackage ../applications/misc/googleearth { }; google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; @@ -20580,11 +21031,11 @@ in gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { + gpsbabel = libsForQt514.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; }; - gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { }; + gpsbabel-gui = libsForQt514.callPackage ../applications/misc/gpsbabel/gui.nix { }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; @@ -20610,7 +21061,9 @@ in gv = callPackage ../applications/misc/gv { }; - gvisor = callPackage ../applications/virtualization/gvisor { }; + gvisor = callPackage ../applications/virtualization/gvisor { + go = go_1_14; + }; gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; @@ -20626,6 +21079,8 @@ in hackrf = callPackage ../applications/radio/hackrf { }; + hacksaw = callPackage ../tools/misc/hacksaw {}; + hakuneko = callPackage ../tools/misc/hakuneko { }; hamster = callPackage ../applications/misc/hamster { }; @@ -20695,8 +21150,8 @@ in hugo = callPackage ../applications/misc/hugo { }; - hydrogen = callPackage ../applications/audio/hydrogen { }; - hydrogen-unstable = qt5.callPackage ../applications/audio/hydrogen/unstable.nix { }; + hydrogen = qt5.callPackage ../applications/audio/hydrogen { }; + hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit. hydroxide = callPackage ../applications/networking/hydroxide { }; @@ -20808,6 +21263,8 @@ in i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; + i3lock-fancy-rapid = callPackage ../applications/window-managers/i3/lock-fancy-rapid.nix { }; + i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { @@ -20824,6 +21281,8 @@ in i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; + windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; + wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; @@ -20848,6 +21307,10 @@ in iksemel = callPackage ../development/libraries/iksemel { }; + imag = callPackage ../applications/misc/imag { + inherit (darwin.apple_sdk.frameworks) Security; + }; + imagej = callPackage ../applications/graphics/imagej { }; imagemagick_light = imagemagick.override { @@ -20921,23 +21384,23 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; - inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; + inkcut = libsForQt514.callPackage ../applications/misc/inkcut { }; inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; }; - inkscape_0 = callPackage ../applications/graphics/inkscape/0.x.nix { - lcms = lcms2; - }; + inkscape-with-extensions = callPackage ../applications/graphics/inkscape/with-extensions.nix { }; - inspectrum = libsForQt5.callPackage ../applications/radio/inspectrum { }; + inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); + + inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; }; - ipe = libsForQt5.callPackage ../applications/graphics/ipe { + ipe = libsForQt514.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; @@ -21008,7 +21471,7 @@ in joe = callPackage ../applications/editors/joe { }; - josm = callPackage ../applications/misc/josm { jre = jdk11; }; + josm = callPackage ../applications/misc/josm { }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -21028,7 +21491,7 @@ in k3s = callPackage ../applications/networking/cluster/k3s {}; - k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; + k9copy = libsForQt514.callPackage ../applications/video/k9copy {}; kail = callPackage ../tools/networking/kail { }; @@ -21042,36 +21505,61 @@ in let mkApplications = import ../applications/kde; attrs = { - inherit lib libsForQt5 fetchurl; + libsForQt5 = libsForQt514; + inherit lib fetchurl; inherit okteta; }; in recurseIntoAttrs (makeOverridable mkApplications attrs); inherit (kdeApplications) - akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b - kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog - keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake - kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle; + akonadi akregator ark + bomber bovo + dolphin dragon + elisa + ffmpegthumbs filelight + granatier gwenview + k3b + kaddressbook kalzium kapptemplate kapman kate katomic + kblackbox kblocks kbounce + kcachegrind kcalc kcharselect kcolorchooser + kdenlive kdf kdialog kdiamond + keditbookmarks + kfind kfloppy + kget kgpg + khelpcenter + kig kigo killbots kitinerary + kleopatra klettres klines + kmag kmail kmines kmix kmplot + knavalbattle knetwalk knights + kollision kolourpaint kompare konsole kontact korganizer + kpkpass + krdc kreversi krfb + kshisen ksquares ksystemlog + kteatime ktimer ktouch kturtle + kwalletmanager kwave + marble minuet + okular + picmi + spectacle + yakuake; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; - - kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { }; + kdeconnect = libsForQt514.callPackage ../applications/misc/kdeconnect { }; inherit (kdeFrameworks) kdesu; - kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; + kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_10; }; - kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix { python = python3; }; @@ -21085,7 +21573,7 @@ in kermit = callPackage ../tools/misc/kermit { }; - kexi = libsForQt5.callPackage ../applications/office/kexi { }; + kexi = libsForQt514.callPackage ../applications/office/kexi { }; khronos = callPackage ../applications/office/khronos { }; @@ -21093,7 +21581,7 @@ in keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; - kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; + kgraphviewer = libsForQt514.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { }; @@ -21121,7 +21609,7 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { + kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { inherit (kdeApplications) kidentitymanagement; inherit (kdeFrameworks) kdewebkit; }; @@ -21130,23 +21618,23 @@ in kondo = callPackage ../applications/misc/kondo { }; - konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; + konversation = libsForQt514.callPackage ../applications/networking/irc/konversation { }; - kotatogram-desktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; + kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kpt = callPackage ../applications/networking/cluster/kpt { }; - krita = libsForQt5.callPackage ../applications/graphics/krita { + krita = libsForQt514.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; }; - krusader = libsForQt5.callPackage ../applications/misc/krusader { }; + krusader = libsForQt514.callPackage ../applications/misc/krusader { }; ksuperkey = callPackage ../tools/X11/ksuperkey { }; ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + ktorrent = libsForQt514.callPackage ../applications/networking/p2p/ktorrent { }; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; @@ -21166,6 +21654,8 @@ in k9s = callPackage ../applications/networking/cluster/k9s { }; + popeye = callPackage ../applications/networking/cluster/popeye { }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; @@ -21180,7 +21670,7 @@ in python3Packages = python36Packages; }; - kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; + kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; lame = callPackage ../development/libraries/lame { }; @@ -21214,11 +21704,11 @@ in legit = gitAndTools.legit; - leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; + leo-editor = libsForQt514.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; - librecad = libsForQt5.callPackage ../applications/misc/librecad { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; libreoffice-unwrapped = libreoffice.libreoffice; @@ -21242,10 +21732,11 @@ in }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libsForQt5.callPackage ../applications/office/libreoffice + libreoffice = libsForQt514.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; + jdk = jdk11; }); }); @@ -21253,6 +21744,7 @@ in libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { variant = "fresh"; + jdk = jdk11; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; @@ -21262,6 +21754,7 @@ in (libreoffice-args // { icu = icu64; variant = "still"; + jdk = jdk8; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -21280,12 +21773,18 @@ in linuxband = callPackage ../applications/audio/linuxband { }; + littlegptracker = callPackage ../applications/audio/littlegptracker { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + ledger = callPackage ../applications/office/ledger { }; ledger-autosync = callPackage ../applications/office/ledger-autosync { }; ledger-web = callPackage ../applications/office/ledger-web { }; + lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { }; + lighthouse = callPackage ../applications/misc/lighthouse { }; lighttable = callPackage ../applications/editors/lighttable {}; @@ -21312,13 +21811,13 @@ in loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; + lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { }; lrzsz = callPackage ../tools/misc/lrzsz { }; lsp-plugins = callPackage ../applications/audio/lsp-plugins { }; - luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt514.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -21356,7 +21855,7 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop libgnome-keyring; + inherit (gnome3) gnome-desktop; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { @@ -21368,6 +21867,8 @@ in lv2bm = callPackage ../applications/audio/lv2bm { }; + lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; + lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = libsForQt5.callPackage ../applications/misc/lyx { }; @@ -21399,7 +21900,7 @@ in mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; - mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; + mapmap = libsForQt514.callPackage ../applications/video/mapmap { }; marathonctl = callPackage ../tools/virtualization/marathonctl { } ; @@ -21433,7 +21934,7 @@ in mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; }; + mediathekview = callPackage ../applications/video/mediathekview { }; meteo = callPackage ../applications/networking/weather/meteo { }; @@ -21445,7 +21946,7 @@ in meme = callPackage ../applications/graphics/meme { }; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { + mendeley = libsForQt514.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; @@ -21460,7 +21961,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -21489,7 +21990,7 @@ in minishift = callPackage ../applications/networking/cluster/minishift { }; - minitube = libsForQt5.callPackage ../applications/video/minitube { }; + minitube = libsForQt514.callPackage ../applications/video/minitube { }; mimic = callPackage ../applications/audio/mimic { }; @@ -21551,6 +22052,8 @@ in moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; + mooSpace = callPackage ../applications/audio/mooSpace { }; + mop = callPackage ../applications/misc/mop { }; mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { @@ -21645,9 +22148,11 @@ in mpv = wrapMpv mpv-unwrapped {}; mpvScripts = recurseIntoAttrs { + autoload = callPackage ../applications/video/mpv/scripts/autoload.nix {}; convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; + sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -21668,6 +22173,7 @@ in avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; + grpcSupport = config.murmur.grpcSupport or true; }).murmur; mumble = (callPackages ../applications/networking/mumble { @@ -21675,6 +22181,7 @@ in jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or stdenv.isLinux; + qt5 = qt514; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -21690,7 +22197,7 @@ in if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt5.callPackage ../applications/audio/musescore { }; + libsForQt514.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -21710,8 +22217,6 @@ in neocomp = callPackage ../applications/window-managers/neocomp { }; - netease-cloud-music = callPackage ../applications/audio/netease-cloud-music {}; - newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { @@ -21720,6 +22225,8 @@ in nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; + noaa-apt = callPackage ../applications/radio/noaa-apt { }; + node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; ninjas2 = callPackage ../applications/audio/ninjas2 {}; @@ -21739,9 +22246,12 @@ in osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = callPackage ../applications/networking/ostinato { }; + ostinato = callPackage ../applications/networking/ostinato { + wireshark = wireshark.override { qt5 = qt514; }; + }; - p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; + p4 = callPackage ../applications/version-management/p4 { }; + p4v = libsForQt514.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; @@ -21788,7 +22298,7 @@ in i3GapsSupport = false; }; - polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { jre = openjdk11; @@ -21798,11 +22308,11 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; - rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; + rssguard = libsForQt514.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - shotcut = libsForQt5.callPackage ../applications/video/shotcut { + shotcut = libsForQt514.callPackage ../applications/video/shotcut { libmlt = mlt; }; @@ -21819,11 +22329,9 @@ in }; }; - sky = callPackage ../applications/networking/instant-messengers/sky {}; - smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt5.callPackage ../applications/video/smtube {}; + smtube = libsForQt514.callPackage ../applications/video/smtube {}; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; @@ -21844,7 +22352,7 @@ in }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - mlt-qt5 = libsForQt5.mlt; + mlt-qt5 = libsForQt514.mlt; }; typora = callPackage ../applications/editors/typora { }; @@ -21901,7 +22409,7 @@ in mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; + mythtv = libsForQt514.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; @@ -21944,7 +22452,7 @@ in nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; - notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; + notepadqq = libsForQt514.callPackage ../applications/editors/notepadqq { }; notbit = callPackage ../applications/networking/mailreaders/notbit { }; @@ -21973,13 +22481,13 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; + obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; - obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; + obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; - obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { }; obsidian = callPackage ../applications/misc/obsidian { }; @@ -21999,6 +22507,8 @@ in inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; + openambit = qt5.callPackage ../applications/misc/openambit { }; + openbox = callPackage ../applications/window-managers/openbox { }; openbox-menu = callPackage ../applications/misc/openbox-menu { @@ -22017,12 +22527,16 @@ in openjump = callPackage ../applications/misc/openjump { }; - openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; + openorienteering-mapper = libsForQt514.callPackage ../applications/gis/openorienteering-mapper { }; openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; + opentoonz = (qt514.overrideScope' (_: _: { + libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; + })).callPackage ../applications/graphics/opentoonz { }; + opentx = libsForQt5.callPackage ../applications/misc/opentx { }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -22126,7 +22640,9 @@ in }; pdfcpu = callPackage ../applications/graphics/pdfcpu { }; - pdftk = callPackage ../tools/typesetting/pdftk { }; + pdftk = callPackage ../tools/typesetting/pdftk { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { }); pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; @@ -22160,6 +22676,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + picoloop = callPackage ../applications/audio/picoloop { }; + pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if config.pidgin.openssl or true then openssl else null; gnutls = if config.pidgin.gnutls or false then gnutls else null; @@ -22236,7 +22754,7 @@ in plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); + plover = recurseIntoAttrs (libsForQt514.callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; @@ -22246,7 +22764,9 @@ in pommed_light = callPackage ../os-specific/linux/pommed-light {}; - polymake = callPackage ../applications/science/math/polymake { }; + polymake = callPackage ../applications/science/math/polymake { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pond = callPackage ../applications/networking/instant-messengers/pond { }; @@ -22282,9 +22802,9 @@ in ps2client = callPackage ../applications/networking/ps2client { }; - psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; + psi = libsForQt514.callPackage ../applications/networking/instant-messengers/psi { }; - psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; + psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { }; psol = callPackage ../development/libraries/psol { }; @@ -22298,7 +22818,7 @@ in pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { }; - pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { }; + pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; @@ -22331,7 +22851,7 @@ in qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { + qgis-unwrapped = libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { withGrass = false; }; @@ -22343,11 +22863,11 @@ in qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; - qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {}; + qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {}; garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; - qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; + qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { boost = boost17x; @@ -22363,7 +22883,7 @@ in qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; - qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; + qnotero = libsForQt514.callPackage ../applications/office/qnotero { }; qrcode = callPackage ../tools/graphics/qrcode {}; @@ -22376,7 +22896,7 @@ in qsstv = qt5.callPackage ../applications/radio/qsstv { }; - qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt514.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { guvcview = guvcview.override { @@ -22424,9 +22944,9 @@ in quilter = callPackage ../applications/editors/quilter { }; - quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; + quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; + falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; @@ -22457,7 +22977,15 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = let + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + inherit (pkgs) qt5 libsForQt5; + }); + }); + }); + in pkgs_.libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -22475,9 +23003,9 @@ in raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; - rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; }; - rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; + rapid-photo-downloader = libsForQt514.callPackage ../applications/graphics/rapid-photo-downloader { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -22493,7 +23021,7 @@ in rclone = callPackage ../applications/networking/sync/rclone { }; - rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; + rclone-browser = libsForQt514.callPackage ../applications/networking/sync/rclone/browser.nix { }; rcs = callPackage ../applications/version-management/rcs { }; @@ -22513,7 +23041,7 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; + retroshare = libsForQt514.callPackage ../applications/networking/p2p/retroshare { }; retroshare06 = retroshare; rgp = libsForQt5.callPackage ../development/tools/rgp { }; @@ -22539,13 +23067,14 @@ in rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; - rstudio = libsForQt5.callPackage ../applications/editors/rstudio { + rstudio = libsForQt514.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); @@ -22581,13 +23110,15 @@ in sakura = callPackage ../applications/misc/sakura { }; - sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; + sameboy = callPackage ../misc/emulators/sameboy { }; + + sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; scantailor = callPackage ../applications/graphics/scantailor { }; - scantailor-advanced = qt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; + scantailor-advanced = libsForQt514.callPackage ../applications/graphics/scantailor/advanced.nix { }; sc-im = callPackage ../applications/misc/sc-im { }; @@ -22597,18 +23128,16 @@ in inherit (gnome2) libart_lgpl; }; - scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; + scribusUnstable = libsForQt514.callPackage ../applications/office/scribus/unstable.nix { }; - seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; - - seeks = callPackage ../tools/networking/p2p/seeks { - protobuf = protobuf3_1; - }; + seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; + seq66 = qt5.callPackage ../applications/audio/seq66 { }; + setbfree = callPackage ../applications/audio/setbfree { }; sfizz = callPackage ../applications/audio/sfizz { }; @@ -22707,8 +23236,13 @@ in linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) + sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) // (callPackage ../applications/misc/sweethome3d/editors.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 sweethome3dApp = sweethome3d.application; }) ); @@ -22762,11 +23296,11 @@ in curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = qt5.callPackage ../applications/misc/cura { }; + cura = libsForQt514.callPackage ../applications/misc/cura { }; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; + curaLulzbot = libsForQt514.callPackage ../applications/misc/cura/lulzbot/default.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; @@ -22780,9 +23314,13 @@ in prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; - sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; + super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; - skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; + + sddm = libsForQt514.callPackage ../applications/display-managers/sddm { }; + + skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; smartgithg = callPackage ../applications/version-management/smartgithg { jre = openjdk11; @@ -22798,11 +23336,11 @@ in sipp = callPackage ../development/tools/misc/sipp { }; - skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; + skanlite = libsForQt514.callPackage ../applications/office/skanlite { }; soci = callPackage ../development/libraries/soci { }; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; + sonic-lineup = libsForQt514.callPackage ../applications/audio/sonic-lineup { }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; @@ -22816,7 +23354,7 @@ in spek = callPackage ../applications/audio/spek { }; - spotify = callPackage ../applications/audio/spotify { + spotify-unwrapped = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; libpng = libpng12; curl = curl.override { @@ -22824,6 +23362,8 @@ in }; }; + spotify = callPackage ../applications/audio/spotify/wrapper.nix { }; + libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {}); sourcetrail = callPackage ../development/tools/sourcetrail { }; @@ -22892,11 +23432,16 @@ in surf-display = callPackage ../desktops/surf-display { }; + surge = callPackage ../applications/audio/surge { + inherit (gnome3) zenity; + git = gitMinimal; + }; + sunvox = callPackage ../applications/audio/sunvox { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { + swift-im = libsForQt514.callPackage ../applications/networking/instant-messengers/swift-im { inherit (gnome2) GConf; boost = boost168; }; @@ -22908,7 +23453,9 @@ in # this can be changed to python3 once pyside2 is updated to support the latest python version syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + buildGoModule = buildGo114Module; + }) syncthing syncthing-cli syncthing-discovery @@ -22954,6 +23501,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + talentedhack = callPackage ../applications/audio/talentedhack { }; + tambura = callPackage ../applications/audio/tambura { }; tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { }; @@ -22965,7 +23514,7 @@ in teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskell = callPackage ../applications/misc/taskell { }; + taskell = haskell.lib.justStaticExecutables haskellPackages.taskell; taskjuggler = callPackage ../applications/misc/taskjuggler { }; @@ -23009,6 +23558,8 @@ in terminus = callPackage ../applications/misc/terminus { }; + tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; + lxterminal = callPackage ../applications/misc/lxterminal { }; aminal = callPackage ../applications/misc/aminal { @@ -23103,7 +23654,7 @@ in todoman = callPackage ../applications/office/todoman { }; - toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; + toggldesktop = libsForQt514.callPackage ../applications/misc/toggldesktop { }; topydo = callPackage ../applications/misc/topydo {}; @@ -23115,7 +23666,7 @@ in tortoisehg = callPackage ../applications/version-management/tortoisehg { }; - tony = libsForQt5.callPackage ../applications/audio/tony { }; + tony = libsForQt514.callPackage ../applications/audio/tony { }; toot = callPackage ../applications/misc/toot { }; @@ -23130,8 +23681,6 @@ in transcode = callPackage ../applications/audio/transcode { }; - transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { }; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; @@ -23157,14 +23706,20 @@ in treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; + tremc = callPackage ../applications/networking/p2p/tremc { }; + tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { + trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { inherit (kdeApplications) akonadi-contacts; }; tudu = callPackage ../applications/office/tudu { }; + tunefish = callPackage ../applications/audio/tunefish { + stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4 + }; + tut = callPackage ../applications/misc/tut { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; @@ -23215,12 +23770,14 @@ in utox = callPackage ../applications/networking/instant-messengers/utox { }; - valentina = libsForQt5.callPackage ../applications/misc/valentina { }; + valentina = libsForQt514.callPackage ../applications/misc/valentina { }; vbindiff = callPackage ../applications/editors/vbindiff { }; vcprompt = callPackage ../applications/version-management/vcprompt { }; + vcs = callPackage ../applications/video/vcs { }; + vcv-rack = callPackage ../applications/audio/vcv-rack { }; vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; @@ -23252,18 +23809,12 @@ in vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; }; - qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { - features = "huge"; # one of tiny, small, normal, big or huge - lua = pkgs.lua5; - flags = [ "python" "X11" ]; # only flag "X11" by now - }); - vimpc = callPackage ../applications/audio/vimpc { }; wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; @@ -23277,7 +23828,7 @@ in neovim = wrapNeovim neovim-unwrapped { }; - neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; + neovim-qt = libsForQt514.callPackage ../applications/editors/neovim/qt.nix { }; olifant = callPackage ../applications/misc/olifant { }; @@ -23293,6 +23844,8 @@ in inherit (lua52Packages) lpeg; }; + viw = callPackage ../applications/editors/viw { }; + virt-viewer = callPackage ../applications/virtualization/virt-viewer { }; virt-top = callPackage ../applications/virtualization/virt-top { }; @@ -23303,7 +23856,7 @@ in system-libvirt = libvirt; }; - virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { + virt-manager-qt = libsForQt514.callPackage ../applications/virtualization/virt-manager/qt.nix { qtermwidget = lxqt.qtermwidget; }; @@ -23311,9 +23864,12 @@ in virtscreen = callPackage ../tools/admin/virtscreen {}; - virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { + virtual-ans = callPackage ../applications/audio/virtual-ans {}; + + virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; virtualboxHardened = lowPrio (virtualbox.override { @@ -23368,12 +23924,14 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt5.vlc; + vlc = libsForQt514.vlc; vlc_qt5 = vlc; vmpk = callPackage ../applications/audio/vmpk { }; + vocproc = callPackage ../applications/audio/vocproc { }; + vnstat = callPackage ../applications/networking/vnstat { }; vocal = callPackage ../applications/audio/vocal { }; @@ -23398,7 +23956,10 @@ in vue = callPackage ../applications/misc/vue { }; - vuze = callPackage ../applications/networking/p2p/vuze { }; + vuze = callPackage ../applications/networking/p2p/vuze { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; vwm = callPackage ../applications/window-managers/vwm { }; @@ -23446,9 +24007,9 @@ in wayvnc = callPackage ../applications/networking/remote/wayvnc { }; - webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { }; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; + webmacs = libsForQt514.callPackage ../applications/networking/browsers/webmacs {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; @@ -23526,7 +24087,7 @@ in worldengine-cli = python3Packages.worldengine; - wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {}; + wpsoffice = libsForQt514.callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -23693,17 +24254,27 @@ in xawtv = callPackage ../applications/video/xawtv { }; + xbattbar = callPackage ../applications/misc/xbattbar { }; + xbindkeys = callPackage ../tools/X11/xbindkeys { }; xbindkeys-config = callPackage ../tools/X11/xbindkeys-config { gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { }; + kodiPlain = callPackage ../applications/video/kodi { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; + kodiPlainWayland = callPackage ../applications/video/kodi { + useWayland = true; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - kodiGBM = callPackage ../applications/video/kodi { useGbm = true; }; + kodiGBM = callPackage ../applications/video/kodi { + useGbm = true; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); @@ -23899,6 +24470,8 @@ in xmacro = callPackage ../tools/X11/xmacro { }; + xmenu = callPackage ../applications/misc/xmenu { }; + xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; xmp = callPackage ../applications/audio/xmp { }; @@ -23909,7 +24482,7 @@ in inherit (gnome2) scrollkeeper libglade; }; - xygrib = libsForQt5.callPackage ../applications/misc/xygrib/default.nix {}; + xygrib = libsForQt514.callPackage ../applications/misc/xygrib/default.nix {}; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -23943,11 +24516,13 @@ in youtube-viewer = perlPackages.WWWYoutubeViewer; + ytalk = callPackage ../applications/networking/instant-messengers/ytalk { }; + ytcc = callPackage ../tools/networking/ytcc { }; zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt5.callPackage ../applications/office/zanshin { + zanshin = libsForQt514.callPackage ../applications/office/zanshin { inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; inherit (kdeFrameworks) krunner kwallet kcalendarcore; boost = boost160; @@ -23990,7 +24565,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; @@ -24018,7 +24593,7 @@ in withGui = false; }; - bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited.nix { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = true; }; @@ -24027,10 +24602,10 @@ in withGui = false; }; - bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; - bitcoin-gold = libsForQt5.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; + bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; btc1 = callPackage ../applications/blockchains/btc1.nix { @@ -24039,6 +24614,8 @@ in }; btc1d = btc1.override { withGui = false; }; + btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; + cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; dashpay = callPackage ../applications/blockchains/dashpay.nix { }; @@ -24048,7 +24625,7 @@ in dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; - digibyte = libsForQt5.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; + digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; digibyted = callPackage ../applications/blockchains/digibyte.nix { withGui = false; }; dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; @@ -24068,7 +24645,7 @@ in ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; - litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin.nix { + litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin.nix { inherit (darwin.apple_sdk.frameworks) AppKit; }; litecoind = litecoin.override { withGui = false; }; @@ -24091,6 +24668,8 @@ in namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; + nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; + pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; @@ -24102,7 +24681,7 @@ in tessera = callPackage ../applications/blockchains/tessera.nix { }; - vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; + vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; @@ -24234,7 +24813,7 @@ in chessx = libsForQt5.callPackage ../games/chessx { }; - chiaki = libsForQt5.callPackage ../games/chiaki { }; + chiaki = libsForQt514.callPackage ../games/chiaki { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -24286,7 +24865,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt5.callPackage ../applications/graphics/digikam { + digikam = libsForQt514.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) akonadi-contacts; inherit (kdeFrameworks) kcalendarcore; @@ -24373,7 +24952,7 @@ in freecell-solver = callPackage ../games/freecell-solver { }; - freeciv = callPackage ../games/freeciv { }; + freeciv = callPackage ../games/freeciv { qt5 = qt514; }; freeciv_gtk = freeciv.override { gtkClient = true; @@ -24400,7 +24979,6 @@ in fsg = callPackage ../games/fsg { wxGTK = wxGTK28.override { unicode = false; - gst-plugins-base = null; }; }; @@ -24450,6 +25028,8 @@ in gshogi = python3Packages.callPackage ../games/gshogi {}; + gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; + qtads = qt5.callPackage ../games/qtads { }; gtetrinet = callPackage ../games/gtetrinet { @@ -24466,7 +25046,7 @@ in hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; - hedgewars = libsForQt5.callPackage ../games/hedgewars { + hedgewars = libsForQt514.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; @@ -24493,17 +25073,31 @@ in katago = callPackage ../games/katago { }; katagoWithCuda = katago.override { - cudaSupport = true; + enableCuda = true; cudnn = cudnn_cudatoolkit_10_2; cudatoolkit = cudatoolkit_10_2; }; + katagoCPU = katago.override { + enableGPU = false; + }; + klavaro = callPackage ../games/klavaro {}; kobodeluxe = callPackage ../games/kobodeluxe { }; + koboredux = callPackage ../games/koboredux { }; + + koboredux-free = callPackage ../games/koboredux { + useProprietaryAssets = false; + }; + leela-zero = libsForQt5.callPackage ../games/leela-zero { }; + legendary-gl = python38Packages.callPackage ../games/legendary-gl { }; + + left4gore-bin = callPackage ../games/left4gore { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; @@ -24656,7 +25250,7 @@ in papermc = callPackage ../games/papermc { }; - pentobi = libsForQt5.callPackage ../games/pentobi { }; + pentobi = libsForQt514.callPackage ../games/pentobi { }; performous = callPackage ../games/performous { boost = boost166; @@ -24741,11 +25335,11 @@ in rrootage = callPackage ../games/rrootage { }; - saga = callPackage ../applications/gis/saga { + saga = libsForQt514.callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - samplv1 = callPackage ../applications/audio/samplv1 { }; + samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; }; sauerbraten = callPackage ../games/sauerbraten {}; @@ -24799,9 +25393,9 @@ in lua = lua5_1; }; - solarus = libsForQt5.callPackage ../games/solarus { }; - - solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; + # solarus and solarus-quest-editor must use the same version of Qt. + solarus = libsForQt514.callPackage ../games/solarus { }; + solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -25003,6 +25597,8 @@ in tk = tk-8_5; }; + xcowsay = callPackage ../games/xcowsay { }; + xjump = callPackage ../games/xjump { }; # TODO: the corresponding nix file is missing # xracer = callPackage ../games/xracer { }; @@ -25085,10 +25681,7 @@ in cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); - deepin = recurseIntoAttrs (import ../desktops/deepin { - inherit pkgs libsForQt5; - inherit (lib) makeScope; - }); + inherit (cinnamon) mint-x-icons mint-y-icons; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; @@ -25143,7 +25736,9 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit pkgs libsForQt5; + qt5 = qt514; + libsForQt5 = libsForQt514; + inherit pkgs; inherit (lib) makeScope; }); @@ -25179,7 +25774,8 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { - inherit libsForQt5 lib fetchurl; + libsForQt5 = libsForQt514; + inherit lib fetchurl; gconf = gnome2.GConf; inherit gsettings-desktop-schemas; }; @@ -25197,9 +25793,11 @@ in plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde; - kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; - - krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; + inherit (plasma5.thirdParty) + plasma-applet-caffeine-plus + kwin-dynamic-workspaces + kwin-tiling + krohnkite; ### SCIENCE @@ -25213,7 +25811,9 @@ in gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; - jmol = callPackage ../applications/science/chemistry/jmol { }; + jmol = callPackage ../applications/science/chemistry/jmol { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; marvin = callPackage ../applications/science/chemistry/marvin { }; @@ -25385,6 +25985,8 @@ in manta = callPackage ../applications/science/biology/manta { }; + obitools3 = callPackage ../applications/science/biology/obitools/obitools3.nix { }; + octopus-caller = callPackage ../applications/science/biology/octopus { }; paml = callPackage ../applications/science/biology/paml { }; @@ -25414,6 +26016,8 @@ in snpeff = callPackage ../applications/science/biology/snpeff { }; + somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { }; + somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; sortmerna = callPackage ../applications/science/biology/sortmerna { }; @@ -25443,6 +26047,8 @@ in varscan = callPackage ../applications/science/biology/varscan { }; + whisper = callPackage ../applications/science/biology/whisper { }; + hmmer = callPackage ../applications/science/biology/hmmer { }; bwa = callPackage ../applications/science/biology/bwa { }; @@ -25638,7 +26244,7 @@ in xfitter = callPackage ../applications/science/physics/xfitter {}; - xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; + xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { }; ### SCIENCE/PROGRAMMING @@ -25698,8 +26304,11 @@ in cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; }); + stdenv = gccStdenv; + }; + cvc4 = callPackage ../applications/science/logic/cvc4 { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - cvc4 = callPackage ../applications/science/logic/cvc4 {}; drat-trim = callPackage ../applications/science/logic/drat-trim {}; @@ -25734,11 +26343,11 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = stdenv.lib.overrideDerivation polyml57 (attrs: { + polyml = stdenv.lib.overrideDerivation polyml (attrs: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); - java = if stdenv.isLinux then jre else jdk; + java = openjdk11; }; iprover = callPackage ../applications/science/logic/iprover { }; @@ -25753,6 +26362,7 @@ in lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; elan = callPackage ../applications/science/logic/elan {}; + mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;}; @@ -25832,7 +26442,9 @@ in z3 = callPackage ../applications/science/logic/z3 { python = python2; }; z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; - tlaplus = callPackage ../applications/science/logic/tlaplus {}; + tlaplus = callPackage ../applications/science/logic/tlaplus { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; @@ -25856,7 +26468,7 @@ in adms = callPackage ../applications/science/electronics/adms { }; - appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; + appcsxcad = libsForQt514.callPackage ../applications/science/electronics/appcsxcad { }; # Since version 8 Eagle requires an Autodesk account and a subscription # in contrast to single payment for the charged editions. @@ -25865,12 +26477,14 @@ in openssl = openssl_1_0_2; }; - eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; + eagle = libsForQt514.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; csxcad = callPackage ../applications/science/electronics/csxcad { }; + flatcam = callPackage ../applications/science/electronics/flatcam { }; + fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { @@ -25902,7 +26516,7 @@ in pcb = callPackage ../applications/science/electronics/pcb { }; - qcsxcad = libsForQt5.callPackage ../applications/science/electronics/qcsxcad { }; + qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { }; qucs = callPackage ../applications/science/electronics/qucs { }; @@ -26131,7 +26745,7 @@ in ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt514.callPackage ../applications/science/robotics/apmplanner2 { }; betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; @@ -26151,7 +26765,11 @@ in auctex = callPackage ../tools/typesetting/tex/auctex { }; - areca = callPackage ../applications/backup/areca { }; + areca = callPackage ../applications/backup/areca { + jdk = jdk8; + jre = jre8; + swt = swt_jdk8; + }; attract-mode = callPackage ../misc/emulators/attract-mode { }; @@ -26171,7 +26789,7 @@ in cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; - calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; + calaos_installer = libsForQt514.callPackage ../misc/calaos/installer {}; ccemux = callPackage ../misc/emulators/ccemux { }; @@ -26179,6 +26797,8 @@ in clinfo = callPackage ../tools/system/clinfo { }; + clpeak = callPackage ../tools/misc/clpeak { }; + cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; @@ -26218,6 +26838,8 @@ in cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; + cups-brother-hl1210w = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1210w { }; + cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { }; cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; @@ -26259,6 +26881,8 @@ in dumb = callPackage ../misc/dumb { }; + dump = callPackage ../tools/backup/dump { }; + ecdsatool = callPackage ../tools/security/ecdsatool { }; emulationstation = callPackage ../misc/emulators/emulationstation { }; @@ -26314,7 +26938,8 @@ in fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; gajim = callPackage ../applications/networking/instant-messengers/gajim { - inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly; + inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; gammu = callPackage ../applications/misc/gammu { }; @@ -26345,15 +26970,13 @@ in hatari = callPackage ../misc/emulators/hatari { }; - helm = callPackage ../applications/audio/helm { - stdenv = gcc8Stdenv; - }; + helm = callPackage ../applications/audio/helm { }; helmfile = callPackage ../applications/networking/cluster/helmfile { }; helmsman = callPackage ../applications/networking/cluster/helmsman { }; - heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; + velero = callPackage ../applications/networking/cluster/velero { }; hplip = callPackage ../misc/drivers/hplip { }; @@ -26418,11 +27041,11 @@ in # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_15 kops_1_16 kops_1_17 + kops_1_18 ; - kops = kops_1_17; + kops = kops_1_18; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -26440,9 +27063,9 @@ in icu = icu58; }; - mamba = callPackage ../applications/audio/mamba{ }; + mamba = callPackage ../applications/audio/mamba { }; - mame = libsForQt5.callPackage ../misc/emulators/mame { + mame = libsForQt514.callPackage ../misc/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -26722,6 +27345,7 @@ in gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); r128gain = callPackage ../applications/audio/r128gain { }; @@ -26782,6 +27406,8 @@ in pyload = callPackage ../applications/networking/pyload {}; + pwntools = with python3Packages; toPythonApplication pwntools; + uae = callPackage ../misc/emulators/uae { }; fsuae = callPackage ../misc/emulators/fs-uae { }; @@ -26794,6 +27420,8 @@ in py-wmi-client = callPackage ../tools/networking/py-wmi-client { }; + rargs = callPackage ../tools/misc/rargs { }; + redprl = callPackage ../applications/science/logic/redprl { }; renderizer = pkgs.callPackage ../development/tools/renderizer {}; @@ -26839,6 +27467,8 @@ in sift = callPackage ../tools/text/sift { }; + xdragon = lowPrio (callPackage ../applications/misc/xdragon { }); + xlockmore = callPackage ../misc/screensavers/xlockmore { }; xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { }; @@ -26899,9 +27529,7 @@ in sanoid = callPackage ../tools/backup/sanoid { }; - satysfi = callPackage ../tools/typesetting/satysfi { - ocamlPackages = ocaml-ng.ocamlPackages_4_07; - }; + satysfi = callPackage ../tools/typesetting/satysfi { }; sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. @@ -26946,13 +27574,15 @@ in sqsh = callPackage ../development/tools/sqsh { }; + go-swag = callPackage ../development/tools/go-swag { }; + go-swagger = callPackage ../development/tools/go-swagger { }; jx = callPackage ../applications/networking/cluster/jx {}; prow = callPackage ../applications/networking/cluster/prow { }; - tellico = libsForQt5.callPackage ../applications/misc/tellico { }; + tellico = libsForQt514.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; @@ -26984,6 +27614,8 @@ in tilt = callPackage ../applications/networking/cluster/tilt {}; + timeular = callPackage ../applications/office/timeular {}; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tewi-font = callPackage ../data/fonts/tewi @@ -26999,7 +27631,7 @@ in ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vnote = libsForQt5.callPackage ../applications/office/vnote { }; + vnote = libsForQt514.callPackage ../applications/office/vnote { }; ssh-audit = callPackage ../tools/security/ssh-audit { }; @@ -27075,9 +27707,13 @@ in vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; + vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly; + }; + vttest = callPackage ../tools/misc/vttest { }; - wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; + wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { }; wasmer = callPackage ../development/interpreters/wasmer { }; @@ -27094,6 +27730,8 @@ in webfs = callPackage ../servers/http/webfs { }; + webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; + websocketd = callPackage ../applications/networking/websocketd { }; wikicurses = callPackage ../applications/misc/wikicurses { @@ -27128,6 +27766,8 @@ in wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; + wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; wordpress = callPackage ../servers/web-apps/wordpress { }; @@ -27146,6 +27786,8 @@ in wxGTK = wxGTK30; }; + wyvern = callPackage ../games/wyvern { }; + x11idle = callPackage ../tools/misc/x11idle {}; x11docker = callPackage ../applications/virtualization/x11docker { }; @@ -27194,6 +27836,8 @@ in xteddy = callPackage ../applications/misc/xteddy { }; + xva-img = callPackage ../tools/virtualization/xva-img { }; + xwiimote = callPackage ../misc/drivers/xwiimote { }; xzoom = callPackage ../tools/X11/xzoom {}; @@ -27247,7 +27891,7 @@ in snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; openmsx = callPackage ../misc/emulators/openmsx { - python = python27; + python = python3; }; higan = callPackage ../misc/emulators/higan { @@ -27318,6 +27962,8 @@ in sequelpro = callPackage ../applications/misc/sequelpro {}; + snowsql = callPackage ../applications/misc/snowsql {}; + sidequest = callPackage ../applications/misc/sidequest {}; maphosts = callPackage ../tools/networking/maphosts {}; @@ -27529,4 +28175,11 @@ in gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; navidrome = callPackage ../servers/misc/navidrome {}; + + zettlr = callPackage ../applications/misc/zettlr { }; + + unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; + + fac-build = callPackage ../development/tools/build-managers/fac {}; + } diff --git a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix index 84d2a4e311..139749e7d3 100644 --- a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix @@ -97,7 +97,7 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR22.elixir`. - inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; + inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 38f23ed8cd..c6c75cd7ff 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -130,7 +130,7 @@ in rec { coqPackages_8_11 = mkCoqPackages coq_8_11; coqPackages_8_12 = mkCoqPackages coq_8_12; coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute - coqPackages_8_9 + coqPackages_8_11 ); coq = coqPackages.coq; diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix index 02184a5685..affb4ae92c 100644 --- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -88,4 +88,8 @@ in ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; + discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + }) diff --git a/third_party/nixpkgs/pkgs/top-level/impure.nix b/third_party/nixpkgs/pkgs/top-level/impure.nix index 3ba6c08a14..88440f711d 100644 --- a/third_party/nixpkgs/pkgs/top-level/impure.nix +++ b/third_party/nixpkgs/pkgs/top-level/impure.nix @@ -81,7 +81,7 @@ in # not be passed. assert args ? localSystem -> !(args ? system || args ? platform); -import ./. (builtins.removeAttrs args [ "system" "platform" ] // { +import ./. (builtins.removeAttrs args [ "system" "platform" "inNixShell" ] // { inherit config overlays crossSystem crossOverlays; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. diff --git a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix index 5e307305af..f65829e29c 100644 --- a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix +++ b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix @@ -40,7 +40,6 @@ releaseTools.sourceTarball { checkPhase = '' set -o pipefail - export NIX_DB_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR export NIX_PATH=nixpkgs=$TMPDIR/barf.nix opts=(--option build-users-group "") diff --git a/third_party/nixpkgs/pkgs/top-level/metrics.nix b/third_party/nixpkgs/pkgs/top-level/metrics.nix index 244b0ce7a6..2bfcb9d5d8 100644 --- a/third_party/nixpkgs/pkgs/top-level/metrics.nix +++ b/third_party/nixpkgs/pkgs/top-level/metrics.nix @@ -7,7 +7,6 @@ runCommand "nixpkgs-metrics" requiredSystemFeatures = [ "benchmark" ]; } '' - export NIX_DB_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR nix-store --init diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 7f2e2e1a4b..ae1fe050b8 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -137,12 +137,16 @@ let cohttp = callPackage ../development/ocaml-modules/cohttp { }; + cohttp-async = callPackage ../development/ocaml-modules/cohttp/async.nix { }; + cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { }; cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { }; conduit = callPackage ../development/ocaml-modules/conduit { }; + conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; + conduit-lwt = callPackage ../development/ocaml-modules/conduit/lwt.nix { }; conduit-lwt-unix = callPackage ../development/ocaml-modules/conduit/lwt-unix.nix { }; @@ -151,6 +155,8 @@ let containers = callPackage ../development/ocaml-modules/containers { }; + containers-data = callPackage ../development/ocaml-modules/containers/data.nix { }; + cow = callPackage ../development/ocaml-modules/cow { }; cpdf = callPackage ../development/ocaml-modules/cpdf { }; @@ -167,6 +173,8 @@ let cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + csexp = callPackage ../development/ocaml-modules/csexp { }; + cstruct = if lib.versionAtLeast ocaml.version "4.2" then callPackage ../development/ocaml-modules/cstruct {} @@ -218,16 +226,20 @@ let dune = callPackage ../development/tools/ocaml/dune { }; dune_2 = - if lib.versionAtLeast ocaml.version "4.07" + if lib.versionAtLeast ocaml.version "4.08" then callPackage ../development/tools/ocaml/dune/2.nix { } else if lib.versionAtLeast ocaml.version "4.02" then pkgs.dune_2 else throw "dune_2 is not available for OCaml ${ocaml.version}"; + dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; + dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { }; + dune-glob = callPackage ../development/ocaml-modules/dune-glob { }; + dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; dune-release = callPackage ../development/tools/ocaml/dune-release { @@ -274,6 +286,8 @@ let farfadet = callPackage ../development/ocaml-modules/farfadet { }; + fdkaac = callPackage ../development/ocaml-modules/fdkaac { }; + fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; @@ -300,6 +314,8 @@ let gen = callPackage ../development/ocaml-modules/gen { }; + genspio = callPackage ../development/ocaml-modules/genspio { }; + gmap = callPackage ../development/ocaml-modules/gmap { }; gnuplot = callPackage ../development/ocaml-modules/gnuplot { @@ -310,6 +326,8 @@ let herelib = callPackage ../development/ocaml-modules/herelib { }; + hidapi = callPackage ../development/ocaml-modules/hidapi { }; + higlo = callPackage ../development/ocaml-modules/higlo { }; hkdf = callPackage ../development/ocaml-modules/hkdf { }; @@ -334,8 +352,6 @@ let ipaddr-sexp = callPackage ../development/ocaml-modules/ipaddr/sexp.nix { }; - irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; - iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; iter = callPackage ../development/ocaml-modules/iter { }; @@ -429,6 +445,8 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; + jwto = callPackage ../development/ocaml-modules/jwto { }; + kafka = callPackage ../development/ocaml-modules/kafka { }; ke = callPackage ../development/ocaml-modules/ke { }; @@ -573,6 +591,8 @@ let nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; + nonstd = callPackage ../development/ocaml-modules/nonstd { }; + notty = callPackage ../development/ocaml-modules/notty { }; npy = callPackage ../development/ocaml-modules/npy { @@ -736,6 +756,12 @@ let piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + posix-base = callPackage ../development/ocaml-modules/posix/base.nix { }; + + posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { }; + + posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; + ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; @@ -756,6 +782,8 @@ let seq = callPackage ../development/ocaml-modules/seq { }; + sosa = callPackage ../development/ocaml-modules/sosa { }; + spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; @@ -852,8 +880,16 @@ let ptmap = callPackage ../development/ocaml-modules/ptmap { }; + ptset = callPackage ../development/ocaml-modules/ptset { }; + pycaml = callPackage ../development/ocaml-modules/pycaml { }; + qcheck-alcotest = callPackage ../development/ocaml-modules/qcheck/alcotest.nix { }; + + qcheck-core = callPackage ../development/ocaml-modules/qcheck/core.nix { }; + + qcheck-ounit = callPackage ../development/ocaml-modules/qcheck/ounit.nix { }; + qcheck = callPackage ../development/ocaml-modules/qcheck { }; qtest = callPackage ../development/ocaml-modules/qtest { }; @@ -886,6 +922,10 @@ let sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; + srt = callPackage ../development/ocaml-modules/srt { + inherit (pkgs) srt; + }; + ssl = callPackage ../development/ocaml-modules/ssl { }; stdlib-shims = callPackage ../development/ocaml-modules/stdlib-shims { }; @@ -935,6 +975,8 @@ let wasm = callPackage ../development/ocaml-modules/wasm { }; + webbrowser = callPackage ../development/ocaml-modules/webbrowser { }; + webmachine = callPackage ../development/ocaml-modules/webmachine { }; wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; @@ -975,7 +1017,7 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes janePackage num octavius ppxlib re; + inherit ctypes dune-configurator janePackage num octavius ppxlib re; inherit (pkgs) openssl; } else if lib.versionOlder "4.07" ocaml.version @@ -1205,7 +1247,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { }); - ocamlPackages_latest = ocamlPackages_4_10; + ocamlPackages_latest = ocamlPackages_4_11; ocamlPackages = ocamlPackages_4_10; } diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index d623610ad7..64fc2011ff 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -11,8 +11,8 @@ , perl, overrides, buildPerl, shortenPerlShebang }: -# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.3 or above -assert stdenv.lib.versionAtLeast perl.version "5.28.3"; +# cpan2nix assumes that perl-packages.nix will be used only with perl 5.30.3 or above +assert stdenv.lib.versionAtLeast perl.version "5.30.3"; let inherit (stdenv.lib) maintainers; self = _self // (overrides pkgs); @@ -804,6 +804,20 @@ let }; }; + AstroFITSHeader = buildPerlModule rec { + pname = "Astro-FITS-Header"; + version = "3.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${pname}-${version}.tar.gz"; + sha256 = "530d59ef0c0935f9862d187187a2d7583b12c639bb67db14f983322b161892d9"; + }; + meta = { + homepage = "http://github.com/timj/perl-Astro-FITS-Header/tree/master"; + description = "Object-oriented interface to FITS HDUs"; + license = stdenv.lib.licenses.free; + }; + }; + AudioScan = buildPerlPackage { pname = "Audio-Scan"; version = "1.01"; @@ -2916,6 +2930,22 @@ let }; }; + CLIHelpers = buildPerlPackage { + pname = "CLI-Helpers"; + version = "1.8"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BL/BLHOTSKY/CLI-Helpers-1.8.tar.gz"; + sha256 = "1hgiynpy7q4gbx1d9pwnzdzil36k13vjxhscalj710ikcddvjz92"; + }; + buildInputs = [ PodCoverageTrustPod TestPerlCritic ]; + propagatedBuildInputs = [ CaptureTiny RefUtil SubExporter TermReadKey YAML ]; + meta = { + homepage = "https://github.com/reyjrar/CLI-Helpers"; + description = "Subroutines for making simple command line scripts"; + license = stdenv.lib.licenses.bsd3; + }; + }; + Clipboard = buildPerlModule { pname = "Clipboard"; version = "0.26"; @@ -4039,6 +4069,23 @@ let }; }; + CryptSodium = buildPerlPackage { + pname = "Crypt-Sodium"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MG/MGREGORO/Crypt-Sodium-0.11.tar.gz"; + sha256 = "0y3c24zv4iwnvlf9zwxambk8ddram54fm6l1m5yhbskc0nhp6z4h"; + }; + NIX_CFLAGS_COMPILE = "-I${pkgs.libsodium.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.libsodium.out}/lib -lsodium"; + meta = { + homepage = "https://metacpan.org/release/Crypt-Sodium"; + description = "Perl bindings for libsodium (NaCL)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptTwofish = buildPerlPackage { pname = "Crypt-Twofish"; version = "2.17"; @@ -8762,6 +8809,21 @@ let }; }; + HamAPRSFAP = buildPerlPackage { + pname = "Ham-APRS-FAP"; + version = "1.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HE/HESSU/Ham-APRS-FAP-1.21.tar.gz"; + sha256 = "e01b455d46f44710dbcf21b6fa843f09358ce60eee1c4141bc74e0a204d3a020"; + }; + propagatedBuildInputs = [ DateCalc ]; + meta = with stdenv.lib; { + description = "Finnish APRS Parser (Fabulous APRS Parser)"; + maintainers = with maintainers; [ andrew-d ]; + license = with licenses; [ artistic1 gpl1Plus ]; + }; + }; + HashDiff = buildPerlPackage { pname = "Hash-Diff"; version = "0.010"; @@ -10183,7 +10245,8 @@ let propagatedBuildInputs = [ Inline ]; - makeMakerFlags = "J2SDK=${pkgs.jdk}"; + # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 + makeMakerFlags = "J2SDK=${pkgs.jdk8}"; # FIXME: Apparently tests want to access the network. doCheck = false; @@ -12858,10 +12921,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.55"; + version = "8.58"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.55.tar.gz"; - sha256 = "116f79a8jvdk0zfj34gp3idhxgk4l8qq4ka6pwhdp8pmks969w0x"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.58.tar.gz"; + sha256 = "0543m2g1pjm06b0yr4cffw70ki76762ria65zvrjccc2zk69pwvy"; }; meta = { homepage = "https://mojolicious.org"; @@ -15615,6 +15678,51 @@ let }; }; + PDL = buildPerlPackage rec { + pname = "PDL"; + version = "2.022"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETJ/${pname}-${version}.tar.gz"; + sha256 = "12isj05ni44bgf76lc0fs5v88ai8gn5dqrppsbj7vsxblcya7113"; + }; + patchPhase = '' + substituteInPlace perldl.conf \ + --replace 'POSIX_THREADS_LIBS => undef' 'POSIX_THREADS_LIBS => "-L${pkgs.glibc.dev}/lib"' \ + --replace 'POSIX_THREADS_INC => undef' 'POSIX_THREADS_INC => "-I${pkgs.glibc.dev}/include"' \ + --replace 'WITH_MINUIT => undef' 'WITH_MINUIT => 0' \ + --replace 'WITH_SLATEC => undef' 'WITH_SLATEC => 0' \ + --replace 'WITH_HDF => undef' 'WITH_HDF => 0' \ + --replace 'WITH_GD => undef' 'WITH_GD => 0' \ + --replace 'WITH_PROJ => undef' 'WITH_PROJ => 0' + ''; + + nativeBuildInputs = with pkgs; [ autoPatchelfHook libGL.dev glibc.dev mesa_glu.dev ]; + + buildInputs = [ DevelChecklib TestDeep TestException TestWarn ] ++ + (with pkgs; [ gsl freeglut xorg.libXmu xorg.libXi ]); + + propagatedBuildInputs = [ + AstroFITSHeader + ConvertUU + ExtUtilsF77 + FileMap + Inline + InlineC + ListMoreUtils + ModuleCompile + OpenGL + PodParser + TermReadKey + ]; + + meta = { + homepage = "http://pdl.perl.org/"; + description = "Perl Data Language"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; + }; + }; + Pegex = buildPerlPackage { pname = "Pegex"; version = "0.75"; @@ -16716,6 +16824,24 @@ let }; }; + Apprainbarf = buildPerlModule { + pname = "Apprainbarf"; + version = "1.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SY/SYP/App-rainbarf-1.4.tar.gz"; + sha256 = "4f139ad35faaf2de0623dc0bb1dd89fa5a431e548bfec87dee194cf0e25cc97d"; + }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/rainbarf + ''; + meta = { + homepage = "https://github.com/creaktive/rainbarf"; + description = "CPU/RAM/battery stats chart bar for tmux (and GNU screen)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Razor2ClientAgent = buildPerlPackage { pname = "Razor2-Client-Agent"; version = "2.86"; @@ -16985,6 +17111,22 @@ let }; }; + RPM2 = buildPerlModule { + pname = "RPM2"; + version = "1.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/RPM2-1.4.tar.gz"; + sha256 = "5ecb42aa69324e6f4088abfae07313906e5aabf2f46f1204f3f1de59155bb636"; + }; + buildInputs = [ pkgs.pkg-config pkgs.rpm ]; + doCheck = false; # Tries to open /var/lib/rpm + meta = { + description = "Perl bindings for the RPM Package Manager API"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; + }; + }; + RSSParserLite = buildPerlPackage { pname = "RSS-Parser-Lite"; version = "0.12"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 1000d615ac..af2ec27f73 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -142,118 +142,323 @@ in { else callPackage ../development/python-modules/setuptools { }; - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; - - acoustics = callPackage ../development/python-modules/acoustics { }; - - py3to2 = callPackage ../development/python-modules/3to2 { }; - - pynamodb = callPackage ../development/python-modules/pynamodb { }; - aadict = callPackage ../development/python-modules/aadict { }; + aafigure = callPackage ../development/python-modules/aafigure { }; + absl-py = callPackage ../development/python-modules/absl-py { }; + accupy = callPackage ../development/python-modules/accupy { }; + + acebinf = callPackage ../development/python-modules/acebinf { }; + + acme = callPackage ../development/python-modules/acme { }; + + acme-tiny = callPackage ../development/python-modules/acme-tiny { }; + + acoustics = callPackage ../development/python-modules/acoustics { }; + + actdiag = callPackage ../development/python-modules/actdiag { }; + + adal = callPackage ../development/python-modules/adal { }; + adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + aenum = callPackage ../development/python-modules/aenum { }; + afdko = callPackage ../development/python-modules/afdko { }; + + affine = callPackage ../development/python-modules/affine { }; + affinity = callPackage ../development/python-modules/affinity { }; agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; - alerta = callPackage ../development/python-modules/alerta { }; - - alerta-server = callPackage ../development/python-modules/alerta-server { }; - - androguard = callPackage ../development/python-modules/androguard { }; - - phonenumbers = callPackage ../development/python-modules/phonenumbers { }; - agate-excel = callPackage ../development/python-modules/agate-excel { }; agate-sql = callPackage ../development/python-modules/agate-sql { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; + + aioconsole = callPackage ../development/python-modules/aioconsole { }; + + aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; + + aiodns = callPackage ../development/python-modules/aiodns { }; + + aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; + + aioeventlet = callPackage ../development/python-modules/aioeventlet { }; + + aiofiles = callPackage ../development/python-modules/aiofiles { }; + + aioftp = callPackage ../development/python-modules/aioftp { }; + + aioh2 = callPackage ../development/python-modules/aioh2 { }; + + aioharmony = callPackage ../development/python-modules/aioharmony { }; + + aiohttp = callPackage ../development/python-modules/aiohttp { }; + + aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; + + aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + + aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + + aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; + + aiohue = callPackage ../development/python-modules/aiohue { }; + aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aiojobs = callPackage ../development/python-modules/aiojobs { }; + + aiokafka = callPackage ../development/python-modules/aiokafka { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; - aioamqp = callPackage ../development/python-modules/aioamqp { }; + aiomysql = callPackage ../development/python-modules/aiomysql { }; - aiojobs = callPackage ../development/python-modules/aiojobs { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioredis = callPackage ../development/python-modules/aioredis { }; + aioresponses = callPackage ../development/python-modules/aioresponses { }; + + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + aiorun = callPackage ../development/python-modules/aiorun { }; - ansicolor = callPackage ../development/python-modules/ansicolor { }; + aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; - ansiwrap = callPackage ../development/python-modules/ansiwrap { }; + aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + + aiounifi = callPackage ../development/python-modules/aiounifi { }; + + aiounittest = callPackage ../development/python-modules/aiounittest { }; + + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + + ajpy = callPackage ../development/python-modules/ajpy { }; + + alabaster = callPackage ../development/python-modules/alabaster { }; + + alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + + alembic = callPackage ../development/python-modules/alembic { }; + + alerta = callPackage ../development/python-modules/alerta { }; + + alerta-server = callPackage ../development/python-modules/alerta-server { }; + + algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; + + allpairspy = callPackage ../development/python-modules/allpairspy { }; + + alot = callPackage ../development/python-modules/alot { }; + + altair = callPackage ../development/python-modules/altair { }; + + amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + + amply = callPackage ../development/python-modules/amply { }; + + amqp = callPackage ../development/python-modules/amqp { }; + + amqplib = callPackage ../development/python-modules/amqplib { }; + + androguard = callPackage ../development/python-modules/androguard { }; + + aniso8601 = callPackage ../development/python-modules/aniso8601 { }; + + annexremote = callPackage ../development/python-modules/annexremote { }; + + annoy = callPackage ../development/python-modules/annoy { }; + + anonip = callPackage ../development/python-modules/anonip { }; ansi2html = callPackage ../development/python-modules/ansi2html { }; - anytree = callPackage ../development/python-modules/anytree { - inherit (pkgs) graphviz; - }; + ansible = callPackage ../development/python-modules/ansible { }; + + ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; + + ansible-lint = callPackage ../development/python-modules/ansible-lint { }; + + ansible-runner = callPackage ../development/python-modules/ansible-runner { }; + + ansi = callPackage ../development/python-modules/ansi { }; + + ansicolor = callPackage ../development/python-modules/ansicolor { }; + + ansicolors = callPackage ../development/python-modules/ansicolors { }; + + ansiconv = callPackage ../development/python-modules/ansiconv { }; + + ansiwrap = callPackage ../development/python-modules/ansiwrap { }; + + antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; + + antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + + anyjson = callPackage ../development/python-modules/anyjson { }; + + anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; + + apache-airflow = callPackage ../development/python-modules/apache-airflow { }; + + apipkg = callPackage ../development/python-modules/apipkg { }; + + apispec = callPackage ../development/python-modules/apispec { }; aplpy = callPackage ../development/python-modules/aplpy { }; + appdirs = callPackage ../development/python-modules/appdirs { }; + + appleseed = disabledIf isPy3k (toPythonModule (pkgs.appleseed.override { inherit (self) python; })); + + application = callPackage ../development/python-modules/application { }; + + applicationinsights = callPackage ../development/python-modules/applicationinsights { }; + + appnope = callPackage ../development/python-modules/appnope { }; + apprise = callPackage ../development/python-modules/apprise { }; - arrayqueues = callPackage ../development/python-modules/arrayqueues { }; + approvaltests = callPackage ../development/python-modules/approvaltests { }; + + apptools = callPackage ../development/python-modules/apptools { }; + + APScheduler = callPackage ../development/python-modules/APScheduler { }; + + apsw = callPackage ../development/python-modules/apsw { }; + + area = callPackage ../development/python-modules/area { }; + + arelle = callPackage ../development/python-modules/arelle { gui = true; }; + + arelle-headless = callPackage ../development/python-modules/arelle { gui = false; }; aresponses = callPackage ../development/python-modules/aresponses { }; + argcomplete = callPackage ../development/python-modules/argcomplete { }; + + argh = callPackage ../development/python-modules/argh { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + args = callPackage ../development/python-modules/args { }; + aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2; }; + arrayqueues = callPackage ../development/python-modules/arrayqueues { }; + + arrow = callPackage ../development/python-modules/arrow { }; + arviz = callPackage ../development/python-modules/arviz { }; - asana = callPackage ../development/python-modules/asana { }; + arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; - asdf = callPackage ../development/python-modules/asdf { }; + asana = callPackage ../development/python-modules/asana { }; asciimatics = callPackage ../development/python-modules/asciimatics { }; asciitree = callPackage ../development/python-modules/asciitree { }; + asdf = callPackage ../development/python-modules/asdf { }; + ase = if isPy27 then - callPackage ../development/python-modules/ase/3.17.nix { } - else - callPackage ../development/python-modules/ase { }; + callPackage ../development/python-modules/ase/3.17.nix { } + else + callPackage ../development/python-modules/ase { }; + + asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; + + asgiref = callPackage ../development/python-modules/asgiref { }; + + asn1ate = callPackage ../development/python-modules/asn1ate { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + astor = callPackage ../development/python-modules/astor { }; + astral = callPackage ../development/python-modules/astral { }; + astroid = if isPy3k then + callPackage ../development/python-modules/astroid { } + else + callPackage ../development/python-modules/astroid/1.6.nix { }; + astropy = callPackage ../development/python-modules/astropy { }; - astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; - astropy-healpix = callPackage ../development/python-modules/astropy-healpix { }; + astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + astroquery = callPackage ../development/python-modules/astroquery { }; asttokens = callPackage ../development/python-modules/asttokens { }; + astunparse = callPackage ../development/python-modules/astunparse { }; + + async_generator = callPackage ../development/python-modules/async_generator { }; + + asyncpg = callPackage ../development/python-modules/asyncpg { }; + + asyncssh = callPackage ../development/python-modules/asyncssh { }; + + asynctest = callPackage ../development/python-modules/asynctest { }; + + async-timeout = callPackage ../development/python-modules/async_timeout { }; + + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + + atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; + atom = callPackage ../development/python-modules/atom { }; - augeas = callPackage ../development/python-modules/augeas { - inherit (pkgs) augeas; - }; + atomiclong = callPackage ../development/python-modules/atomiclong { }; + + atomicwrites = callPackage ../development/python-modules/atomicwrites { }; + + atomman = callPackage ../development/python-modules/atomman { }; + + atpublic = callPackage ../development/python-modules/atpublic { }; + + atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; + + attrdict = callPackage ../development/python-modules/attrdict { }; + + attrs = callPackage ../development/python-modules/attrs { }; + + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; + + audioread = callPackage ../development/python-modules/audioread { }; + + audiotools = callPackage ../development/python-modules/audiotools { }; + + augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; + + auth0-python = callPackage ../development/python-modules/auth0-python { }; authheaders = callPackage ../development/python-modules/authheaders { }; + authlib = callPackage ../development/python-modules/authlib { }; + authres = callPackage ../development/python-modules/authres { }; - auth0-python = callPackage ../development/python-modules/auth0-python { }; + autobahn = callPackage ../development/python-modules/autobahn { }; autograd = callPackage ../development/python-modules/autograd { }; @@ -261,42 +466,44 @@ in { automat = callPackage ../development/python-modules/automat { }; - awkward = callPackage ../development/python-modules/awkward { }; - awkward1 = callPackage ../development/python-modules/awkward1 { }; - - aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; - - aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; - - aws-adfs = callPackage ../development/python-modules/aws-adfs { }; - - atomman = callPackage ../development/python-modules/atomman { }; - - authlib = callPackage ../development/python-modules/authlib { }; - - # packages defined elsewhere - - amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; - - ansiconv = callPackage ../development/python-modules/ansiconv { }; + autopep8 = callPackage ../development/python-modules/autopep8 { }; avahi = toPythonModule (pkgs.avahi.override { inherit python; withPython = true; }); - azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; + av = callPackage ../development/python-modules/av { inherit (pkgs) pkgconfig; }; - azure-common = callPackage ../development/python-modules/azure-common { }; + avro3k = callPackage ../development/python-modules/avro3k { }; - azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + avro = callPackage ../development/python-modules/avro { }; + + avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + + awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; + + awkward = callPackage ../development/python-modules/awkward { }; + awkward1 = callPackage ../development/python-modules/awkward1 { }; + + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + + aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; + + aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; + + aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; azure-batch = callPackage ../development/python-modules/azure-batch { }; + azure-common = callPackage ../development/python-modules/azure-common { }; + azure-core = callPackage ../development/python-modules/azure-core { }; + azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { }; azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { }; @@ -323,30 +530,6 @@ in { azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; - azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; - - azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; - - azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; - - azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; - - azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; - - azure-storage = callPackage ../development/python-modules/azure-storage { }; - - azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - - azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; - - azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; - - azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - - azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; - - azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; - azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { }; azure-mgmt-apimanagement = callPackage ../development/python-modules/azure-mgmt-apimanagement { }; @@ -357,10 +540,10 @@ in { azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { }; - azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; - azure-mgmt-batchai = callPackage ../development/python-modules/azure-mgmt-batchai { }; + azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; + azure-mgmt-billing = callPackage ../development/python-modules/azure-mgmt-billing { }; azure-mgmt-botservice = callPackage ../development/python-modules/azure-mgmt-botservice { }; @@ -371,6 +554,8 @@ in { azure-mgmt-commerce = callPackage ../development/python-modules/azure-mgmt-commerce { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; + azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; azure-mgmt-consumption = callPackage ../development/python-modules/azure-mgmt-consumption { }; @@ -395,12 +580,12 @@ in { azure-mgmt-datamigration = callPackage ../development/python-modules/azure-mgmt-datamigration { }; + azure-mgmt-deploymentmanager = callPackage ../development/python-modules/azure-mgmt-deploymentmanager { }; + azure-mgmt-devspaces = callPackage ../development/python-modules/azure-mgmt-devspaces { }; azure-mgmt-devtestlabs = callPackage ../development/python-modules/azure-mgmt-devtestlabs { }; - azure-mgmt-deploymentmanager = callPackage ../development/python-modules/azure-mgmt-deploymentmanager { }; - azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { }; azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { }; @@ -417,7 +602,8 @@ in { azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { }; - azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; + azure-mgmt-iothubprovisioningservices = + callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { }; @@ -451,6 +637,8 @@ in { azure-mgmt-notificationhubs = callPackage ../development/python-modules/azure-mgmt-notificationhubs { }; + azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { }; azure-mgmt-powerbiembedded = callPackage ../development/python-modules/azure-mgmt-powerbiembedded { }; @@ -459,10 +647,10 @@ in { azure-mgmt-rdbms = callPackage ../development/python-modules/azure-mgmt-rdbms { }; - azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; - azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; + azure-mgmt-redhatopenshift = callPackage ../development/python-modules/azure-mgmt-redhatopenshift { }; azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; @@ -493,1507 +681,47 @@ in { azure-mgmt-subscription = callPackage ../development/python-modules/azure-mgmt-subscription { }; + azure-mgmt-synapse = callPackage ../development/python-modules/azure-mgmt-synapse { }; + azure-mgmt-trafficmanager = callPackage ../development/python-modules/azure-mgmt-trafficmanager { }; azure-mgmt-web = callPackage ../development/python-modules/azure-mgmt-web { }; azure-multiapi-storage = callPackage ../development/python-modules/azure-multiapi-storage { }; - backports_csv = callPackage ../development/python-modules/backports_csv {}; + azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; - backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; + azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; - bacpypes = callPackage ../development/python-modules/bacpypes {}; + azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; - bap = callPackage ../development/python-modules/bap { - bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; - }; + azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; - baselines = callPackage ../development/python-modules/baselines { }; + azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - bash_kernel = callPackage ../development/python-modules/bash_kernel { - inherit (pkgs) bash; - }; + azure-storage = callPackage ../development/python-modules/azure-storage { }; - bashlex = callPackage ../development/python-modules/bashlex { }; + azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; - bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; + azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; - bayespy = callPackage ../development/python-modules/bayespy { }; + azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; - beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; - beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; + azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - biplist = callPackage ../development/python-modules/biplist { }; + azure-synapse-accesscontrol = callPackage ../development/python-modules/azure-synapse-accesscontrol { }; - bip_utils = callPackage ../development/python-modules/bip_utils { }; + azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { }; - bitarray = callPackage ../development/python-modules/bitarray { }; + b2sdk = callPackage ../development/python-modules/b2sdk { }; - bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; + Babel = callPackage ../development/python-modules/Babel { }; - bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + babelfish = callPackage ../development/python-modules/babelfish { }; - blivet = callPackage ../development/python-modules/blivet { }; - - bluepy = callPackage ../development/python-modules/bluepy { }; - - boltons = callPackage ../development/python-modules/boltons { }; - - bravia-tv = callPackage ../development/python-modules/bravia-tv { }; - - braintree = callPackage ../development/python-modules/braintree { }; - - breezy = callPackage ../development/python-modules/breezy { }; - - brother = callPackage ../development/python-modules/brother { }; - - build = callPackage ../development/python-modules/build { }; - - bytecode = callPackage ../development/python-modules/bytecode { }; - - ciso8601 = callPackage ../development/python-modules/ciso8601 { }; - - deepdiff = callPackage ../development/python-modules/deepdiff { }; - - deepmerge = callPackage ../development/python-modules/deepmerge { }; - - django-sesame = callPackage ../development/python-modules/django-sesame { }; - - bravado-core = callPackage ../development/python-modules/bravado-core { }; - - breathe = callPackage ../development/python-modules/breathe { }; - - brotli = callPackage ../development/python-modules/brotli { }; - - broadlink = callPackage ../development/python-modules/broadlink { }; - - browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; - - browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); - - btrfs = callPackage ../development/python-modules/btrfs { }; - - bt_proximity = callPackage ../development/python-modules/bt-proximity { }; - - bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 - - bugsnag = callPackage ../development/python-modules/bugsnag { }; - - cachecontrol = callPackage ../development/python-modules/cachecontrol { }; - - cachelib = callPackage ../development/python-modules/cachelib { }; - - cachy = callPackage ../development/python-modules/cachy { }; - - cadquery = callPackage ../development/python-modules/cadquery { }; - - catalogue = callPackage ../development/python-modules/catalogue { }; - - cbeams = callPackage ../misc/cbeams { }; - - cdecimal = callPackage ../development/python-modules/cdecimal { }; - - certbot = callPackage ../development/python-modules/certbot { }; - - certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; - - certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; - - certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; - - cfn-flip = callPackage ../development/python-modules/cfn-flip { }; - - chalice = callPackage ../development/python-modules/chalice { }; - - channels-redis = callPackage ../development/python-modules/channels-redis { }; - - cleo = callPackage ../development/python-modules/cleo { }; - - clikit = callPackage ../development/python-modules/clikit { }; - - cliff = callPackage ../development/python-modules/cliff { }; - - clifford = callPackage ../development/python-modules/clifford { }; - - clickclick = callPackage ../development/python-modules/clickclick { }; - - clustershell = callPackage ../development/python-modules/clustershell { }; - - cnvkit = callPackage ../development/python-modules/cnvkit { }; - - cocotb = callPackage ../development/python-modules/cocotb { }; - - compiledb = callPackage ../development/python-modules/compiledb { }; - - connexion = callPackage ../development/python-modules/connexion { }; - - coordinates = callPackage ../development/python-modules/coordinates { }; - - cozy = callPackage ../development/python-modules/cozy { }; - - codespell = callPackage ../development/python-modules/codespell { }; - - convertdate = callPackage ../development/python-modules/convertdate { }; - - cot = callPackage ../development/python-modules/cot { }; - - crc32c = callPackage ../development/python-modules/crc32c { }; - - curio = callPackage ../development/python-modules/curio { }; - - dendropy = callPackage ../development/python-modules/dendropy { }; - - denonavr = callPackage ../development/python-modules/denonavr { }; - - dependency-injector = callPackage ../development/python-modules/dependency-injector { }; - - btchip = callPackage ../development/python-modules/btchip { }; - - databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - - datatable = callPackage ../development/python-modules/datatable { - inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; - }; - - databases = callPackage ../development/python-modules/databases { }; - - datamodeldict = callPackage ../development/python-modules/datamodeldict { }; - - datasette = callPackage ../development/python-modules/datasette { }; - - datashader = callPackage ../development/python-modules/datashader { }; - - dbf = callPackage ../development/python-modules/dbf { }; - - dbfread = callPackage ../development/python-modules/dbfread { }; - - deap = callPackage ../development/python-modules/deap { }; - - deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; - - dkimpy = callPackage ../development/python-modules/dkimpy { }; - - diceware = callPackage ../development/python-modules/diceware { }; - - dictionaries = callPackage ../development/python-modules/dictionaries { }; - - diff_cover = callPackage ../development/python-modules/diff_cover { }; - - diofant = callPackage ../development/python-modules/diofant { }; - - dipy = callPackage ../development/python-modules/dipy { }; - - docrep = callPackage ../development/python-modules/docrep { }; - - dominate = callPackage ../development/python-modules/dominate { }; - - dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { - inherit (pkgs) substituteAll dotnet-sdk; - }; - - emcee = callPackage ../development/python-modules/emcee { }; - - emailthreads = callPackage ../development/python-modules/emailthreads { }; - - email_validator = callPackage ../development/python-modules/email-validator { }; - - ewmh = callPackage ../development/python-modules/ewmh { }; - - exchangelib = callPackage ../development/python-modules/exchangelib { }; - - dcmstack = callPackage ../development/python-modules/dcmstack { }; - - dbus-python = callPackage ../development/python-modules/dbus { - inherit (pkgs) dbus pkgconfig; - }; - - debts = callPackage ../development/python-modules/debts { }; - - dftfit = callPackage ../development/python-modules/dftfit { }; - - dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; - - discid = callPackage ../development/python-modules/discid { }; - - discordpy = callPackage ../development/python-modules/discordpy { }; - - parver = callPackage ../development/python-modules/parver { }; - arpeggio = callPackage ../development/python-modules/arpeggio { }; - - influxdb-client = callPackage ../development/python-modules/influxdb-client { }; - - invoke = callPackage ../development/python-modules/invoke { }; - - distorm3 = callPackage ../development/python-modules/distorm3 { }; - - distlib = callPackage ../development/python-modules/distlib { }; - - distributed = callPackage ../development/python-modules/distributed { }; - - docutils = callPackage ../development/python-modules/docutils { }; - - dogtail = callPackage ../development/python-modules/dogtail { }; - - diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; - - eliot = callPackage ../development/python-modules/eliot {}; - - entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; - - entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; - - eradicate = callPackage ../development/python-modules/eradicate { }; - - face = callPackage ../development/python-modules/face { }; - - fastparquet = callPackage ../development/python-modules/fastparquet { }; - - fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; - - fasttext = callPackage ../development/python-modules/fasttext { }; - - facedancer = callPackage ../development/python-modules/facedancer { }; - - favicon = callPackage ../development/python-modules/favicon { }; - - fdint = callPackage ../development/python-modules/fdint { }; - - fido2 = callPackage ../development/python-modules/fido2 { }; - - filterpy = callPackage ../development/python-modules/filterpy { }; - - filemagic = callPackage ../development/python-modules/filemagic { }; - - finalfusion = callPackage ../development/python-modules/finalfusion { }; - - fints = callPackage ../development/python-modules/fints { }; - - fire = callPackage ../development/python-modules/fire { }; - - firetv = callPackage ../development/python-modules/firetv { }; - - flower = callPackage ../development/python-modules/flower { }; - - flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - - flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; - - flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; - - foxdot = callPackage ../development/python-modules/foxdot { }; - - freetype-py = callPackage ../development/python-modules/freetype-py { }; - - fsspec = callPackage ../development/python-modules/fsspec { }; - - furl = callPackage ../development/python-modules/furl { }; - - fuse = callPackage ../development/python-modules/fuse-python { - inherit (pkgs) fuse pkgconfig; - }; - - fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; - - genanki = callPackage ../development/python-modules/genanki { }; - - geoip2 = callPackage ../development/python-modules/geoip2 { }; - - getmac = callPackage ../development/python-modules/getmac { }; - - gidgethub = callPackage ../development/python-modules/gidgethub { }; - - gin-config = callPackage ../development/python-modules/gin-config { }; - - globus-sdk = callPackage ../development/python-modules/globus-sdk { }; - - glymur = callPackage ../development/python-modules/glymur { }; - - glob2 = callPackage ../development/python-modules/glob2 { }; - - globre = callPackage ../development/python-modules/globre { }; - - glom = callPackage ../development/python-modules/glom { }; - - gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { - inherit (self) python; - enablePython = true; - })); - - goocalendar = callPackage ../development/python-modules/goocalendar { }; - - grandalf = callPackage ../development/python-modules/grandalf { }; - - gprof2dot = callPackage ../development/python-modules/gprof2dot { - inherit (pkgs) graphviz; - }; - - gsd = if isPy27 then - callPackage ../development/python-modules/gsd/1.7.nix { } - else - callPackage ../development/python-modules/gsd { }; - - gssapi = callPackage ../development/python-modules/gssapi { - inherit (pkgs) darwin krb5Full; - }; - - guestfs = callPackage ../development/python-modules/guestfs { }; - - gumath = callPackage ../development/python-modules/gumath { }; - - h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; - - h5py = callPackage ../development/python-modules/h5py { - hdf5 = pkgs.hdf5; - }; - - h5py-mpi = self.h5py.override { - hdf5 = pkgs.hdf5-mpi; - }; - - h5netcdf = callPackage ../development/python-modules/h5netcdf { }; - - ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; - - habanero = callPackage ../development/python-modules/habanero { }; - - handout = callPackage ../development/python-modules/handout { }; - - HAP-python = callPackage ../development/python-modules/HAP-python { }; - - helper = callPackage ../development/python-modules/helper { }; - - hdmedians = callPackage ../development/python-modules/hdmedians { }; - - hdlparse = callPackage ../development/python-modules/hdlparse { }; - - hiyapyco = callPackage ../development/python-modules/hiyapyco { }; - - hocr-tools = callPackage ../development/python-modules/hocr-tools { }; - - holidays = callPackage ../development/python-modules/holidays { }; - - holoviews = callPackage ../development/python-modules/holoviews { }; - - hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { - inherit python; - }); - - hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; - - http-ece = callPackage ../development/python-modules/http-ece { }; - - httpsig = callPackage ../development/python-modules/httpsig { }; - - httptools = callPackage ../development/python-modules/httptools { }; - - hwi = callPackage ../development/python-modules/hwi { }; - - i3ipc = callPackage ../development/python-modules/i3ipc { }; - - ignite = callPackage ../development/python-modules/ignite { }; - - ihatemoney = callPackage ../development/python-modules/ihatemoney { }; - - imutils = callPackage ../development/python-modules/imutils { }; - - inotify-simple = callPackage ../development/python-modules/inotify-simple { }; - - intake = callPackage ../development/python-modules/intake { }; - - intelhex = callPackage ../development/python-modules/intelhex { }; - - inquirer = callPackage ../development/python-modules/inquirer { }; - - ipympl = callPackage ../development/python-modules/ipympl { }; - - itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; - - itemadapter = callPackage ../development/python-modules/itemadapter { }; - - itemloaders = callPackage ../development/python-modules/itemloaders { }; - - iterm2 = callPackage ../development/python-modules/iterm2 { }; - - janus = callPackage ../development/python-modules/janus { }; - - jc = callPackage ../development/python-modules/jc { }; - - jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; - - jira = callPackage ../development/python-modules/jira { }; - - jsonpath = callPackage ../development/python-modules/jsonpath { }; - - junit-xml = callPackage ../development/python-modules/junit-xml { }; - - junitparser = callPackage ../development/python-modules/junitparser { }; - - jwcrypto = callPackage ../development/python-modules/jwcrypto { }; - - kconfiglib = callPackage ../development/python-modules/kconfiglib { }; - - kinparse = callPackage ../development/python-modules/kinparse { }; - - labelbox = callPackage ../development/python-modules/labelbox { }; - - lammps-cython = callPackage ../development/python-modules/lammps-cython { - mpi = pkgs.openmpi; - }; - - langdetect = callPackage ../development/python-modules/langdetect { }; - - launchpadlib = callPackage ../development/python-modules/launchpadlib { }; - - lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; - - lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; - - lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; - - lazr-uri = callPackage ../development/python-modules/lazr-uri { }; - - libmr = callPackage ../development/python-modules/libmr { }; - - limitlessled = callPackage ../development/python-modules/limitlessled { }; - - livelossplot = callPackage ../development/python-modules/livelossplot { }; - - lmtpd = callPackage ../development/python-modules/lmtpd { }; - - logster = callPackage ../development/python-modules/logster { }; - - loguru = callPackage ../development/python-modules/loguru { }; - - logzero = callPackage ../development/python-modules/logzero { }; - - mac_alias = callPackage ../development/python-modules/mac_alias { }; - - macropy = callPackage ../development/python-modules/macropy { }; - - mail-parser = callPackage ../development/python-modules/mail-parser { }; - - mailman = callPackage ../servers/mail/mailman { }; - - mailman-web = callPackage ../servers/mail/mailman/web.nix { }; - - mailmanclient = callPackage ../development/python-modules/mailmanclient { }; - - mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; - - manhole = callPackage ../development/python-modules/manhole { }; - - mapbox = callPackage ../development/python-modules/mapbox { }; - - markerlib = callPackage ../development/python-modules/markerlib { }; - - mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; - - matchpy = callPackage ../development/python-modules/matchpy { }; - - maxminddb = callPackage ../development/python-modules/maxminddb { }; - - mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py; - - mkl-service = callPackage ../development/python-modules/mkl-service { }; - - mnist = callPackage ../development/python-modules/mnist { }; - - monkeyhex = callPackage ../development/python-modules/monkeyhex { }; - - monty = callPackage ../development/python-modules/monty { }; - - mpi4py = callPackage ../development/python-modules/mpi4py { - mpi = pkgs.openmpi; - }; - - pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; - - python-baseconv = callPackage ../development/python-modules/python-baseconv { }; - - pycognito = callPackage ../development/python-modules/pycognito { }; - - python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; - - mortgage = callPackage ../development/python-modules/mortgage { }; - - msal = callPackage ../development/python-modules/msal { }; - - msal-extensions = callPackage ../development/python-modules/msal-extensions { }; - - msrest = callPackage ../development/python-modules/msrest { }; - - msrestazure = callPackage ../development/python-modules/msrestazure { }; - - multiset = callPackage ../development/python-modules/multiset { }; - - mwclient = callPackage ../development/python-modules/mwclient { }; - - mwoauth = callPackage ../development/python-modules/mwoauth { }; - - nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; - - nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; - - nassl = callPackage ../development/python-modules/nassl { }; - - nbsmoke = callPackage ../development/python-modules/nbsmoke { }; - - nbsphinx = callPackage ../development/python-modules/nbsphinx { }; - - nbval = callPackage ../development/python-modules/nbval { }; - - ndtypes = callPackage ../development/python-modules/ndtypes { }; - - neo = callPackage ../development/python-modules/neo { }; - - nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; - - neuron = pkgs.neuron.override { - inherit python; - }; - - neuron-mpi = pkgs.neuron-mpi.override { - inherit python; - }; - - nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; - - nixpart = callPackage ../tools/filesystems/nixpart { }; - - # This is used for NixOps to make sure we won't break it with the next major - # version of nixpart. - nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; - - nltk = callPackage ../development/python-modules/nltk { }; - - ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; - - nvchecker = callPackage ../development/python-modules/nvchecker { }; - - numericalunits = callPackage ../development/python-modules/numericalunits { }; - - nunavut = callPackage ../development/python-modules/nunavut { }; - - oath = callPackage ../development/python-modules/oath { }; - - oauthenticator = callPackage ../development/python-modules/oauthenticator { }; - - onnx = callPackage ../development/python-modules/onnx { }; - - ordered-set = callPackage ../development/python-modules/ordered-set { }; - - orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; - - ortools = (toPythonModule (pkgs.or-tools.override { - inherit (self) python; - })).python; - - osmnx = callPackage ../development/python-modules/osmnx { }; - - osmpythontools = callPackage ../development/python-modules/osmpythontools { }; - - outcome = callPackage ../development/python-modules/outcome {}; - - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { - pythonPackages = self; - }); - - palettable = callPackage ../development/python-modules/palettable { }; - - papermill = callPackage ../development/python-modules/papermill { }; - - parsley = callPackage ../development/python-modules/parsley { }; - - pastel = callPackage ../development/python-modules/pastel { }; - - pathlib = callPackage ../development/python-modules/pathlib { }; - - pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); - - pcpp = callPackage ../development/python-modules/pcpp { }; - - pdf2image = callPackage ../development/python-modules/pdf2image { }; - - pdfminer = callPackage ../development/python-modules/pdfminer_six { }; - - pdfposter = callPackage ../development/python-modules/pdfposter { }; - - pdftotext = callPackage ../development/python-modules/pdftotext { }; - - pdfx = callPackage ../development/python-modules/pdfx { }; - - pushover-complete = callPackage ../development/python-modules/pushover-complete { }; - - pyicloud = callPackage ../development/python-modules/pyicloud { }; - - pyperf = callPackage ../development/python-modules/pyperf { }; - - pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; - - pefile = callPackage ../development/python-modules/pefile { }; - - perfplot = callPackage ../development/python-modules/perfplot { }; - - phonopy = callPackage ../development/python-modules/phonopy { }; - - phik = callPackage ../development/python-modules/phik {}; - - piccata = callPackage ../development/python-modules/piccata {}; - - pims = callPackage ../development/python-modules/pims { }; - - poetry = callPackage ../development/python-modules/poetry { }; - - poetry-core = callPackage ../development/python-modules/poetry-core { }; - - polyline = callPackage ../development/python-modules/polyline { }; - - postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); - - pplpy = callPackage ../development/python-modules/pplpy { }; - - pprintpp = callPackage ../development/python-modules/pprintpp { }; - - progress = callPackage ../development/python-modules/progress { }; - - proglog = callPackage ../development/python-modules/proglog { }; - - pulsectl = callPackage ../development/python-modules/pulsectl { }; - - pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; - - purl = callPackage ../development/python-modules/purl { }; - - pyclipper = callPackage ../development/python-modules/pyclipper { }; - - pymystem3 = callPackage ../development/python-modules/pymystem3 { }; - - pymysql = callPackage ../development/python-modules/pymysql { }; - - pymupdf = callPackage ../development/python-modules/pymupdf { }; - - pynamecheap = callPackage ../development/python-modules/pynamecheap { }; - - Pmw = callPackage ../development/python-modules/Pmw { }; - - py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; - - pyaes = callPackage ../development/python-modules/pyaes { }; - - pyairvisual = callPackage ../development/python-modules/pyairvisual { }; - - pyamf = callPackage ../development/python-modules/pyamf { }; - - pyarrow = callPackage ../development/python-modules/pyarrow { - inherit (pkgs) arrow-cpp cmake pkgconfig; - }; - - pyannotate = callPackage ../development/python-modules/pyannotate { }; - - pyatspi = callPackage ../development/python-modules/pyatspi { - inherit (pkgs) pkgconfig; - }; - - pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; - - pybids = callPackage ../development/python-modules/pybids { }; - - pybind11 = callPackage ../development/python-modules/pybind11 { }; - - py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); - - pybullet = callPackage ../development/python-modules/pybullet { }; - - pycairo = callPackage ../development/python-modules/pycairo { - inherit (pkgs) meson pkgconfig; - }; - - pycategories = callPackage ../development/python-modules/pycategories { }; - - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { - inherit (pkgs) pkgconfig; - }); - - pycrc = callPackage ../development/python-modules/pycrc { }; - - pycrypto = callPackage ../development/python-modules/pycrypto { }; - - pycryptodome = callPackage ../development/python-modules/pycryptodome { }; - - pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; - - PyChromecast = callPackage ../development/python-modules/pychromecast { }; - - pycm = callPackage ../development/python-modules/pycm { }; - - py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; - - py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; - - py-multibase = callPackage ../development/python-modules/py-multibase { }; - - py-multihash = callPackage ../development/python-modules/py-multihash { }; - - py-radix = callPackage ../development/python-modules/py-radix { }; - - pydbus = callPackage ../development/python-modules/pydbus { }; - - pydicom = callPackage ../development/python-modules/pydicom { }; - - pydocstyle = - if isPy27 then - callPackage ../development/python-modules/pydocstyle/2.nix { } - else - callPackage ../development/python-modules/pydocstyle { }; - - pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; - - pydrive = callPackage ../development/python-modules/pydrive { }; - - pydy = callPackage ../development/python-modules/pydy { }; - - pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); - - py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; - - pyfakefs = callPackage ../development/python-modules/pyfakefs {}; - - pyfaidx = callPackage ../development/python-modules/pyfaidx { }; - - pyfcm = callPackage ../development/python-modules/pyfcm { }; - - pyfttt = callPackage ../development/python-modules/pyfttt { }; - - pyftdi = callPackage ../development/python-modules/pyftdi { }; - - pygame = callPackage ../development/python-modules/pygame { }; - - pygbm = callPackage ../development/python-modules/pygbm { }; - - pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; - - pygdbmi = callPackage ../development/python-modules/pygdbmi { }; - - pygmo = callPackage ../development/python-modules/pygmo { }; - - pygobject2 = callPackage ../development/python-modules/pygobject { - inherit (pkgs) pkgconfig; - }; - - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { - inherit (pkgs) meson pkgconfig; - }; - - pygtail = callPackage ../development/python-modules/pygtail { }; - - pygtk = callPackage ../development/python-modules/pygtk { - inherit (pkgs) pkgconfig; - libglade = null; - }; - - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { - inherit (pkgs) pkgconfig; - }; - - pyGtkGlade = self.pygtk.override { - libglade = pkgs.gnome2.libglade; - }; - - pyjwkest = callPackage ../development/python-modules/pyjwkest { }; - - pykdtree = callPackage ../development/python-modules/pykdtree { - inherit (pkgs.llvmPackages) openmp; - }; - - pykerberos = callPackage ../development/python-modules/pykerberos { }; - - pykeepass = callPackage ../development/python-modules/pykeepass { }; - - pylev = callPackage ../development/python-modules/pylev { }; - - pylibftdi = callPackage ../development/python-modules/pylibftdi { - inherit (pkgs) libusb1; - }; - - pymatgen = callPackage ../development/python-modules/pymatgen { }; - - pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; - - pymavlink = callPackage ../development/python-modules/pymavlink { }; - - pymeeus = callPackage ../development/python-modules/pymeeus { }; - - pymsgbox = callPackage ../development/python-modules/pymsgbox { }; - - pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; - - pynisher = callPackage ../development/python-modules/pynisher { }; - - pynput = callPackage ../development/python-modules/pynput { }; - - pyparser = callPackage ../development/python-modules/pyparser { }; - - pyres = callPackage ../development/python-modules/pyres { }; - - PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; - - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { - inherit (pkgs) pkgconfig; - }; - - pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { - pythonPackages = self; - }; - - /* - `pyqt5_with_qtwebkit` should not be used by python libraries in - pkgs/development/python-modules/*. Putting this attribute in - `propagatedBuildInputs` may cause collisions. - */ - pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; - - pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; - - pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { - pythonPackages = self; - }; - - pysc2 = callPackage ../development/python-modules/pysc2 { }; - - pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; - - pyschedule = callPackage ../development/python-modules/pyschedule { }; - - pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; - - pydsdl = callPackage ../development/python-modules/pydsdl { }; - - pyside = callPackage ../development/python-modules/pyside { - inherit (pkgs) mesa; - }; - - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { - inherit (pkgs) libxml2 libxslt; # Do not need the Python bindings. - }; - - pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; - - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { - inherit (pkgs) cmake qt5 ninja; - }); - - shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 { - inherit (pkgs) cmake qt5 llvmPackages; - }); - - simplefix = callPackage ../development/python-modules/simplefix { }; - - pyscrypt = callPackage ../development/python-modules/pyscrypt { }; - - pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools { - inherit (pkgs) cmake qt5; - }); - - pyslurm = callPackage ../development/python-modules/pyslurm { - slurm = pkgs.slurm; - }; - - pysmb = callPackage ../development/python-modules/pysmb { }; - - pysmf = callPackage ../development/python-modules/pysmf { }; - - pyspinel = callPackage ../development/python-modules/pyspinel {}; - - pyssim = callPackage ../development/python-modules/pyssim { }; - - pystache = callPackage ../development/python-modules/pystache { }; - - pystray = callPackage ../development/python-modules/pystray { }; - - pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; - - pytesseract = callPackage ../development/python-modules/pytesseract { }; - - pytest-bdd = callPackage ../development/python-modules/pytest-bdd { }; - - pytest-black = callPackage ../development/python-modules/pytest-black { }; - - pytest-click = callPackage ../development/python-modules/pytest-click { }; - - pytest-check = callPackage ../development/python-modules/pytest-check { }; - - pytest-env = callPackage ../development/python-modules/pytest-env { }; - - pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { }; - - pytest-flask = callPackage ../development/python-modules/pytest-flask { }; - - pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; - - pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; - - pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; - - pytest-qt = callPackage ../development/python-modules/pytest-qt { }; - - pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; - - pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; - - pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { }; - - pytest-trio = callPackage ../development/python-modules/pytest-trio { }; - - pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; - - pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; - - pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; - - pytmx = callPackage ../development/python-modules/pytmx { }; - - pythonmagick = callPackage ../development/python-modules/pythonmagick { }; - - python-binance = callPackage ../development/python-modules/python-binance { }; - - python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; - - python-dotenv = callPackage ../development/python-modules/python-dotenv { }; - - python-engineio = callPackage ../development/python-modules/python-engineio { }; - - python-hosts = callPackage ../development/python-modules/python-hosts { }; - - python-lz4 = callPackage ../development/python-modules/python-lz4 { }; - lz4 = self.python-lz4; # alias 2018-12-05 - - python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; - - python-mnist = callPackage ../development/python-modules/python-mnist { }; - - pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs.xorg) libX11; - }); - - python-igraph = callPackage ../development/python-modules/python-igraph { - pkgconfig = pkgs.pkgconfig; - igraph = pkgs.igraph; - }; - - python-olm = callPackage ../development/python-modules/python-olm { }; - - python3-openid = callPackage ../development/python-modules/python3-openid { }; - - python-packer = callPackage ../development/python-modules/python-packer { }; - - python-periphery = callPackage ../development/python-modules/python-periphery { }; - - python-prctl = callPackage ../development/python-modules/python-prctl { }; - - python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; - - python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; - - python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; - - python-sql = callPackage ../development/python-modules/python-sql { }; - - python-snappy = callPackage ../development/python-modules/python-snappy { - inherit (pkgs) snappy; - }; - - python-stdnum = callPackage ../development/python-modules/python-stdnum { }; - - python-socketio = callPackage ../development/python-modules/python-socketio { }; - - python-utils = callPackage ../development/python-modules/python-utils { }; - - python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; - - pytimeparse = callPackage ../development/python-modules/pytimeparse { }; - - pytricia = callPackage ../development/python-modules/pytricia { }; - - pytrends = callPackage ../development/python-modules/pytrends { }; - - py-vapid = callPackage ../development/python-modules/py-vapid { }; - - PyWebDAV = callPackage ../development/python-modules/pywebdav { }; - - pywebpush = callPackage ../development/python-modules/pywebpush { }; - - pywebview = callPackage ../development/python-modules/pywebview { }; - - pywick = callPackage ../development/python-modules/pywick { }; - - pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); - - pyvcd = callPackage ../development/python-modules/pyvcd { }; - - pyvcf = callPackage ../development/python-modules/pyvcf { }; - - pyvoro = callPackage ../development/python-modules/pyvoro { }; - - radish-bdd = callPackage ../development/python-modules/radish-bdd { }; - - relatorio = callPackage ../development/python-modules/relatorio { }; - - reproject = callPackage ../development/python-modules/reproject { }; - - remotecv = callPackage ../development/python-modules/remotecv { }; - - pyzufall = callPackage ../development/python-modules/pyzufall { }; - - rig = callPackage ../development/python-modules/rig { }; - - rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {}); - - rlp = callPackage ../development/python-modules/rlp { }; - - rq = callPackage ../development/python-modules/rq { }; - - rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; - - rx = callPackage ../development/python-modules/rx { }; - - sabyenc = callPackage ../development/python-modules/sabyenc { }; - - salmon-mail = callPackage ../development/python-modules/salmon-mail { }; - - sanic-auth = callPackage ../development/python-modules/sanic-auth { }; - - sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; - - seekpath = callPackage ../development/python-modules/seekpath { }; - - selectors2 = callPackage ../development/python-modules/selectors2 { }; - - sacremoses = callPackage ../development/python-modules/sacremoses { }; - - sentencepiece = callPackage ../development/python-modules/sentencepiece { - inherit (pkgs) sentencepiece pkgconfig; - }; - - tokenizers = disabledIf (!isPy3k) - (toPythonModule (callPackage ../development/python-modules/tokenizers { })); - - towncrier = callPackage ../development/python-modules/towncrier { - inherit (pkgs) git; - }; - - transformers = callPackage ../development/python-modules/transformers { }; - - transforms3d = callPackage ../development/python-modules/transforms3d { }; - - trimesh = callPackage ../development/python-modules/trimesh {}; - - sentinel = callPackage ../development/python-modules/sentinel { }; - - sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; - - sepaxml = callPackage ../development/python-modules/sepaxml { }; - - serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; - - shellingham = callPackage ../development/python-modules/shellingham {}; - - simpleaudio = callPackage ../development/python-modules/simpleaudio { }; - - simpleeval = callPackage ../development/python-modules/simpleeval { }; - - simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; - - singledispatch = callPackage ../development/python-modules/singledispatch { }; - - sip = callPackage ../development/python-modules/sip { }; - - sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; - - sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; - - skorch = callPackage ../development/python-modules/skorch { }; - - slackclient = callPackage ../development/python-modules/slackclient { }; - - slicedimage = callPackage ../development/python-modules/slicedimage { }; - - slicerator = callPackage ../development/python-modules/slicerator { }; - - slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; - - sly = callPackage ../development/python-modules/sly { }; - - snapcast = callPackage ../development/python-modules/snapcast { }; - - soapysdr = toPythonModule (pkgs.soapysdr.override { - python = self.python; - usePython = true; - }); - - soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { - python = self.python; - usePython = true; - }); - - softlayer = callPackage ../development/python-modules/softlayer { }; - - sparse = callPackage ../development/python-modules/sparse { }; - - spglib = callPackage ../development/python-modules/spglib { }; - - spidev = callPackage ../development/python-modules/spidev { }; - - srvlookup = callPackage ../development/python-modules/srvlookup { }; - - sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; - - sshtunnel = callPackage ../development/python-modules/sshtunnel { }; - - sslib = callPackage ../development/python-modules/sslib { }; - - sslyze = callPackage ../development/python-modules/sslyze { }; - - statistics = callPackage ../development/python-modules/statistics { }; - - stm32loader = callPackage ../development/python-modules/stm32loader { }; - - stumpy = callPackage ../development/python-modules/stumpy { }; - - stups-cli-support = callPackage ../development/python-modules/stups-cli-support { }; - - stups-fullstop = callPackage ../development/python-modules/stups-fullstop { }; - - stups-pierone = callPackage ../development/python-modules/stups-pierone { }; - - stups-tokens = callPackage ../development/python-modules/stups-tokens { }; - - stups-zign = callPackage ../development/python-modules/stups-zign { }; - - sumo = callPackage ../development/python-modules/sumo { }; - - supervise_api = callPackage ../development/python-modules/supervise_api { }; - - tables = if isPy3k then callPackage ../development/python-modules/tables { - hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; - } else callPackage ../development/python-modules/tables/3.5.nix { - hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; - }; - - tag-expressions = callPackage ../development/python-modules/tag-expressions { }; - - tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - - tesserocr = callPackage ../development/python-modules/tesserocr { }; - - tls-parser = callPackage ../development/python-modules/tls-parser { }; - - trueskill = callPackage ../development/python-modules/trueskill { }; - - trustme = callPackage ../development/python-modules/trustme {}; - - trio = callPackage ../development/python-modules/trio {}; - - sniffio = callPackage ../development/python-modules/sniffio { }; - - spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; - spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {}; - - spyder = callPackage ../development/python-modules/spyder {}; - spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; - - tenacity = callPackage ../development/python-modules/tenacity { }; - - tokenserver = callPackage ../development/python-modules/tokenserver {}; - - toml = callPackage ../development/python-modules/toml { }; - - tomlkit = callPackage ../development/python-modules/tomlkit { }; - - toggl-cli = callPackage ../development/python-modules/toggl-cli { }; - - uamqp = callPackage ../development/python-modules/uamqp { - inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; - }; - - unifi = callPackage ../development/python-modules/unifi { }; - - uvcclient = callPackage ../development/python-modules/uvcclient { }; - - uvloop = callPackage ../development/python-modules/uvloop { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }; - - pyuavcan = callPackage ../development/python-modules/pyuavcan { - # this version pinpoint to anold version is necessary due to a regression - nunavut = self.nunavut.overridePythonAttrs ( old: rec { - version = "0.2.3"; - src = old.src.override { - inherit version; - sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; - }; - }); - }; - - pyunifi = callPackage ../development/python-modules/pyunifi { }; - - vdf = callPackage ../development/python-modules/vdf { }; - - vdirsyncer = callPackage ../development/python-modules/vdirsyncer { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; - inherit (pkgs) pkg-config openssl rustPlatform; - }; - - vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; - - vidstab = callPackage ../development/python-modules/vidstab { }; - - webapp2 = callPackage ../development/python-modules/webapp2 { }; - - webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; - - wordcloud = callPackage ../development/python-modules/wordcloud { }; - - wrf-python = callPackage ../development/python-modules/wrf-python { }; - - pyunbound = callPackage ../tools/networking/unbound/python.nix { }; - - WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; - - yarg = callPackage ../development/python-modules/yarg { }; - - yt = callPackage ../development/python-modules/yt { }; - - # packages defined here - - aafigure = callPackage ../development/python-modules/aafigure { }; - - addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; - - algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; - - altair = callPackage ../development/python-modules/altair { }; - - vega = callPackage ../development/python-modules/vega { }; - - accupy = callPackage ../development/python-modules/accupy { }; - - acme = callPackage ../development/python-modules/acme { }; - - acme-tiny = callPackage ../development/python-modules/acme-tiny { }; - - actdiag = callPackage ../development/python-modules/actdiag { }; - - adal = callPackage ../development/python-modules/adal { }; - - affine = callPackage ../development/python-modules/affine { }; - - aioconsole = callPackage ../development/python-modules/aioconsole { }; - - aiodns = callPackage ../development/python-modules/aiodns { }; - - aiofiles = callPackage ../development/python-modules/aiofiles { }; - - aioh2 = callPackage ../development/python-modules/aioh2 { }; - - aioftp = callPackage ../development/python-modules/aioftp { }; - - aioharmony = callPackage ../development/python-modules/aioharmony { }; - - aiohttp = callPackage ../development/python-modules/aiohttp { }; - - aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; - - aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; - - aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; - - aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; - - aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; - - aiomysql = callPackage ../development/python-modules/aiomysql { }; - - aioprocessing = callPackage ../development/python-modules/aioprocessing { }; - - aioresponses = callPackage ../development/python-modules/aioresponses { }; - - aiosqlite = callPackage ../development/python-modules/aiosqlite { }; - - aiorpcx = callPackage ../development/python-modules/aiorpcx { }; - - aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; - - aiounifi = callPackage ../development/python-modules/aiounifi { }; - - aiounittest = callPackage ../development/python-modules/aiounittest { }; - - aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; - - ajpy = callPackage ../development/python-modules/ajpy { }; - - alabaster = callPackage ../development/python-modules/alabaster {}; - - alarmdecoder = callPackage ../development/python-modules/alarmdecoder {}; - - alembic = callPackage ../development/python-modules/alembic {}; - - allpairspy = callPackage ../development/python-modules/allpairspy { }; - - annexremote = callPackage ../development/python-modules/annexremote { }; - - ansible = callPackage ../development/python-modules/ansible { }; - - ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; - - ansible-lint = callPackage ../development/python-modules/ansible-lint { }; - - ansible-runner = callPackage ../development/python-modules/ansible-runner { }; - - ansicolors = callPackage ../development/python-modules/ansicolors {}; - - aniso8601 = callPackage ../development/python-modules/aniso8601 {}; - - anonip = callPackage ../development/python-modules/anonip { }; - - asgiref = callPackage ../development/python-modules/asgiref { }; - - python-editor = callPackage ../development/python-modules/python-editor { }; - - python-gnupg = callPackage ../development/python-modules/python-gnupg {}; - - python-uinput = callPackage ../development/python-modules/python-uinput {}; - - python-sybase = callPackage ../development/python-modules/sybase {}; - - alot = callPackage ../development/python-modules/alot {}; - - anyjson = callPackage ../development/python-modules/anyjson {}; - - amqp = callPackage ../development/python-modules/amqp {}; - - amqplib = callPackage ../development/python-modules/amqplib {}; - - antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; - - antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; - - apache-airflow = callPackage ../development/python-modules/apache-airflow { }; - - apipkg = callPackage ../development/python-modules/apipkg {}; - - apispec = callPackage ../development/python-modules/apispec {}; - - appdirs = callPackage ../development/python-modules/appdirs { }; - - appleseed = disabledIf isPy3k - (toPythonModule (pkgs.appleseed.override { - inherit (self) python; - })); - - application = callPackage ../development/python-modules/application { }; - - applicationinsights = callPackage ../development/python-modules/applicationinsights { }; - - appnope = callPackage ../development/python-modules/appnope { }; - - approvaltests = callPackage ../development/python-modules/approvaltests { }; - - apptools = callPackage ../development/python-modules/apptools {}; - - apsw = callPackage ../development/python-modules/apsw {}; - - astor = callPackage ../development/python-modules/astor {}; - - asyncpg = callPackage ../development/python-modules/asyncpg { }; - - asyncssh = callPackage ../development/python-modules/asyncssh { }; - - atpublic = callPackage ../development/python-modules/atpublic { }; - - python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; - - funcsigs = callPackage ../development/python-modules/funcsigs { }; - - APScheduler = callPackage ../development/python-modules/APScheduler { }; - - args = callPackage ../development/python-modules/args { }; - - argcomplete = callPackage ../development/python-modules/argcomplete { }; - - area = callPackage ../development/python-modules/area { }; - - arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; - - chai = callPackage ../development/python-modules/chai { }; - - chainmap = callPackage ../development/python-modules/chainmap { }; - - arelle = callPackage ../development/python-modules/arelle { - gui = true; - }; - - arelle-headless = callPackage ../development/python-modules/arelle { - gui = false; - }; - - delegator-py = callPackage ../development/python-modules/delegator-py { }; - - deluge-client = callPackage ../development/python-modules/deluge-client { }; - - arrow = callPackage ../development/python-modules/arrow { }; - - asynctest = callPackage ../development/python-modules/asynctest { }; - - async-timeout = callPackage ../development/python-modules/async_timeout { }; - - async_generator = callPackage ../development/python-modules/async_generator { }; - - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; - - asn1ate = callPackage ../development/python-modules/asn1ate { }; - - atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; - - atomiclong = callPackage ../development/python-modules/atomiclong { }; - - atomicwrites = callPackage ../development/python-modules/atomicwrites { }; - - astroid = if isPy3k then callPackage ../development/python-modules/astroid { } - else callPackage ../development/python-modules/astroid/1.6.nix { }; - - attrdict = callPackage ../development/python-modules/attrdict { }; - - attrs = callPackage ../development/python-modules/attrs { }; - - atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; - - audio-metadata = callPackage ../development/python-modules/audio-metadata { }; - - audioread = callPackage ../development/python-modules/audioread { }; - - audiotools = callPackage ../development/python-modules/audiotools { }; - - autopep8 = callPackage ../development/python-modules/autopep8 { }; - - av = callPackage ../development/python-modules/av { - inherit (pkgs) pkgconfig; - }; - - avro = callPackage ../development/python-modules/avro {}; - - avro3k = callPackage ../development/python-modules/avro3k {}; - - avro-python3 = callPackage ../development/python-modules/avro-python3 {}; - - aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; - - python-slugify = callPackage ../development/python-modules/python-slugify { }; - - awesome-slugify = callPackage ../development/python-modules/awesome-slugify {}; - - noise = callPackage ../development/python-modules/noise {}; + babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; backcall = callPackage ../development/python-modules/backcall { }; @@ -2001,46 +729,81 @@ in { backports_abc = callPackage ../development/python-modules/backports_abc { }; + backports_csv = callPackage ../development/python-modules/backports_csv { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; + backports_lzma = callPackage ../development/python-modules/backports_lzma { }; + backports_os = callPackage ../development/python-modules/backports_os { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; - backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else - callPackage ../development/python-modules/backports_ssl_match_hostname { }; + backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; - backports_lzma = callPackage ../development/python-modules/backports_lzma { }; + backports_ssl_match_hostname = + if !(pythonOlder "3.5") then null else callPackage ../development/python-modules/backports_ssl_match_hostname { }; backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; - backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; + backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock { }; - babelfish = callPackage ../development/python-modules/babelfish {}; + backports_weakref = callPackage ../development/python-modules/backports_weakref { }; - bandit = callPackage ../development/python-modules/bandit {}; + bacpypes = callPackage ../development/python-modules/bacpypes { }; - basiciw = callPackage ../development/python-modules/basiciw { - inherit (pkgs) gcc wirelesstools; - }; + bandit = callPackage ../development/python-modules/bandit { }; - base58 = callPackage ../development/python-modules/base58 {}; + bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; }; + + base58 = callPackage ../development/python-modules/base58 { }; + + baselines = callPackage ../development/python-modules/baselines { }; + + basemap = callPackage ../development/python-modules/basemap { }; + + bash_kernel = callPackage ../development/python-modules/bash_kernel { inherit (pkgs) bash; }; + + bashlex = callPackage ../development/python-modules/bashlex { }; + + basiciw = callPackage ../development/python-modules/basiciw { inherit (pkgs) gcc wirelesstools; }; batchgenerators = callPackage ../development/python-modules/batchgenerators { }; - batinfo = callPackage ../development/python-modules/batinfo {}; + batchspawner = callPackage ../development/python-modules/batchspawner { }; - bcdoc = callPackage ../development/python-modules/bcdoc {}; + batinfo = callPackage ../development/python-modules/batinfo { }; - beancount = callPackage ../development/python-modules/beancount { }; + bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; - beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; + bayespy = callPackage ../development/python-modules/bayespy { }; + + bcdoc = callPackage ../development/python-modules/bcdoc { }; + + bcrypt = if pythonOlder "3.6" then + callPackage ../development/python-modules/bcrypt/3_1.nix { } + else + callPackage ../development/python-modules/bcrypt { }; beaker = callPackage ../development/python-modules/beaker { }; + beancount = callPackage ../development/python-modules/beancount { }; + + beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; + + beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; + + bedup = callPackage ../development/python-modules/bedup { }; + + behave = callPackage ../development/python-modules/behave { }; + + bellows = callPackage ../development/python-modules/bellows { }; + bespon = callPackage ../development/python-modules/bespon { }; - betamax = callPackage ../development/python-modules/betamax {}; + betamax = callPackage ../development/python-modules/betamax { }; betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; @@ -2052,6 +815,10 @@ in { bids-validator = callPackage ../development/python-modules/bids-validator { }; + billiard = callPackage ../development/python-modules/billiard { }; + + binaryornot = callPackage ../development/python-modules/binaryornot { }; + binwalk = callPackage ../development/python-modules/binwalk { pyqtgraph = null; matplotlib = null; @@ -2062,19 +829,71 @@ in { matplotlib = self.matplotlib; }); + biopython = callPackage ../development/python-modules/biopython { }; + + biplist = callPackage ../development/python-modules/biplist { }; + + bip_utils = callPackage ../development/python-modules/bip_utils { }; + + bitarray = callPackage ../development/python-modules/bitarray { }; + + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; + + bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; + + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; + + bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + bitmath = callPackage ../development/python-modules/bitmath { }; + bitstring = callPackage ../development/python-modules/bitstring { }; + bitstruct = callPackage ../development/python-modules/bitstruct { }; - caldav = callPackage ../development/python-modules/caldav { }; + bjoern = callPackage ../development/python-modules/bjoern { }; - biopython = callPackage ../development/python-modules/biopython { }; + bkcharts = callPackage ../development/python-modules/bkcharts { }; - bedup = callPackage ../development/python-modules/bedup { }; + black = callPackage ../development/python-modules/black { }; - blessed = callPackage ../development/python-modules/blessed {}; + black-macchiato = callPackage ../development/python-modules/black-macchiato { }; - block-io = callPackage ../development/python-modules/block-io {}; + bleach = callPackage ../development/python-modules/bleach { }; + + bleak = callPackage ../development/python-modules/bleak { }; + + blessed = callPackage ../development/python-modules/blessed { }; + + blessings = callPackage ../development/python-modules/blessings { }; + + blinker = callPackage ../development/python-modules/blinker { }; + + BlinkStick = callPackage ../development/python-modules/blinkstick { }; + + blis = callPackage ../development/python-modules/blis { }; + + blist = callPackage ../development/python-modules/blist { }; + + blivet = callPackage ../development/python-modules/blivet { }; + + blockdiag = callPackage ../development/python-modules/blockdiag { }; + + blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; + + block-io = callPackage ../development/python-modules/block-io { }; + + bluepy = callPackage ../development/python-modules/bluepy { }; + + bokeh = callPackage ../development/python-modules/bokeh { }; + + boltons = callPackage ../development/python-modules/boltons { }; + + boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + + booleanoperations = callPackage ../development/python-modules/booleanoperations { }; + + boolean-py = callPackage ../development/python-modules/boolean-py { }; # Build boost for this specific Python version # TODO: use separate output for libboost_python.so @@ -2083,93 +902,469 @@ in { enablePython = true; }); - boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + boto3 = callPackage ../development/python-modules/boto3 { }; - boolean-py = callPackage ../development/python-modules/boolean-py { }; + boto = callPackage ../development/python-modules/boto { }; - bumps = callPackage ../development/python-modules/bumps {}; + botocore = callPackage ../development/python-modules/botocore { }; - bx-python = callPackage ../development/python-modules/bx-python { - inherit (pkgs) zlib; - }; + bottle = callPackage ../development/python-modules/bottle { }; + + bottleneck = callPackage ../development/python-modules/bottleneck { }; + + box2d = callPackage ../development/python-modules/box2d { }; + + bpython = callPackage ../development/python-modules/bpython { }; + + braintree = callPackage ../development/python-modules/braintree { }; + + branca = callPackage ../development/python-modules/branca { }; + + bravado-core = callPackage ../development/python-modules/bravado-core { }; + + bravia-tv = callPackage ../development/python-modules/bravia-tv { }; + + breathe = callPackage ../development/python-modules/breathe { }; + + breezy = callPackage ../development/python-modules/breezy { }; + + broadlink = callPackage ../development/python-modules/broadlink { }; + + brother = callPackage ../development/python-modules/brother { }; + + brotli = callPackage ../development/python-modules/brotli { }; + + brotlipy = callPackage ../development/python-modules/brotlipy { }; + + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + + browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { }); + + bsddb3 = callPackage ../development/python-modules/bsddb3 { }; + + bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; + + btchip = callPackage ../development/python-modules/btchip { }; + + bt_proximity = callPackage ../development/python-modules/bt-proximity { }; + + BTrees = callPackage ../development/python-modules/btrees { }; + + btrfs = callPackage ../development/python-modules/btrfs { }; + + bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + + bugsnag = callPackage ../development/python-modules/bugsnag { }; + + bugwarrior = callPackage ../development/python-modules/bugwarrior { }; + + bugz = callPackage ../development/python-modules/bugz { }; + + bugzilla = callPackage ../development/python-modules/bugzilla { }; + + buildbot = callPackage ../development/python-modules/buildbot { }; + + buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); + + buildbot-full = self.buildbot.withPlugins + (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); + + buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; + + buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); + + buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; + + build = callPackage ../development/python-modules/build { }; + + bumps = callPackage ../development/python-modules/bumps { }; + + bunch = callPackage ../development/python-modules/bunch { }; + + bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; }; + + bwapy = callPackage ../development/python-modules/bwapy { }; + + bytecode = callPackage ../development/python-modules/bytecode { }; + + bz2file = callPackage ../development/python-modules/bz2file { }; + + cachecontrol = callPackage ../development/python-modules/cachecontrol { }; cached-property = callPackage ../development/python-modules/cached-property { }; + cachelib = callPackage ../development/python-modules/cachelib { }; + + cachetools = let + cachetools' = callPackage ../development/python-modules/cachetools { }; + cachetools_2 = cachetools'.overridePythonAttrs (oldAttrs: rec { + version = "3.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; + }; + }); + in if isPy3k then cachetools' else cachetools_2; + + cachy = callPackage ../development/python-modules/cachy { }; + + cadquery = callPackage ../development/python-modules/cadquery { }; + caffe = toPythonModule (pkgs.caffe.override { pythonSupport = true; inherit (self) python numpy boost; }); + cairocffi = if isPy3k then + callPackage ../development/python-modules/cairocffi { } + else + callPackage ../development/python-modules/cairocffi/0_9.nix { }; + + cairosvg = if isPy3k then + callPackage ../development/python-modules/cairosvg { } + else + callPackage ../development/python-modules/cairosvg/1_x.nix { }; + + caldav = callPackage ../development/python-modules/caldav { }; + + can = callPackage ../development/python-modules/can { }; + + canmatrix = callPackage ../development/python-modules/canmatrix { }; + + canonicaljson = callPackage ../development/python-modules/canonicaljson { }; + + canopen = callPackage ../development/python-modules/canopen { }; + capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; }; capturer = callPackage ../development/python-modules/capturer { }; - cement = callPackage ../development/python-modules/cement {}; + carbon = callPackage ../development/python-modules/carbon { }; + + carrot = callPackage ../development/python-modules/carrot { }; + + cartopy = callPackage ../development/python-modules/cartopy { }; + + casbin = callPackage ../development/python-modules/casbin { }; + + case = callPackage ../development/python-modules/case { }; + + cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; + + casttube = callPackage ../development/python-modules/casttube { }; + + catalogue = callPackage ../development/python-modules/catalogue { }; + + cbeams = callPackage ../misc/cbeams { }; + + cbor2 = callPackage ../development/python-modules/cbor2 { }; + + cbor = callPackage ../development/python-modules/cbor { }; + + cccolutils = callPackage ../development/python-modules/cccolutils { }; + + cchardet = callPackage ../development/python-modules/cchardet { }; + + CDDB = callPackage ../development/python-modules/cddb { }; + + cdecimal = callPackage ../development/python-modules/cdecimal { }; + + celery = callPackage ../development/python-modules/celery { }; + + cement = callPackage ../development/python-modules/cement { }; + + cerberus = callPackage ../development/python-modules/cerberus { }; + + certbot = callPackage ../development/python-modules/certbot { }; + + certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; + + certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; + + certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; + + certifi = callPackage ../development/python-modules/certifi { }; + + certipy = callPackage ../development/python-modules/certipy { }; + + cffi = callPackage ../development/python-modules/cffi { }; + + cfgv = callPackage ../development/python-modules/cfgv { }; + + cfn-flip = callPackage ../development/python-modules/cfn-flip { }; + + cfn-lint = callPackage ../development/python-modules/cfn-lint { }; + + cftime = callPackage ../development/python-modules/cftime { }; cgen = callPackage ../development/python-modules/cgen { }; - cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; + cgroup-utils = callPackage ../development/python-modules/cgroup-utils { }; - chainer = callPackage ../development/python-modules/chainer { - cudaSupport = pkgs.config.cudaSupport or false; - }; + chai = callPackage ../development/python-modules/chai { }; - channels = callPackage ../development/python-modules/channels {}; + chainer = callPackage ../development/python-modules/chainer { cudaSupport = pkgs.config.cudaSupport or false; }; - cheroot = callPackage ../development/python-modules/cheroot {}; + chainmap = callPackage ../development/python-modules/chainmap { }; - chevron = callPackage ../development/python-modules/chevron {}; + chalice = callPackage ../development/python-modules/chalice { }; + + chameleon = callPackage ../development/python-modules/chameleon { }; + + channels = callPackage ../development/python-modules/channels { }; + + channels-redis = callPackage ../development/python-modules/channels-redis { }; + + characteristic = callPackage ../development/python-modules/characteristic { }; + + chardet = callPackage ../development/python-modules/chardet { }; + + chart-studio = callPackage ../development/python-modules/chart-studio { }; + + check-manifest = callPackage ../development/python-modules/check-manifest { }; + + cheetah3 = callPackage ../development/python-modules/cheetah3 { }; + + cheetah = callPackage ../development/python-modules/cheetah { }; + + cheroot = callPackage ../development/python-modules/cheroot { }; + + cherrypy = if isPy3k then + callPackage ../development/python-modules/cherrypy { } + else + callPackage ../development/python-modules/cherrypy/17.nix { }; + + chevron = callPackage ../development/python-modules/chevron { }; ci-info = callPackage ../development/python-modules/ci-info { }; ci-py = callPackage ../development/python-modules/ci-py { }; - cli-helpers = callPackage ../development/python-modules/cli-helpers {}; - - cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; - cirq = callPackage ../development/python-modules/cirq { }; + ciso8601 = callPackage ../development/python-modules/ciso8601 { }; + citeproc-py = callPackage ../development/python-modules/citeproc-py { }; + cjson = callPackage ../development/python-modules/cjson { }; + + ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; + + cleo = callPackage ../development/python-modules/cleo { }; + + clf = callPackage ../development/python-modules/clf { }; + + cliapp = callPackage ../development/python-modules/cliapp { }; + + click = callPackage ../development/python-modules/click { }; + + clickclick = callPackage ../development/python-modules/clickclick { }; + + click-completion = callPackage ../development/python-modules/click-completion { }; + + click-datetime = callPackage ../development/python-modules/click-datetime { }; + + click-default-group = callPackage ../development/python-modules/click-default-group { }; + + click-didyoumean = callPackage ../development/python-modules/click-didyoumean { }; + + click-log = callPackage ../development/python-modules/click-log { }; + + click-plugins = callPackage ../development/python-modules/click-plugins { }; + + click-repl = callPackage ../development/python-modules/click-repl { }; + + click-threading = callPackage ../development/python-modules/click-threading { }; + + cliff = callPackage ../development/python-modules/cliff { }; + + clifford = callPackage ../development/python-modules/clifford { }; + + cligj = callPackage ../development/python-modules/cligj { }; + + cli-helpers = callPackage ../development/python-modules/cli-helpers { }; + + clikit = callPackage ../development/python-modules/clikit { }; + + clint = callPackage ../development/python-modules/clint { }; + + clize = callPackage ../development/python-modules/clize { }; + + clldutils = callPackage ../development/python-modules/clldutils { }; + + closure-linter = callPackage ../development/python-modules/closure-linter { }; + + cloudflare = callPackage ../development/python-modules/cloudflare { }; + + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; + + clustershell = callPackage ../development/python-modules/clustershell { }; + + cma = callPackage ../development/python-modules/cma { }; + + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; + + cmd2 = callPackage ../development/python-modules/cmd2 { }; + + cmdline = callPackage ../development/python-modules/cmdline { }; + + cmdtest = callPackage ../development/python-modules/cmdtest { }; + + cntk = callPackage ../development/python-modules/cntk { }; + + cnvkit = callPackage ../development/python-modules/cnvkit { }; + + cocotb = callPackage ../development/python-modules/cocotb { }; + + codecov = callPackage ../development/python-modules/codecov { }; + + codespell = callPackage ../development/python-modules/codespell { }; + + cogapp = callPackage ../development/python-modules/cogapp { }; + + coilmq = callPackage ../development/python-modules/coilmq { }; + + coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; + + ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; + + colander = callPackage ../development/python-modules/colander { }; + + colorama = callPackage ../development/python-modules/colorama { }; + colorcet = callPackage ../development/python-modules/colorcet { }; + colorclass = callPackage ../development/python-modules/colorclass { }; + + colored = callPackage ../development/python-modules/colored { }; + coloredlogs = callPackage ../development/python-modules/coloredlogs { }; - colorclass = callPackage ../development/python-modules/colorclass {}; - - colorful = callPackage ../development/python-modules/colorful {}; + colorful = callPackage ../development/python-modules/colorful { }; colorlog = callPackage ../development/python-modules/colorlog { }; + colorlover = callPackage ../development/python-modules/colorlover { }; + + colormath = callPackage ../development/python-modules/colormath { }; + colorspacious = callPackage ../development/python-modules/colorspacious { }; - colour = callPackage ../development/python-modules/colour {}; + colour = callPackage ../development/python-modules/colour { }; - colormath = callPackage ../development/python-modules/colormath {}; + CommonMark = callPackage ../development/python-modules/commonmark { }; + + compiledb = callPackage ../development/python-modules/compiledb { }; + + conda = callPackage ../development/python-modules/conda { }; + + ConfigArgParse = callPackage ../development/python-modules/configargparse { }; + + configobj = callPackage ../development/python-modules/configobj { }; + + configparser = if pythonOlder "3.6" then + callPackage ../development/python-modules/configparser/4.nix { } + else + callPackage ../development/python-modules/configparser { }; configshell = callPackage ../development/python-modules/configshell { }; + confluent-kafka = callPackage ../development/python-modules/confluent-kafka { }; + + connexion = callPackage ../development/python-modules/connexion { }; + consonance = callPackage ../development/python-modules/consonance { }; constantly = callPackage ../development/python-modules/constantly { }; + construct = callPackage ../development/python-modules/construct { }; + + consul = callPackage ../development/python-modules/consul { }; + + contexter = callPackage ../development/python-modules/contexter { }; + + contextlib2 = callPackage ../development/python-modules/contextlib2 { }; + + contextvars = callPackage ../development/python-modules/contextvars { }; + + convertdate = callPackage ../development/python-modules/convertdate { }; + + cookiecutter = callPackage ../development/python-modules/cookiecutter { }; + + cookies = callPackage ../development/python-modules/cookies { }; + + coordinates = callPackage ../development/python-modules/coordinates { }; + + coreapi = callPackage ../development/python-modules/coreapi { }; + + coreschema = callPackage ../development/python-modules/coreschema { }; + cornice = callPackage ../development/python-modules/cornice { }; - crashtest = callPackage ../development/python-modules/crashtest { }; + cot = callPackage ../development/python-modules/cot { }; + + covCore = callPackage ../development/python-modules/cov-core { }; + + coverage = callPackage ../development/python-modules/coverage { }; + + coveralls = callPackage ../development/python-modules/coveralls { }; + + cozy = callPackage ../development/python-modules/cozy { }; + + cppy = callPackage ../development/python-modules/cppy { }; cram = callPackage ../development/python-modules/cram { }; + crashtest = callPackage ../development/python-modules/crashtest { }; + + crate = callPackage ../development/python-modules/crate { }; + + crayons = callPackage ../development/python-modules/crayons { }; + crc16 = callPackage ../development/python-modules/crc16 { }; + crc32c = callPackage ../development/python-modules/crc32c { }; + crccheck = callPackage ../development/python-modules/crccheck { }; + crcmod = callPackage ../development/python-modules/crcmod { }; + + credstash = callPackage ../development/python-modules/credstash { }; + croniter = callPackage ../development/python-modules/croniter { }; - csscompressor = callPackage ../development/python-modules/csscompressor {}; + cryptacular = callPackage ../development/python-modules/cryptacular { }; + + cryptography = if isPy27 then + callPackage ../development/python-modules/cryptography/2.9.nix { } + else + callPackage ../development/python-modules/cryptography { }; + + cryptography_vectors = if isPy27 then + callPackage ../development/python-modules/cryptography/vectors-2.9.nix { } + else + callPackage ../development/python-modules/cryptography/vectors.nix { }; + + csscompressor = callPackage ../development/python-modules/csscompressor { }; + + cssmin = callPackage ../development/python-modules/cssmin { }; + + css-parser = callPackage ../development/python-modules/css-parser { }; + + cssselect2 = callPackage ../development/python-modules/cssselect2 { }; + + cssselect = callPackage ../development/python-modules/cssselect { }; + + cssutils = callPackage ../development/python-modules/cssutils { }; csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; + csvw = callPackage ../development/python-modules/csvw { }; + + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; + cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { @@ -2178,617 +1373,55 @@ in { nccl = pkgs.nccl_cudatoolkit_10; }; - cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; + curio = callPackage ../development/python-modules/curio { }; - cx_oracle = callPackage ../development/python-modules/cx_oracle {}; + curtsies = callPackage ../development/python-modules/curtsies { }; + + curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; cvxopt = callPackage ../development/python-modules/cvxopt { }; cvxpy = callPackage ../development/python-modules/cvxpy { }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze { }; + + cx_oracle = callPackage ../development/python-modules/cx_oracle { }; + cycler = callPackage ../development/python-modules/cycler { }; - cysignals = callPackage ../development/python-modules/cysignals { }; + cymem = callPackage ../development/python-modules/cymem { }; cypari2 = callPackage ../development/python-modules/cypari2 { }; - dlib = callPackage ../development/python-modules/dlib { - inherit (pkgs) dlib; - }; - - datadog = callPackage ../development/python-modules/datadog {}; - - dataclasses = callPackage ../development/python-modules/dataclasses { }; - - dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; - - debian = callPackage ../development/python-modules/debian {}; - - defusedxml = callPackage ../development/python-modules/defusedxml {}; - - dodgy = callPackage ../development/python-modules/dodgy { }; - - duecredit = callPackage ../development/python-modules/duecredit { }; - - dugong = callPackage ../development/python-modules/dugong {}; - - easysnmp = callPackage ../development/python-modules/easysnmp { - openssl = pkgs.openssl; - net-snmp = pkgs.net-snmp; - }; - - iowait = callPackage ../development/python-modules/iowait {}; - - responses = callPackage ../development/python-modules/responses {}; - - rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; - - proboscis = callPackage ../development/python-modules/proboscis {}; - - poster3 = callPackage ../development/python-modules/poster3 { }; - - py4j = callPackage ../development/python-modules/py4j { }; - - pyechonest = callPackage ../development/python-modules/pyechonest { }; - - pyepsg = callPackage ../development/python-modules/pyepsg { }; - - billiard = callPackage ../development/python-modules/billiard { }; - - binaryornot = callPackage ../development/python-modules/binaryornot { }; - - bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - - bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; - - bitstring = callPackage ../development/python-modules/bitstring { }; - - html5-parser = callPackage ../development/python-modules/html5-parser { - inherit (pkgs) pkgconfig; - }; - - HTSeq = callPackage ../development/python-modules/HTSeq { }; - - httpserver = callPackage ../development/python-modules/httpserver {}; - - bleach = callPackage ../development/python-modules/bleach { }; - - bleak = callPackage ../development/python-modules/bleak { }; - - blinker = callPackage ../development/python-modules/blinker { }; - - blockdiag = callPackage ../development/python-modules/blockdiag { }; - - blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; - - bpython = callPackage ../development/python-modules/bpython {}; - - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; - - bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; - - bkcharts = callPackage ../development/python-modules/bkcharts { }; - - bokeh = callPackage ../development/python-modules/bokeh { }; - - boto = callPackage ../development/python-modules/boto { }; - - boto3 = callPackage ../development/python-modules/boto3 { }; - - botocore = callPackage ../development/python-modules/botocore { }; - - bottle = callPackage ../development/python-modules/bottle { }; - - box2d = callPackage ../development/python-modules/box2d { }; - - branca = callPackage ../development/python-modules/branca { }; - - bugwarrior = callPackage ../development/python-modules/bugwarrior { }; - - bugz = callPackage ../development/python-modules/bugz { }; - - bugzilla = callPackage ../development/python-modules/bugzilla { }; - - buildbot = callPackage ../development/python-modules/buildbot { }; - buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); - buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); - buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; - buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; - - check-manifest = callPackage ../development/python-modules/check-manifest { }; - - devpi-common = callPackage ../development/python-modules/devpi-common { }; - # A patched version of buildout, useful for buildout based development on Nix - zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - - zc_buildout = self.zc_buildout221; - - zc_buildout221 = callPackage ../development/python-modules/buildout { }; - - z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; - - bunch = callPackage ../development/python-modules/bunch { }; - - can = callPackage ../development/python-modules/can {}; - - canopen = callPackage ../development/python-modules/canopen {}; - - canmatrix = callPackage ../development/python-modules/canmatrix {}; - - - cairocffi = if isPy3k then - callPackage ../development/python-modules/cairocffi {} - else - callPackage ../development/python-modules/cairocffi/0_9.nix {}; - - cairosvg = if isPy3k then - callPackage ../development/python-modules/cairosvg {} - else - callPackage ../development/python-modules/cairosvg/1_x.nix {}; - - carrot = callPackage ../development/python-modules/carrot {}; - - cartopy = callPackage ../development/python-modules/cartopy {}; - - casbin = callPackage ../development/python-modules/casbin { }; - - case = callPackage ../development/python-modules/case {}; - - cbor = callPackage ../development/python-modules/cbor {}; - - cbor2 = callPackage ../development/python-modules/cbor2 {}; - - cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; - - cccolutils = callPackage ../development/python-modules/cccolutils {}; - - cchardet = callPackage ../development/python-modules/cchardet { }; - - CDDB = callPackage ../development/python-modules/cddb { }; - - cntk = callPackage ../development/python-modules/cntk { }; - - celery = callPackage ../development/python-modules/celery { }; - - cerberus = callPackage ../development/python-modules/cerberus { }; - - certifi = callPackage ../development/python-modules/certifi { }; - - certipy = callPackage ../development/python-modules/certipy {}; - - characteristic = callPackage ../development/python-modules/characteristic { }; - - chart-studio = callPackage ../development/python-modules/chart-studio { }; - - cheetah = callPackage ../development/python-modules/cheetah { }; - - cheetah3 = callPackage ../development/python-modules/cheetah3 { }; - - cherrypy = if isPy3k then - callPackage ../development/python-modules/cherrypy { } - else - callPackage ../development/python-modules/cherrypy/17.nix { }; - - cfgv = callPackage ../development/python-modules/cfgv { }; - - cfn-lint = callPackage ../development/python-modules/cfn-lint { }; - - cftime = callPackage ../development/python-modules/cftime {}; - - cjson = callPackage ../development/python-modules/cjson { }; - - cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; - - clf = callPackage ../development/python-modules/clf {}; - - click = callPackage ../development/python-modules/click {}; - - click-completion = callPackage ../development/python-modules/click-completion {}; - - click-datetime = callPackage ../development/python-modules/click-datetime { }; - - click-default-group = callPackage ../development/python-modules/click-default-group { }; - - click-didyoumean = callPackage ../development/python-modules/click-didyoumean {}; - - click-log = callPackage ../development/python-modules/click-log {}; - - click-plugins = callPackage ../development/python-modules/click-plugins {}; - - click-repl = callPackage ../development/python-modules/click-repl { }; - - click-threading = callPackage ../development/python-modules/click-threading {}; - - cligj = callPackage ../development/python-modules/cligj { }; - - closure-linter = callPackage ../development/python-modules/closure-linter { }; - - cloudflare = callPackage ../development/python-modules/cloudflare { }; - - cloudpickle = callPackage ../development/python-modules/cloudpickle { }; - - cmdline = callPackage ../development/python-modules/cmdline { }; - - codecov = callPackage ../development/python-modules/codecov {}; - - cogapp = callPackage ../development/python-modules/cogapp {}; - - colorama = callPackage ../development/python-modules/colorama { }; - - colorlover = callPackage ../development/python-modules/colorlover { }; - - CommonMark = callPackage ../development/python-modules/commonmark { }; - - coilmq = callPackage ../development/python-modules/coilmq { }; - - colander = callPackage ../development/python-modules/colander { }; - - # Backported version of the ConfigParser library of Python 3.3 - configparser = if pythonOlder "3.6" then - callPackage ../development/python-modules/configparser/4.nix { } - else - callPackage ../development/python-modules/configparser { }; - - ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; - - conda = callPackage ../development/python-modules/conda { }; - - configobj = callPackage ../development/python-modules/configobj { }; - - confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; - - kafka-python = callPackage ../development/python-modules/kafka-python {}; - - construct = callPackage ../development/python-modules/construct {}; - - consul = callPackage ../development/python-modules/consul { }; - - contexter = callPackage ../development/python-modules/contexter { }; - - contextvars = callPackage ../development/python-modules/contextvars {}; - - contextlib2 = callPackage ../development/python-modules/contextlib2 { }; - - cookiecutter = callPackage ../development/python-modules/cookiecutter { }; - - cookies = callPackage ../development/python-modules/cookies { }; - - coreapi = callPackage ../development/python-modules/coreapi { }; - - coreschema = callPackage ../development/python-modules/coreschema { }; - - coveralls = callPackage ../development/python-modules/coveralls { }; - - coverage = callPackage ../development/python-modules/coverage { }; - - covCore = callPackage ../development/python-modules/cov-core { }; - - crcmod = callPackage ../development/python-modules/crcmod { }; - - credstash = callPackage ../development/python-modules/credstash { }; + cysignals = callPackage ../development/python-modules/cysignals { }; cython = callPackage ../development/python-modules/Cython { }; cytoolz = callPackage ../development/python-modules/cytoolz { }; - cppy = callPackage ../development/python-modules/cppy { }; + d2to1 = callPackage ../development/python-modules/d2to1 { }; - cryptacular = callPackage ../development/python-modules/cryptacular { }; + daemonize = callPackage ../development/python-modules/daemonize { }; - cryptography = if isPy27 then - callPackage ../development/python-modules/cryptography/2.9.nix { } - else - callPackage ../development/python-modules/cryptography { }; - - cryptography_vectors = if isPy27 then - callPackage ../development/python-modules/cryptography/vectors-2.9.nix { } - else - callPackage ../development/python-modules/cryptography/vectors.nix { }; - - curtsies = callPackage ../development/python-modules/curtsies { }; - - envs = callPackage ../development/python-modules/envs { }; - - enaml = callPackage ../development/python-modules/enaml { }; - - enamlx = callPackage ../development/python-modules/enamlx { }; - - etelemetry = callPackage ../development/python-modules/etelemetry { }; - - eth-hash = callPackage ../development/python-modules/eth-hash { }; - - eth-typing = callPackage ../development/python-modules/eth-typing { }; - - eth-utils = callPackage ../development/python-modules/eth-utils { }; - - gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { - pythonSupport = true; - pythonPackages = self; - })); - - impacket = callPackage ../development/python-modules/impacket { }; - - img2pdf = callPackage ../development/python-modules/img2pdf { }; - - jsonlines = callPackage ../development/python-modules/jsonlines { }; - - json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; - - jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; - - jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; - - jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; - - hepmc3 = toPythonModule (pkgs.hepmc3.override { - inherit python; - }); - - onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; - - tablib = callPackage ../development/python-modules/tablib { }; - - wakeonlan = callPackage ../development/python-modules/wakeonlan { }; - - openant = callPackage ../development/python-modules/openant { }; - - opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { - enablePython = true; - pythonPackages = self; - })); - - opencv3 = toPythonModule (pkgs.opencv3.override { - enablePython = true; - pythonPackages = self; - }); - - opencv4 = toPythonModule (pkgs.opencv4.override { - enablePython = true; - pythonPackages = self; - }); - - opentracing = callPackage ../development/python-modules/opentracing { }; - - openidc-client = callPackage ../development/python-modules/openidc-client {}; - - openwebifpy = callPackage ../development/python-modules/openwebifpy {}; - - optuna = callPackage ../development/python-modules/optuna { }; - - idna = callPackage ../development/python-modules/idna { }; - - mahotas = callPackage ../development/python-modules/mahotas { }; - - MDP = callPackage ../development/python-modules/mdp {}; - - minidb = callPackage ../development/python-modules/minidb { }; - - miniupnpc = callPackage ../development/python-modules/miniupnpc {}; - - mixpanel = callPackage ../development/python-modules/mixpanel { }; - - mpyq = callPackage ../development/python-modules/mpyq { }; - - mxnet = callPackage ../development/python-modules/mxnet { }; - - nplusone = callPackage ../development/python-modules/nplusone { }; - - parsy = callPackage ../development/python-modules/parsy { }; - - portalocker = callPackage ../development/python-modules/portalocker { }; - - portpicker = callPackage ../development/python-modules/portpicker { }; - - pkginfo = callPackage ../development/python-modules/pkginfo { }; - - pre-commit = callPackage ../development/python-modules/pre-commit { }; - - pretend = callPackage ../development/python-modules/pretend { }; - - detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 - - pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; - - bcrypt = callPackage ../development/python-modules/bcrypt { }; - - cffi = callPackage ../development/python-modules/cffi { }; - - pyavm = callPackage ../development/python-modules/pyavm { }; - - pycollada = callPackage ../development/python-modules/pycollada { }; - - pycontracts = callPackage ../development/python-modules/pycontracts { }; - - pycparser = callPackage ../development/python-modules/pycparser { }; - - pydub = callPackage ../development/python-modules/pydub {}; - - pyjade = callPackage ../development/python-modules/pyjade {}; - - pyjet = callPackage ../development/python-modules/pyjet {}; - - pyjks = callPackage ../development/python-modules/pyjks {}; - - PyLD = callPackage ../development/python-modules/PyLD { }; - - pysingleton = callPackage ../development/python-modules/pysingleton { }; - - python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; - - python-jose = callPackage ../development/python-modules/python-jose {}; - - python-json-logger = callPackage ../development/python-modules/python-json-logger { }; - - python-ly = callPackage ../development/python-modules/python-ly {}; - - pyhcl = callPackage ../development/python-modules/pyhcl { }; - - pyhs100 = callPackage ../development/python-modules/pyhs100 { }; - - pyrealsense2 = toPythonModule (pkgs.librealsense.override { - enablePython = true; - pythonPackages = self; - }); - - pyrealsense2WithCuda = toPythonModule (pkgs.librealsenseWithCuda.override { - enablePython = true; - pythonPackages = self; - }); - - pyrealsense2WithoutCuda = toPythonModule (pkgs.librealsenseWithoutCuda.override { - enablePython = true; - pythonPackages = self; - }); - - pytest = if isPy3k then self.pytest_5 else self.pytest_4; - - pytest_5 = callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; - - pytest_4 = callPackage ../development/python-modules/pytest/4.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; - - pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; - - pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; - - pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; - - pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; - - pytest-ansible = callPackage ../development/python-modules/pytest-ansible { }; - - pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; - - pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; - - pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; - - pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; - - pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; - - pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; - - pytestcache = callPackage ../development/python-modules/pytestcache { }; - - pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; - - pytest-cram = callPackage ../development/python-modules/pytest-cram { }; - - pytest-datadir = callPackage ../development/python-modules/pytest-datadir { }; - - pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; - - pytest-dependency = callPackage ../development/python-modules/pytest-dependency { }; - - pytest-django = callPackage ../development/python-modules/pytest-django { }; - - pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; - - pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; - - pytest-forked = callPackage ../development/python-modules/pytest-forked { }; - - pytest-html = callPackage ../development/python-modules/pytest-html { }; - - pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; - - pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; - - pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; - - pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; - - pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; - - pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; - - pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; - - pytest-isort = callPackage ../development/python-modules/pytest-isort { }; - - pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; - - pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; - - pytest-mock = if isPy3k then - callPackage ../development/python-modules/pytest-mock { } - else - callPackage ../development/python-modules/pytest-mock/2.nix { }; - - pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; - - pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; - - pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; - - pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - - pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; - - pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - - pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; - - pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; - - pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; - - pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; - - pytestrunner = callPackage ../development/python-modules/pytestrunner { }; - - pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; - - pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; - - pytest-services = callPackage ../development/python-modules/pytest-services { }; - - pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; - - pytest-socket = callPackage ../development/python-modules/pytest-socket { }; - - pytestcov = callPackage ../development/python-modules/pytest-cov { }; - - pytest-expect = callPackage ../development/python-modules/pytest-expect { }; - - pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; - - pytest_xdist = callPackage ../development/python-modules/pytest-xdist { }; - - pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; - - pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; - - pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; - - tinycss = callPackage ../development/python-modules/tinycss { }; - - tinycss2 = callPackage ../development/python-modules/tinycss2 { }; - - cssselect = callPackage ../development/python-modules/cssselect { }; - - cssselect2 = callPackage ../development/python-modules/cssselect2 { }; - - cssutils = callPackage ../development/python-modules/cssutils { }; - - css-parser = callPackage ../development/python-modules/css-parser { }; + daphne = callPackage ../development/python-modules/daphne { }; darcsver = callPackage ../development/python-modules/darcsver { }; + dash = callPackage ../development/python-modules/dash { }; + + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; + + dash-html-components = callPackage ../development/python-modules/dash-html-components { }; + + dash-renderer = callPackage ../development/python-modules/dash-renderer { }; + + dash-table = callPackage ../development/python-modules/dash-table { }; + dask = callPackage ../development/python-modules/dask { }; dask-gateway = callPackage ../development/python-modules/dask-gateway { }; - dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { - inherit (pkgs) go; - }; + dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { inherit (pkgs) go; }; dask-glm = callPackage ../development/python-modules/dask-glm { }; @@ -2802,969 +1435,166 @@ in { dask-xgboost = callPackage ../development/python-modules/dask-xgboost { }; - datrie = callPackage ../development/python-modules/datrie { }; + databases = callPackage ../development/python-modules/databases { }; - heapdict = callPackage ../development/python-modules/heapdict { }; + databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - zict = callPackage ../development/python-modules/zict { }; + databricks-connect = callPackage ../development/python-modules/databricks-connect { inherit (pkgs) jdk; }; - zigpy = callPackage ../development/python-modules/zigpy { }; + dataclasses = callPackage ../development/python-modules/dataclasses { }; - zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; - zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + datadiff = callPackage ../development/python-modules/datadiff { }; - zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + datadog = callPackage ../development/python-modules/datadog { }; - zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + datamodeldict = callPackage ../development/python-modules/datamodeldict { }; - digital-ocean = callPackage ../development/python-modules/digitalocean { }; + datasets = callPackage ../development/python-modules/datasets { }; - digi-xbee = callPackage ../development/python-modules/digi-xbee { }; + datasette = callPackage ../development/python-modules/datasette { }; - leather = callPackage ../development/python-modules/leather { }; - - libais = callPackage ../development/python-modules/libais { }; - - libevdev = callPackage ../development/python-modules/libevdev { }; - - libfdt = toPythonModule (pkgs.dtc.override { - inherit python; - pythonSupport = true; - }); - - libtmux = callPackage ../development/python-modules/libtmux { }; - - libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; - - linuxfd = callPackage ../development/python-modules/linuxfd { }; - - locket = callPackage ../development/python-modules/locket { }; - - loo-py = callPackage ../development/python-modules/loo-py { }; - - tblib = callPackage ../development/python-modules/tblib { }; - - s3fs = callPackage ../development/python-modules/s3fs { }; + datashader = callPackage ../development/python-modules/datashader { }; datashape = callPackage ../development/python-modules/datashape { }; - requests-cache = callPackage ../development/python-modules/requests-cache { }; - - requests-file = callPackage ../development/python-modules/requests-file { }; - - requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; - - requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; - - requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; - - howdoi = callPackage ../development/python-modules/howdoi {}; - - jdatetime = callPackage ../development/python-modules/jdatetime {}; - - daphne = callPackage ../development/python-modules/daphne { }; - - dash = callPackage ../development/python-modules/dash { }; - - dash-core-components = callPackage ../development/python-modules/dash-core-components { }; - - dash-html-components = callPackage ../development/python-modules/dash-html-components { }; - - dash-renderer = callPackage ../development/python-modules/dash-renderer { }; - - dash-table = callPackage ../development/python-modules/dash-table { }; + datatable = + callPackage ../development/python-modules/datatable { inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; }; dateparser = callPackage ../development/python-modules/dateparser { }; - # Actual name of package - python-dateutil = callPackage ../development/python-modules/dateutil { }; - # Alias that we should deprecate - dateutil = self.python-dateutil; + datrie = callPackage ../development/python-modules/datrie { }; - debugpy = callPackage ../development/python-modules/debugpy { - django = if isPy27 then self.django_1_11 else self.django; - }; + dbf = callPackage ../development/python-modules/dbf { }; + + dbfread = callPackage ../development/python-modules/dbfread { }; + + dbus-next = callPackage ../development/python-modules/dbus-next { }; + + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; + + dcmstack = callPackage ../development/python-modules/dcmstack { }; + + ddt = callPackage ../development/python-modules/ddt { }; + + deap = callPackage ../development/python-modules/deap { }; + + debian = callPackage ../development/python-modules/debian { }; + + debts = callPackage ../development/python-modules/debts { }; + + debugpy = callPackage ../development/python-modules/debugpy { }; decorator = callPackage ../development/python-modules/decorator { }; + deepdiff = callPackage ../development/python-modules/deepdiff { }; + + deepmerge = callPackage ../development/python-modules/deepmerge { }; + + deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; + + defcon = callPackage ../development/python-modules/defcon { }; + deform = callPackage ../development/python-modules/deform { }; + defusedxml = callPackage ../development/python-modules/defusedxml { }; + + delegator-py = callPackage ../development/python-modules/delegator-py { }; + + deluge-client = callPackage ../development/python-modules/deluge-client { }; + demjson = callPackage ../development/python-modules/demjson { }; + dendropy = callPackage ../development/python-modules/dendropy { }; + + denonavr = callPackage ../development/python-modules/denonavr { }; + + dependency-injector = callPackage ../development/python-modules/dependency-injector { }; + deprecated = callPackage ../development/python-modules/deprecated { }; deprecation = callPackage ../development/python-modules/deprecation { }; derpconf = callPackage ../development/python-modules/derpconf { }; + descartes = callPackage ../development/python-modules/descartes { }; + deskcon = callPackage ../development/python-modules/deskcon { }; + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + + devpi-common = callPackage ../development/python-modules/devpi-common { }; + + dftfit = callPackage ../development/python-modules/dftfit { }; + + diceware = callPackage ../development/python-modules/diceware { }; + + dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + + dict2xml = callPackage ../development/python-modules/dict2xml { }; + + dictionaries = callPackage ../development/python-modules/dictionaries { }; + + dicttoxml = callPackage ../development/python-modules/dicttoxml { }; + + diff_cover = callPackage ../development/python-modules/diff_cover { }; + + diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + + digital-ocean = callPackage ../development/python-modules/digitalocean { }; + + digi-xbee = callPackage ../development/python-modules/digi-xbee { }; + dill = callPackage ../development/python-modules/dill { }; + diofant = callPackage ../development/python-modules/diofant { }; + + dipy = callPackage ../development/python-modules/dipy { }; + + discid = callPackage ../development/python-modules/discid { }; + discogs_client = callPackage ../development/python-modules/discogs_client { }; - dlx = callPackage ../development/python-modules/dlx { }; + discordpy = callPackage ../development/python-modules/discordpy { }; - dmenu-python = callPackage ../development/python-modules/dmenu { }; + diskcache = callPackage ../development/python-modules/diskcache { }; - dnslib = callPackage ../development/python-modules/dnslib { }; + dissononce = callPackage ../development/python-modules/dissononce { }; - dnspython = callPackage ../development/python-modules/dnspython { }; - dns = self.dnspython; # Alias for compatibility, 2017-12-10 + distlib = callPackage ../development/python-modules/distlib { }; - docker = callPackage ../development/python-modules/docker {}; + distorm3 = callPackage ../development/python-modules/distorm3 { }; - dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse {}; + distributed = callPackage ../development/python-modules/distributed { }; - docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py {}); - - dockerpty = callPackage ../development/python-modules/dockerpty {}; - - dockerspawner = callPackage ../development/python-modules/dockerspawner {}; - - docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; - - docloud = callPackage ../development/python-modules/docloud { }; - - docplex = callPackage ../development/python-modules/docplex { }; - - docopt = callPackage ../development/python-modules/docopt { }; - - doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; - - dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; - - dogpile_core = callPackage ../development/python-modules/dogpile.core { }; - - dopy = callPackage ../development/python-modules/dopy { }; - - dpath = callPackage ../development/python-modules/dpath { }; - - dparse = callPackage ../development/python-modules/dparse { }; - - dpkt = callPackage ../development/python-modules/dpkt {}; - - urllib3 = callPackage ../development/python-modules/urllib3 {}; - - varint = callPackage ../development/python-modules/varint {}; - - drf-yasg = callPackage ../development/python-modules/drf-yasg { }; - - dropbox = callPackage ../development/python-modules/dropbox {}; - - drms = callPackage ../development/python-modules/drms { }; - - ds4drv = callPackage ../development/python-modules/ds4drv { - inherit (pkgs) fetchFromGitHub bluez; - }; - - dyn = callPackage ../development/python-modules/dyn { }; - - easydict = callPackage ../development/python-modules/easydict { }; - - easygui = callPackage ../development/python-modules/easygui { }; - - EasyProcess = callPackage ../development/python-modules/easyprocess { }; - - easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; - - eccodes = toPythonModule (pkgs.eccodes.override { - enablePython = true; - pythonPackages = self; - }); - - edward = callPackage ../development/python-modules/edward { }; - - elasticsearch = callPackage ../development/python-modules/elasticsearch { }; - - elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; - # alias - elasticsearchdsl = self.elasticsearch-dsl; - - elementpath = callPackage ../development/python-modules/elementpath { }; - - entrypoints = callPackage ../development/python-modules/entrypoints { }; - - envisage = callPackage ../development/python-modules/envisage { }; - - enzyme = callPackage ../development/python-modules/enzyme {}; - - escapism = callPackage ../development/python-modules/escapism { }; - - etcd = callPackage ../development/python-modules/etcd { }; - - evdev = callPackage ../development/python-modules/evdev {}; - - eve = callPackage ../development/python-modules/eve {}; - - eventlib = callPackage ../development/python-modules/eventlib { }; - - events = callPackage ../development/python-modules/events { }; - - eyeD3 = callPackage ../development/python-modules/eyed3 { }; - - execnet = callPackage ../development/python-modules/execnet { }; - - executor = callPackage ../development/python-modules/executor { }; - - ezdxf = callPackage ../development/python-modules/ezdxf {}; - - facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; - - face_recognition = callPackage ../development/python-modules/face_recognition { }; - - face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; - - faker = callPackage ../development/python-modules/faker { }; - - fake_factory = callPackage ../development/python-modules/fake_factory { }; - - fake-useragent = callPackage ../development/python-modules/fake-useragent { }; - - factory_boy = callPackage ../development/python-modules/factory_boy { }; - - Fabric = callPackage ../development/python-modules/Fabric { }; - - fastdtw = callPackage ../development/python-modules/fastdtw { }; - - fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; - - faulthandler = if ! isPy3k - then callPackage ../development/python-modules/faulthandler {} - else throw "faulthandler is built into ${python.executable}"; - - fb-re2 = callPackage ../development/python-modules/fb-re2 { }; - - ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; - - fenics = callPackage ../development/libraries/science/math/fenics { - inherit (pkgs) pkg-config; - mpi = pkgs.openmpi; - pytest = self.pytest_4; - }; - - filetype = callPackage ../development/python-modules/filetype { }; - - flammkuchen = callPackage ../development/python-modules/flammkuchen { }; - - flexmock = callPackage ../development/python-modules/flexmock { }; - - flit = callPackage ../development/python-modules/flit { }; - - flit-core = callPackage ../development/python-modules/flit-core { }; - - flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; - - fluent-logger = callPackage ../development/python-modules/fluent-logger {}; - - flux-led = callPackage ../development/python-modules/flux-led { }; - - python-forecastio = callPackage ../development/python-modules/python-forecastio { }; - - fpdf = callPackage ../development/python-modules/fpdf { }; - - fpylll = callPackage ../development/python-modules/fpylll { }; - - fritzconnection = callPackage ../development/python-modules/fritzconnection { }; - - frozendict = callPackage ../development/python-modules/frozendict { }; - - ftputil = callPackage ../development/python-modules/ftputil { }; - - fudge = callPackage ../development/python-modules/fudge { }; - - funcparserlib = callPackage ../development/python-modules/funcparserlib { }; - - fastcache = callPackage ../development/python-modules/fastcache { }; - - fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; - - functools32 = callPackage ../development/python-modules/functools32 { }; - - future-fstrings = callPackage ../development/python-modules/future-fstrings { }; - - fx2 = callPackage ../development/python-modules/fx2 { }; - - # gaia isn't supported with python3 and it's not available from pypi - gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { - pythonPackages = self; - pythonSupport = true; - })); - - gateone = callPackage ../development/python-modules/gateone { }; - - GeoIP = callPackage ../development/python-modules/GeoIP { }; - - glasgow = callPackage ../development/python-modules/glasgow { }; - - gmpy = callPackage ../development/python-modules/gmpy { }; - - gmpy2 = callPackage ../development/python-modules/gmpy2 { }; - - gmusicapi = callPackage ../development/python-modules/gmusicapi { }; - - gnureadline = callPackage ../development/python-modules/gnureadline { }; - - gnutls = callPackage ../development/python-modules/gnutls { }; - - gpy = callPackage ../development/python-modules/gpy { }; - - gpyopt = callPackage ../development/python-modules/gpyopt { }; - - gitdb = callPackage ../development/python-modules/gitdb { }; - - gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 - - GitPython = callPackage ../development/python-modules/GitPython { }; - - git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { - inherit (pkgs.gitAndTools) git-annex; - }; - - python-gitlab = callPackage ../development/python-modules/python-gitlab { }; - - google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; - - google-music = callPackage ../development/python-modules/google-music { }; - - google-music-proto = callPackage ../development/python-modules/google-music-proto { }; - - google-music-utils = callPackage ../development/python-modules/google-music-utils { }; - - google-pasta = callPackage ../development/python-modules/google-pasta { }; - - googletrans = callPackage ../development/python-modules/googletrans { }; - - gdown = callPackage ../development/python-modules/gdown { }; - - gpapi = callPackage ../development/python-modules/gpapi { }; - gplaycli = callPackage ../development/python-modules/gplaycli { }; - - gpsoauth = callPackage ../development/python-modules/gpsoauth { }; - - gpxpy = callPackage ../development/python-modules/gpxpy { }; - - grip = callPackage ../development/python-modules/grip { }; - - gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson pkgconfig; - gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; - }; - - gtimelog = callPackage ../development/python-modules/gtimelog { }; - - gtts = callPackage ../development/python-modules/gtts { }; - - gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" - then callPackage ../development/python-modules/gurobipy/darwin.nix { - inherit (pkgs.darwin) cctools insert_dylib; - } - else if stdenv.hostPlatform.system == "x86_64-linux" - then callPackage ../development/python-modules/gurobipy/linux.nix {} - else throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; - - hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; - - hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - - helpdev = callPackage ../development/python-modules/helpdev { }; - - heudiconv = callPackage ../development/python-modules/heudiconv { }; - - hickle = callPackage ../development/python-modules/hickle { }; - - hiro = callPackage ../development/python-modules/hiro {}; - - hglib = callPackage ../development/python-modules/hglib {}; - - huey = callPackage ../development/python-modules/huey { }; - - humanize = callPackage ../development/python-modules/humanize { }; - - humanfriendly = callPackage ../development/python-modules/humanfriendly { }; - - hupper = callPackage ../development/python-modules/hupper {}; - - hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; - - hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; - - hstspreload = callPackage ../development/python-modules/hstspreload { }; - - htmlmin = callPackage ../development/python-modules/htmlmin {}; - - httpauth = callPackage ../development/python-modules/httpauth { }; - - httpx = callPackage ../development/python-modules/httpx { }; - - idna-ssl = callPackage ../development/python-modules/idna-ssl { }; - - identify = callPackage ../development/python-modules/identify { }; - - ijson = callPackage ../development/python-modules/ijson {}; - - imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); - - imagesize = callPackage ../development/python-modules/imagesize { }; - - image-match = callPackage ../development/python-modules/image-match { }; - - imbalanced-learn = - if isPy27 then - callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } - else - callPackage ../development/python-modules/imbalanced-learn { }; - - immutables = callPackage ../development/python-modules/immutables {}; - - imread = callPackage ../development/python-modules/imread { - inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; - }; - - imaplib2 = callPackage ../development/python-modules/imaplib2 { }; - - ipfsapi = callPackage ../development/python-modules/ipfsapi { }; - - isbnlib = callPackage ../development/python-modules/isbnlib { }; - - islpy = callPackage ../development/python-modules/islpy { }; - - itsdangerous = callPackage ../development/python-modules/itsdangerous { }; - - itypes = callPackage ../development/python-modules/itypes { }; - - iniparse = callPackage ../development/python-modules/iniparse { }; - - intreehooks = callPackage ../development/python-modules/intreehooks { }; - - i3-py = callPackage ../development/python-modules/i3-py { }; - - JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi {}; - - jdcal = callPackage ../development/python-modules/jdcal { }; - - jieba = callPackage ../development/python-modules/jieba { }; - - internetarchive = callPackage ../development/python-modules/internetarchive {}; - - JPype1 = callPackage ../development/python-modules/JPype1 {}; - - jpylyzer = callPackage ../development/python-modules/jpylyzer {}; - - josepy = callPackage ../development/python-modules/josepy {}; - - jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; - - jug = callPackage ../development/python-modules/jug {}; - - jsmin = callPackage ../development/python-modules/jsmin { }; - - jsonmerge = callPackage ../development/python-modules/jsonmerge { }; - - jsonpatch = callPackage ../development/python-modules/jsonpatch { }; - - jsonpickle = callPackage ../development/python-modules/jsonpickle { }; - - jsonpointer = callPackage ../development/python-modules/jsonpointer { }; - - jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; - - jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {}; - - jsonwatch = callPackage ../development/python-modules/jsonwatch { }; - - kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { - python3 = python; - }).src); - - latexcodec = callPackage ../development/python-modules/latexcodec {}; - - lazy = callPackage ../development/python-modules/lazy { }; - - libmodulemd = pipe pkgs.libmodulemd [ - toPythonModule - - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - # The package always builds python3 bindings - broken = (super.meta.broken or false) || !isPy3k; - }; - })) - - (p: p.override { - python3 = python; - }) - - (p: p.py) - ]; - - libselinux = pipe pkgs.libselinux [ - toPythonModule - - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - broken = (super.meta.broken or false) || pythonAtLeast "3.8"; - }; - })) - - (p: p.override { - enablePython = true; - inherit python; - }) - - (p: p.py) - ]; - - libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - - libthumbor = callPackage ../development/python-modules/libthumbor { }; - - license-expression = callPackage ../development/python-modules/license-expression { }; - - lightblue = callPackage ../development/python-modules/lightblue { }; - - lightgbm = callPackage ../development/python-modules/lightgbm { }; - - lightning = callPackage ../development/python-modules/lightning { }; - - lightparam = callPackage ../development/python-modules/lightparam { }; - - jupyter = callPackage ../development/python-modules/jupyter { }; - - jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; - - jupyter_console = if pythonOlder "3.5" then - callPackage ../development/python-modules/jupyter_console/5.nix { } - else - callPackage ../development/python-modules/jupyter_console { }; - - jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; - - jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; - - jupyterlab = callPackage ../development/python-modules/jupyterlab {}; - - jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; - - jupytext = callPackage ../development/python-modules/jupytext { }; - - PyLTI = callPackage ../development/python-modules/pylti { }; - - lmdb = callPackage ../development/python-modules/lmdb { }; - - logilab_astng = callPackage ../development/python-modules/logilab_astng { }; - - lpod = callPackage ../development/python-modules/lpod { }; - - ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; - - luftdaten = callPackage ../development/python-modules/luftdaten { }; - - m2r = callPackage ../development/python-modules/m2r { }; - - mailchimp = callPackage ../development/python-modules/mailchimp { }; - - python-mapnik = callPackage ../development/python-modules/python-mapnik { }; - - measurement = callPackage ../development/python-modules/measurement {}; - - mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { - python3Packages = self; - })); - - midiutil = callPackage ../development/python-modules/midiutil {}; - - mido = callPackage ../development/python-modules/mido { }; - - misaka = callPackage ../development/python-modules/misaka {}; - - mlrose = callPackage ../development/python-modules/mlrose { }; - - mlflow = callPackage ../development/python-modules/mlflow { }; - - mt-940 = callPackage ../development/python-modules/mt-940 { }; - - mwlib = callPackage ../development/python-modules/mwlib { }; - - mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; - - mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; - - myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; - - natsort = callPackage ../development/python-modules/natsort { }; - - naturalsort = callPackage ../development/python-modules/naturalsort { }; - - ncclient = callPackage ../development/python-modules/ncclient {}; - - logfury = callPackage ../development/python-modules/logfury { }; - - ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; - - netcdf4 = callPackage ../development/python-modules/netcdf4 { }; - - netdisco = callPackage ../development/python-modules/netdisco { }; - - Nikola = callPackage ../development/python-modules/Nikola { }; - - nmigen = callPackage ../development/python-modules/nmigen { }; - - nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; - - nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; - - nxt-python = callPackage ../development/python-modules/nxt-python { }; - - odfpy = callPackage ../development/python-modules/odfpy { }; - - openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; - openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; - - oset = callPackage ../development/python-modules/oset { }; - - oscrypto = callPackage ../development/python-modules/oscrypto { }; - - osqp = callPackage ../development/python-modules/osqp { }; - - oyaml = callPackage ../development/python-modules/oyaml { }; - - pam = callPackage ../development/python-modules/pam { - inherit (pkgs) pam; - }; - - pamela = callPackage ../development/python-modules/pamela { }; - - paperspace = callPackage ../development/python-modules/paperspace { }; - - paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; - - papis = callPackage ../development/python-modules/papis { }; - - papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; - - pathspec = callPackage ../development/python-modules/pathspec { }; - - pathtools = callPackage ../development/python-modules/pathtools { }; - - paver = callPackage ../development/python-modules/paver { }; - - passlib = callPackage ../development/python-modules/passlib { }; - - path-and-address = callPackage ../development/python-modules/path-and-address { }; - - peppercorn = callPackage ../development/python-modules/peppercorn { }; - - pex = callPackage ../development/python-modules/pex { }; - - phe = callPackage ../development/python-modules/phe { }; - - 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 {}; - - playsound = callPackage ../development/python-modules/playsound { }; - - plexapi = callPackage ../development/python-modules/plexapi { }; - - plexauth = callPackage ../development/python-modules/plexauth { }; - - plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; - - plotly = callPackage ../development/python-modules/plotly { }; - - plyfile = callPackage ../development/python-modules/plyfile { }; - - podcastparser = callPackage ../development/python-modules/podcastparser { }; - - podcats = callPackage ../development/python-modules/podcats { }; - - pomegranate = callPackage ../development/python-modules/pomegranate { }; - - poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (pkgs.qt5) qtbase; - inherit (pkgs.libsForQt5) poppler; - inherit (pkgs) pkgconfig; - }; - - poyo = callPackage ../development/python-modules/poyo { }; - - priority = callPackage ../development/python-modules/priority { }; - - privacyidea = callPackage ../development/python-modules/privacyidea { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; - - prov = callPackage ../development/python-modules/prov { }; - - pudb = callPackage ../development/python-modules/pudb { }; - - pybtex = callPackage ../development/python-modules/pybtex {}; - - pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils {}; - - pycallgraph = callPackage ../development/python-modules/pycallgraph { }; - - pycassa = callPackage ../development/python-modules/pycassa { }; - - lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { - python3 = python; - })); - - pyblake2 = callPackage ../development/python-modules/pyblake2 { }; - - pybluez = callPackage ../development/python-modules/pybluez { }; - - pycares = callPackage ../development/python-modules/pycares { }; - - pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit; - inherit (pkgs.stdenv) mkDerivation; - }; - - pydotplus = callPackage ../development/python-modules/pydotplus { }; - - pyfxa = callPackage ../development/python-modules/pyfxa { }; - - pygls = callPackage ../development/python-modules/pygls {}; - - pyhomematic = callPackage ../development/python-modules/pyhomematic { }; - - pylama = callPackage ../development/python-modules/pylama { }; - - pylatexenc = callPackage ../development/python-modules/pylatexenc { }; - - pymbolic = callPackage ../development/python-modules/pymbolic { }; - - pymediainfo = callPackage ../development/python-modules/pymediainfo { }; - - pyphen = callPackage ../development/python-modules/pyphen {}; - - pypoppler = callPackage ../development/python-modules/pypoppler { }; - - pypillowfight = callPackage ../development/python-modules/pypillowfight { }; - - pyprind = callPackage ../development/python-modules/pyprind { }; - - python-axolotl = callPackage ../development/python-modules/python-axolotl { }; - - python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; - - python-pam = callPackage ../development/python-modules/python-pam { }; - - pythonix = callPackage ../development/python-modules/pythonix { - inherit (pkgs) meson pkgconfig; - }; - - python-lzf = callPackage ../development/python-modules/python-lzf { }; - - pyramid = callPackage ../development/python-modules/pyramid { }; - - pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; - - pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; - - pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; - - pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; - - peewee = callPackage ../development/python-modules/peewee { }; - - pyroma = callPackage ../development/python-modules/pyroma { }; - - pyroute2 = callPackage ../development/python-modules/pyroute2 { }; - - pyspf = callPackage ../development/python-modules/pyspf { }; - - pysptk = callPackage ../development/python-modules/pysptk { }; - - pysrim = callPackage ../development/python-modules/pysrim { }; - - pysrt = callPackage ../development/python-modules/pysrt { }; - - pytools = callPackage ../development/python-modules/pytools { }; - - python-constraint = callPackage ../development/python-modules/python-constraint { }; - - python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; - - python-lzo = callPackage ../development/python-modules/python-lzo { - inherit (pkgs) lzo; - }; - - pxml = callPackage ../development/python-modules/pxml { }; - - junos-eznc = callPackage ../development/python-modules/junos-eznc {}; - - raven = callPackage ../development/python-modules/raven { }; - - rawkit = callPackage ../development/python-modules/rawkit { }; - - joblib = callPackage ../development/python-modules/joblib { }; - - sarge = callPackage ../development/python-modules/sarge { }; - - subliminal = callPackage ../development/python-modules/subliminal {}; - - sunpy = callPackage ../development/python-modules/sunpy { }; - - hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; - - robot-detection = callPackage ../development/python-modules/robot-detection {}; - - cssmin = callPackage ../development/python-modules/cssmin {}; - - django-paintstore = callPackage ../development/python-modules/django-paintstore {}; - - django-q = callPackage ../development/python-modules/django-q {}; - - hyperlink = callPackage ../development/python-modules/hyperlink {}; - - zope_copy = callPackage ../development/python-modules/zope_copy {}; - - s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; - - py3status = callPackage ../development/python-modules/py3status {}; - - pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; - - scandir = callPackage ../development/python-modules/scandir { }; - - schema = callPackage ../development/python-modules/schema {}; - - simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server {}; - - stem = callPackage ../development/python-modules/stem { }; - - svg-path = callPackage ../development/python-modules/svg-path { }; - - r2pipe = callPackage ../development/python-modules/r2pipe { }; - - regex = callPackage ../development/python-modules/regex { }; - - pygrok = callPackage ../development/python-modules/pygrok { }; - - regional = callPackage ../development/python-modules/regional { }; - - ratelimiter = callPackage ../development/python-modules/ratelimiter { }; - - pywatchman = callPackage ../development/python-modules/pywatchman { }; - - pywavelets = callPackage ../development/python-modules/pywavelets { }; - - vcrpy = callPackage ../development/python-modules/vcrpy { }; - - descartes = callPackage ../development/python-modules/descartes { }; - - chardet = callPackage ../development/python-modules/chardet { }; - - pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; - - pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; - - pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; - - pytun = callPackage ../development/python-modules/pytun { }; - - rethinkdb = callPackage ../development/python-modules/rethinkdb { }; - - roku = callPackage ../development/python-modules/roku { }; - - roman = callPackage ../development/python-modules/roman { }; - - rotate-backups = callPackage ../tools/backup/rotate-backups { }; - - liblarch = callPackage ../development/python-modules/liblarch { }; - - librosa = callPackage ../development/python-modules/librosa { }; - - samplerate = callPackage ../development/python-modules/samplerate { }; - - screeninfo = callPackage ../development/python-modules/screeninfo { }; - - ssdeep = callPackage ../development/python-modules/ssdeep { }; - - ssdp = callPackage ../development/python-modules/ssdp { }; - - statsd = callPackage ../development/python-modules/statsd { }; - - starfish = callPackage ../development/python-modules/starfish { }; - - swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; - - multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; - - random2 = callPackage ../development/python-modules/random2 { }; - - schedule = callPackage ../development/python-modules/schedule { }; - - repoze_lru = callPackage ../development/python-modules/repoze_lru { }; - - repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; - - setuptools-git = callPackage ../development/python-modules/setuptools-git { }; - - setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; - - sievelib = callPackage ../development/python-modules/sievelib { }; - - watchdog = callPackage ../development/python-modules/watchdog { }; - - zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; - - validators = callPackage ../development/python-modules/validators { }; - - validictory = callPackage ../development/python-modules/validictory { }; - - validate-email = callPackage ../development/python-modules/validate-email { }; - - venusian = callPackage ../development/python-modules/venusian { }; - - chameleon = callPackage ../development/python-modules/chameleon { }; - - ddt = callPackage ../development/python-modules/ddt { }; + distro = callPackage ../development/python-modules/distro { }; distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - pyxdg = callPackage ../development/python-modules/pyxdg { }; - - crayons = callPackage ../development/python-modules/crayons{ }; - - django = self.django_lts; - - django_lts = self.django_2_2; - - django_1_11 = callPackage ../development/python-modules/django/1_11.nix { - gdal = self.gdal; - }; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; django-allauth = callPackage ../development/python-modules/django-allauth { }; - django-anymail = callPackage ../development/python-modules/django-anymail {}; + django-anymail = callPackage ../development/python-modules/django-anymail { }; django_appconf = callPackage ../development/python-modules/django_appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; - django_colorful = callPackage ../development/python-modules/django_colorful { }; - django-cache-url = callPackage ../development/python-modules/django-cache-url { }; + django_classytags = callPackage ../development/python-modules/django_classytags { }; + django-cleanup = callPackage ../development/python-modules/django-cleanup { }; - django-configurations = callPackage ../development/python-modules/django-configurations { }; + django_colorful = callPackage ../development/python-modules/django_colorful { }; + + django_compat = callPackage ../development/python-modules/django-compat { }; django_compressor = callPackage ../development/python-modules/django_compressor { }; - django_compat = callPackage ../development/python-modules/django-compat { }; + django-configurations = callPackage ../development/python-modules/django-configurations { }; django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; @@ -3788,30 +1618,73 @@ in { django_guardian = callPackage ../development/python-modules/django_guardian { }; + django-haystack = callPackage ../development/python-modules/django-haystack { }; + + django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; + + django_hijack = callPackage ../development/python-modules/django-hijack + { }; # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. + django-ipware = callPackage ../development/python-modules/django-ipware { }; django-jinja = callPackage ../development/python-modules/django-jinja2 { }; django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + django_lts = self.django_2_2; + django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; + django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; + + django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; + + django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { }; + + django_nose = callPackage ../development/python-modules/django_nose { }; + django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; + django-paintstore = callPackage ../development/python-modules/django-paintstore { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; django-picklefield = callPackage ../development/python-modules/django-picklefield { }; + django_pipeline = callPackage ../development/python-modules/django-pipeline { }; + django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; + django-q = callPackage ../development/python-modules/django-q { }; + + djangoql = callPackage ../development/python-modules/djangoql { }; + django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; + django-raster = callPackage ../development/python-modules/django-raster { }; + + django_redis = callPackage ../development/python-modules/django_redis { }; + django-rest-auth = callPackage ../development/python-modules/django-rest-auth { }; + djangorestframework = callPackage ../development/python-modules/djangorestframework { }; + + djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; + + djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; + + django_reversion = callPackage ../development/python-modules/django_reversion { }; + django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; + django = self.django_lts; + + django-sesame = callPackage ../development/python-modules/django-sesame { }; + + django_silk = callPackage ../development/python-modules/django_silk { }; + django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { }; django-sites = callPackage ../development/python-modules/django-sites { }; @@ -3820,142 +1693,357 @@ in { django-storages = callPackage ../development/python-modules/django-storages { }; - django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; - - django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; - django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_classytags = callPackage ../development/python-modules/django_classytags { }; - - # This package may need an older version of Django. - # Override the package set and set e.g. `django = super.django_1_9`. - # See the Nixpkgs manual for examples on how to override the package set. - django_hijack = callPackage ../development/python-modules/django-hijack { }; - - django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; - - django_nose = callPackage ../development/python-modules/django_nose { }; - - django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; - - djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - - djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; - - djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; - - django-raster = callPackage ../development/python-modules/django-raster { }; - - django_redis = callPackage ../development/python-modules/django_redis { }; - - django_reversion = callPackage ../development/python-modules/django_reversion { }; - - django_silk = callPackage ../development/python-modules/django_silk { }; - django_taggit = callPackage ../development/python-modules/django_taggit { }; django_treebeard = callPackage ../development/python-modules/django_treebeard { }; - django_pipeline = callPackage ../development/python-modules/django-pipeline { }; + django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; - djangoql = callPackage ../development/python-modules/djangoql { }; + django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; + + django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; dj-database-url = callPackage ../development/python-modules/dj-database-url { }; dj-email-url = callPackage ../development/python-modules/dj-email-url { }; - dj-search-url = callPackage ../development/python-modules/dj-search-url { }; - djmail = callPackage ../development/python-modules/djmail { }; - pillowfight = callPackage ../development/python-modules/pillowfight { }; + dj-search-url = callPackage ../development/python-modules/dj-search-url { }; - kaptan = callPackage ../development/python-modules/kaptan { }; + dkimpy = callPackage ../development/python-modules/dkimpy { }; - keepalive = callPackage ../development/python-modules/keepalive { }; + dlib = callPackage ../development/python-modules/dlib { inherit (pkgs) dlib; }; - keyrings-alt = callPackage ../development/python-modules/keyrings-alt {}; + dlx = callPackage ../development/python-modules/dlx { }; - SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; + dmenu-python = callPackage ../development/python-modules/dmenu { }; - duckdb = callPackage ../development/python-modules/duckdb { - duckdb = pkgs.duckdb; - }; + dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; + + dnslib = callPackage ../development/python-modules/dnslib { }; + + dnspython = if isPy3k then + callPackage ../development/python-modules/dnspython { } + else + self.dnspython_1; + + dnspython_1 = callPackage ../development/python-modules/dnspython/1.nix { }; + + dns = self.dnspython; # Alias for compatibility, 2017-12-10 + + doc8 = callPackage ../development/python-modules/doc8 { }; + + docker = callPackage ../development/python-modules/docker { }; + + dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse { }; + + dockerpty = callPackage ../development/python-modules/dockerpty { }; + + docker_pycreds = callPackage ../development/python-modules/docker-pycreds { }; + + docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py { }); + + dockerspawner = callPackage ../development/python-modules/dockerspawner { }; + + docloud = callPackage ../development/python-modules/docloud { }; + + docopt = callPackage ../development/python-modules/docopt { }; + + docplex = callPackage ../development/python-modules/docplex { }; + + docrep = callPackage ../development/python-modules/docrep { }; + + doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; + + docutils = callPackage ../development/python-modules/docutils { }; + + dodgy = callPackage ../development/python-modules/dodgy { }; + + dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; + + dogpile_core = callPackage ../development/python-modules/dogpile.core { }; + + dogtail = callPackage ../development/python-modules/dogtail { }; + + dominate = callPackage ../development/python-modules/dominate { }; + + dopy = callPackage ../development/python-modules/dopy { }; + + dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; + + dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { inherit (pkgs) substituteAll dotnet-sdk; }; + + dparse = callPackage ../development/python-modules/dparse { }; + + dpath = callPackage ../development/python-modules/dpath { }; + + dpkt = callPackage ../development/python-modules/dpkt { }; + + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; + + drms = callPackage ../development/python-modules/drms { }; + + dropbox = callPackage ../development/python-modules/dropbox { }; + + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; + + dtopt = callPackage ../development/python-modules/dtopt { }; + + duckdb = callPackage ../development/python-modules/duckdb { duckdb = pkgs.duckdb; }; + + duecredit = callPackage ../development/python-modules/duecredit { }; + + dugong = callPackage ../development/python-modules/dugong { }; dulwich = if isPy3k then callPackage ../development/python-modules/dulwich { } else callPackage ../development/python-modules/dulwich/0_19.nix { }; - hg-git = callPackage ../development/python-modules/hg-git { }; + dyn = callPackage ../development/python-modules/dyn { }; - hg-evolve = callPackage ../development/python-modules/hg-evolve { }; + dynd = callPackage ../development/python-modules/dynd { }; - dtopt = callPackage ../development/python-modules/dtopt { }; + easydict = callPackage ../development/python-modules/easydict { }; + + easygui = callPackage ../development/python-modules/easygui { }; + + EasyProcess = callPackage ../development/python-modules/easyprocess { }; + + easysnmp = callPackage ../development/python-modules/easysnmp { + openssl = pkgs.openssl; + net-snmp = pkgs.net-snmp; + }; + + easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; easywatch = callPackage ../development/python-modules/easywatch { }; + eccodes = toPythonModule (pkgs.eccodes.override { + enablePython = true; + pythonPackages = self; + }); + ecdsa = callPackage ../development/python-modules/ecdsa { }; ecos = callPackage ../development/python-modules/ecos { }; - effect = callPackage ../development/python-modules/effect {}; + ecpy = callPackage ../development/python-modules/ecpy { }; + + ed25519 = callPackage ../development/python-modules/ed25519 { }; + + editorconfig = callPackage ../development/python-modules/editorconfig { }; + + edward = callPackage ../development/python-modules/edward { }; + + effect = callPackage ../development/python-modules/effect { }; + + eggdeps = callPackage ../development/python-modules/eggdeps { }; + + elasticsearch = callPackage ../development/python-modules/elasticsearch { }; + + elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; + + elasticsearchdsl = self.elasticsearch-dsl; # alias + + elementpath = callPackage ../development/python-modules/elementpath { }; + + eliot = callPackage ../development/python-modules/eliot { }; + + emailthreads = callPackage ../development/python-modules/emailthreads { }; + + email_validator = callPackage ../development/python-modules/email-validator { }; + + emcee = callPackage ../development/python-modules/emcee { }; + + emoji = callPackage ../development/python-modules/emoji { }; + + enaml = callPackage ../development/python-modules/enaml { }; + + enamlx = callPackage ../development/python-modules/enamlx { }; + + entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; + + entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; + + entrypoints = callPackage ../development/python-modules/entrypoints { }; + + enum34 = callPackage ../development/python-modules/enum34 { }; enum = callPackage ../development/python-modules/enum { }; enum-compat = callPackage ../development/python-modules/enum-compat { }; - enum34 = callPackage ../development/python-modules/enum34 { }; + envisage = callPackage ../development/python-modules/envisage { }; + + envs = callPackage ../development/python-modules/envs { }; + + enzyme = callPackage ../development/python-modules/enzyme { }; epc = callPackage ../development/python-modules/epc { }; - et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + ephem = callPackage ../development/python-modules/ephem { }; + + eradicate = callPackage ../development/python-modules/eradicate { }; + + escapism = callPackage ../development/python-modules/escapism { }; + + etcd = callPackage ../development/python-modules/etcd { }; + + etelemetry = callPackage ../development/python-modules/etelemetry { }; etesync = callPackage ../development/python-modules/etesync { }; + eth-hash = callPackage ../development/python-modules/eth-hash { }; + + eth-typing = callPackage ../development/python-modules/eth-typing { }; + + eth-utils = callPackage ../development/python-modules/eth-utils { }; + + et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + + evdev = callPackage ../development/python-modules/evdev { }; + + eve = callPackage ../development/python-modules/eve { }; + eventlet = callPackage ../development/python-modules/eventlet { }; + eventlib = callPackage ../development/python-modules/eventlib { }; + + events = callPackage ../development/python-modules/events { }; + + evernote = callPackage ../development/python-modules/evernote { }; + + ewmh = callPackage ../development/python-modules/ewmh { }; + + exchangelib = callPackage ../development/python-modules/exchangelib { }; + + execnet = callPackage ../development/python-modules/execnet { }; + executing = callPackage ../development/python-modules/executing { }; + executor = callPackage ../development/python-modules/executor { }; + exifread = callPackage ../development/python-modules/exifread { }; + extension-helpers = callPackage ../development/python-modules/extension-helpers { }; + + extras = callPackage ../development/python-modules/extras { }; + + eyeD3 = callPackage ../development/python-modules/eyed3 { }; + + ezdxf = callPackage ../development/python-modules/ezdxf { }; + + Fabric = callPackage ../development/python-modules/Fabric { }; + + facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; + + face = callPackage ../development/python-modules/face { }; + + facedancer = callPackage ../development/python-modules/facedancer { }; + + face_recognition = callPackage ../development/python-modules/face_recognition { }; + + face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; + + factory_boy = callPackage ../development/python-modules/factory_boy { }; + + fake_factory = callPackage ../development/python-modules/fake_factory { }; + + faker = callPackage ../development/python-modules/faker { }; + + fake-useragent = callPackage ../development/python-modules/fake-useragent { }; + + falcon = callPackage ../development/python-modules/falcon { }; + + fastapi = callPackage ../development/python-modules/fastapi { }; + + fastcache = callPackage ../development/python-modules/fastcache { }; + + fastdtw = callPackage ../development/python-modules/fastdtw { }; + + fasteners = callPackage ../development/python-modules/fasteners { }; + + fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; + fastimport = callPackage ../development/python-modules/fastimport { }; + fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + fastpair = callPackage ../development/python-modules/fastpair { }; - fastrlock = callPackage ../development/python-modules/fastrlock {}; + fastparquet = callPackage ../development/python-modules/fastparquet { }; + + fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + + fastrlock = callPackage ../development/python-modules/fastrlock { }; + + fasttext = callPackage ../development/python-modules/fasttext { }; + + faulthandler = if !isPy3k then + callPackage ../development/python-modules/faulthandler { } + else + throw "faulthandler is built into ${python.executable}"; + + favicon = callPackage ../development/python-modules/favicon { }; + + fb-re2 = callPackage ../development/python-modules/fb-re2 { }; + + fdint = callPackage ../development/python-modules/fdint { }; feedgen = callPackage ../development/python-modules/feedgen { }; - feedgenerator = callPackage ../development/python-modules/feedgenerator { - inherit (pkgs) glibcLocales; - }; + feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; }; feedparser = callPackage ../development/python-modules/feedparser { }; - pyfribidi = callPackage ../development/python-modules/pyfribidi { }; + fenics = callPackage ../development/libraries/science/math/fenics { + inherit (pkgs) pkg-config; + mpi = pkgs.openmpi; + pytest = self.pytest_4; + }; - pyfritzhome = callPackage ../development/python-modules/pyfritzhome { }; + ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; - pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; + fido2 = callPackage ../development/python-modules/fido2 { }; filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; - pycodestyle = callPackage ../development/python-modules/pycodestyle { }; - filebytes = callPackage ../development/python-modules/filebytes { }; - filelock = callPackage ../development/python-modules/filelock {}; + filelock = callPackage ../development/python-modules/filelock { }; + + filemagic = callPackage ../development/python-modules/filemagic { }; + + filetype = callPackage ../development/python-modules/filetype { }; + + filterpy = callPackage ../development/python-modules/filterpy { }; + + finalfusion = callPackage ../development/python-modules/finalfusion { }; + + fints = callPackage ../development/python-modules/fints { }; fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; + fipy = callPackage ../development/python-modules/fipy { }; + + fire = callPackage ../development/python-modules/fire { }; + + firetv = callPackage ../development/python-modules/firetv { }; + + first = callPackage ../development/python-modules/first { }; + fitbit = callPackage ../development/python-modules/fitbit { }; - flake8 = callPackage ../development/python-modules/flake8 { }; + fixtures = callPackage ../development/python-modules/fixtures { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; + flake8 = callPackage ../development/python-modules/flake8 { }; + flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; @@ -3966,20 +2054,22 @@ in { flaky = callPackage ../development/python-modules/flaky { }; - flask = callPackage ../development/python-modules/flask { }; + flammkuchen = callPackage ../development/python-modules/flammkuchen { }; flask-admin = callPackage ../development/python-modules/flask-admin { }; - flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { }; - flask-api = callPackage ../development/python-modules/flask-api { }; + flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { }; + flask_assets = callPackage ../development/python-modules/flask-assets { }; flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; flask-babel = callPackage ../development/python-modules/flask-babel { }; + flaskbabel = callPackage ../development/python-modules/flaskbabel { }; + flask-babelex = callPackage ../development/python-modules/flask-babelex { }; flask-bcrypt = callPackage ../development/python-modules/flask-bcrypt { }; @@ -3988,6 +2078,8 @@ in { flask-caching = callPackage ../development/python-modules/flask-caching { }; + flask = callPackage ../development/python-modules/flask { }; + flask-common = callPackage ../development/python-modules/flask-common { }; flask-compress = callPackage ../development/python-modules/flask-compress { }; @@ -4000,12 +2092,12 @@ in { flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; + flask-limiter = callPackage ../development/python-modules/flask-limiter { }; flask_login = callPackage ../development/python-modules/flask-login { }; - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; - flask_mail = callPackage ../development/python-modules/flask-mail { }; flask_marshmallow = callPackage ../development/python-modules/flask-marshmallow { }; @@ -4050,63 +2142,30 @@ in { flask_wtf = callPackage ../development/python-modules/flask-wtf { }; - wtforms = callPackage ../development/python-modules/wtforms { }; + flexmock = callPackage ../development/python-modules/flexmock { }; - wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; + flickrapi = callPackage ../development/python-modules/flickrapi { }; - graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { - inherit (pkgs) pkg-config; - }; + flit = callPackage ../development/python-modules/flit { }; - grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; + flit-core = callPackage ../development/python-modules/flit-core { }; - greatfet = callPackage ../development/python-modules/greatfet { }; + flower = callPackage ../development/python-modules/flower { }; - pygreat = callPackage ../development/python-modules/pygreat { }; + flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; - pytorch = callPackage ../development/python-modules/pytorch { - cudaSupport = pkgs.config.cudaSupport or false; - }; + fluent-logger = callPackage ../development/python-modules/fluent-logger { }; - pyro-ppl = callPackage ../development/python-modules/pyro-ppl {}; + flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - opt-einsum = if isPy27 then - callPackage ../development/python-modules/opt-einsum/2.nix {} - else - callPackage ../development/python-modules/opt-einsum {}; + flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; - pytorchWithCuda = self.pytorch.override { - cudaSupport = true; - }; - - pytorchWithoutCuda = self.pytorch.override { - cudaSupport = false; - }; - - pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; - - pythondialog = callPackage ../development/python-modules/pythondialog { }; - - python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; - - pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; - - rfc3987 = callPackage ../development/python-modules/rfc3987 { }; - - ConfigArgParse = callPackage ../development/python-modules/configargparse { }; - - jsonschema = callPackage ../development/python-modules/jsonschema { }; - - vcver = callPackage ../development/python-modules/vcver { }; - - vcversioner = callPackage ../development/python-modules/vcversioner { }; - - falcon = callPackage ../development/python-modules/falcon { }; - - hug = callPackage ../development/python-modules/hug { }; + flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; flup = callPackage ../development/python-modules/flup { }; + flux-led = callPackage ../development/python-modules/flux-led { }; + fn = callPackage ../development/python-modules/fn { }; folium = callPackage ../development/python-modules/folium { }; @@ -4116,28 +2175,101 @@ in { inherit python; })); + fontmath = callPackage ../development/python-modules/fontmath { }; + + fontparts = callPackage ../development/python-modules/fontparts { }; + + fontpens = callPackage ../development/python-modules/fontpens { }; + fonttools = callPackage ../development/python-modules/fonttools { }; foolscap = callPackage ../development/python-modules/foolscap { }; forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; + FormEncode = callPackage ../development/python-modules/FormEncode { }; + + foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; + foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; + foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; + foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; + + foxdot = callPackage ../development/python-modules/foxdot { }; + + fpdf = callPackage ../development/python-modules/fpdf { }; + + fpylll = callPackage ../development/python-modules/fpylll { }; + + freetype-py = callPackage ../development/python-modules/freetype-py { }; + + freezegun = callPackage ../development/python-modules/freezegun { }; + + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; + + frozendict = callPackage ../development/python-modules/frozendict { }; + + fs = callPackage ../development/python-modules/fs { }; + + fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; + + fsspec = callPackage ../development/python-modules/fsspec { }; + + ftfy = callPackage ../development/python-modules/ftfy { }; + + ftputil = callPackage ../development/python-modules/ftputil { }; + + fudge = callPackage ../development/python-modules/fudge { }; + + funcparserlib = callPackage ../development/python-modules/funcparserlib { }; + + funcsigs = callPackage ../development/python-modules/funcsigs { }; + + functools32 = callPackage ../development/python-modules/functools32 { }; + + funcy = callPackage ../development/python-modules/funcy { }; + + furl = callPackage ../development/python-modules/furl { }; + + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; + fusepy = callPackage ../development/python-modules/fusepy { }; future = callPackage ../development/python-modules/future { }; + future-fstrings = callPackage ../development/python-modules/future-fstrings { }; + futures = callPackage ../development/python-modules/futures { }; + fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; + + fx2 = callPackage ../development/python-modules/fx2 { }; + + gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { + pythonPackages = self; + pythonSupport = true; + })); # gaia isn't supported with python3 and it's not available from pypi + galario = toPythonModule (pkgs.galario.override { enablePython = true; pythonPackages = self; }); + gast = callPackage ../development/python-modules/gast { }; + + gateone = callPackage ../development/python-modules/gateone { }; + gcovr = callPackage ../development/python-modules/gcovr { }; - gdal = toPythonModule (pkgs.gdal.override { - pythonPackages = self; - }); + gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; }); + + gdata = callPackage ../development/python-modules/gdata { }; + + gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { + inherit (self) python; + enablePython = true; + })); + + gdown = callPackage ../development/python-modules/gdown { }; gdrivefs = callPackage ../development/python-modules/gdrivefs { }; @@ -4146,72 +2278,131 @@ in { python3 = python; })); + geeknote = callPackage ../development/python-modules/geeknote { }; + + genanki = callPackage ../development/python-modules/genanki { }; + + genpy = callPackage ../development/python-modules/genpy { }; + genshi = callPackage ../development/python-modules/genshi { }; + gensim = callPackage ../development/python-modules/gensim { }; + gentools = callPackage ../development/python-modules/gentools { }; + genzshcomp = callPackage ../development/python-modules/genzshcomp { }; + + geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { }; + + geographiclib = callPackage ../development/python-modules/geographiclib { }; + + geoip2 = callPackage ../development/python-modules/geoip2 { }; + + GeoIP = callPackage ../development/python-modules/GeoIP { }; + + geojson = callPackage ../development/python-modules/geojson { }; + + geopandas = callPackage ../development/python-modules/geopandas { }; + + geopy = if isPy3k then + callPackage ../development/python-modules/geopy { } + else + callPackage ../development/python-modules/geopy/2.nix { }; + + getmac = callPackage ../development/python-modules/getmac { }; + gevent = callPackage ../development/python-modules/gevent { }; geventhttpclient = callPackage ../development/python-modules/geventhttpclient { }; gevent-socketio = callPackage ../development/python-modules/gevent-socketio { }; - geopandas = callPackage ../development/python-modules/geopandas { }; - - geojson = callPackage ../development/python-modules/geojson { }; - gevent-websocket = callPackage ../development/python-modules/gevent-websocket { }; - genzshcomp = callPackage ../development/python-modules/genzshcomp { }; - gflags = callPackage ../development/python-modules/gflags { }; ghdiff = callPackage ../development/python-modules/ghdiff { }; + gidgethub = callPackage ../development/python-modules/gidgethub { }; + + gin-config = callPackage ../development/python-modules/gin-config { }; + gipc = callPackage ../development/python-modules/gipc { }; + git-annex-adapter = + callPackage ../development/python-modules/git-annex-adapter { inherit (pkgs.gitAndTools) git-annex; }; + + gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 + + gitdb = callPackage ../development/python-modules/gitdb { }; + + github3_py = callPackage ../development/python-modules/github3_py { }; + + github-webhook = callPackage ../development/python-modules/github-webhook { }; + + GitPython = callPackage ../development/python-modules/GitPython { }; + git-revise = callPackage ../development/python-modules/git-revise { }; git-sweep = callPackage ../development/python-modules/git-sweep { }; glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 - github3_py = callPackage ../development/python-modules/github3_py { }; + glasgow = callPackage ../development/python-modules/glasgow { }; - github-webhook = callPackage ../development/python-modules/github-webhook { }; + glob2 = callPackage ../development/python-modules/glob2 { }; + + globre = callPackage ../development/python-modules/globre { }; + + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; + + glom = callPackage ../development/python-modules/glom { }; + + glymur = callPackage ../development/python-modules/glymur { }; + + gmpy2 = callPackage ../development/python-modules/gmpy2 { }; + + gmpy = callPackage ../development/python-modules/gmpy { }; + + gmusicapi = callPackage ../development/python-modules/gmusicapi { }; + + gnureadline = callPackage ../development/python-modules/gnureadline { }; + + gnutls = callPackage ../development/python-modules/gnutls { }; goobook = callPackage ../development/python-modules/goobook { }; - googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; - - google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; - - google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + goocalendar = callPackage ../development/python-modules/goocalendar { }; google_api_core = callPackage ../development/python-modules/google_api_core { }; - google_api_python_client = let - google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; - in if isPy3k then google_api_python_client else - # Python 2.7 support was deprecated but is still needed by weboob and duplicity - google_api_python_client.overridePythonAttrs (old: rec { - version = "1.7.6"; - src = old.src.override { - inherit version; - sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; - }; - }); + google_api_python_client = + let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; + in if isPy3k then + google_api_python_client + else # Python 2.7 support was deprecated but is still needed by weboob and duplicity + google_api_python_client.overridePythonAttrs (old: rec { + version = "1.7.6"; + src = old.src.override { + inherit version; + sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; + }; + }); + + googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; google_apputils = callPackage ../development/python-modules/google_apputils { }; google_auth = callPackage ../development/python-modules/google_auth { }; + google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; + + google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; - google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; - google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { }; google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { }; @@ -4220,6 +2411,8 @@ in { google_cloud_container = callPackage ../development/python-modules/google_cloud_container { }; + google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; + google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { }; google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { }; @@ -4256,10 +2449,10 @@ in { google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; - google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; - google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; + google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; + google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { }; google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { }; @@ -4276,180 +2469,438 @@ in { google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { }; + google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + + google-crc32c = callPackage ../development/python-modules/google-crc32c { + inherit (pkgs) crc32c; + }; + google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; + google-music = callPackage ../development/python-modules/google-music { }; + + google-music-proto = callPackage ../development/python-modules/google-music-proto { }; + + google-music-utils = callPackage ../development/python-modules/google-music-utils { }; + + google-pasta = callPackage ../development/python-modules/google-pasta { }; + google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; + googletrans = callPackage ../development/python-modules/googletrans { }; + gorilla = callPackage ../development/python-modules/gorilla { }; + gpapi = callPackage ../development/python-modules/gpapi { }; + gplaycli = callPackage ../development/python-modules/gplaycli { }; + gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport = true; inherit python; }); - gphoto2 = callPackage ../development/python-modules/gphoto2 { - inherit (pkgs) pkgconfig; - }; + gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; }; + + gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; + + gpsoauth = callPackage ../development/python-modules/gpsoauth { }; + + gpxpy = callPackage ../development/python-modules/gpxpy { }; + + gpy = callPackage ../development/python-modules/gpy { }; + + gpyopt = callPackage ../development/python-modules/gpyopt { }; + + grammalecte = callPackage ../development/python-modules/grammalecte { }; + + grandalf = callPackage ../development/python-modules/grandalf { }; + + graphite_api = callPackage ../development/python-modules/graphite-api { }; + + graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; + + graphite-web = callPackage ../development/python-modules/graphite-web { }; + + graph_nets = callPackage ../development/python-modules/graph_nets { }; graphql-core = callPackage ../development/python-modules/graphql-core { }; graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; - grammalecte = callPackage ../development/python-modules/grammalecte { }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; + + graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; }; + + grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; + + graspy = callPackage ../development/python-modules/graspy { }; + + greatfet = callPackage ../development/python-modules/greatfet { }; + + green = callPackage ../development/python-modules/green { }; greenlet = callPackage ../development/python-modules/greenlet { }; - grib-api = disabledIf (!isPy27) (toPythonModule - (pkgs.grib-api.override { - enablePython = true; - pythonPackages = self; - })); + grequests = callPackage ../development/python-modules/grequests { }; - grpcio = callPackage ../development/python-modules/grpcio { }; + grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { + enablePython = true; + pythonPackages = self; + })); - grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; - - grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + grip = callPackage ../development/python-modules/grip { }; grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; + grpcio = callPackage ../development/python-modules/grpcio { }; + + grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + + grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; + + gsd = if isPy27 then + callPackage ../development/python-modules/gsd/1.7.nix { } + else + callPackage ../development/python-modules/gsd { }; + gspread = callPackage ../development/python-modules/gspread { }; + gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; + + gst-python = callPackage ../development/python-modules/gst-python { + inherit (pkgs) meson pkgconfig; + gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; + }; + + gtimelog = callPackage ../development/python-modules/gtimelog { }; + + gtts = callPackage ../development/python-modules/gtts { }; + gtts-token = callPackage ../development/python-modules/gtts-token { }; + guessit = callPackage ../development/python-modules/guessit { }; + + guestfs = callPackage ../development/python-modules/guestfs { }; + + gumath = callPackage ../development/python-modules/gumath { }; + + gunicorn = if isPy27 then + callPackage ../development/python-modules/gunicorn/19.nix { } + else + callPackage ../development/python-modules/gunicorn { }; + + gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then + callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; } + else if stdenv.hostPlatform.system == "x86_64-linux" then + callPackage ../development/python-modules/gurobipy/linux.nix { } + else + throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; + + guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; + + gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { + pythonSupport = true; + pythonPackages = self; + })); + gym = callPackage ../development/python-modules/gym { }; gyp = callPackage ../development/python-modules/gyp { }; - guessit = callPackage ../development/python-modules/guessit { }; + h11 = callPackage ../development/python-modules/h11 { }; - rebulk = callPackage ../development/python-modules/rebulk { }; + h2 = callPackage ../development/python-modules/h2 { }; - gunicorn = if isPy27 then - callPackage ../development/python-modules/gunicorn/19.nix { } - else - callPackage ../development/python-modules/gunicorn { }; + h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; + + h5netcdf = callPackage ../development/python-modules/h5netcdf { }; + + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; + + h5py-mpi = self.h5py.override { hdf5 = pkgs.hdf5-mpi; }; + + habanero = callPackage ../development/python-modules/habanero { }; + + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + + handout = callPackage ../development/python-modules/handout { }; + + HAP-python = callPackage ../development/python-modules/HAP-python { }; + + hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; - hdbscan = callPackage ../development/python-modules/hdbscan { }; + hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - hmmlearn = callPackage ../development/python-modules/hmmlearn { }; + hcloud = callPackage ../development/python-modules/hcloud { }; hcs_utils = callPackage ../development/python-modules/hcs_utils { }; + hdbscan = callPackage ../development/python-modules/hdbscan { }; + + hdlparse = callPackage ../development/python-modules/hdlparse { }; + + hdmedians = callPackage ../development/python-modules/hdmedians { }; + + heapdict = callPackage ../development/python-modules/heapdict { }; + + helpdev = callPackage ../development/python-modules/helpdev { }; + + helper = callPackage ../development/python-modules/helper { }; + + hepmc3 = toPythonModule (pkgs.hepmc3.override { inherit python; }); + hetzner = callPackage ../development/python-modules/hetzner { }; + heudiconv = callPackage ../development/python-modules/heudiconv { }; + + hg-evolve = callPackage ../development/python-modules/hg-evolve { }; + + hg-git = callPackage ../development/python-modules/hg-git { }; + + hglib = callPackage ../development/python-modules/hglib { }; + + hgsvn = callPackage ../development/python-modules/hgsvn { }; + + hickle = callPackage ../development/python-modules/hickle { }; + + hidapi = callPackage ../development/python-modules/hidapi { inherit (pkgs) udev libusb1; }; + + hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + hiredis = callPackage ../development/python-modules/hiredis { }; + hiro = callPackage ../development/python-modules/hiro { }; + + hiyapyco = callPackage ../development/python-modules/hiyapyco { }; + + hkdf = callPackage ../development/python-modules/hkdf { }; + + hmmlearn = callPackage ../development/python-modules/hmmlearn { }; + + hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + + holidays = callPackage ../development/python-modules/holidays { }; + + holoviews = callPackage ../development/python-modules/holoviews { }; + homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; - htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); - html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; + + howdoi = callPackage ../development/python-modules/howdoi { }; + + hpack = callPackage ../development/python-modules/hpack { }; + + hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; + + hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; + + hstspreload = callPackage ../development/python-modules/hstspreload { }; + + html2text = if isPy3k then + callPackage ../development/python-modules/html2text { } + else + callPackage ../development/python-modules/html2text/2018.nix { }; html5lib = callPackage ../development/python-modules/html5lib { }; + html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkgconfig; }; + + htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + + htmlmin = callPackage ../development/python-modules/htmlmin { }; + + html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + + htmltreediff = callPackage ../development/python-modules/htmltreediff { }; + + HTSeq = callPackage ../development/python-modules/HTSeq { }; + httmock = callPackage ../development/python-modules/httmock { }; - http_signature = callPackage ../development/python-modules/http_signature { }; + httpauth = callPackage ../development/python-modules/httpauth { }; httpbin = callPackage ../development/python-modules/httpbin { }; + httpcore = callPackage ../development/python-modules/httpcore { }; + + http-ece = callPackage ../development/python-modules/http-ece { }; + httplib2 = callPackage ../development/python-modules/httplib2 { }; - hvac = callPackage ../development/python-modules/hvac { }; - - hydra = callPackage ../development/python-modules/hydra { }; - - # File name is called 2.nix because this one will need to remain for Python 2. - hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { }; - - hypothesis = if isPy3k then - callPackage ../development/python-modules/hypothesis { } - else - self.hypothesis_4; - - hydra-check = callPackage ../development/python-modules/hydra-check { }; - - colored = callPackage ../development/python-modules/colored { }; - - xdg = callPackage ../development/python-modules/xdg { }; - - xdis = callPackage ../development/python-modules/xdis { }; - - xnd = callPackage ../development/python-modules/xnd { }; - - uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; - - unrpa = callPackage ../development/python-modules/unrpa { }; - - lsi = callPackage ../development/python-modules/lsi { }; - - hkdf = callPackage ../development/python-modules/hkdf { }; + http-parser = callPackage ../development/python-modules/http-parser { }; httpretty = if isPy3k then callPackage ../development/python-modules/httpretty { } else callPackage ../development/python-modules/httpretty/0.nix { }; + httpserver = callPackage ../development/python-modules/httpserver { }; + + httpsig = callPackage ../development/python-modules/httpsig { }; + + http_signature = callPackage ../development/python-modules/http_signature { }; + + httptools = callPackage ../development/python-modules/httptools { }; + + httpx = callPackage ../development/python-modules/httpx { }; + + huey = callPackage ../development/python-modules/huey { }; + + hug = callPackage ../development/python-modules/hug { }; + + humanfriendly = callPackage ../development/python-modules/humanfriendly { }; + + humanize = callPackage ../development/python-modules/humanize { }; + + hupper = callPackage ../development/python-modules/hupper { }; + + hvac = callPackage ../development/python-modules/hvac { }; + + hvplot = callPackage ../development/python-modules/hvplot { }; + + hwi = callPackage ../development/python-modules/hwi { }; + + hydra = callPackage ../development/python-modules/hydra { }; + + hydra-check = callPackage ../development/python-modules/hydra-check { }; + + hypchat = callPackage ../development/python-modules/hypchat { }; + + hyperframe = callPackage ../development/python-modules/hyperframe { }; + + hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; + + hyperlink = callPackage ../development/python-modules/hyperlink { }; + + hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix + { }; # File name is called 2.nix because this one will need to remain for Python 2. + + hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; + + hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4; + + hyppo = callPackage ../development/python-modules/hyppo { }; + + i3ipc = callPackage ../development/python-modules/i3ipc { }; + + i3-py = callPackage ../development/python-modules/i3-py { }; + iapws = callPackage ../development/python-modules/iapws { }; + ibis = callPackage ../development/python-modules/ibis { }; + + ibis-framework = callPackage ../development/python-modules/ibis-framework { }; + icalendar = callPackage ../development/python-modules/icalendar { }; icecream = callPackage ../development/python-modules/icecream { }; ics = callPackage ../development/python-modules/ics { }; + identify = callPackage ../development/python-modules/identify { }; + + idna = callPackage ../development/python-modules/idna { }; + + idna-ssl = callPackage ../development/python-modules/idna-ssl { }; + ifaddr = callPackage ../development/python-modules/ifaddr { }; ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; + ignite = callPackage ../development/python-modules/ignite { }; + + ihatemoney = callPackage ../development/python-modules/ihatemoney { }; + + ijson = callPackage ../development/python-modules/ijson { }; + + imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); + imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; imageio = callPackage ../development/python-modules/imageio { }; imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; + image-match = callPackage ../development/python-modules/image-match { }; + + imagesize = callPackage ../development/python-modules/imagesize { }; + + IMAPClient = callPackage ../development/python-modules/imapclient { }; + + imaplib2 = callPackage ../development/python-modules/imaplib2 { }; + + imbalanced-learn = if isPy27 then + callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } + else + callPackage ../development/python-modules/imbalanced-learn { }; + + img2pdf = callPackage ../development/python-modules/img2pdf { }; + imgaug = callPackage ../development/python-modules/imgaug { }; + imgsize = callPackage ../development/python-modules/imgsize { }; + + immutables = callPackage ../development/python-modules/immutables { }; + + impacket = callPackage ../development/python-modules/impacket { }; + + importlib-metadata = callPackage ../development/python-modules/importlib-metadata { }; + + importlib-resources = callPackage ../development/python-modules/importlib-resources { }; + + importmagic = callPackage ../development/python-modules/importmagic { }; + + imread = + callPackage ../development/python-modules/imread { inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; }; + + imutils = callPackage ../development/python-modules/imutils { }; + + incremental = callPackage ../development/python-modules/incremental { }; + + inflect = callPackage ../development/python-modules/inflect { }; + inflection = callPackage ../development/python-modules/inflection { }; influxdb = callPackage ../development/python-modules/influxdb { }; + influxdb-client = callPackage ../development/python-modules/influxdb-client { }; + + influxgraph = callPackage ../development/python-modules/influxgraph { }; + infoqscraper = callPackage ../development/python-modules/infoqscraper { }; + iniconfig = callPackage ../development/python-modules/iniconfig { }; + inifile = callPackage ../development/python-modules/inifile { }; - interruptingcow = callPackage ../development/python-modules/interruptingcow {}; + iniparse = callPackage ../development/python-modules/iniparse { }; + + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; + + inquirer = callPackage ../development/python-modules/inquirer { }; + + intake = callPackage ../development/python-modules/intake { }; + + intelhex = callPackage ../development/python-modules/intelhex { }; + + internetarchive = callPackage ../development/python-modules/internetarchive { }; + + interruptingcow = callPackage ../development/python-modules/interruptingcow { }; + + intervaltree = callPackage ../development/python-modules/intervaltree { }; + + intreehooks = callPackage ../development/python-modules/intreehooks { }; + + invoke = callPackage ../development/python-modules/invoke { }; iocapture = callPackage ../development/python-modules/iocapture { }; - iptools = callPackage ../development/python-modules/iptools { }; - - ipy = callPackage ../development/python-modules/IPy { }; - - ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; - - ipykernel = if pythonOlder "3.4" then - callPackage ../development/python-modules/ipykernel/4.nix { } - else - callPackage ../development/python-modules/ipykernel { }; - - ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - - ipython = if isPy27 then - callPackage ../development/python-modules/ipython/5.nix { } - else - callPackage ../development/python-modules/ipython { }; - - ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; - - ipyvue = callPackage ../development/python-modules/ipyvue { }; - - ipyvuetify = callPackage ../development/python-modules/ipyvuetify { }; - - ipywidgets = callPackage ../development/python-modules/ipywidgets { }; + iowait = callPackage ../development/python-modules/iowait { }; ipaddr = callPackage ../development/python-modules/ipaddr { }; @@ -4459,154 +2910,395 @@ in { ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; + ipfsapi = callPackage ../development/python-modules/ipfsapi { }; - iso-639 = callPackage ../development/python-modules/iso-639 {}; + iptools = callPackage ../development/python-modules/iptools { }; - iso3166 = callPackage ../development/python-modules/iso3166 {}; + ipy = callPackage ../development/python-modules/IPy { }; + + ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + + ipykernel = if pythonOlder "3.4" then + callPackage ../development/python-modules/ipykernel/4.nix { } + else + callPackage ../development/python-modules/ipykernel { }; + + ipympl = callPackage ../development/python-modules/ipympl { }; + + ipyparallel = callPackage ../development/python-modules/ipyparallel { }; + + ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; + + ipython = if isPy27 then + callPackage ../development/python-modules/ipython/5.nix { } + else if isPy36 then + callPackage ../development/python-modules/ipython/7.16.nix { } + else + callPackage ../development/python-modules/ipython { }; + + ipyvue = callPackage ../development/python-modules/ipyvue { }; + + ipyvuetify = callPackage ../development/python-modules/ipyvuetify { }; + + ipywidgets = callPackage ../development/python-modules/ipywidgets { }; + + irc = callPackage ../development/python-modules/irc { }; + + isbnlib = callPackage ../development/python-modules/isbnlib { }; + + islpy = callPackage ../development/python-modules/islpy { }; + + iso3166 = callPackage ../development/python-modules/iso3166 { }; + + iso-639 = callPackage ../development/python-modules/iso-639 { }; iso8601 = callPackage ../development/python-modules/iso8601 { }; - isort = callPackage ../development/python-modules/isort {}; + isodate = callPackage ../development/python-modules/isodate { }; - isoweek = callPackage ../development/python-modules/isoweek {}; + isort = callPackage ../development/python-modules/isort { }; - jabberbot = callPackage ../development/python-modules/jabberbot {}; + isoweek = callPackage ../development/python-modules/isoweek { }; - jedi = callPackage ../development/python-modules/jedi { }; + itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; - jellyfish = callPackage ../development/python-modules/jellyfish { }; + itemadapter = callPackage ../development/python-modules/itemadapter { }; - jeepney = callPackage ../development/python-modules/jeepney { }; + itemloaders = callPackage ../development/python-modules/itemloaders { }; + + iterm2 = callPackage ../development/python-modules/iterm2 { }; + + itsdangerous = callPackage ../development/python-modules/itsdangerous { }; + + itypes = callPackage ../development/python-modules/itypes { }; j2cli = callPackage ../development/python-modules/j2cli { }; - jinja2 = callPackage ../development/python-modules/jinja2 { }; + jabberbot = callPackage ../development/python-modules/jabberbot { }; - jinja2_time = callPackage ../development/python-modules/jinja2_time { }; + janus = callPackage ../development/python-modules/janus { }; + + jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; + + jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + + jaraco_functools = if pythonOlder "3.6" then + callPackage ../development/python-modules/jaraco_functools/2.nix { } + else + callPackage ../development/python-modules/jaraco_functools { }; + + jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; + + jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + + jaraco_stream = if pythonOlder "3.6" then + callPackage ../development/python-modules/jaraco_stream/2.nix { } + else + callPackage ../development/python-modules/jaraco_stream { }; + + jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + + javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; + + javaproperties = callPackage ../development/python-modules/javaproperties { }; + + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; + + jc = callPackage ../development/python-modules/jc { }; + + jdatetime = callPackage ../development/python-modules/jdatetime { }; + + jdcal = callPackage ../development/python-modules/jdcal { }; + + jedi = callPackage ../development/python-modules/jedi { }; + + jeepney = callPackage ../development/python-modules/jeepney { }; + + jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; + + jellyfish = callPackage ../development/python-modules/jellyfish { }; + + jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; + + jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; + + jieba = callPackage ../development/python-modules/jieba { }; + + jinja2 = callPackage ../development/python-modules/jinja2 { }; jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; + jinja2_time = callPackage ../development/python-modules/jinja2_time { }; + + jira = callPackage ../development/python-modules/jira { }; + jmespath = callPackage ../development/python-modules/jmespath { }; - journalwatch = callPackage ../tools/system/journalwatch { - inherit (self) systemd pytest; - }; + joblib = callPackage ../development/python-modules/joblib { }; - jq = callPackage ../development/python-modules/jq { - inherit (pkgs) jq; - }; + josepy = callPackage ../development/python-modules/josepy { }; + + journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; }; + + jpylyzer = callPackage ../development/python-modules/jpylyzer { }; + + JPype1 = callPackage ../development/python-modules/JPype1 { }; + + jq = callPackage ../development/python-modules/jq { inherit (pkgs) jq; }; + + jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; + + jsmin = callPackage ../development/python-modules/jsmin { }; jsondate = callPackage ../development/python-modules/jsondate { }; jsondiff = callPackage ../development/python-modules/jsondiff { }; - jsonnet = buildPythonPackage { - inherit (pkgs.jsonnet) name src; - }; + jsonlines = callPackage ../development/python-modules/jsonlines { }; + + jsonmerge = callPackage ../development/python-modules/jsonmerge { }; + + json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; + + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; + + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; + + jsonpath = callPackage ../development/python-modules/jsonpath { }; + + jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; + + jsonpickle = callPackage ../development/python-modules/jsonpickle { }; + + jsonpointer = callPackage ../development/python-modules/jsonpointer { }; + + jsonref = callPackage ../development/python-modules/jsonref { }; + + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; + + jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; + + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; + + jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix { }; + + jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; + + jsonschema = callPackage ../development/python-modules/jsonschema { }; + + jsonwatch = callPackage ../development/python-modules/jsonwatch { }; + + jug = callPackage ../development/python-modules/jug { }; + + junitparser = callPackage ../development/python-modules/junitparser { }; + + junit-xml = callPackage ../development/python-modules/junit-xml { }; + + junos-eznc = callPackage ../development/python-modules/junos-eznc { }; + + jupyter = callPackage ../development/python-modules/jupyter { }; + + jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; jupyter_client = if isPy3k then callPackage ../development/python-modules/jupyter_client { } else callPackage ../development/python-modules/jupyter_client/5.nix { }; + jupyter_console = if pythonOlder "3.5" then + callPackage ../development/python-modules/jupyter_console/5.nix { } + else + callPackage ../development/python-modules/jupyter_console { }; + jupyter_core = callPackage ../development/python-modules/jupyter_core { }; - jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { - pkgs-docker = pkgs.docker; - }; - - jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { }; - jupyterhub = callPackage ../development/python-modules/jupyterhub { }; jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; - jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { - inherit (pkgs) bash; - }; + jupyterhub-systemdspawner = + callPackage ../development/python-modules/jupyterhub-systemdspawner { inherit (pkgs) bash; }; + + jupyterhub-tmpauthenticator = callPackage ../development/python-modules/jupyterhub-tmpauthenticator { }; + + jupyterlab = callPackage ../development/python-modules/jupyterlab { }; + + jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git { }; + + jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; + + jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; + + jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; + + jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; + + jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { }; + + jupytext = callPackage ../development/python-modules/jupytext { }; + + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + + k5test = callPackage ../development/python-modules/k5test { inherit (pkgs) krb5Full findutils which; }; + + kaa-base = callPackage ../development/python-modules/kaa-base { }; + + kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; + + kafka-python = callPackage ../development/python-modules/kafka-python { }; kaggle = callPackage ../development/python-modules/kaggle { }; + kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; + + Kajiki = callPackage ../development/python-modules/kajiki { }; + + kaptan = callPackage ../development/python-modules/kaptan { }; + + kazoo = callPackage ../development/python-modules/kazoo { }; + + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; + + keep = callPackage ../development/python-modules/keep { }; + + keepalive = callPackage ../development/python-modules/keepalive { }; + + keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; + + keepkey = callPackage ../development/python-modules/keepkey { }; + + keras-applications = callPackage ../development/python-modules/keras-applications { }; + + Keras = callPackage ../development/python-modules/keras { }; + + keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; + + kerberos = callPackage ../development/python-modules/kerberos { inherit (pkgs) kerberos; }; + keyring = if isPy3k then callPackage ../development/python-modules/keyring { } else callPackage ../development/python-modules/keyring/2.nix { }; + keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; + kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src); + + kinparse = callPackage ../development/python-modules/kinparse { }; + + kitchen = callPackage ../development/python-modules/kitchen { }; + kiwisolver = if isPy3k then callPackage ../development/python-modules/kiwisolver { } else callPackage ../development/python-modules/kiwisolver/1_1.nix { }; - klaus = callPackage ../development/python-modules/klaus {}; + klaus = callPackage ../development/python-modules/klaus { }; klein = callPackage ../development/python-modules/klein { }; + kmapper = callPackage ../development/python-modules/kmapper { }; + + kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { + inherit (pkgs.kmsxx) stdenv; + inherit (pkgs) pkgconfig; + withPython = true; + }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); + + knack = callPackage ../development/python-modules/knack { }; + koji = callPackage ../development/python-modules/koji { }; kombu = callPackage ../development/python-modules/kombu { }; konfig = callPackage ../development/python-modules/konfig { }; - kitchen = callPackage ../development/python-modules/kitchen { }; - - knack = callPackage ../development/python-modules/knack { }; + korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { }; kubernetes = callPackage ../development/python-modules/kubernetes { }; - k5test = callPackage ../development/python-modules/k5test { - inherit (pkgs) krb5Full findutils which; - }; + labelbox = callPackage ../development/python-modules/labelbox { }; - pylast = callPackage ../development/python-modules/pylast { }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; }; - pylru = callPackage ../development/python-modules/pylru { }; + langcodes = callPackage ../development/python-modules/langcodes { }; - libnl-python = disabledIf isPy3k - (toPythonModule (pkgs.libnl.override{pythonSupport=true; inherit python; })).py; + langdetect = callPackage ../development/python-modules/langdetect { }; + + larch = callPackage ../development/python-modules/larch { }; lark-parser = callPackage ../development/python-modules/lark-parser { }; - jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; + Lasagne = callPackage ../development/python-modules/lasagne { }; - kerberos = callPackage ../development/python-modules/kerberos { - inherit (pkgs) kerberos; - }; + latexcodec = callPackage ../development/python-modules/latexcodec { }; + + launchpadlib = callPackage ../development/python-modules/launchpadlib { }; + + lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; + + lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + + lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; + + lazr-uri = callPackage ../development/python-modules/lazr-uri { }; + + lazy = callPackage ../development/python-modules/lazy { }; lazy_import = callPackage ../development/python-modules/lazy_import { }; lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; + ldap3 = callPackage ../development/python-modules/ldap3 { }; + + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; + + ldappool = callPackage ../development/python-modules/ldappool { }; + ldaptor = callPackage ../development/python-modules/ldaptor { }; + leather = callPackage ../development/python-modules/leather { }; + le = callPackage ../development/python-modules/le { }; + ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + + ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + lektor = callPackage ../development/python-modules/lektor { }; leveldb = callPackage ../development/python-modules/leveldb { }; - python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + libagent = callPackage ../development/python-modules/libagent { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { - inherit (pkgs) pkgconfig; - }; + pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; - python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; + libais = callPackage ../development/python-modules/libais { }; - python-unshare = callPackage ../development/python-modules/python-unshare { }; - - fs = callPackage ../development/python-modules/fs { }; - - fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; + libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; }; libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; }; + libcloud = if isPy27 then - callPackage ../development/python-modules/libcloud/2.nix { } - else - callPackage ../development/python-modules/libcloud { }; + callPackage ../development/python-modules/libcloud/2.nix { } + else + callPackage ../development/python-modules/libcloud { }; + + libevdev = callPackage ../development/python-modules/libevdev { }; + + libfdt = toPythonModule (pkgs.dtc.override { + inherit python; + pythonSupport = true; + }); + + libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { + enablePython = true; + python3 = python; + })); libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; @@ -4614,13 +3306,39 @@ in { inherit (pkgs.linuxPackages) nvidia_x11; }; - libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { - enablePython = true; - python3 = python; - })); + libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; libkeepass = callPackage ../development/python-modules/libkeepass { }; + liblarch = callPackage ../development/python-modules/liblarch { }; + + libmodulemd = pipe pkgs.libmodulemd [ + toPythonModule + (p: + p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; # The package always builds python3 bindings + broken = (super.meta.broken or false) || !isPy3k; + }; + })) + (p: p.override { python3 = python; }) + (p: p.py) + ]; + + libmr = callPackage ../development/python-modules/libmr { }; + + libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; }; + + libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override { + pythonSupport = true; + inherit python; + })).py; + + libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override { + enablePython = true; + inherit python; + })).py; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -4628,109 +3346,238 @@ in { librepo = pipe pkgs.librepo [ toPythonModule - - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - }; - })) - - (p: p.override { - inherit python; - }) - + (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; })) + (p: p.override { inherit python; }) (p: p.py) ]; - libnacl = callPackage ../development/python-modules/libnacl { - inherit (pkgs) libsodium; - }; + librosa = callPackage ../development/python-modules/librosa { }; libsavitar = callPackage ../development/python-modules/libsavitar { }; - libplist = disabledIf isPy3k - (toPythonModule (pkgs.libplist.override { enablePython = true; inherit python; })).py; + libselinux = pipe pkgs.libselinux [ + toPythonModule + (p: + p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; + broken = (super.meta.broken or false) || pythonAtLeast "3.8"; + }; + })) + (p: + p.override { + enablePython = true; + inherit python; + }) + (p: p.py) + ]; - libxml2 = (toPythonModule (pkgs.libxml2.override{pythonSupport=true; inherit python;})).py; + libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - libxslt = (toPythonModule (pkgs.libxslt.override{pythonSupport=true; inherit python; inherit (self) libxml2;})).py; + libthumbor = callPackage ../development/python-modules/libthumbor { }; + + libtmux = callPackage ../development/python-modules/libtmux { }; + + libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python; + + libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; + + libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkgconfig; }; + + libvirt = if isPy3k then + (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; }) + else + (callPackage ../development/python-modules/libvirt/5.9.0.nix { + inherit (pkgs) pkgconfig; + libvirt = pkgs.libvirt_5_9_0; + }); + + libxml2 = (toPythonModule (pkgs.libxml2.override { + pythonSupport = true; + inherit python; + })).py; + + libxslt = (toPythonModule (pkgs.libxslt.override { + pythonSupport = true; + inherit python; + inherit (self) libxml2; + })).py; + + license-expression = callPackage ../development/python-modules/license-expression { }; + + lightblue = callPackage ../development/python-modules/lightblue { }; + + lightgbm = callPackage ../development/python-modules/lightgbm { }; + + lightning = callPackage ../development/python-modules/lightning { }; + + lightparam = callPackage ../development/python-modules/lightparam { }; + + limitlessled = callPackage ../development/python-modules/limitlessled { }; limits = callPackage ../development/python-modules/limits { }; limnoria = callPackage ../development/python-modules/limnoria { }; - line_profiler = callPackage ../development/python-modules/line_profiler { }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; - linode = callPackage ../development/python-modules/linode { }; + line_profiler = callPackage ../development/python-modules/line_profiler { }; linode-api = callPackage ../development/python-modules/linode-api { }; + linode = callPackage ../development/python-modules/linode { }; + + linuxfd = callPackage ../development/python-modules/linuxfd { }; + + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; })); + + livelossplot = callPackage ../development/python-modules/livelossplot { }; + livereload = callPackage ../development/python-modules/livereload { }; - llfuse = callPackage ../development/python-modules/llfuse { - inherit (pkgs) fuse pkgconfig; # use "real" fuse and pkgconfig, not the python modules - }; + livestreamer = callPackage ../development/python-modules/livestreamer { }; - locustio = callPackage ../development/python-modules/locustio { }; + livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; + + llfuse = callPackage ../development/python-modules/llfuse { + inherit (pkgs) fuse pkgconfig; + }; # use "real" fuse and pkgconfig, not the python modules llvmlite = callPackage ../development/python-modules/llvmlite { - llvm = pkgs.llvm_9; # llvmlite always requires a specific version of llvm. - }; + llvm = pkgs.llvm_9; + }; # llvmlite always requires a specific version of llvm. + + lmdb = callPackage ../development/python-modules/lmdb { }; + + lml = callPackage ../development/python-modules/lml { }; + + lmtpd = callPackage ../development/python-modules/lmtpd { }; + + localzone = callPackage ../development/python-modules/localzone { }; + + locket = callPackage ../development/python-modules/locket { }; lockfile = callPackage ../development/python-modules/lockfile { }; - logilab_common = callPackage ../development/python-modules/logilab/common.nix {}; + locustio = callPackage ../development/python-modules/locustio { }; - logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; + Logbook = callPackage ../development/python-modules/Logbook { }; - lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt zlib;}; + logfury = callPackage ../development/python-modules/logfury { }; + + logilab_astng = callPackage ../development/python-modules/logilab_astng { }; + + logilab_common = callPackage ../development/python-modules/logilab/common.nix { }; + + logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { }; + + logster = callPackage ../development/python-modules/logster { }; + + loguru = callPackage ../development/python-modules/loguru { }; + + logutils = callPackage ../development/python-modules/logutils { }; + + logzero = callPackage ../development/python-modules/logzero { }; + + loo-py = callPackage ../development/python-modules/loo-py { }; + + lpod = callPackage ../development/python-modules/lpod { }; + + lsi = callPackage ../development/python-modules/lsi { }; + + ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; + + luftdaten = callPackage ../development/python-modules/luftdaten { }; lxc = callPackage ../development/python-modules/lxc { }; - py_scrypt = callPackage ../development/python-modules/py_scrypt { }; + lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; - python_magic = callPackage ../development/python-modules/python-magic { }; + lz4 = self.python-lz4; # alias 2018-12-05 - m3u8 = callPackage ../development/python-modules/m3u8 { }; - - magic = callPackage ../development/python-modules/magic { }; + lzstring = callPackage ../development/python-modules/lzstring { }; m2crypto = callPackage ../development/python-modules/m2crypto { }; - Mako = callPackage ../development/python-modules/Mako { }; + m2r = callPackage ../development/python-modules/m2r { }; + + m3u8 = callPackage ../development/python-modules/m3u8 { }; + + mac_alias = callPackage ../development/python-modules/mac_alias { }; macfsevents = callPackage ../development/python-modules/macfsevents { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; + macropy = callPackage ../development/python-modules/macropy { }; + maestral = callPackage ../development/python-modules/maestral { }; - manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; - marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; - mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {}; - mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix {}; - mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix {}; - mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix {}; - mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix {}; - mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix {}; - moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix {}; - mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix {}; - mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix {}; - mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix {}; - moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix {}; - mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix {}; - marionette-harness = callPackage ../development/python-modules/marionette-harness {}; + magic = callPackage ../development/python-modules/magic { }; - marisa = callPackage ../development/python-modules/marisa { - marisa = pkgs.marisa; - }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; + + magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; + + magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; + + mahotas = callPackage ../development/python-modules/mahotas { }; + + mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; + + mailchimp = callPackage ../development/python-modules/mailchimp { }; + + mailman = callPackage ../servers/mail/mailman { }; + + mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + + mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; + + mailman-web = callPackage ../servers/mail/mailman/web.nix { }; + + rtmixer = callPackage ../development/python-modules/rtmixer { }; + + mail-parser = callPackage ../development/python-modules/mail-parser { }; + + Mako = callPackage ../development/python-modules/Mako { }; + + managesieve = callPackage ../development/python-modules/managesieve { }; + + manhole = callPackage ../development/python-modules/manhole { }; + + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; + + manuel = callPackage ../development/python-modules/manuel { }; + + mapbox = callPackage ../development/python-modules/mapbox { }; + + mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; + + marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { }; + + marionette-harness = callPackage ../development/python-modules/marionette-harness { }; + + marisa = callPackage ../development/python-modules/marisa { marisa = pkgs.marisa; }; marisa-trie = callPackage ../development/python-modules/marisa-trie { }; - Markups = callPackage ../development/python-modules/Markups { }; + markdown2 = callPackage ../development/python-modules/markdown2 { }; + + markdown = if isPy3k then + callPackage ../development/python-modules/markdown { } + else + callPackage ../development/python-modules/markdown/3_1.nix { }; + + markdown-macros = callPackage ../development/python-modules/markdown-macros { }; + + markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript { }; + + markerlib = callPackage ../development/python-modules/markerlib { }; markupsafe = callPackage ../development/python-modules/markupsafe { }; + Markups = callPackage ../development/python-modules/Markups { }; + marshmallow = callPackage ../development/python-modules/marshmallow { }; marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; @@ -4739,21 +3586,16 @@ in { marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { }; - manuel = callPackage ../development/python-modules/manuel { }; + mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; - mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; + matchpy = callPackage ../development/python-modules/matchpy { }; - markdown = if isPy3k then - callPackage ../development/python-modules/markdown { } - else - callPackage ../development/python-modules/markdown/3_1.nix { }; - - markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; - - markdown-macros = callPackage ../development/python-modules/markdown-macros { }; + mathlibtools = callPackage ../development/python-modules/mathlibtools { }; matplotlib = let - path = if isPy3k then ../development/python-modules/matplotlib/default.nix else + path = if isPy3k then + ../development/python-modules/matplotlib/default.nix + else ../development/python-modules/matplotlib/2.nix; in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; @@ -4766,8 +3608,11 @@ in { matrix-nio = callPackage ../development/python-modules/matrix-nio { }; mautrix = callPackage ../development/python-modules/mautrix { }; + mautrix-appservice = self.mautrix; # alias 2019-12-28 + maxminddb = callPackage ../development/python-modules/maxminddb { }; + maya = callPackage ../development/python-modules/maya { }; mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { @@ -4777,87 +3622,100 @@ in { mccabe = callPackage ../development/python-modules/mccabe { }; - mechanize = callPackage ../development/python-modules/mechanize { }; + MDP = callPackage ../development/python-modules/mdp { }; + + measurement = callPackage ../development/python-modules/measurement { }; + + mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup { }; - meld3 = callPackage ../development/python-modules/meld3 { }; - - meliae = callPackage ../development/python-modules/meliae {}; + mechanize = callPackage ../development/python-modules/mechanize { }; meinheld = callPackage ../development/python-modules/meinheld { }; + meld3 = callPackage ../development/python-modules/meld3 { }; + + meliae = callPackage ../development/python-modules/meliae { }; + memcached = callPackage ../development/python-modules/memcached { }; memory_profiler = callPackage ../development/python-modules/memory_profiler { }; + mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { python3Packages = self; })); + + mergedeep = callPackage ../development/python-modules/mergedeep { }; + + merkletools = callPackage ../development/python-modules/merkletools { }; + mesa = callPackage ../development/python-modules/mesa { }; - meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { - python3 = python; - }).overrideAttrs(oldAttrs: { - # We do not want the setup hook in Python packages - # because the build is performed differently. - setupHook = null; - }))); + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; + + meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs + (oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently. + setupHook = null; + }))); mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; - meshlabxml = callPackage ../development/python-modules/meshlabxml { }; - metaphone = callPackage ../development/python-modules/metaphone { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; micawber = callPackage ../development/python-modules/micawber { }; + midiutil = callPackage ../development/python-modules/midiutil { }; + + mido = callPackage ../development/python-modules/mido { }; + milksnake = callPackage ../development/python-modules/milksnake { }; + minidb = callPackage ../development/python-modules/minidb { }; + minimock = callPackage ../development/python-modules/minimock { }; + mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py; + minio = callPackage ../development/python-modules/minio { }; - moviepy = callPackage ../development/python-modules/moviepy { }; + miniupnpc = callPackage ../development/python-modules/miniupnpc { }; - mozterm = callPackage ../development/python-modules/mozterm { }; + misaka = callPackage ../development/python-modules/misaka { }; - mplleaflet = callPackage ../development/python-modules/mplleaflet { }; - - multidict = callPackage ../development/python-modules/multidict { }; - - munch = callPackage ../development/python-modules/munch { }; - - nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; - - rainbowstream = callPackage ../development/python-modules/rainbowstream { }; - - pendulum = callPackage ../development/python-modules/pendulum { }; - - pocket = callPackage ../development/python-modules/pocket { }; + mistletoe = callPackage ../development/python-modules/mistletoe { }; mistune = callPackage ../development/python-modules/mistune { }; - brotlipy = callPackage ../development/python-modules/brotlipy { }; + mitmproxy = callPackage ../development/python-modules/mitmproxy { }; - sortedcollections = callPackage ../development/python-modules/sortedcollections { }; + mixpanel = callPackage ../development/python-modules/mixpanel { }; - hyperframe = callPackage ../development/python-modules/hyperframe { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; - h2 = callPackage ../development/python-modules/h2 { }; + mlflow = callPackage ../development/python-modules/mlflow { }; - editorconfig = callPackage ../development/python-modules/editorconfig { }; + mlrose = callPackage ../development/python-modules/mlrose { }; + + mmh3 = callPackage ../development/python-modules/mmh3 { }; + + mmpython = callPackage ../development/python-modules/mmpython { }; + + mnemonic = callPackage ../development/python-modules/mnemonic { }; + + mnist = callPackage ../development/python-modules/mnist { }; + + mocket = callPackage ../development/python-modules/mocket { }; mock = if pythonOlder "3.6" then callPackage ../development/python-modules/mock/2.nix { } else callPackage ../development/python-modules/mock { }; - mocket = callPackage ../development/python-modules/mocket { }; + mockito = callPackage ../development/python-modules/mockito { }; mock-open = callPackage ../development/python-modules/mock-open { }; - mockito = callPackage ../development/python-modules/mockito { }; - modeled = callPackage ../development/python-modules/modeled { }; moderngl = callPackage ../development/python-modules/moderngl { }; @@ -4866,53 +3724,153 @@ in { modestmaps = callPackage ../development/python-modules/modestmaps { }; - # Needed here because moinmoin is loaded as a Python library. - moinmoin = callPackage ../development/python-modules/moinmoin { }; + mohawk = callPackage ../development/python-modules/mohawk { }; + + moinmoin = callPackage ../development/python-modules/moinmoin + { }; # Needed here because moinmoin is loaded as a Python library. + + mongodict = callPackage ../development/python-modules/mongodict { }; + + mongoengine = callPackage ../development/python-modules/mongoengine { }; + + monkeyhex = callPackage ../development/python-modules/monkeyhex { }; + + monosat = disabledIf (!isPy3k) (pkgs.monosat.python { + inherit buildPythonPackage; + inherit (self) cython; + }); + + monotonic = callPackage ../development/python-modules/monotonic { }; + + monty = callPackage ../development/python-modules/monty { }; + + more-itertools = if isPy27 then + callPackage ../development/python-modules/more-itertools/2.7.nix { } + else + callPackage ../development/python-modules/more-itertools { }; moretools = callPackage ../development/python-modules/moretools { }; - moto = callPackage ../development/python-modules/moto {}; + morphys = callPackage ../development/python-modules/morphys { }; + + mortgage = callPackage ../development/python-modules/mortgage { }; + + moto = callPackage ../development/python-modules/moto { }; + + moviepy = callPackage ../development/python-modules/moviepy { }; + + mox3 = callPackage ../development/python-modules/mox3 { }; mox = callPackage ../development/python-modules/mox { }; + mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { }; + + mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { }; + + mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { }; + + mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { }; + + mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { }; + + mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { }; + + moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { }; + + mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { }; + + mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { }; + + mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { }; + mozsvc = callPackage ../development/python-modules/mozsvc { }; - mpmath = callPackage ../development/python-modules/mpmath { }; + mozterm = callPackage ../development/python-modules/mozterm { }; - mpd = callPackage ../development/python-modules/mpd { }; + moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { }; + + mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { }; mpd2 = callPackage ../development/python-modules/mpd2 { }; + mpd = callPackage ../development/python-modules/mpd { }; + + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; + + mplleaflet = callPackage ../development/python-modules/mplleaflet { }; + + mpmath = callPackage ../development/python-modules/mpmath { }; + mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; }; - mrbob = callPackage ../development/python-modules/mrbob {}; + mpyq = callPackage ../development/python-modules/mpyq { }; - msgpack = callPackage ../development/python-modules/msgpack {}; + mrbob = callPackage ../development/python-modules/mrbob { }; - msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {}; + msal = callPackage ../development/python-modules/msal { }; + + msal-extensions = callPackage ../development/python-modules/msal-extensions { }; + + msgpack = callPackage ../development/python-modules/msgpack { }; + + msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; + + msrestazure = callPackage ../development/python-modules/msrestazure { }; + + msrest = callPackage ../development/python-modules/msrest { }; msrplib = callPackage ../development/python-modules/msrplib { }; + mt-940 = callPackage ../development/python-modules/mt-940 { }; + + multidict = callPackage ../development/python-modules/multidict { }; + + multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; + multipledispatch = callPackage ../development/python-modules/multipledispatch { }; multiprocess = callPackage ../development/python-modules/multiprocess { }; + multiset = callPackage ../development/python-modules/multiset { }; + + multitasking = callPackage ../development/python-modules/multitasking { }; + + munch = callPackage ../development/python-modules/munch { }; + munkres = callPackage ../development/python-modules/munkres { }; + murmurhash = callPackage ../development/python-modules/murmurhash { }; + musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; mutag = callPackage ../development/python-modules/mutag { }; mutagen = if isPy27 then - callPackage ../development/python-modules/mutagen/1.43.nix { } - else - callPackage ../development/python-modules/mutagen { }; + callPackage ../development/python-modules/mutagen/1.43.nix { } + else + callPackage ../development/python-modules/mutagen { }; + + mutatormath = callPackage ../development/python-modules/mutatormath { }; muttils = callPackage ../development/python-modules/muttils { }; - mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + mwclient = callPackage ../development/python-modules/mwclient { }; - mysqlclient = callPackage ../development/python-modules/mysqlclient { }; + mwlib = callPackage ../development/python-modules/mwlib { }; + + mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; + + mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; + + mwoauth = callPackage ../development/python-modules/mwoauth { }; + + mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; + + mxnet = callPackage ../development/python-modules/mxnet { }; + + myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; + + mygpoclient = callPackage ../development/python-modules/mygpoclient { }; mypy = callPackage ../development/python-modules/mypy { }; @@ -4920,44 +3878,12 @@ in { mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; - neuronpy = callPackage ../development/python-modules/neuronpy { }; - - persisting-theory = callPackage ../development/python-modules/persisting-theory { }; - - pint = callPackage ../development/python-modules/pint { }; - - pkutils = callPackage ../development/python-modules/pkutils { }; - - pygal = callPackage ../development/python-modules/pygal { }; - - pygogo = callPackage ../development/python-modules/pygogo { }; - - pytaglib = callPackage ../development/python-modules/pytaglib { }; - - pyte = callPackage ../development/python-modules/pyte { }; - - graphviz = callPackage ../development/python-modules/graphviz { - inherit (pkgs) graphviz; - }; - - pygraphviz = callPackage ../development/python-modules/pygraphviz { - inherit (pkgs) graphviz pkgconfig; # not the python package - }; - - pymc3 = callPackage ../development/python-modules/pymc3 { }; - - pympler = callPackage ../development/python-modules/pympler { }; - - pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; - - merkletools = callPackage ../development/python-modules/merkletools { }; - - monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; }); - - monotonic = callPackage ../development/python-modules/monotonic { }; + mysqlclient = callPackage ../development/python-modules/mysqlclient { }; mysql-connector = callPackage ../development/python-modules/mysql-connector { }; + nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; + namebench = callPackage ../development/python-modules/namebench { }; namedlist = callPackage ../development/python-modules/namedlist { }; @@ -4966,33 +3892,69 @@ in { names = callPackage ../development/python-modules/names { }; + nanoleaf = callPackage ../development/python-modules/nanoleaf { }; + + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + + nanotime = callPackage ../development/python-modules/nanotime { }; + + nassl = callPackage ../development/python-modules/nassl { }; + + natsort = callPackage ../development/python-modules/natsort { }; + + naturalsort = callPackage ../development/python-modules/naturalsort { }; + nbclient = callPackage ../development/python-modules/nbclient { }; nbconflux = callPackage ../development/python-modules/nbconflux { }; nbconvert = callPackage ../development/python-modules/nbconvert { }; + nbdime = callPackage ../development/python-modules/nbdime { }; + nbformat = if isPy3k then callPackage ../development/python-modules/nbformat { } - else callPackage ../development/python-modules/nbformat/2.nix { }; + else + callPackage ../development/python-modules/nbformat/2.nix { }; nbmerge = callPackage ../development/python-modules/nbmerge { }; - nbdime = callPackage ../development/python-modules/nbdime { }; + nbsmoke = callPackage ../development/python-modules/nbsmoke { }; + + nbsphinx = callPackage ../development/python-modules/nbsphinx { }; + + nbval = callPackage ../development/python-modules/nbval { }; nbxmpp = callPackage ../development/python-modules/nbxmpp { }; - sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; + ncclient = callPackage ../development/python-modules/ncclient { }; - slixmpp = callPackage ../development/python-modules/slixmpp { - inherit (pkgs) gnupg; - }; + ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; + + ndtypes = callPackage ../development/python-modules/ndtypes { }; + + neo = callPackage ../development/python-modules/neo { }; + + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; netaddr = callPackage ../development/python-modules/netaddr { }; + netcdf4 = callPackage ../development/python-modules/netcdf4 { }; + + netdisco = callPackage ../development/python-modules/netdisco { }; + netifaces = callPackage ../development/python-modules/netifaces { }; - hpack = callPackage ../development/python-modules/hpack { }; + networkx = if isPy3k then + callPackage ../development/python-modules/networkx { } + else + callPackage ../development/python-modules/networkx/2.2.nix { }; + + neuron-mpi = pkgs.neuron-mpi.override { inherit python; }; + + neuron = pkgs.neuron.override { inherit python; }; + + neuronpy = callPackage ../development/python-modules/neuronpy { }; nevow = callPackage ../development/python-modules/nevow { }; @@ -5002,561 +3964,949 @@ in { enablePython = true; })).python; - nibabel = callPackage ../development/python-modules/nibabel {}; + nibabel = callPackage ../development/python-modules/nibabel { }; nidaqmx = callPackage ../development/python-modules/nidaqmx { }; - nilearn = callPackage ../development/python-modules/nilearn {}; + Nikola = callPackage ../development/python-modules/Nikola { }; - nimfa = callPackage ../development/python-modules/nimfa {}; + nilearn = callPackage ../development/python-modules/nilearn { }; + + nimfa = callPackage ../development/python-modules/nimfa { }; + + nine = callPackage ../development/python-modules/nine { }; nipy = callPackage ../development/python-modules/nipy { }; - nipype = callPackage ../development/python-modules/nipype { - inherit (pkgs) which; - }; + nipype = callPackage ../development/python-modules/nipype { inherit (pkgs) which; }; nitime = callPackage ../development/python-modules/nitime { }; - nix-kernel = callPackage ../development/python-modules/nix-kernel { - inherit (pkgs) nix; - }; + nitpick = callPackage ../applications/version-management/nitpick { }; + + nix-kernel = callPackage ../development/python-modules/nix-kernel { inherit (pkgs) nix; }; + + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 + { }; # This is used for NixOps to make sure we won't break it with the next major version of nixpart. + + nixpart = callPackage ../tools/filesystems/nixpart { }; nixpkgs = callPackage ../development/python-modules/nixpkgs { }; nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; + nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; + + nltk = callPackage ../development/python-modules/nltk { }; + + nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; + + nmigen = callPackage ../development/python-modules/nmigen { }; + + nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; + node-semver = callPackage ../development/python-modules/node-semver { }; + + noise = callPackage ../development/python-modules/noise { }; + + nose2 = callPackage ../development/python-modules/nose2 { }; + nose = callPackage ../development/python-modules/nose { }; nose-cov = callPackage ../development/python-modules/nose-cov { }; + nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; + + nose-cprof = callPackage ../development/python-modules/nose-cprof { }; + nose-exclude = callPackage ../development/python-modules/nose-exclude { }; nose-focus = callPackage ../development/python-modules/nose-focus { }; - nose-randomly = callPackage ../development/python-modules/nose-randomly { }; - - nose2 = callPackage ../development/python-modules/nose2 { }; - - nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; - - nosexcover = callPackage ../development/python-modules/nosexcover { }; - nosejs = callPackage ../development/python-modules/nosejs { }; - nose-cprof = callPackage ../development/python-modules/nose-cprof { }; - nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; + nose_progressive = callPackage ../development/python-modules/nose_progressive { }; + + nose-randomly = callPackage ../development/python-modules/nose-randomly { }; + nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { }; - notebook = if isPy3k then callPackage ../development/python-modules/notebook { } - else callPackage ../development/python-modules/notebook/2.nix { }; + nosexcover = callPackage ../development/python-modules/nosexcover { }; + + notebook = if isPy3k then + callPackage ../development/python-modules/notebook { } + else + callPackage ../development/python-modules/notebook/2.nix { }; notedown = callPackage ../development/python-modules/notedown { }; + notify2 = callPackage ../development/python-modules/notify2 { }; + notify = callPackage ../development/python-modules/notify { }; - notify2 = callPackage ../development/python-modules/notify2 {}; + notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; - notmuch = callPackage ../development/python-modules/notmuch { - inherit (pkgs) notmuch; - }; + nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; - emoji = callPackage ../development/python-modules/emoji { }; + nplusone = callPackage ../development/python-modules/nplusone { }; + + ntc-templates = callPackage ../development/python-modules/ntc-templates { }; + + ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; ntplib = callPackage ../development/python-modules/ntplib { }; + Nuitka = callPackage ../development/python-modules/nuitka { }; + num2words = callPackage ../development/python-modules/num2words { }; numba = callPackage ../development/python-modules/numba { }; - numcodecs = callPackage ../development/python-modules/numcodecs { - inherit (pkgs) gcc8; - }; + numcodecs = callPackage ../development/python-modules/numcodecs { inherit (pkgs) gcc8; }; + + numericalunits = callPackage ../development/python-modules/numericalunits { }; numexpr = callPackage ../development/python-modules/numexpr { }; - Nuitka = callPackage ../development/python-modules/nuitka { }; - - numpy = - if pythonOlder "3.5" then - callPackage ../development/python-modules/numpy/1.16.nix { } - else - callPackage ../development/python-modules/numpy { }; - numpydoc = callPackage ../development/python-modules/numpydoc { }; + numpy = if pythonOlder "3.5" then + callPackage ../development/python-modules/numpy/1.16.nix { } + else + callPackage ../development/python-modules/numpy { }; + numpy-stl = callPackage ../development/python-modules/numpy-stl { }; numtraits = callPackage ../development/python-modules/numtraits { }; + nunavut = callPackage ../development/python-modules/nunavut { }; + + nvchecker = callPackage ../development/python-modules/nvchecker { }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; - dynd = callPackage ../development/python-modules/dynd { }; + nxt-python = callPackage ../development/python-modules/nxt-python { }; - langcodes = callPackage ../development/python-modules/langcodes { }; - - livestreamer = callPackage ../development/python-modules/livestreamer { }; - - livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; - - oauth = callPackage ../development/python-modules/oauth { }; + oath = callPackage ../development/python-modules/oath { }; oauth2 = callPackage ../development/python-modules/oauth2 { }; oauth2client = callPackage ../development/python-modules/oauth2client { }; + oauth = callPackage ../development/python-modules/oauth { }; + + oauthenticator = callPackage ../development/python-modules/oauthenticator { }; + oauthlib = if isPy27 then - callPackage ../development/python-modules/oauthlib/3.1.nix { } - else - callPackage ../development/python-modules/oauthlib { }; + callPackage ../development/python-modules/oauthlib/3.1.nix { } + else + callPackage ../development/python-modules/oauthlib { }; obfsproxy = callPackage ../development/python-modules/obfsproxy { }; - objgraph = callPackage ../development/python-modules/objgraph { - graphvizPkg = pkgs.graphviz; - }; + objgraph = callPackage ../development/python-modules/objgraph { graphvizPkg = pkgs.graphviz; }; + + od = callPackage ../development/python-modules/od { }; + + odfpy = callPackage ../development/python-modules/odfpy { }; offtrac = callPackage ../development/python-modules/offtrac { }; + ofxclient = callPackage ../development/python-modules/ofxclient { }; + + ofxhome = callPackage ../development/python-modules/ofxhome { }; + + ofxparse = callPackage ../development/python-modules/ofxparse { }; + + ofxtools = callPackage ../development/python-modules/ofxtools { }; + + olefile = callPackage ../development/python-modules/olefile { }; + + omegaconf = callPackage ../development/python-modules/omegaconf { }; + + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; + + onnx = callPackage ../development/python-modules/onnx { }; + + openant = callPackage ../development/python-modules/openant { }; + + openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + + opencv3 = toPythonModule (pkgs.opencv3.override { + enablePython = true; + pythonPackages = self; + }); + + opencv4 = toPythonModule (pkgs.opencv4.override { + enablePython = true; + pythonPackages = self; + }); + + opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { + enablePython = true; + pythonPackages = self; + })); + + openidc-client = callPackage ../development/python-modules/openidc-client { }; + openpyxl = if pythonAtLeast "3.6" then callPackage ../development/python-modules/openpyxl { } else callPackage ../development/python-modules/openpyxl/2.nix { }; + openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; + + openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; - ordereddict = callPackage ../development/python-modules/ordereddict { }; + opentracing = callPackage ../development/python-modules/opentracing { }; - od = callPackage ../development/python-modules/od { }; + openwebifpy = callPackage ../development/python-modules/openwebifpy { }; - omegaconf = callPackage ../development/python-modules/omegaconf { }; + openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + + opt-einsum = if isPy27 then + callPackage ../development/python-modules/opt-einsum/2.nix { } + else + callPackage ../development/python-modules/opt-einsum { }; + + optuna = callPackage ../development/python-modules/optuna { }; opuslib = callPackage ../development/python-modules/opuslib { }; + ordereddict = callPackage ../development/python-modules/ordereddict { }; + + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; + + ordered-set = callPackage ../development/python-modules/ordered-set { }; + orderedset = callPackage ../development/python-modules/orderedset { }; - python-multipart = callPackage ../development/python-modules/python-multipart { }; + orm = callPackage ../development/python-modules/orm { }; - python-otr = callPackage ../development/python-modules/python-otr { }; - - plone-testing = callPackage ../development/python-modules/plone-testing { }; - - ply = callPackage ../development/python-modules/ply { }; - - plyplus = callPackage ../development/python-modules/plyplus { }; - - plyvel = callPackage ../development/python-modules/plyvel { }; + ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python; osc = callPackage ../development/python-modules/osc { }; - rfc3986 = callPackage ../development/python-modules/rfc3986 { }; + oscrypto = callPackage ../development/python-modules/oscrypto { }; - cachetools = let - cachetools' = callPackage ../development/python-modules/cachetools {}; - cachetools_2 = cachetools'.overridePythonAttrs(oldAttrs: rec { - version = "3.1.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; - }; + oset = callPackage ../development/python-modules/oset { }; - }); - in if isPy3k then cachetools' else cachetools_2; + osmnx = callPackage ../development/python-modules/osmnx { }; - cma = callPackage ../development/python-modules/cma { }; + osmpythontools = callPackage ../development/python-modules/osmpythontools { }; - cmd2 = callPackage ../development/python-modules/cmd2 {}; + osqp = callPackage ../development/python-modules/osqp { }; - warlock = callPackage ../development/python-modules/warlock { }; + outcome = callPackage ../development/python-modules/outcome { }; - pecan = callPackage ../development/python-modules/pecan { }; + ovh = callPackage ../development/python-modules/ovh { }; - kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; + ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); - Kajiki = callPackage ../development/python-modules/kajiki { }; + owslib = callPackage ../development/python-modules/owslib { }; - WSME = callPackage ../development/python-modules/WSME { }; + oyaml = callPackage ../development/python-modules/oyaml { }; - zake = callPackage ../development/python-modules/zake { }; + packaging = callPackage ../development/python-modules/packaging { }; - zarr = callPackage ../development/python-modules/zarr { }; + packet-python = callPackage ../development/python-modules/packet-python { }; - kazoo = callPackage ../development/python-modules/kazoo { }; + pafy = callPackage ../development/python-modules/pafy { }; - FormEncode = callPackage ../development/python-modules/FormEncode { }; - - pycountry = callPackage ../development/python-modules/pycountry { }; - - nine = callPackage ../development/python-modules/nine { }; - - logutils = callPackage ../development/python-modules/logutils { }; - - ldappool = callPackage ../development/python-modules/ldappool { }; - - retrying = callPackage ../development/python-modules/retrying { }; - - fasteners = callPackage ../development/python-modules/fasteners { }; - - aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; - - aioeventlet = callPackage ../development/python-modules/aioeventlet { }; - - aiokafka = callPackage ../development/python-modules/aiokafka { }; - - olefile = callPackage ../development/python-modules/olefile { }; - - requests-mock = callPackage ../development/python-modules/requests-mock { }; - - mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; - - mox3 = callPackage ../development/python-modules/mox3 { }; - - doc8 = callPackage ../development/python-modules/doc8 { }; - - wrapt = callPackage ../development/python-modules/wrapt { }; + pagelabels = callPackage ../development/python-modules/pagelabels { }; pagerduty = callPackage ../development/python-modules/pagerduty { }; + paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + + palettable = callPackage ../development/python-modules/palettable { }; + + # Alias. Added 2020-09-07. + pam = self.python-pam; + + pamela = callPackage ../development/python-modules/pamela { }; + + pamqp = callPackage ../development/python-modules/pamqp { }; + pandas = if isPy3k then callPackage ../development/python-modules/pandas { } else callPackage ../development/python-modules/pandas/2.nix { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; + panel = callPackage ../development/python-modules/panel { }; - xlrd = callPackage ../development/python-modules/xlrd { }; + papermill = callPackage ../development/python-modules/papermill { }; - bottleneck = callPackage ../development/python-modules/bottleneck { }; + paperspace = callPackage ../development/python-modules/paperspace { }; - paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; - pagelabels = callPackage ../development/python-modules/pagelabels { }; + papis = callPackage ../development/python-modules/papis { }; - pamqp = callPackage ../development/python-modules/pamqp { }; - - parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; param = callPackage ../development/python-modules/param { }; - paramiko = callPackage ../development/python-modules/paramiko { }; - parameterized = callPackage ../development/python-modules/parameterized { }; + paramiko = callPackage ../development/python-modules/paramiko { }; + paramz = callPackage ../development/python-modules/paramz { }; parfive = callPackage ../development/python-modules/parfive { }; + parse = callPackage ../development/python-modules/parse { }; + + parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + parsel = callPackage ../development/python-modules/parsel { }; + parse-type = callPackage ../development/python-modules/parse-type { }; + + parsimonious = callPackage ../development/python-modules/parsimonious { }; + + parsley = callPackage ../development/python-modules/parsley { }; + parso = callPackage ../development/python-modules/parso { }; + parsy = callPackage ../development/python-modules/parsy { }; + partd = callPackage ../development/python-modules/partd { }; - patch = callPackage ../development/python-modules/patch { }; + parver = callPackage ../development/python-modules/parver { }; + arpeggio = callPackage ../development/python-modules/arpeggio { }; - patch-ng = callPackage ../development/python-modules/patch-ng { }; - - pathos = callPackage ../development/python-modules/pathos { }; - - patsy = callPackage ../development/python-modules/patsy { }; + passlib = callPackage ../development/python-modules/passlib { }; paste = callPackage ../development/python-modules/paste { }; PasteDeploy = callPackage ../development/python-modules/pastedeploy { }; + pastel = callPackage ../development/python-modules/pastel { }; + pasteScript = callPackage ../development/python-modules/pastescript { }; patator = callPackage ../development/python-modules/patator { }; + patch = callPackage ../development/python-modules/patch { }; + + patch-ng = callPackage ../development/python-modules/patch-ng { }; + + path-and-address = callPackage ../development/python-modules/path-and-address { }; + pathlib2 = callPackage ../development/python-modules/pathlib2 { }; + pathlib = callPackage ../development/python-modules/pathlib { }; + + pathos = callPackage ../development/python-modules/pathos { }; + pathpy = if isPy3k then callPackage ../development/python-modules/path.py { } else callPackage ../development/python-modules/path.py/2.nix { }; + pathspec = callPackage ../development/python-modules/pathspec { }; + + pathtools = callPackage ../development/python-modules/pathtools { }; + + patsy = callPackage ../development/python-modules/patsy { }; + + paver = callPackage ../development/python-modules/paver { }; + paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; + pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; + pbr = callPackage ../development/python-modules/pbr { }; - fixtures = callPackage ../development/python-modules/fixtures { }; + pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); - fipy = callPackage ../development/python-modules/fipy { }; + pcpp = callPackage ../development/python-modules/pcpp { }; - sfepy = callPackage ../development/python-modules/sfepy { }; + pdf2image = callPackage ../development/python-modules/pdf2image { }; - pelican = callPackage ../development/python-modules/pelican { - inherit (pkgs) glibcLocales git; - }; + pdfkit = callPackage ../development/python-modules/pdfkit { }; - pep8 = callPackage ../development/python-modules/pep8 { }; + pdfminer = callPackage ../development/python-modules/pdfminer_six { }; - pep8-naming = callPackage ../development/python-modules/pep8-naming { }; + pdfposter = callPackage ../development/python-modules/pdfposter { }; + + pdfrw = callPackage ../development/python-modules/pdfrw { }; + + pdftotext = callPackage ../development/python-modules/pdftotext { }; + + pdfx = callPackage ../development/python-modules/pdfx { }; + + pecan = callPackage ../development/python-modules/pecan { }; + + peewee = callPackage ../development/python-modules/peewee { }; + + pefile = callPackage ../development/python-modules/pefile { }; + + pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; + + pendulum = callPackage ../development/python-modules/pendulum { }; pep257 = callPackage ../development/python-modules/pep257 { }; pep517 = callPackage ../development/python-modules/pep517 { }; + pep8 = callPackage ../development/python-modules/pep8 { }; + + pep8-naming = callPackage ../development/python-modules/pep8-naming { }; + + peppercorn = callPackage ../development/python-modules/peppercorn { }; + percol = callPackage ../development/python-modules/percol { }; + perfplot = callPackage ../development/python-modules/perfplot { }; + + periodictable = callPackage ../development/python-modules/periodictable { }; + + persim = callPackage ../development/python-modules/persim { }; + + persistent = callPackage ../development/python-modules/persistent { }; + + persisting-theory = callPackage ../development/python-modules/persisting-theory { }; + + pex = callPackage ../development/python-modules/pex { }; + pexif = callPackage ../development/python-modules/pexif { }; pexpect = callPackage ../development/python-modules/pexpect { }; - pdfkit = callPackage ../development/python-modules/pdfkit { }; - - pdfrw = callPackage ../development/python-modules/pdfrw { }; - - periodictable = callPackage ../development/python-modules/periodictable { }; - - pgcli = callPackage ../development/tools/database/pgcli {}; - pg8000 = callPackage ../development/python-modules/pg8000 { }; pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; + pgcli = callPackage ../development/tools/database/pgcli { }; + pglast = callPackage ../development/python-modules/pglast { }; + pgpdump = callPackage ../development/python-modules/pgpdump { }; + + pgpy = callPackage ../development/python-modules/pgpy { }; + pgsanity = callPackage ../development/python-modules/pgsanity { }; pgspecial = callPackage ../development/python-modules/pgspecial { }; - pgpy = callPackage ../development/python-modules/pgpy { }; + phe = callPackage ../development/python-modules/phe { }; + + phik = callPackage ../development/python-modules/phik { }; + + phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + + phonopy = callPackage ../development/python-modules/phonopy { }; + + phpserialize = callPackage ../development/python-modules/phpserialize { }; + + piccata = callPackage ../development/python-modules/piccata { }; pickleshare = callPackage ../development/python-modules/pickleshare { }; picos = callPackage ../development/python-modules/picos { }; + pid = callPackage ../development/python-modules/pid { }; + piep = callPackage ../development/python-modules/piep { }; piexif = callPackage ../development/python-modules/piexif { }; - pip = callPackage ../development/python-modules/pip { }; - - pip-tools = callPackage ../development/python-modules/pip-tools { - git = pkgs.gitMinimal; - glibcLocales = pkgs.glibcLocales; - }; - - pipdate = callPackage ../development/python-modules/pipdate { }; - pika = callPackage ../development/python-modules/pika { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; pikepdf = callPackage ../development/python-modules/pikepdf { }; - kmapper = callPackage ../development/python-modules/kmapper { }; + pilkit = callPackage ../development/python-modules/pilkit { }; - kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { - inherit (pkgs.kmsxx) stdenv; - inherit (pkgs) pkgconfig; - withPython = true; - }).overrideAttrs (oldAttrs: { - name = "${python.libPrefix}-${pkgs.kmsxx.name}"; - })); - - precis-i18n = callPackage ../development/python-modules/precis-i18n { }; - - promise = callPackage ../development/python-modules/promise { }; - - prox-tv = callPackage ../development/python-modules/prox-tv { }; - - pvlib = callPackage ../development/python-modules/pvlib { }; - - pybase64 = callPackage ../development/python-modules/pybase64 { }; - - pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; - - pylibmc = callPackage ../development/python-modules/pylibmc {}; - - pymetar = callPackage ../development/python-modules/pymetar { }; - - pypubsub = callPackage ../development/python-modules/pypubsub { }; - - pysftp = callPackage ../development/python-modules/pysftp { }; - - soundfile = callPackage ../development/python-modules/soundfile { }; - - pysoundfile = self.soundfile; # Alias added 23-06-2019 - - python-jenkins = callPackage ../development/python-modules/python-jenkins { }; - - pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - - pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pillowfight = callPackage ../development/python-modules/pillowfight { }; pillow = if isPy27 then callPackage ../development/python-modules/pillow/6.nix { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; - } else + } + else callPackage ../development/python-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; + }; + + pims = callPackage ../development/python-modules/pims { }; + + pint = callPackage ../development/python-modules/pint { }; + + pip = callPackage ../development/python-modules/pip { }; + + pipdate = callPackage ../development/python-modules/pipdate { }; + + pip-tools = callPackage ../development/python-modules/pip-tools { + git = pkgs.gitMinimal; + glibcLocales = pkgs.glibcLocales; }; - pkgconfig = callPackage ../development/python-modules/pkgconfig { - inherit (pkgs) pkgconfig; + pipx = callPackage ../development/python-modules/pipx { }; + + pivy = callPackage ../development/python-modules/pivy { + inherit (pkgs.qt5) qtbase qmake; + inherit (pkgs.libsForQt5) soqt; }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; + + pkginfo = callPackage ../development/python-modules/pkginfo { }; + + pkuseg = callPackage ../development/python-modules/pkuseg { }; + + pkutils = callPackage ../development/python-modules/pkutils { }; + + plac = callPackage ../development/python-modules/plac { }; + + plaid-python = callPackage ../development/python-modules/plaid-python { }; + + plaster = callPackage ../development/python-modules/plaster { }; + + plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { }; + + playsound = callPackage ../development/python-modules/playsound { }; + + plexapi = callPackage ../development/python-modules/plexapi { }; + + plexauth = callPackage ../development/python-modules/plexauth { }; + + plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; + + plone-testing = callPackage ../development/python-modules/plone-testing { }; + + plotly = callPackage ../development/python-modules/plotly { }; + + pluggy = callPackage ../development/python-modules/pluggy { }; + + pluginbase = callPackage ../development/python-modules/pluginbase { }; + plumbum = callPackage ../development/python-modules/plumbum { }; - polib = callPackage ../development/python-modules/polib {}; + ply = callPackage ../development/python-modules/ply { }; + + plyfile = callPackage ../development/python-modules/plyfile { }; + + plyplus = callPackage ../development/python-modules/plyplus { }; + + plyvel = callPackage ../development/python-modules/plyvel { }; + + Pmw = callPackage ../development/python-modules/Pmw { }; + + pocket = callPackage ../development/python-modules/pocket { }; + + podcastparser = callPackage ../development/python-modules/podcastparser { }; + + podcats = callPackage ../development/python-modules/podcats { }; + + poetry = callPackage ../development/python-modules/poetry { }; + + poetry-core = callPackage ../development/python-modules/poetry-core { }; + + poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkgconfig; }; + + polib = callPackage ../development/python-modules/polib { }; + + polyline = callPackage ../development/python-modules/polyline { }; + + pomegranate = callPackage ../development/python-modules/pomegranate { }; + + pony = callPackage ../development/python-modules/pony { }; ponywhoosh = callPackage ../development/python-modules/ponywhoosh { }; - posix_ipc = callPackage ../development/python-modules/posix_ipc { }; + pooch = callPackage ../development/python-modules/pooch { }; + + poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { + inherit (pkgs.qt5) qtbase; + inherit (pkgs.libsForQt5) poppler; + inherit (pkgs) pkgconfig; + }; + + portalocker = callPackage ../development/python-modules/portalocker { }; portend = callPackage ../development/python-modules/portend { }; + portpicker = callPackage ../development/python-modules/portpicker { }; + + posix_ipc = callPackage ../development/python-modules/posix_ipc { }; + + poster3 = callPackage ../development/python-modules/poster3 { }; + + postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); + + potr = callPackage ../development/python-modules/potr { }; + + power = callPackage ../development/python-modules/power { }; + powerline = callPackage ../development/python-modules/powerline { }; pox = callPackage ../development/python-modules/pox { }; + poyo = callPackage ../development/python-modules/poyo { }; + ppft = callPackage ../development/python-modules/ppft { }; + pplpy = callPackage ../development/python-modules/pplpy { }; + + pprintpp = callPackage ../development/python-modules/pprintpp { }; + pproxy = callPackage ../development/python-modules/pproxy { }; pq = callPackage ../development/python-modules/pq { }; - praw = if isPy3k then callPackage ../development/python-modules/praw { } - else callPackage ../development/python-modules/praw/6.3.nix { }; - prance = callPackage ../development/python-modules/prance { }; prawcore = callPackage ../development/python-modules/prawcore { }; + praw = if isPy3k then + callPackage ../development/python-modules/praw { } + else + callPackage ../development/python-modules/praw/6.3.nix { }; + + precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + + pre-commit = callPackage ../development/python-modules/pre-commit { }; + + preggy = callPackage ../development/python-modules/preggy { }; + premailer = callPackage ../development/python-modules/premailer { }; + preshed = callPackage ../development/python-modules/preshed { }; + + pretend = callPackage ../development/python-modules/pretend { }; + prettytable = callPackage ../development/python-modules/prettytable { }; - property-manager = callPackage ../development/python-modules/property-manager { }; + priority = callPackage ../development/python-modules/priority { }; + + prison = callPackage ../development/python-modules/prison { }; + + privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + + proboscis = callPackage ../development/python-modules/proboscis { }; + + process-tests = callPackage ../development/python-modules/process-tests { }; + + proglog = callPackage ../development/python-modules/proglog { }; + + progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + + progressbar2 = callPackage ../development/python-modules/progressbar2 { }; + + progressbar33 = callPackage ../development/python-modules/progressbar33 { }; + + progressbar = callPackage ../development/python-modules/progressbar { }; + + progress = callPackage ../development/python-modules/progress { }; + + prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + + promise = callPackage ../development/python-modules/promise { }; prompt_toolkit = let - filename = if isPy3k then ../development/python-modules/prompt_toolkit else ../development/python-modules/prompt_toolkit/1.nix; + filename = if isPy3k then + ../development/python-modules/prompt_toolkit + else + ../development/python-modules/prompt_toolkit/1.nix; in callPackage filename { }; + property-manager = callPackage ../development/python-modules/property-manager { }; + + protego = callPackage ../development/python-modules/protego { }; + protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; - doCheck = !isPy3k; - # If a protobuf upgrade causes many Python packages to fail, please pin it - # here to the previous version. + doCheck = + !isPy3k; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. protobuf = pkgs.protobuf; }; + prov = callPackage ../development/python-modules/prov { }; + + prox-tv = callPackage ../development/python-modules/prox-tv { }; + + psautohint = callPackage ../development/python-modules/psautohint { }; + psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { }; - psycopg2 = callPackage ../development/python-modules/psycopg2 {}; - - ptpython = callPackage ../development/python-modules/ptpython { - prompt_toolkit = self.prompt_toolkit; - }; + psycopg2 = callPackage ../development/python-modules/psycopg2 { }; ptable = callPackage ../development/python-modules/ptable { }; - publicsuffix = callPackage ../development/python-modules/publicsuffix {}; + ptest = callPackage ../development/python-modules/ptest { }; - publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 {}; + ptpython = callPackage ../development/python-modules/ptpython { prompt_toolkit = self.prompt_toolkit; }; - py = callPackage ../development/python-modules/py { }; + ptyprocess = callPackage ../development/python-modules/ptyprocess { }; + + publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 { }; + + publicsuffix = callPackage ../development/python-modules/publicsuffix { }; + + pudb = callPackage ../development/python-modules/pudb { }; + + pulp = callPackage ../development/python-modules/pulp { }; + + pulsectl = callPackage ../development/python-modules/pulsectl { }; + + pure-eval = callPackage ../development/python-modules/pure-eval { }; + + pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + + purepng = callPackage ../development/python-modules/purepng { }; + + pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + + purl = callPackage ../development/python-modules/purl { }; + + pushbullet = callPackage ../development/python-modules/pushbullet { }; + + pushover-complete = callPackage ../development/python-modules/pushover-complete { }; + + pvlib = callPackage ../development/python-modules/pvlib { }; + + Pweave = callPackage ../development/python-modules/pweave { }; + + pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; + + pxml = callPackage ../development/python-modules/pxml { }; + + py2bit = callPackage ../development/python-modules/py2bit { }; + + py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); + + py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + + py3status = callPackage ../development/python-modules/py3status { }; + + py3to2 = callPackage ../development/python-modules/3to2 { }; + + py4j = callPackage ../development/python-modules/py4j { }; pyacoustid = callPackage ../development/python-modules/pyacoustid { }; + pyaes = callPackage ../development/python-modules/pyaes { }; + + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; + pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; + pyamf = callPackage ../development/python-modules/pyamf { }; + + pyamg = callPackage ../development/python-modules/pyamg { }; + + pyaml = callPackage ../development/python-modules/pyaml { }; + + pyannotate = callPackage ../development/python-modules/pyannotate { }; + + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; }; + pyasn1 = callPackage ../development/python-modules/pyasn1 { }; pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; pyatmo = callPackage ../development/python-modules/pyatmo { }; + pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkgconfig; }; + + pyatv = callPackage ../development/python-modules/pyatv { }; + pyaudio = callPackage ../development/python-modules/pyaudio { }; - pycoin = callPackage ../development/python-modules/pycoin { }; + pyavm = callPackage ../development/python-modules/pyavm { }; - pysam = callPackage ../development/python-modules/pysam { }; + pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; - pysaml2 = callPackage ../development/python-modules/pysaml2 { - inherit (pkgs) xmlsec; - }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; - python-pushover = callPackage ../development/python-modules/pushover {}; - - pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; - - mongodict = callPackage ../development/python-modules/mongodict { }; - - mongoengine = callPackage ../development/python-modules/mongoengine { }; - - repoze_who = callPackage ../development/python-modules/repoze_who { }; - - vobject = callPackage ../development/python-modules/vobject { }; - - pycarddav = callPackage ../development/python-modules/pycarddav { }; - - pygit2 = callPackage ../development/python-modules/pygit2 { }; - - Babel = callPackage ../development/python-modules/Babel { }; - - babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; - - batchspawner = callPackage ../development/python-modules/batchspawner { }; + pybids = callPackage ../development/python-modules/pybids { }; pybigwig = callPackage ../development/python-modules/pybigwig { }; - py2bit = callPackage ../development/python-modules/py2bit { }; + pybind11 = callPackage ../development/python-modules/pybind11 { }; + + pybindgen = callPackage ../development/python-modules/pybindgen { }; + + pyblake2 = callPackage ../development/python-modules/pyblake2 { }; pyblock = callPackage ../development/python-modules/pyblock { }; pyblosxom = callPackage ../development/python-modules/pyblosxom { }; + pybluez = callPackage ../development/python-modules/pybluez { }; + + pybotvac = callPackage ../development/python-modules/pybotvac { }; + + pybrowserid = callPackage ../development/python-modules/pybrowserid { }; + + pybtex = callPackage ../development/python-modules/pybtex { }; + + pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils { }; + + pybullet = callPackage ../development/python-modules/pybullet { }; + + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; }; + + pycallgraph = callPackage ../development/python-modules/pycallgraph { }; + + py = callPackage ../development/python-modules/py { }; + + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkgconfig; }); + pycapnp = callPackage ../development/python-modules/pycapnp { }; pycaption = callPackage ../development/python-modules/pycaption { }; + pycarddav = callPackage ../development/python-modules/pycarddav { }; + + pycares = callPackage ../development/python-modules/pycares { }; + + pycassa = callPackage ../development/python-modules/pycassa { }; + + pycategories = callPackage ../development/python-modules/pycategories { }; + pycdio = callPackage ../development/python-modules/pycdio { }; + pychart = callPackage ../development/python-modules/pychart { }; + + pychef = callPackage ../development/python-modules/pychef { }; + + PyChromecast = callPackage ../development/python-modules/pychromecast { }; + + pyclipper = callPackage ../development/python-modules/pyclipper { }; + + pycm = callPackage ../development/python-modules/pycm { }; + + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; + + pycognito = callPackage ../development/python-modules/pycognito { }; + + pycoin = callPackage ../development/python-modules/pycoin { }; + + pycollada = callPackage ../development/python-modules/pycollada { }; + + pycontracts = callPackage ../development/python-modules/pycontracts { }; + pycosat = callPackage ../development/python-modules/pycosat { }; + pycountry = callPackage ../development/python-modules/pycountry { }; + + pycparser = callPackage ../development/python-modules/pycparser { }; + + py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; + + pycrc = callPackage ../development/python-modules/pycrc { }; + + pycrypto = callPackage ../development/python-modules/pycrypto { }; + + pycryptodome = callPackage ../development/python-modules/pycryptodome { }; + + pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; + pycryptopp = callPackage ../development/python-modules/pycryptopp { }; pyct = callPackage ../development/python-modules/pyct { }; - pycups = callPackage ../development/python-modules/pycups { }; + pycuda = callPackage ../development/python-modules/pycuda { + cudatoolkit = pkgs.cudatoolkit; + inherit (pkgs.stdenv) mkDerivation; + }; - pycurl = callPackage ../development/python-modules/pycurl { }; + pycups = callPackage ../development/python-modules/pycups { }; pycurl2 = callPackage ../development/python-modules/pycurl2 { }; + pycurl = callPackage ../development/python-modules/pycurl { }; + + pydantic = callPackage ../development/python-modules/pydantic { }; + + pydbus = callPackage ../development/python-modules/pydbus { }; + + pydenticon = callPackage ../development/python-modules/pydenticon { }; + + pydicom = callPackage ../development/python-modules/pydicom { }; + pydispatcher = callPackage ../development/python-modules/pydispatcher { }; - pydot = callPackage ../development/python-modules/pydot { - inherit (pkgs) graphviz; - }; + pydns = let + py3 = callPackage ../development/python-modules/py3dns { }; + py2 = callPackage ../development/python-modules/pydns { }; + in if isPy3k then py3 else py2; + + pydocstyle = if isPy27 then + callPackage ../development/python-modules/pydocstyle/2.nix { } + else + callPackage ../development/python-modules/pydocstyle { }; + + pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; + + pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; pydot_ng = callPackage ../development/python-modules/pydot_ng { graphviz = pkgs.graphviz; }; + pydotplus = callPackage ../development/python-modules/pydotplus { }; + + pydrive = callPackage ../development/python-modules/pydrive { }; + + pydsdl = callPackage ../development/python-modules/pydsdl { }; + + pydub = callPackage ../development/python-modules/pydub { }; + + pydy = callPackage ../development/python-modules/pydy { }; + + pyechonest = callPackage ../development/python-modules/pyechonest { }; + pyelftools = callPackage ../development/python-modules/pyelftools { }; + pyemd = callPackage ../development/python-modules/pyemd { }; + pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; + pyepsg = callPackage ../development/python-modules/pyepsg { }; + + pyexcel = callPackage ../development/python-modules/pyexcel { }; + pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; + pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; + + pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { }; + + pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; + + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 { })); + pyext = callPackage ../development/python-modules/pyext { }; pyface = callPackage ../development/python-modules/pyface { }; + pyfaidx = callPackage ../development/python-modules/pyfaidx { }; + + pyfakefs = callPackage ../development/python-modules/pyfakefs { }; + pyfantom = callPackage ../development/python-modules/pyfantom { }; - pyfma = callPackage ../development/python-modules/pyfma { }; + pyfcm = callPackage ../development/python-modules/pyfcm { }; pyfftw = callPackage ../development/python-modules/pyfftw { }; @@ -5564,25 +4914,154 @@ in { pyflakes = callPackage ../development/python-modules/pyflakes { }; + pyfma = callPackage ../development/python-modules/pyfma { }; + + pyfribidi = callPackage ../development/python-modules/pyfribidi { }; + + pyfritzhome = callPackage ../development/python-modules/pyfritzhome { }; + + pyftdi = callPackage ../development/python-modules/pyftdi { }; + pyftgl = callPackage ../development/python-modules/pyftgl { }; - pygeoip = callPackage ../development/python-modules/pygeoip {}; + pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; - PyGithub = callPackage ../development/python-modules/pyGithub {}; + pyfttt = callPackage ../development/python-modules/pyfttt { }; - pyglet = callPackage ../development/python-modules/pyglet {}; + pyfxa = callPackage ../development/python-modules/pyfxa { }; + + pygal = callPackage ../development/python-modules/pygal { }; + + pygame = callPackage ../development/python-modules/pygame { }; + + pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; + + pygbm = callPackage ../development/python-modules/pygbm { }; + + pygccxml = callPackage ../development/python-modules/pygccxml { }; + + pygdbmi = callPackage ../development/python-modules/pygdbmi { }; + + pygeoip = callPackage ../development/python-modules/pygeoip { }; + + pygit2 = callPackage ../development/python-modules/pygit2 { }; + + PyGithub = callPackage ../development/python-modules/pyGithub { }; + + pyglet = callPackage ../development/python-modules/pyglet { }; + + pygls = callPackage ../development/python-modules/pygls { }; + + pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; pygments = if isPy3k then callPackage ../development/python-modules/Pygments { } else callPackage ../development/python-modules/Pygments/2_5.nix { }; + pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; + + pygmo = callPackage ../development/python-modules/pygmo { }; + + pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; + + pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }; + + pygogo = callPackage ../development/python-modules/pygogo { }; + pygpgme = callPackage ../development/python-modules/pygpgme { }; - pyment = callPackage ../development/python-modules/pyment { }; + pygraphviz = callPackage ../development/python-modules/pygraphviz { + inherit (pkgs) graphviz pkgconfig; + }; # not the python package - pylint = if isPy3k then callPackage ../development/python-modules/pylint { } - else callPackage ../development/python-modules/pylint/1.9.nix { }; + pygreat = callPackage ../development/python-modules/pygreat { }; + + pygrok = callPackage ../development/python-modules/pygrok { }; + + pygtail = callPackage ../development/python-modules/pygtail { }; + + pygtk = callPackage ../development/python-modules/pygtk { + inherit (pkgs) pkgconfig; + libglade = null; + }; + + pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; + + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; }; + + pyhamcrest = if isPy3k then + callPackage ../development/python-modules/pyhamcrest { } + else + callPackage ../development/python-modules/pyhamcrest/1.nix { }; + + pyhaversion = callPackage ../development/python-modules/pyhaversion { }; + + pyhcl = callPackage ../development/python-modules/pyhcl { }; + + pyhocon = callPackage ../development/python-modules/pyhocon { }; + + pyhomematic = callPackage ../development/python-modules/pyhomematic { }; + + pyhs100 = callPackage ../development/python-modules/pyhs100 { }; + + pyicloud = callPackage ../development/python-modules/pyicloud { }; + + PyICU = callPackage ../development/python-modules/pyicu { }; + + pyinotify = callPackage ../development/python-modules/pyinotify { }; + + pyinputevent = callPackage ../development/python-modules/pyinputevent { }; + + pyipp = callPackage ../development/python-modules/pyipp { }; + + pyjade = callPackage ../development/python-modules/pyjade { }; + + pyjet = callPackage ../development/python-modules/pyjet { }; + + pyjks = callPackage ../development/python-modules/pyjks { }; + + pyjson5 = callPackage ../development/python-modules/pyjson5 { }; + + pyjwkest = callPackage ../development/python-modules/pyjwkest { }; + + pyjwt = callPackage ../development/python-modules/pyjwt { }; + + pykdl = callPackage ../development/python-modules/pykdl { }; + + pykdtree = callPackage ../development/python-modules/pykdtree { inherit (pkgs.llvmPackages) openmp; }; + + pykeepass = callPackage ../development/python-modules/pykeepass { }; + + pykerberos = callPackage ../development/python-modules/pykerberos { }; + + pykickstart = callPackage ../development/python-modules/pykickstart { }; + + pykka = callPackage ../development/python-modules/pykka { }; + + pykwalify = callPackage ../development/python-modules/pykwalify { }; + + pylama = callPackage ../development/python-modules/pylama { }; + + pylast = callPackage ../development/python-modules/pylast { }; + + pylatexenc = callPackage ../development/python-modules/pylatexenc { }; + + PyLD = callPackage ../development/python-modules/PyLD { }; + + pylev = callPackage ../development/python-modules/pylev { }; + + pylibacl = callPackage ../development/python-modules/pylibacl { }; + + pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; + + pylibftdi = callPackage ../development/python-modules/pylibftdi { inherit (pkgs) libusb1; }; + + pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 + + pyliblo = callPackage ../development/python-modules/pyliblo { }; + + pylibmc = callPackage ../development/python-modules/pylibmc { }; pylint-celery = callPackage ../development/python-modules/pylint-celery { }; @@ -5590,237 +5069,855 @@ in { pylint-flask = callPackage ../development/python-modules/pylint-flask { }; + pylint = if isPy3k then + callPackage ../development/python-modules/pylint { } + else + callPackage ../development/python-modules/pylint/1.9.nix { }; + pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; - pymumble = callPackage ../development/python-modules/pymumble { }; + py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; - pyomo = callPackage ../development/python-modules/pyomo { }; + pylru = callPackage ../development/python-modules/pylru { }; - pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyls-black = callPackage ../development/python-modules/pyls-black { }; - pyosmium = callPackage ../development/python-modules/pyosmium { }; + pyls-isort = callPackage ../development/python-modules/pyls-isort { }; - pyotp = callPackage ../development/python-modules/pyotp { }; + pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; - pyproj = callPackage ../development/python-modules/pyproj { }; + PyLTI = callPackage ../development/python-modules/pylti { }; - pyqrcode = callPackage ../development/python-modules/pyqrcode { }; - - pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; - - pyrad = callPackage ../development/python-modules/pyrad { }; - - pyrr = callPackage ../development/python-modules/pyrr { }; - - pysha3 = callPackage ../development/python-modules/pysha3 { }; - - pyshp = callPackage ../development/python-modules/pyshp { }; - - pysnow = callPackage ../development/python-modules/pysnow { }; - - pysmbc = callPackage ../development/python-modules/pysmbc { - inherit (pkgs) pkgconfig; - }; - - pyspread = callPackage ../development/python-modules/pyspread { }; - - pysparse = callPackage ../development/python-modules/pysparse { }; - - pyupdate = callPackage ../development/python-modules/pyupdate {}; - - pyvmomi = callPackage ../development/python-modules/pyvmomi { }; - - pyx = callPackage ../development/python-modules/pyx { }; - - mmpython = callPackage ../development/python-modules/mmpython { }; - - kaa-base = callPackage ../development/python-modules/kaa-base { }; - - kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; - - PyICU = callPackage ../development/python-modules/pyicu { }; - - pyinputevent = callPackage ../development/python-modules/pyinputevent { }; - - pyinotify = callPackage ../development/python-modules/pyinotify { }; - - pyipp = callPackage ../development/python-modules/pyipp { }; - - pyjwt = callPackage ../development/python-modules/pyjwt { }; - - pykickstart = callPackage ../development/python-modules/pykickstart { }; - - pymemoize = callPackage ../development/python-modules/pymemoize { }; - - pyobjc = if stdenv.isDarwin - then callPackage ../development/python-modules/pyobjc {} - else throw "pyobjc can only be built on Mac OS"; - - pyodbc = callPackage ../development/python-modules/pyodbc { }; - - pyocr = callPackage ../development/python-modules/pyocr { }; - - pyparsing = callPackage ../development/python-modules/pyparsing { }; - - pyparted = callPackage ../development/python-modules/pyparted { }; - - pyptlib = callPackage ../development/python-modules/pyptlib { }; - - pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - - PyStemmer = callPackage ../development/python-modules/pystemmer {}; - - # Missing expression? - # Pyro = callPackage ../development/python-modules/pyro { }; - - pyrsistent = callPackage ../development/python-modules/pyrsistent { }; - - PyRSS2Gen = callPackage ../development/python-modules/pyrss2gen { }; - - pysmi = callPackage ../development/python-modules/pysmi { }; - - pysnmp = callPackage ../development/python-modules/pysnmp { }; - - pysocks = callPackage ../development/python-modules/pysocks { }; - - python_fedora = callPackage ../development/python-modules/python_fedora {}; - - python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; - python_simple_hipchat = self.python-simple-hipchat; - - scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; - - python_keyczar = callPackage ../development/python-modules/python_keyczar { }; - - python-language-server = callPackage ../development/python-modules/python-language-server {}; - - python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server {}; - - pyls-black = callPackage ../development/python-modules/pyls-black {}; - - pyls-isort = callPackage ../development/python-modules/pyls-isort {}; - - pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; - - pyu2f = callPackage ../development/python-modules/pyu2f { }; - - pyudev = callPackage ../development/python-modules/pyudev { - inherit (pkgs) systemd; - }; - - pynmea2 = callPackage ../development/python-modules/pynmea2 {}; - - pynrrd = callPackage ../development/python-modules/pynrrd { }; - - pynvml = callPackage ../development/python-modules/pynvml { }; - - pynzb = callPackage ../development/python-modules/pynzb { }; - - process-tests = callPackage ../development/python-modules/process-tests { }; - - progressbar = callPackage ../development/python-modules/progressbar {}; - - progressbar2 = callPackage ../development/python-modules/progressbar2 { }; - - progressbar231 = callPackage ../development/python-modules/progressbar231 { }; - - progressbar33 = callPackage ../development/python-modules/progressbar33 { }; - - protego = callPackage ../development/python-modules/protego {}; - - ldap = callPackage ../development/python-modules/ldap { - inherit (pkgs) openldap cyrus_sasl; - }; - - ldap3 = callPackage ../development/python-modules/ldap3 {}; - - ptest = callPackage ../development/python-modules/ptest { }; - - ptyprocess = callPackage ../development/python-modules/ptyprocess { }; - - pylibacl = callPackage ../development/python-modules/pylibacl { }; - - pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 - - pyliblo = callPackage ../development/python-modules/pyliblo { }; - - pypcap = callPackage ../development/python-modules/pypcap {}; - - pyplatec = callPackage ../development/python-modules/pyplatec { }; - - purepng = callPackage ../development/python-modules/purepng { }; - - pyhocon = callPackage ../development/python-modules/pyhocon { }; - - pyjson5 = callPackage ../development/python-modules/pyjson5 {}; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { }; pymaging_png = callPackage ../development/python-modules/pymaging_png { }; - pyPdf = callPackage ../development/python-modules/pypdf { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; - pypdf2 = callPackage ../development/python-modules/pypdf2 { }; + pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; + + pymavlink = callPackage ../development/python-modules/pymavlink { }; + + pymbolic = callPackage ../development/python-modules/pymbolic { }; + + pymc3 = callPackage ../development/python-modules/pymc3 { }; + + pymediainfo = callPackage ../development/python-modules/pymediainfo { }; + + pymeeus = callPackage ../development/python-modules/pymeeus { }; + + pymemoize = callPackage ../development/python-modules/pymemoize { }; + + pyment = callPackage ../development/python-modules/pyment { }; + + pymetar = callPackage ../development/python-modules/pymetar { }; + + pymetno = callPackage ../development/python-modules/pymetno { }; + + pymongo = callPackage ../development/python-modules/pymongo { }; + + pympler = callPackage ../development/python-modules/pympler { }; + + pymsgbox = callPackage ../development/python-modules/pymsgbox { }; + + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + + py-multibase = callPackage ../development/python-modules/py-multibase { }; + + py-multihash = callPackage ../development/python-modules/py-multihash { }; + + pymumble = callPackage ../development/python-modules/pymumble { }; + + pymupdf = callPackage ../development/python-modules/pymupdf { }; + + PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + + pymysql = callPackage ../development/python-modules/pymysql { }; + + pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; + + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; + + pynac = callPackage ../development/python-modules/pynac { }; + + pynacl = callPackage ../development/python-modules/pynacl { }; + + pynamecheap = callPackage ../development/python-modules/pynamecheap { }; + + pynamodb = callPackage ../development/python-modules/pynamodb { }; + + pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; + + pync = callPackage ../development/python-modules/pync { }; + + pynisher = callPackage ../development/python-modules/pynisher { }; + + pynmea2 = callPackage ../development/python-modules/pynmea2 { }; + + pynput = callPackage ../development/python-modules/pynput { }; + + pynrrd = callPackage ../development/python-modules/pynrrd { }; + + pynvim = callPackage ../development/python-modules/pynvim { }; + + pynvml = callPackage ../development/python-modules/pynvml { }; + + pynzb = callPackage ../development/python-modules/pynzb { }; + + pyobjc = if stdenv.isDarwin then + callPackage ../development/python-modules/pyobjc { } + else + throw "pyobjc can only be built on Mac OS"; + + pyocr = callPackage ../development/python-modules/pyocr { + tesseract = pkgs.tesseract_4; + }; + + pyodbc = callPackage ../development/python-modules/pyodbc { }; + + pyogg = callPackage ../development/python-modules/pyogg { }; + + pyomo = callPackage ../development/python-modules/pyomo { }; + + pyopencl = callPackage ../development/python-modules/pyopencl { }; pyopengl = callPackage ../development/python-modules/pyopengl { }; pyopenssl = callPackage ../development/python-modules/pyopenssl { }; - pyquery = callPackage ../development/python-modules/pyquery { }; + pyosmium = callPackage ../development/python-modules/pyosmium { }; - pyreport = callPackage ../development/python-modules/pyreport { }; + pyotp = callPackage ../development/python-modules/pyotp { }; - pyreadability = callPackage ../development/python-modules/pyreadability { }; + pyowm = callPackage ../development/python-modules/pyowm { }; - pyscss = callPackage ../development/python-modules/pyscss { }; + pypamtest = pkgs.libpam-wrapper.override { + enablePython = true; + inherit python; + }; - pyserial = callPackage ../development/python-modules/pyserial {}; + pypandoc = callPackage ../development/python-modules/pypandoc { }; - pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + pyparser = callPackage ../development/python-modules/pyparser { }; - pysonos = callPackage ../development/python-modules/pysonos {}; + pyparsing = callPackage ../development/python-modules/pyparsing { }; - pymongo = callPackage ../development/python-modules/pymongo {}; + pyparted = callPackage ../development/python-modules/pyparted { }; + + pypcap = callPackage ../development/python-modules/pypcap { }; + + pypdf2 = callPackage ../development/python-modules/pypdf2 { }; + + pyPdf = callPackage ../development/python-modules/pypdf { }; + + pypeg2 = callPackage ../development/python-modules/pypeg2 { }; pyperclip = callPackage ../development/python-modules/pyperclip { }; + pyperf = callPackage ../development/python-modules/pyperf { }; + + pyphen = callPackage ../development/python-modules/pyphen { }; + + pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; + + pypillowfight = callPackage ../development/python-modules/pypillowfight { }; + + pyplatec = callPackage ../development/python-modules/pyplatec { }; + + pypoppler = callPackage ../development/python-modules/pypoppler { }; + + pyprind = callPackage ../development/python-modules/pyprind { }; + + pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; + + pyproj = callPackage ../development/python-modules/pyproj { }; + + pyptlib = callPackage ../development/python-modules/pyptlib { }; + + pypubsub = callPackage ../development/python-modules/pypubsub { }; + + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; + + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; + + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + + pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + + /* + `pyqt5_with_qtwebkit` should not be used by python libraries in + pkgs/development/python-modules/*. Putting this attribute in + `propagatedBuildInputs` may cause collisions. + */ + pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; + + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + + pyquery = callPackage ../development/python-modules/pyquery { }; + + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; + + pyrad = callPackage ../development/python-modules/pyrad { }; + + py-radix = callPackage ../development/python-modules/py-radix { }; + + pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; + + pyramid = callPackage ../development/python-modules/pyramid { }; + + pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; + + pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; + + pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; + + pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; + + pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; + + pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; + + pyreadability = callPackage ../development/python-modules/pyreadability { }; + + pyrealsense2 = toPythonModule (pkgs.librealsense.override { + enablePython = true; + pythonPackages = self; + }); + + pyrealsense2WithCuda = toPythonModule (pkgs.librealsenseWithCuda.override { + enablePython = true; + pythonPackages = self; + }); + + pyrealsense2WithoutCuda = toPythonModule (pkgs.librealsenseWithoutCuda.override { + enablePython = true; + pythonPackages = self; + }); + + pyregion = callPackage ../development/python-modules/pyregion { }; + + pyreport = callPackage ../development/python-modules/pyreport { }; + + pyres = callPackage ../development/python-modules/pyres { }; + + pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; + + PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; + + Pyro4 = callPackage ../development/python-modules/pyro4 { }; + + Pyro5 = callPackage ../development/python-modules/pyro5 { }; + + pyroma = callPackage ../development/python-modules/pyroma { }; + + pyro-ppl = callPackage ../development/python-modules/pyro-ppl { }; + + pyroute2 = callPackage ../development/python-modules/pyroute2 { }; + + pyrr = callPackage ../development/python-modules/pyrr { }; + + pyrsistent = callPackage ../development/python-modules/pyrsistent { }; + + PyRSS2Gen = callPackage ../development/python-modules/pyrss2gen { }; + + pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; + + pysam = callPackage ../development/python-modules/pysam { }; + + pysaml2 = callPackage ../development/python-modules/pysaml2 { inherit (pkgs) xmlsec; }; + + pysc2 = callPackage ../development/python-modules/pysc2 { }; + + pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + + pyschedule = callPackage ../development/python-modules/pyschedule { }; + + pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; + + py_scrypt = callPackage ../development/python-modules/py_scrypt { }; + + pyscrypt = callPackage ../development/python-modules/pyscrypt { }; + + pyscss = callPackage ../development/python-modules/pyscss { }; + + pysdl2 = callPackage ../development/python-modules/pysdl2 { }; + + pysendfile = callPackage ../development/python-modules/pysendfile { }; + + pysensors = callPackage ../development/python-modules/pysensors { }; + + pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + + pyserial = callPackage ../development/python-modules/pyserial { }; + + pysftp = callPackage ../development/python-modules/pysftp { }; + + pysha3 = callPackage ../development/python-modules/pysha3 { }; + + pyshp = callPackage ../development/python-modules/pyshp { }; + + pyside2-tools = + toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); + + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; }); + + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; + + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { inherit (pkgs) libxml2 libxslt; }; + + pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + + pysigset = callPackage ../development/python-modules/pysigset { }; + + pysingleton = callPackage ../development/python-modules/pysingleton { }; + + pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; + + pysmb = callPackage ../development/python-modules/pysmb { }; + + pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkgconfig; }; + + pysmf = callPackage ../development/python-modules/pysmf { }; + + pysmi = callPackage ../development/python-modules/pysmi { }; + + pysnmp = callPackage ../development/python-modules/pysnmp { }; + + pysnooper = callPackage ../development/python-modules/pysnooper { }; + + pysnow = callPackage ../development/python-modules/pysnow { }; + + pysocks = callPackage ../development/python-modules/pysocks { }; + + pysolr = callPackage ../development/python-modules/pysolr { }; + + pysonos = callPackage ../development/python-modules/pysonos { }; + + pysoundfile = self.soundfile; # Alias added 23-06-2019 + + pyspark = callPackage ../development/python-modules/pyspark { }; + + pysparse = callPackage ../development/python-modules/pysparse { }; + + pyspf = callPackage ../development/python-modules/pyspf { }; + + pyspice = callPackage ../development/python-modules/pyspice { }; + + pyspinel = callPackage ../development/python-modules/pyspinel { }; + + pyspotify = callPackage ../development/python-modules/pyspotify { }; + + pyspread = callPackage ../development/python-modules/pyspread { }; + + pysptk = callPackage ../development/python-modules/pysptk { }; + pysqlite = callPackage ../development/python-modules/pysqlite { }; + pysqueezebox = callPackage ../development/python-modules/pysqueezebox { }; + + pysrim = callPackage ../development/python-modules/pysrim { }; + + pysrt = callPackage ../development/python-modules/pysrt { }; + + pyssim = callPackage ../development/python-modules/pyssim { }; + + pystache = callPackage ../development/python-modules/pystache { }; + + pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; + + PyStemmer = callPackage ../development/python-modules/pystemmer { }; + + pystray = callPackage ../development/python-modules/pystray { }; + + py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; + + pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pysvn = callPackage ../development/python-modules/pysvn { }; + pytabix = callPackage ../development/python-modules/pytabix { }; + + pytado = callPackage ../development/python-modules/pytado { }; + + pytaglib = callPackage ../development/python-modules/pytaglib { }; + + pyte = callPackage ../development/python-modules/pyte { }; + + pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; + + pytesseract = callPackage ../development/python-modules/pytesseract { }; + + # pytest>=6 is too new for most packages + pytest = if isPy3k then self.pytest_5 else self.pytest_4; + + pytest_4 = callPackage + ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest_5 = callPackage + ../development/python-modules/pytest/5.nix { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest_6 = + callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; + + pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; + + pytest-ansible = callPackage ../development/python-modules/pytest-ansible { }; + + pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; + + pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; + + pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; + + pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; + + pytest-bdd = callPackage ../development/python-modules/pytest-bdd { }; + + pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; + + pytest-black = callPackage ../development/python-modules/pytest-black { }; + + pytestcache = callPackage ../development/python-modules/pytestcache { }; + + pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; + + pytest-check = callPackage ../development/python-modules/pytest-check { }; + + pytest-click = callPackage ../development/python-modules/pytest-click { }; + + pytestcov = callPackage ../development/python-modules/pytest-cov { }; + + pytest-cram = callPackage ../development/python-modules/pytest-cram { }; + + pytest-datadir = callPackage ../development/python-modules/pytest-datadir { }; + + pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; + + pytest-dependency = callPackage ../development/python-modules/pytest-dependency { }; + + pytest-django = callPackage ../development/python-modules/pytest-django { }; + + pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; + + pytest-env = callPackage ../development/python-modules/pytest-env { }; + + pytest-expect = callPackage ../development/python-modules/pytest-expect { }; + + pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { }; + + pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; + + pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; + + pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; + + pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; + + pytest-flask = callPackage ../development/python-modules/pytest-flask { }; + + pytest-forked = callPackage ../development/python-modules/pytest-forked { }; + + pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; + + pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; + + pyopengl-accelerate = callPackage ../development/python-modules/pyopengl-accelerate { }; + + pytest-html = callPackage ../development/python-modules/pytest-html { }; + + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + + pytest-isort = callPackage ../development/python-modules/pytest-isort { }; + + pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; + + pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; + + pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; + + pytest-mock = if isPy3k then + callPackage ../development/python-modules/pytest-mock { } + else + callPackage ../development/python-modules/pytest-mock/2.nix { }; + + pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; + + pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; + + pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; + + pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; + + pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; + + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + + pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; + + pytest-qt = callPackage ../development/python-modules/pytest-qt { }; + + pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; + + pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; + + pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; + + pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; + + pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; + + pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; + + pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; + + pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; + + pytestrunner = callPackage ../development/python-modules/pytestrunner { }; + + pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; + + pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; + + pytest-services = callPackage ../development/python-modules/pytest-services { }; + + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; + + pytest-socket = callPackage ../development/python-modules/pytest-socket { }; + + pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; + + pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; + + pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; + + pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; + + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + + pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { }; + + pytest-trio = callPackage ../development/python-modules/pytest-trio { }; + + pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; + + pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; + + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; + + pytest-watch = callPackage ../development/python-modules/pytest-watch { }; + + pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; + + pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; + + pytest_xdist = self.pytest_xdist_1; + + pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; + + pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; + + python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; + + python3-openid = callPackage ../development/python-modules/python3-openid { }; + + python-axolotl = callPackage ../development/python-modules/python-axolotl { }; + + python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; + + python-baseconv = callPackage ../development/python-modules/python-baseconv { }; + + python-binance = callPackage ../development/python-modules/python-binance { }; + + python-constraint = callPackage ../development/python-modules/python-constraint { }; + + python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; + + python-daemon = callPackage ../development/python-modules/python-daemon { }; + + python-dateutil = callPackage ../development/python-modules/dateutil { }; + # Alias that we should deprecate + dateutil = self.python-dateutil; + + python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; + + pythondialog = callPackage ../development/python-modules/pythondialog { }; + + python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; + + python-docx = callPackage ../development/python-modules/python-docx { }; + + python-doi = callPackage ../development/python-modules/python-doi { }; + + python-dotenv = callPackage ../development/python-modules/python-dotenv { }; + + python-editor = callPackage ../development/python-modules/python-editor { }; + + pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkgconfig; }; + + python-engineio = callPackage ../development/python-modules/python-engineio { }; + + python-etcd = callPackage ../development/python-modules/python-etcd { }; + + python_fedora = callPackage ../development/python-modules/python_fedora { }; + + python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; + + python-forecastio = callPackage ../development/python-modules/python-forecastio { }; + + python-gitlab = callPackage ../development/python-modules/python-gitlab { }; + + python-gnupg = callPackage ../development/python-modules/python-gnupg { }; + + python-hosts = callPackage ../development/python-modules/python-hosts { }; + + python-igraph = callPackage ../development/python-modules/python-igraph { + pkgconfig = pkgs.pkgconfig; + igraph = pkgs.igraph; + }; + + pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; + + pythonix = callPackage ../development/python-modules/pythonix { inherit (pkgs) meson pkgconfig; }; + + python-jenkins = callPackage ../development/python-modules/python-jenkins { }; + + python-jose = callPackage ../development/python-modules/python-jose { }; + + python-json-logger = callPackage ../development/python-modules/python-json-logger { }; + + python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server { }; + + python_keyczar = callPackage ../development/python-modules/python_keyczar { }; + + python-language-server = callPackage ../development/python-modules/python-language-server { }; + + python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; + + python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; + + python-logstash = callPackage ../development/python-modules/python-logstash { }; + + python-ly = callPackage ../development/python-modules/python-ly { }; + + python-lz4 = callPackage ../development/python-modules/python-lz4 { }; + + python-lzf = callPackage ../development/python-modules/python-lzf { }; + + python-lzo = callPackage ../development/python-modules/python-lzo { inherit (pkgs) lzo; }; + + python_magic = callPackage ../development/python-modules/python-magic { }; + + pythonmagick = callPackage ../development/python-modules/pythonmagick { }; + + python-mapnik = callPackage ../development/python-modules/python-mapnik { }; + python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; python-miio = callPackage ../development/python-modules/python-miio { }; + python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; + + python-mnist = callPackage ../development/python-modules/python-mnist { }; + + python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; + + python-multipart = callPackage ../development/python-modules/python-multipart { }; + + pythonnet = callPackage + ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. + mono = pkgs.mono4; + inherit (pkgs) pkgconfig; + }; + + python-nomad = callPackage ../development/python-modules/python-nomad { }; + + python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + + pythonocc-core = + toPythonModule (callPackage ../development/python-modules/pythonocc-core { inherit (pkgs.xorg) libX11; }); + + python-olm = callPackage ../development/python-modules/python-olm { }; + + python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; }; + + python-otr = callPackage ../development/python-modules/python-otr { }; + + python-packer = callPackage ../development/python-modules/python-packer { }; + + python-pam = callPackage ../development/python-modules/python-pam { + inherit (pkgs) pam; + }; + + python-periphery = callPackage ../development/python-modules/python-periphery { }; + python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; + python-prctl = callPackage ../development/python-modules/python-prctl { }; + python-ptrace = callPackage ../development/python-modules/python-ptrace { }; + python-pushover = callPackage ../development/python-modules/pushover { }; + + python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; + + python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; + + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; + + python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { }; + python_simple_hipchat = self.python-simple-hipchat; + + python-slugify = callPackage ../development/python-modules/python-slugify { }; + + python-snap7 = callPackage ../development/python-modules/python-snap7 { + inherit (pkgs) snap7; + }; + + python-snappy = callPackage ../development/python-modules/python-snappy { inherit (pkgs) snappy; }; + + python-socketio = callPackage ../development/python-modules/python-socketio { }; + + python-sql = callPackage ../development/python-modules/python-sql { }; + + python_statsd = callPackage ../development/python-modules/python_statsd { }; + + python-stdnum = callPackage ../development/python-modules/python-stdnum { }; + + python-sybase = callPackage ../development/python-modules/sybase { }; + + python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; + + python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + + python-twitter = callPackage ../development/python-modules/python-twitter { }; + + python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; + + python-uinput = callPackage ../development/python-modules/python-uinput { }; + + python-unshare = callPackage ../development/python-modules/python-unshare { }; + + python-utils = callPackage ../development/python-modules/python-utils { }; + + python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + + python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; + + python-vlc = callPackage ../development/python-modules/python-vlc { }; + python-wifi = callPackage ../development/python-modules/python-wifi { }; - python-etcd = callPackage ../development/python-modules/python-etcd { }; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - pythonnet = callPackage ../development/python-modules/pythonnet { - # `mono >= 4.6` required to prevent crashes encountered with earlier versions. - mono = pkgs.mono4; - inherit (pkgs) pkgconfig; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; + + pytmx = callPackage ../development/python-modules/pytmx { }; + + pytoml = callPackage ../development/python-modules/pytoml { }; + + pytools = callPackage ../development/python-modules/pytools { }; + + pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; }; + + pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { + inherit (pkgs.linuxPackages) nvidia_x11; }; + pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; + + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + + pytorchWithCuda = self.pytorch.override { cudaSupport = true; }; + + pytorchWithoutCuda = self.pytorch.override { cudaSupport = false; }; + + pytrends = callPackage ../development/python-modules/pytrends { }; + + pytricia = callPackage ../development/python-modules/pytricia { }; + + pytun = callPackage ../development/python-modules/pytun { }; + pytz = callPackage ../development/python-modules/pytz { }; pytzdata = callPackage ../development/python-modules/pytzdata { }; + pyu2f = callPackage ../development/python-modules/pyu2f { }; + + pyuavcan = callPackage + ../development/python-modules/pyuavcan { # this version pinpoint to anold version is necessary due to a regression + nunavut = self.nunavut.overridePythonAttrs (old: rec { + version = "0.2.3"; + src = old.src.override { + inherit version; + sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; + }; + }); + }; + + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; }; + + pyunbound = callPackage ../tools/networking/unbound/python.nix { }; + + pyunifi = callPackage ../development/python-modules/pyunifi { }; + + pyupdate = callPackage ../development/python-modules/pyupdate { }; + + pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; + pyutil = callPackage ../development/python-modules/pyutil { }; pyutilib = callPackage ../development/python-modules/pyutilib { }; + pyuv = callPackage ../development/python-modules/pyuv { }; + + py-vapid = callPackage ../development/python-modules/py-vapid { }; + + pyvcd = callPackage ../development/python-modules/pyvcd { }; + + pyvcf = callPackage ../development/python-modules/pyvcf { }; + + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + + pyvmomi = callPackage ../development/python-modules/pyvmomi { }; + + pyvoro = callPackage ../development/python-modules/pyvoro { }; + pywal = callPackage ../development/python-modules/pywal { }; + pywatchman = callPackage ../development/python-modules/pywatchman { }; + + pywavelets = callPackage ../development/python-modules/pywavelets { }; + + # We need "normal" libxml2 and not the python package by the same name. + pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; + + pywebpush = callPackage ../development/python-modules/pywebpush { }; + + pywebview = callPackage ../development/python-modules/pywebview { }; + + pywick = callPackage ../development/python-modules/pywick { }; + pywinrm = callPackage ../development/python-modules/pywinrm { }; pyxattr = let pyxattr' = callPackage ../development/python-modules/pyxattr { }; - pyxattr_2 = pyxattr'.overridePythonAttrs(oldAttrs: rec { + pyxattr_2 = pyxattr'.overridePythonAttrs (oldAttrs: rec { version = "0.6.1"; src = oldAttrs.src.override { inherit version; @@ -5829,48 +5926,23 @@ in { }); in if isPy3k then pyxattr' else pyxattr_2; - pyamg = callPackage ../development/python-modules/pyamg { }; + pyx = callPackage ../development/python-modules/pyx { }; - pyaml = callPackage ../development/python-modules/pyaml { }; + pyxdg = callPackage ../development/python-modules/pyxdg { }; + + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; + + pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); + + pyxnat = callPackage ../development/python-modules/pyxnat { }; pyyaml = callPackage ../development/python-modules/pyyaml { }; - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; - rasterio = callPackage ../development/python-modules/rasterio { - gdal = pkgs.gdal_2; # gdal 3.0 not supported yet - }; + pyzufall = callPackage ../development/python-modules/pyzufall { }; - radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {}; - - recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; - - rbtools = callPackage ../development/python-modules/rbtools { }; - - rencode = callPackage ../development/python-modules/rencode { }; - - reportlab = callPackage ../development/python-modules/reportlab { }; - - requests = callPackage ../development/python-modules/requests { }; - - requests_download = callPackage ../development/python-modules/requests_download { }; - - requestsexceptions = callPackage ../development/python-modules/requestsexceptions {}; - - requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; - - requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; - - requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; - requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 - - retry_decorator = callPackage ../development/python-modules/retry_decorator { }; - - roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package - }; - - rfc6555 = callPackage ../development/python-modules/rfc6555 { }; + qasm2image = callPackage ../development/python-modules/qasm2image { }; qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; @@ -5878,19 +5950,27 @@ in { qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; - quamash = callPackage ../development/python-modules/quamash { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; - quandl = callPackage ../development/python-modules/quandl { }; - # alias for an older package which did not support Python 3 - Quandl = callPackage ../development/python-modules/quandl { }; + qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + qiskit = callPackage ../development/python-modules/qiskit { }; + + qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; + + qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; + + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; + + qpid-python = callPackage ../development/python-modules/qpid-python { }; + + qrcode = callPackage ../development/python-modules/qrcode { }; + + qreactor = callPackage ../development/python-modules/qreactor { }; qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { - pythonPackages = self; - }; + qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4; @@ -5902,80 +5982,182 @@ in { qtpy = callPackage ../development/python-modules/qtpy { }; - qreactor = callPackage ../development/python-modules/qreactor { }; + quamash = callPackage ../development/python-modules/quamash { }; + + quandl = callPackage ../development/python-modules/quandl { }; + + Quandl = + callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 quantities = callPackage ../development/python-modules/quantities { }; - qutip = callPackage ../development/python-modules/qutip { }; + querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + + queuelib = callPackage ../development/python-modules/queuelib { }; + + r2pipe = callPackage ../development/python-modules/r2pipe { }; + + rabbitpy = callPackage ../development/python-modules/rabbitpy { }; + + radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { }; + + radio_beam = callPackage ../development/python-modules/radio_beam { }; + + radish-bdd = callPackage ../development/python-modules/radish-bdd { }; + + rainbowstream = callPackage ../development/python-modules/rainbowstream { }; + + ramlfications = callPackage ../development/python-modules/ramlfications { }; + + random2 = callPackage ../development/python-modules/random2 { }; + + rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; + + rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet + + ratelimiter = callPackage ../development/python-modules/ratelimiter { }; + + raven = callPackage ../development/python-modules/raven { }; + + rawkit = callPackage ../development/python-modules/rawkit { }; + + rbtools = callPackage ../development/python-modules/rbtools { }; rcssmin = callPackage ../development/python-modules/rcssmin { }; + rdflib = callPackage ../development/python-modules/rdflib { }; + + rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; + + readchar = callPackage ../development/python-modules/readchar { }; + + readme = callPackage ../development/python-modules/readme { }; + + readme_renderer = callPackage ../development/python-modules/readme_renderer { }; + + readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; + + rebulk = callPackage ../development/python-modules/rebulk { }; + + recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; + recommonmark = callPackage ../development/python-modules/recommonmark { }; redis = callPackage ../development/python-modules/redis { }; rednose = callPackage ../development/python-modules/rednose { }; + regex = callPackage ../development/python-modules/regex { }; + + regional = callPackage ../development/python-modules/regional { }; + reikna = callPackage ../development/python-modules/reikna { }; + relatorio = callPackage ../development/python-modules/relatorio { }; + + remotecv = callPackage ../development/python-modules/remotecv { }; + + rencode = callPackage ../development/python-modules/rencode { }; + + repeated_test = callPackage ../development/python-modules/repeated_test { }; + repocheck = callPackage ../development/python-modules/repocheck { }; - restrictedpython = callPackage ../development/python-modules/restrictedpython { }; + reportlab = callPackage ../development/python-modules/reportlab { }; - restview = callPackage ../development/python-modules/restview { }; + repoze_lru = callPackage ../development/python-modules/repoze_lru { }; - readme = callPackage ../development/python-modules/readme { }; + repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; - readme_renderer = callPackage ../development/python-modules/readme_renderer { }; + repoze_who = callPackage ../development/python-modules/repoze_who { }; - readchar = callPackage ../development/python-modules/readchar { }; + reproject = callPackage ../development/python-modules/reproject { }; - retworkx = callPackage ../development/python-modules/retworkx { }; + requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; - rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { - python3 = python; - })); + requests-cache = callPackage ../development/python-modules/requests-cache { }; - ripser = callPackage ../development/python-modules/ripser { }; + requests = callPackage ../development/python-modules/requests { }; - rjsmin = callPackage ../development/python-modules/rjsmin { }; + requests_download = callPackage ../development/python-modules/requests_download { }; - pysolr = callPackage ../development/python-modules/pysolr { }; + requestsexceptions = callPackage ../development/python-modules/requestsexceptions { }; - geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { }; - - geographiclib = callPackage ../development/python-modules/geographiclib { }; - - geopy = if isPy3k - then callPackage ../development/python-modules/geopy { } - else callPackage ../development/python-modules/geopy/2.nix { }; - - django-haystack = callPackage ../development/python-modules/django-haystack { }; - - django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; - - rdflib = callPackage ../development/python-modules/rdflib { }; - - rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; - - isodate = callPackage ../development/python-modules/isodate { }; - - owslib = callPackage ../development/python-modules/owslib { }; - - readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; + requests-file = callPackage ../development/python-modules/requests-file { }; requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; + requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; + + requests-mock = callPackage ../development/python-modules/requests-mock { }; + + requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; + + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; + + requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; + + requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 + + requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; + requirements-detector = callPackage ../development/python-modules/requirements-detector { }; resampy = callPackage ../development/python-modules/resampy { }; + responses = callPackage ../development/python-modules/responses { }; + + restrictedpython = callPackage ../development/python-modules/restrictedpython { }; + restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + restview = callPackage ../development/python-modules/restview { }; + + rethinkdb = callPackage ../development/python-modules/rethinkdb { }; + retry = callPackage ../development/python-modules/retry { }; + retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + + retrying = callPackage ../development/python-modules/retrying { }; + + retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { })); + + rfc3986 = callPackage ../development/python-modules/rfc3986 { }; + + rfc3987 = callPackage ../development/python-modules/rfc3987 { }; + + rfc6555 = callPackage ../development/python-modules/rfc6555 { }; + + rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + + rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { }); + + rig = callPackage ../development/python-modules/rig { }; + + ripser = callPackage ../development/python-modules/ripser { }; + + rising = callPackage ../development/python-modules/rising { }; + + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { python3 = python; })); + + rjsmin = callPackage ../development/python-modules/rjsmin { }; + + rl-coach = callPackage ../development/python-modules/rl-coach { }; + + rlp = callPackage ../development/python-modules/rlp { }; + + rnc2rng = callPackage ../development/python-modules/rnc2rng { }; + robomachine = callPackage ../development/python-modules/robomachine { }; + roboschool = callPackage ../development/python-modules/roboschool { + inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package + inherit (pkgs.qt5) qtbase; + }; + + robot-detection = callPackage ../development/python-modules/robot-detection { }; + robotframework = callPackage ../development/python-modules/robotframework { }; robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { }; @@ -5984,10 +6166,10 @@ in { robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; - robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; - robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { }; + robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; + robotframework-sshlibrary = callPackage ../development/python-modules/robotframework-sshlibrary { }; robotframework-tools = callPackage ../development/python-modules/robotframework-tools { }; @@ -5996,511 +6178,51 @@ in { robotsuite = callPackage ../development/python-modules/robotsuite { }; - serpent = callPackage ../development/python-modules/serpent { }; + rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; - selectors34 = callPackage ../development/python-modules/selectors34 { }; + roku = callPackage ../development/python-modules/roku { }; - Pyro4 = callPackage ../development/python-modules/pyro4 { }; - - Pyro5 = callPackage ../development/python-modules/pyro5 { }; - - rnc2rng = callPackage ../development/python-modules/rnc2rng { }; + roman = callPackage ../development/python-modules/roman { }; rope = callPackage ../development/python-modules/rope { }; + ROPGadget = callPackage ../development/python-modules/ROPGadget { }; + ropper = callPackage ../development/python-modules/ropper { }; - rpkg = callPackage ../development/python-modules/rpkg {}; - - rply = callPackage ../development/python-modules/rply {}; - - rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override{ inherit python; })); - - rpmfluff = callPackage ../development/python-modules/rpmfluff {}; - - rpy2 = if isPy3k - then callPackage ../development/python-modules/rpy2 { } - else callPackage ../development/python-modules/rpy2/2.nix { }; - - rtslib = callPackage ../development/python-modules/rtslib {}; - - Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; - - typing = callPackage ../development/python-modules/typing { }; - - typing-extensions = callPackage ../development/python-modules/typing-extensions { }; - - typing-inspect = callPackage ../development/python-modules/typing-inspect { }; - - typeguard = callPackage ../development/python-modules/typeguard { }; - - typesentry = callPackage ../development/python-modules/typesentry { }; - - typesystem = callPackage ../development/python-modules/typesystem { }; - - s3transfer = callPackage ../development/python-modules/s3transfer { }; - - seqdiag = callPackage ../development/python-modules/seqdiag { }; - - sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { - pythonPackages = self; - pythonSupport = true; - })); - - safe = callPackage ../development/python-modules/safe { }; - - safety = callPackage ../development/python-modules/safety { }; - - sampledata = callPackage ../development/python-modules/sampledata { }; - - sasmodels = callPackage ../development/python-modules/sasmodels { }; - - scapy = callPackage ../development/python-modules/scapy { }; - - scipy = let - scipy_ = callPackage ../development/python-modules/scipy { }; - scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec { - version = "1.2.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; - }; - }); - in if pythonOlder "3.5" then scipy_1_2 else scipy_; - - scipy_1_3 = self.scipy.overridePythonAttrs(oldAttrs: rec { - version = "1.3.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; - }; - doCheck = false; - }); - - scikitimage = callPackage ../development/python-modules/scikit-image { }; - - scikitlearn = let - args = { inherit (pkgs) gfortran glibcLocales; }; - in - if isPy3k then callPackage ../development/python-modules/scikitlearn args - else callPackage ../development/python-modules/scikitlearn/0.20.nix args; - - scikit-bio = callPackage ../development/python-modules/scikit-bio { }; - - scikit-build = callPackage ../development/python-modules/scikit-build { }; - - scikits-odes = callPackage ../development/python-modules/scikits-odes { }; - - scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; - - scikit-tda = callPackage ../development/python-modules/scikit-tda { }; - - scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; - - scp = callPackage ../development/python-modules/scp {}; - - seaborn = if isPy3k then - callPackage ../development/python-modules/seaborn { } - else - callPackage ../development/python-modules/seaborn/0.9.1.nix { }; - - seabreeze = callPackage ../development/python-modules/seabreeze { }; - - selenium = callPackage ../development/python-modules/selenium { }; - - serpy = callPackage ../development/python-modules/serpy { }; - - setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; - - setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; - - serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; - - shippai = callPackage ../development/python-modules/shippai {}; - - shutilwhich = callPackage ../development/python-modules/shutilwhich { }; - - simanneal = callPackage ../development/python-modules/simanneal { }; - - simplegeneric = callPackage ../development/python-modules/simplegeneric { }; - - shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; - - shodan = callPackage ../development/python-modules/shodan { }; - - should-dsl = callPackage ../development/python-modules/should-dsl { }; - - showit = callPackage ../development/python-modules/showit { }; - - simplejson = callPackage ../development/python-modules/simplejson { }; - - simplekml = callPackage ../development/python-modules/simplekml { }; - - slimit = callPackage ../development/python-modules/slimit { }; - - snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { }; - - snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { }; - - snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; - - snitun = callPackage ../development/python-modules/snitun { }; - - snscrape = callPackage ../development/python-modules/snscrape { }; - - snug = callPackage ../development/python-modules/snug { }; - - snuggs = callPackage ../development/python-modules/snuggs { }; - - spake2 = callPackage ../development/python-modules/spake2 { }; - - sphfile = callPackage ../development/python-modules/sphfile { }; - - supervisor = callPackage ../development/python-modules/supervisor {}; - - subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - - spark_parser = callPackage ../development/python-modules/spark_parser { }; - - sphinx = if isPy3k then - callPackage ../development/python-modules/sphinx { } - else - callPackage ../development/python-modules/sphinx/2.nix { }; - - # Only exists for a Haskell package. - sphinx_1_7_9 = (callPackage ../development/python-modules/sphinx/2.nix { }) - .overridePythonAttrs (oldAttrs: rec { - version = "1.7.9"; - src = oldAttrs.src.override { - inherit version; - sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4"; - }; - }); - - sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; - - sphinxcontrib-websupport = if isPy3k then - callPackage ../development/python-modules/sphinxcontrib-websupport { } - else - callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; - - hieroglyph = callPackage ../development/python-modules/hieroglyph { }; - - hvplot = callPackage ../development/python-modules/hvplot { }; - - guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; - - sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; - - sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp {}; - - sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp {}; - - sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; - - sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp {}; - - sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath {}; - - sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; - - sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp {}; - - sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml {}; - - sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex {}; - - sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree {}; - - sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; - - splinter = callPackage ../development/python-modules/splinter { }; - - spotipy = callPackage ../development/python-modules/spotipy { }; - - sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; - - sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; - - sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; - - sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; - - sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; - - sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; - - sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - - staticjinja = callPackage ../development/python-modules/staticjinja { }; - - statsmodels = callPackage ../development/python-modules/statsmodels { }; - - strategies = callPackage ../development/python-modules/strategies { }; - - stravalib = callPackage ../development/python-modules/stravalib { }; - - streamz = callPackage ../development/python-modules/streamz { }; - - structlog = callPackage ../development/python-modules/structlog { }; - - stytra = callPackage ../development/python-modules/stytra { }; - - sybil = callPackage ../development/python-modules/sybil { }; - - # legacy alias - syncthing-gtk = pkgs.syncthing-gtk; - - systemd = callPackage ../development/python-modules/systemd { - inherit (pkgs) pkgconfig systemd; - }; - - sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; - - tabulate = callPackage ../development/python-modules/tabulate { }; - - tadasets = callPackage ../development/python-modules/tadasets { }; - - tasklib = callPackage ../development/python-modules/tasklib { }; - - tatsu = callPackage ../development/python-modules/tatsu { }; - - tbm-utils = callPackage ../development/python-modules/tbm-utils { }; - - tempita = callPackage ../development/python-modules/tempita { }; - - terminado = callPackage ../development/python-modules/terminado { }; - - tess = callPackage ../development/python-modules/tess { }; - - testresources = callPackage ../development/python-modules/testresources { }; - - testtools = callPackage ../development/python-modules/testtools { }; - - traitlets = callPackage ../development/python-modules/traitlets { }; - - traittypes = callPackage ../development/python-modules/traittypes { }; - - transitions = callPackage ../development/python-modules/transitions { }; - - extras = callPackage ../development/python-modules/extras { }; - - extension-helpers = callPackage ../development/python-modules/extension-helpers { }; - - texttable = callPackage ../development/python-modules/texttable { }; - - textwrap3 = callPackage ../development/python-modules/textwrap3 { }; - - tiledb = callPackage ../development/python-modules/tiledb { - inherit (pkgs) tiledb; - }; - - timezonefinder = callPackage ../development/python-modules/timezonefinder { }; - - tiros = callPackage ../development/python-modules/tiros { }; - - tinydb = callPackage ../development/python-modules/tinydb { }; - - tifffile = callPackage ../development/python-modules/tifffile { }; - - tmdb3 = callPackage ../development/python-modules/tmdb3 { }; - - toolz = callPackage ../development/python-modules/toolz { }; - - tox = callPackage ../development/python-modules/tox { }; - - tqdm = callPackage ../development/python-modules/tqdm { }; - - trytond = callPackage ../development/python-modules/trytond { }; - - smmap = callPackage ../development/python-modules/smmap { }; - - smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 - - transaction = callPackage ../development/python-modules/transaction { }; - - TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - - tweepy = callPackage ../development/python-modules/tweepy { }; - - twill = callPackage ../development/python-modules/twill { }; - - twine = callPackage ../development/python-modules/twine { }; - - twisted = callPackage ../development/python-modules/twisted { }; - - txtorcon = callPackage ../development/python-modules/txtorcon { }; - - txdbus = callPackage ../development/python-modules/txdbus { }; - - tzlocal = callPackage ../development/python-modules/tzlocal { }; - - u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; - - ua-parser = callPackage ../development/python-modules/ua-parser { }; - - uarray = callPackage ../development/python-modules/uarray { }; - - ueberzug = callPackage ../development/python-modules/ueberzug { - inherit (pkgs.xorg) libX11 libXext; - }; - - ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; - - umap-learn = callPackage ../development/python-modules/umap-learn { }; - - umemcache = callPackage ../development/python-modules/umemcache {}; - - uritools = callPackage ../development/python-modules/uritools { }; - - update_checker = callPackage ../development/python-modules/update_checker {}; - - update-copyright = callPackage ../development/python-modules/update-copyright {}; - - update-dotdee = callPackage ../development/python-modules/update-dotdee { }; - - uritemplate = callPackage ../development/python-modules/uritemplate { }; - - uproot = callPackage ../development/python-modules/uproot {}; - - uproot-methods = callPackage ../development/python-modules/uproot-methods { }; - - urlgrabber = callPackage ../development/python-modules/urlgrabber {}; - - urwid = callPackage ../development/python-modules/urwid {}; - - user-agents = callPackage ../development/python-modules/user-agents { }; - - variants = callPackage ../development/python-modules/variants { }; - - verboselogs = callPackage ../development/python-modules/verboselogs { }; - - vega_datasets = callPackage ../development/python-modules/vega_datasets { }; - - vertica-python = callPackage ../development/python-modules/vertica-python { }; - - virtkey = callPackage ../development/python-modules/virtkey { - inherit (pkgs) pkgconfig; - }; - - virtual-display = callPackage ../development/python-modules/virtual-display { }; - - virtualenv = callPackage ../development/python-modules/virtualenv { }; - - vispy = callPackage ../development/python-modules/vispy { }; - - vsts = callPackage ../development/python-modules/vsts { }; - - vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; - - python-vlc = callPackage ../development/python-modules/python-vlc { }; - - weasyprint = callPackage ../development/python-modules/weasyprint { }; - - webassets = callPackage ../development/python-modules/webassets { }; - - webcolors = callPackage ../development/python-modules/webcolors { }; - - webencodings = callPackage ../development/python-modules/webencodings { }; - - websockets = callPackage ../development/python-modules/websockets { }; - - Wand = callPackage ../development/python-modules/Wand { }; - - wcwidth = callPackage ../development/python-modules/wcwidth { }; - - werkzeug = callPackage ../development/python-modules/werkzeug { }; - - wheel = callPackage ../development/python-modules/wheel { }; - - widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; - - wordfreq = callPackage ../development/python-modules/wordfreq { }; - - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; - - magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; - - magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; - - wxPython = self.wxPython30; - - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { - wxGTK = pkgs.wxGTK30; - inherit (pkgs) pkgconfig; - }; - - wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs) pkgconfig; - wxGTK = pkgs.wxGTK30.override { withGtk2 = false; withWebKit = true; }; - }; - - xml2rfc = callPackage ../development/python-modules/xml2rfc { }; - - xmlschema = callPackage ../development/python-modules/xmlschema { }; - - xmltodict = callPackage ../development/python-modules/xmltodict { }; - - xarray = callPackage ../development/python-modules/xarray { }; - - xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; - - xapp = callPackage ../development/python-modules/xapp { - inherit (pkgs) gtk3 gobject-introspection polkit; - inherit (pkgs.cinnamon) xapps; - }; - - xlwt = callPackage ../development/python-modules/xlwt { }; - - xxhash = callPackage ../development/python-modules/xxhash { }; - - ydiff = callPackage ../development/python-modules/ydiff { }; - - yoda = toPythonModule (pkgs.yoda.override { - inherit python; - }); - - youtube-dl = callPackage ../tools/misc/youtube-dl {}; - - youtube-dl-light = callPackage ../tools/misc/youtube-dl { - ffmpegSupport = false; - phantomjsSupport = false; - }; - - zconfig = callPackage ../development/python-modules/zconfig { }; - - zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; - - zerorpc = callPackage ../development/python-modules/zerorpc { }; - - zimports = callPackage ../development/python-modules/zimports { }; - - zipstream = callPackage ../development/python-modules/zipstream { }; - - zodb = callPackage ../development/python-modules/zodb {}; - - zodbpickle = callPackage ../development/python-modules/zodbpickle {}; - - BTrees = callPackage ../development/python-modules/btrees {}; - - persistent = callPackage ../development/python-modules/persistent {}; - - persim = callPackage ../development/python-modules/persim { }; - - xdot = callPackage ../development/python-modules/xdot { }; - - zetup = callPackage ../development/python-modules/zetup { }; + rotate-backups = callPackage ../tools/backup/rotate-backups { }; routes = callPackage ../development/python-modules/routes { }; + rpdb = callPackage ../development/python-modules/rpdb { }; + + rpkg = callPackage ../development/python-modules/rpkg { }; + + rply = callPackage ../development/python-modules/rply { }; + + rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { inherit python; })); + + rpmfluff = callPackage ../development/python-modules/rpmfluff { }; + + rpy2 = if isPy3k then + callPackage ../development/python-modules/rpy2 { } + else + callPackage ../development/python-modules/rpy2/2.nix { }; + rpyc = callPackage ../development/python-modules/rpyc { }; + rq = callPackage ../development/python-modules/rq { }; + rsa = if isPy3k then callPackage ../development/python-modules/rsa { } else callPackage ../development/python-modules/rsa/4_0.nix { }; - squaremap = callPackage ../development/python-modules/squaremap { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; + + Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; + + rtslib = callPackage ../development/python-modules/rtslib { }; ruamel_base = callPackage ../development/python-modules/ruamel_base { }; @@ -6510,182 +6232,430 @@ in { ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { }; + rubymarshal = callPackage ../development/python-modules/rubymarshal { }; + ruffus = callPackage ../development/python-modules/ruffus { }; runsnakerun = callPackage ../development/python-modules/runsnakerun { }; - pysendfile = callPackage ../development/python-modules/pysendfile { }; + runway-python = callPackage ../development/python-modules/runway-python { }; - pyxl3 = callPackage ../development/python-modules/pyxl3 { }; + rx = callPackage ../development/python-modules/rx { }; - qpid-python = callPackage ../development/python-modules/qpid-python { }; + rxv = callPackage ../development/python-modules/rxv { }; - xattr = callPackage ../development/python-modules/xattr { }; + s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; + + s3fs = callPackage ../development/python-modules/s3fs { }; + + s3transfer = callPackage ../development/python-modules/s3transfer { }; + + sabyenc3 = callPackage ../development/python-modules/sabyenc3 { }; + + sabyenc = callPackage ../development/python-modules/sabyenc { }; + + sacremoses = callPackage ../development/python-modules/sacremoses { }; + + safe = callPackage ../development/python-modules/safe { }; + + safety = callPackage ../development/python-modules/safety { }; + + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + + sampledata = callPackage ../development/python-modules/sampledata { }; + + samplerate = callPackage ../development/python-modules/samplerate { }; + + samsungctl = callPackage ../development/python-modules/samsungctl { }; + + samsungtvws = callPackage ../development/python-modules/samsungtvws { }; + + sandboxlib = callPackage ../development/python-modules/sandboxlib { }; + + sanic-auth = callPackage ../development/python-modules/sanic-auth { }; + + sanic = callPackage ../development/python-modules/sanic { }; + + sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; + + sarge = callPackage ../development/python-modules/sarge { }; + + sasmodels = callPackage ../development/python-modules/sasmodels { }; + + scales = callPackage ../development/python-modules/scales { }; + + scandir = callPackage ../development/python-modules/scandir { }; + + scapy = callPackage ../development/python-modules/scapy { }; + + schedule = callPackage ../development/python-modules/schedule { }; + + schema = callPackage ../development/python-modules/schema { }; + + scikit-bio = callPackage ../development/python-modules/scikit-bio { }; + + scikit-build = callPackage ../development/python-modules/scikit-build { }; + + scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; + + scikitimage = callPackage ../development/python-modules/scikit-image { }; + + scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; }; + in if isPy3k then + callPackage ../development/python-modules/scikitlearn args + else + callPackage ../development/python-modules/scikitlearn/0.20.nix args; + + scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; + + scikits-odes = callPackage ../development/python-modules/scikits-odes { }; + + scikit-tda = callPackage ../development/python-modules/scikit-tda { }; + + scipy_1_3 = self.scipy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; + }; + doCheck = false; + disabled = !isPy3k; + }); + + scipy = let + scipy_ = callPackage ../development/python-modules/scipy { }; + scipy_1_2 = scipy_.overridePythonAttrs (oldAttrs: rec { + version = "1.2.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; + }; + }); + in if pythonOlder "3.5" then scipy_1_2 else scipy_; + + scour = callPackage ../development/python-modules/scour { }; + + scp = callPackage ../development/python-modules/scp { }; + + scrapy = callPackage ../development/python-modules/scrapy { }; + + scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; + + scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; + + scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; + + screeninfo = callPackage ../development/python-modules/screeninfo { }; scripttest = callPackage ../development/python-modules/scripttest { }; + scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; + + sdnotify = callPackage ../development/python-modules/sdnotify { }; + + seaborn = if isPy3k then + callPackage ../development/python-modules/seaborn { } + else + callPackage ../development/python-modules/seaborn/0.9.1.nix { }; + + seabreeze = callPackage ../development/python-modules/seabreeze { }; + + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; }; + + secretstorage = if isPy3k then + callPackage ../development/python-modules/secretstorage { } + else + callPackage ../development/python-modules/secretstorage/2.nix { }; + + secure = callPackage ../development/python-modules/secure { }; + + seekpath = callPackage ../development/python-modules/seekpath { }; + + segments = callPackage ../development/python-modules/segments { }; + + selectors2 = callPackage ../development/python-modules/selectors2 { }; + + selectors34 = callPackage ../development/python-modules/selectors34 { }; + + selenium = callPackage ../development/python-modules/selenium { }; + + semantic = callPackage ../development/python-modules/semantic { }; + + semantic-version = callPackage ../development/python-modules/semantic-version { }; + + semver = callPackage ../development/python-modules/semver { }; + + send2trash = callPackage ../development/python-modules/send2trash { }; + + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkgconfig; }; + + sentinel = callPackage ../development/python-modules/sentinel { }; + + sentry-sdk = callPackage ../development/python-modules/sentry-sdk { }; + + sepaxml = callPackage ../development/python-modules/sepaxml { }; + + seqdiag = callPackage ../development/python-modules/seqdiag { }; + + sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { + pythonPackages = self; + pythonSupport = true; + })); + + serpent = callPackage ../development/python-modules/serpent { }; + + serpy = callPackage ../development/python-modules/serpy { }; + + serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; + + serversyncstorage = callPackage ../development/python-modules/serversyncstorage { }; + + service-identity = callPackage ../development/python-modules/service_identity { }; + + setproctitle = callPackage ../development/python-modules/setproctitle { }; + setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; + setuptools-git = callPackage ../development/python-modules/setuptools-git { }; + + setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; + + setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + + setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; + setuptoolsTrial = callPackage ../development/python-modules/setuptoolstrial { }; - simplebayes = callPackage ../development/python-modules/simplebayes { }; + sexpdata = callPackage ../development/python-modules/sexpdata { }; - shortuuid = callPackage ../development/python-modules/shortuuid { }; + sfepy = callPackage ../development/python-modules/sfepy { }; - shouldbe = callPackage ../development/python-modules/shouldbe { }; - - simpleparse = callPackage ../development/python-modules/simpleparse { }; - - slob = callPackage ../development/python-modules/slob { }; - - slowaes = callPackage ../development/python-modules/slowaes { }; - - sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; - - sqlitedict = callPackage ../development/python-modules/sqlitedict { }; - - sqlobject = callPackage ../development/python-modules/sqlobject { }; - - sqlmap = callPackage ../development/python-modules/sqlmap { }; - - pgpdump = callPackage ../development/python-modules/pgpdump { }; - - spambayes = callPackage ../development/python-modules/spambayes { }; + shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; shapely = callPackage ../development/python-modules/shapely { }; sharedmem = callPackage ../development/python-modules/sharedmem { }; - soco = callPackage ../development/python-modules/soco { }; - - sopel = callPackage ../development/python-modules/sopel { }; - - sounddevice = callPackage ../development/python-modules/sounddevice { }; - - stevedore = callPackage ../development/python-modules/stevedore {}; - - svglib = callPackage ../development/python-modules/svglib { }; - - text-unidecode = callPackage ../development/python-modules/text-unidecode { }; - - Theano = callPackage ../development/python-modules/Theano rec { - cudaSupport = pkgs.config.cudaSupport or false; - cudnnSupport = cudaSupport; - inherit (pkgs.linuxPackages) nvidia_x11; - }; - - TheanoWithoutCuda = self.Theano.override { - cudaSupport = false; - cudnnSupport = false; - }; - - TheanoWithCuda = self.Theano.override { - cudaSupport = true; - cudnnSupport = true; - }; - - thespian = callPackage ../development/python-modules/thespian { }; - - tidylib = callPackage ../development/python-modules/pytidylib { }; - - tilestache = callPackage ../development/python-modules/tilestache { }; - - timelib = callPackage ../development/python-modules/timelib { }; - - timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; - - pid = callPackage ../development/python-modules/pid { }; - - pip2nix = callPackage ../development/python-modules/pip2nix { }; - - pychef = callPackage ../development/python-modules/pychef { }; - - pydns = - let - py3 = callPackage ../development/python-modules/py3dns { }; - - py2 = callPackage ../development/python-modules/pydns { }; - in if isPy3k then py3 else py2; - - python-daemon = callPackage ../development/python-modules/python-daemon { }; - - python-vagrant = callPackage ../development/python-modules/python-vagrant { }; - - symengine = callPackage ../development/python-modules/symengine { - symengine = pkgs.symengine; - }; - - sympy = if isPy3k then - callPackage ../development/python-modules/sympy { } - else - callPackage ../development/python-modules/sympy/1_5.nix { }; - - pilkit = callPackage ../development/python-modules/pilkit { }; - - clint = callPackage ../development/python-modules/clint { }; - - argh = callPackage ../development/python-modules/argh { }; - - nose_progressive = callPackage ../development/python-modules/nose_progressive { }; - - blessings = callPackage ../development/python-modules/blessings { }; - - secretstorage = if isPy3k - then callPackage ../development/python-modules/secretstorage { } - else callPackage ../development/python-modules/secretstorage/2.nix { }; - - secure = callPackage ../development/python-modules/secure { }; - - semantic = callPackage ../development/python-modules/semantic { }; - - sandboxlib = callPackage ../development/python-modules/sandboxlib { }; - - sanic = callPackage ../development/python-modules/sanic { }; - - scales = callPackage ../development/python-modules/scales { }; - - secp256k1 = callPackage ../development/python-modules/secp256k1 { - inherit (pkgs) secp256k1 pkgconfig; - }; - - semantic-version = callPackage ../development/python-modules/semantic-version { }; - - sexpdata = callPackage ../development/python-modules/sexpdata { }; - sh = callPackage ../development/python-modules/sh { }; + shellingham = callPackage ../development/python-modules/shellingham { }; + + shiboken2 = + toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; }); + + shippai = callPackage ../development/python-modules/shippai { }; + + shodan = callPackage ../development/python-modules/shodan { }; + + shortuuid = callPackage ../development/python-modules/shortuuid { }; + + shouldbe = callPackage ../development/python-modules/shouldbe { }; + + should-dsl = callPackage ../development/python-modules/should-dsl { }; + + showit = callPackage ../development/python-modules/showit { }; + + shutilwhich = callPackage ../development/python-modules/shutilwhich { }; + + sievelib = callPackage ../development/python-modules/sievelib { }; + + signedjson = callPackage ../development/python-modules/signedjson { }; + + sigtools = callPackage ../development/python-modules/sigtools { }; + + simanneal = callPackage ../development/python-modules/simanneal { }; + + simpleai = callPackage ../development/python-modules/simpleai { }; + + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; + + simplebayes = callPackage ../development/python-modules/simplebayes { }; + + simpleeval = callPackage ../development/python-modules/simpleeval { }; + + simplefix = callPackage ../development/python-modules/simplefix { }; + + simplegeneric = callPackage ../development/python-modules/simplegeneric { }; + + simplejson = callPackage ../development/python-modules/simplejson { }; + + simplekml = callPackage ../development/python-modules/simplekml { }; + + simpleparse = callPackage ../development/python-modules/simpleparse { }; + + simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; + + simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { }; + + simpy = callPackage ../development/python-modules/simpy { }; + + singledispatch = callPackage ../development/python-modules/singledispatch { }; + + sip = callPackage ../development/python-modules/sip { }; + sipsimple = callPackage ../development/python-modules/sipsimple { }; six = callPackage ../development/python-modules/six { }; + skein = callPackage ../development/python-modules/skein { + jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + + sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; + + skorch = callPackage ../development/python-modules/skorch { }; + + slackclient = callPackage ../development/python-modules/slackclient { }; + + sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; + + slicedimage = callPackage ../development/python-modules/slicedimage { }; + + slicerator = callPackage ../development/python-modules/slicerator { }; + + slimit = callPackage ../development/python-modules/slimit { }; + + slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; + + slixmpp = callPackage ../development/python-modules/slixmpp { inherit (pkgs) gnupg; }; + + slob = callPackage ../development/python-modules/slob { }; + + slowaes = callPackage ../development/python-modules/slowaes { }; + + sly = callPackage ../development/python-modules/sly { }; + smartdc = callPackage ../development/python-modules/smartdc { }; + smart_open = callPackage ../development/python-modules/smart_open { }; + + smartypants = callPackage ../development/python-modules/smartypants { }; + + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + + smmap = callPackage ../development/python-modules/smmap { }; + smpplib = callPackage ../development/python-modules/smpplib { }; - socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; + smugline = callPackage ../development/python-modules/smugline { }; + + smugpy = callPackage ../development/python-modules/smugpy { }; + + snakebite = callPackage ../development/python-modules/snakebite { }; + + snakeviz = callPackage ../development/python-modules/snakeviz { }; + + snapcast = callPackage ../development/python-modules/snapcast { }; + + snapperGUI = callPackage ../development/python-modules/snappergui { }; + + sniffio = callPackage ../development/python-modules/sniffio { }; + + snitun = callPackage ../development/python-modules/snitun { }; + + snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; + + snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { }; + + snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { }; + + snscrape = callPackage ../development/python-modules/snscrape { }; + + snug = callPackage ../development/python-modules/snug { }; + + snuggs = callPackage ../development/python-modules/snuggs { }; + + soapysdr = toPythonModule (pkgs.soapysdr.override { + python = self.python; + usePython = true; + }); + + soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { + python = self.python; + usePython = true; + }); sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; + + soco = callPackage ../development/python-modules/soco { }; + + softlayer = callPackage ../development/python-modules/softlayer { }; + + solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); + + somajo = callPackage ../development/python-modules/somajo { }; + + sopel = callPackage ../development/python-modules/sopel { }; + sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; + sortedcollections = callPackage ../development/python-modules/sortedcollections { }; + + sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; + + sounddevice = callPackage ../development/python-modules/sounddevice { }; + + soundfile = callPackage ../development/python-modules/soundfile { }; + soupsieve = if isPy3k then callPackage ../development/python-modules/soupsieve { } else callPackage ../development/python-modules/soupsieve/1.nix { }; - sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + spacy = callPackage ../development/python-modules/spacy { }; + + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + + spake2 = callPackage ../development/python-modules/spake2 { }; + + spambayes = callPackage ../development/python-modules/spambayes { }; + + spark_parser = callPackage ../development/python-modules/spark_parser { }; + + SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; + + sparse = callPackage ../development/python-modules/sparse { }; + + speaklater = callPackage ../development/python-modules/speaklater { }; + + spectral-cube = callPackage ../development/python-modules/spectral-cube { }; + + speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; + + spglib = callPackage ../development/python-modules/spglib { }; + + sphfile = callPackage ../development/python-modules/sphfile { }; + + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; + + sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex { }; sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; - sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; + sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { }; + + sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; + + sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp { }; sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; + sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath { }; + + sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; + sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; - sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { - inherit (pkgs) plantuml; - }; + sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; + + sphinxcontrib_plantuml = + callPackage ../development/python-modules/sphinxcontrib_plantuml { inherit (pkgs) plantuml; }; + + sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; + + sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { }; sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; @@ -6693,625 +6663,227 @@ in { texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; }; + sphinxcontrib-websupport = if isPy3k then + callPackage ../development/python-modules/sphinxcontrib-websupport { } + else + callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; + + sphinx = if isPy3k then + callPackage ../development/python-modules/sphinx { } + else + callPackage ../development/python-modules/sphinx/2.nix { }; + + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; + + sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { }; + sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; - Pweave = callPackage ../development/python-modules/pweave { }; + sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; + + spidev = callPackage ../development/python-modules/spidev { }; + + splinter = callPackage ../development/python-modules/splinter { }; + + spotipy = callPackage ../development/python-modules/spotipy { }; + + spyder = callPackage ../development/python-modules/spyder { }; + spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; + + spyder-kernels = callPackage ../development/python-modules/spyder-kernels { }; + spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix { }; + + sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; + + sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; + + sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; + + sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; SQLAlchemy-ImageAttach = callPackage ../development/python-modules/sqlalchemy-imageattach { }; + sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; + + sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + + sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; + + sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + + sqlmap = callPackage ../development/python-modules/sqlmap { }; + + sqlobject = callPackage ../development/python-modules/sqlobject { }; + sqlparse = callPackage ../development/python-modules/sqlparse { }; - python_statsd = callPackage ../development/python-modules/python_statsd { }; + sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - skein = callPackage ../development/python-modules/skein { }; + squaremap = callPackage ../development/python-modules/squaremap { }; + + srp = callPackage ../development/python-modules/srp { }; + + srptools = callPackage ../development/python-modules/srptools { }; + + srsly = callPackage ../development/python-modules/srsly { }; + + srvlookup = callPackage ../development/python-modules/srvlookup { }; + + ssdeep = callPackage ../development/python-modules/ssdeep { }; + + ssdp = callPackage ../development/python-modules/ssdp { }; + + sseclient = callPackage ../development/python-modules/sseclient { }; + + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; + + sshtunnel = callPackage ../development/python-modules/sshtunnel { }; + + sslib = callPackage ../development/python-modules/sslib { }; + + sslyze = callPackage ../development/python-modules/sslyze { }; + + starfish = callPackage ../development/python-modules/starfish { }; + + starlette = callPackage ../development/python-modules/starlette { }; + + staticjinja = callPackage ../development/python-modules/staticjinja { }; + + statistics = callPackage ../development/python-modules/statistics { }; + + statsd = callPackage ../development/python-modules/statsd { }; + + statsmodels = callPackage ../development/python-modules/statsmodels { }; + + stem = callPackage ../development/python-modules/stem { }; + + stevedore = callPackage ../development/python-modules/stevedore { }; + + stm32loader = callPackage ../development/python-modules/stm32loader { }; stompclient = callPackage ../development/python-modules/stompclient { }; + strategies = callPackage ../development/python-modules/strategies { }; + + stravalib = callPackage ../development/python-modules/stravalib { }; + + streamz = callPackage ../development/python-modules/streamz { }; + + strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; + + strictyaml = callPackage ../development/python-modules/strictyaml { }; + + stringcase = callPackage ../development/python-modules/stringcase { }; + + stripe = callPackage ../development/python-modules/stripe { }; + + structlog = callPackage ../development/python-modules/structlog { }; + + stumpy = callPackage ../development/python-modules/stumpy { }; + + stups-cli-support = callPackage ../development/python-modules/stups-cli-support { }; + + stups-fullstop = callPackage ../development/python-modules/stups-fullstop { }; + + stups-pierone = callPackage ../development/python-modules/stups-pierone { }; + + stups-tokens = callPackage ../development/python-modules/stups-tokens { }; + + stups-zign = callPackage ../development/python-modules/stups-zign { }; + + stytra = callPackage ../development/python-modules/stytra { }; + subdownloader = callPackage ../development/python-modules/subdownloader { }; - subunit = callPackage ../development/python-modules/subunit { - inherit (pkgs) subunit pkg-config cppunit check; - }; + subliminal = callPackage ../development/python-modules/subliminal { }; - sure = callPackage ../development/python-modules/sure { }; + subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - svgwrite = callPackage ../development/python-modules/svgwrite { }; - - swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; - - openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; - - freezegun = callPackage ../development/python-modules/freezegun { }; - - taskw = callPackage ../development/python-modules/taskw { }; - - telethon = callPackage ../development/python-modules/telethon { }; - - telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; - - terminaltables = callPackage ../development/python-modules/terminaltables { }; - - testpath = callPackage ../development/python-modules/testpath { }; - - testrepository = callPackage ../development/python-modules/testrepository { }; - - testscenarios = callPackage ../development/python-modules/testscenarios { }; - - python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; - - # Tkinter/tkinter is part of the Python standard library. - # The Python interpreters in Nixpkgs come without tkinter by default. - # To make the module available, we make it available as any other - # Python package. - tkinter = let - py = python.override{x11Support=true;}; - in callPackage ../development/python-modules/tkinter { py = py; }; - - tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; - - qrcode = callPackage ../development/python-modules/qrcode { }; - - traits = callPackage ../development/python-modules/traits { }; - - transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; - - eggdeps = callPackage ../development/python-modules/eggdeps { }; - - twiggy = callPackage ../development/python-modules/twiggy { }; - - twitter = callPackage ../development/python-modules/twitter { }; - - twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; - - twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; - - twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; - - twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; - - twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; - - twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; - - python-twitter = callPackage ../development/python-modules/python-twitter { }; - - umalqurra = callPackage ../development/python-modules/umalqurra { }; - - unicodecsv = callPackage ../development/python-modules/unicodecsv { }; - - unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; - - unidiff = callPackage ../development/python-modules/unidiff { }; - - units = callPackage ../development/python-modules/units { }; - - unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; - - unittest2 = callPackage ../development/python-modules/unittest2 { }; - - unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; - - untangle = callPackage ../development/python-modules/untangle { }; - - traceback2 = callPackage ../development/python-modules/traceback2 { }; - - trackpy = callPackage ../development/python-modules/trackpy { }; - - linecache2 = callPackage ../development/python-modules/linecache2 { }; - - upass = callPackage ../development/python-modules/upass { }; - - uptime = callPackage ../development/python-modules/uptime { }; - - urwidtrees = callPackage ../development/python-modules/urwidtrees { }; - - pyuv = callPackage ../development/python-modules/pyuv { }; - - virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; - - virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; - - vmprof = callPackage ../development/python-modules/vmprof { }; - - vultr = callPackage ../development/python-modules/vultr { }; - - vulture = callPackage ../development/python-modules/vulture { }; - - wadllib = callPackage ../development/python-modules/wadllib { }; - - waitress = callPackage ../development/python-modules/waitress { }; - - waitress-django = callPackage ../development/python-modules/waitress-django { }; - - web = callPackage ../development/python-modules/web { }; - - webob = callPackage ../development/python-modules/webob { }; - - websockify = callPackage ../development/python-modules/websockify { }; - - webtest = callPackage ../development/python-modules/webtest { }; - - wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; - - wsgitools = callPackage ../development/python-modules/wsgitools { }; - - wurlitzer = callPackage ../development/python-modules/wurlitzer { }; - - xcaplib = callPackage ../development/python-modules/xcaplib { }; - - xlib = callPackage ../development/python-modules/xlib { }; - - yappi = callPackage ../development/python-modules/yappi { }; - - zbase32 = callPackage ../development/python-modules/zbase32 { }; - - zdaemon = callPackage ../development/python-modules/zdaemon { }; - - zfec = callPackage ../development/python-modules/zfec { }; - - zha-quirks = callPackage ../development/python-modules/zha-quirks { }; - - zipp = if pythonOlder "3.6" then - callPackage ../development/python-modules/zipp/1.nix { } - else - callPackage ../development/python-modules/zipp { }; - - zope_broken = callPackage ../development/python-modules/zope_broken { }; - - zope_component = callPackage ../development/python-modules/zope_component { }; - - zope_configuration = callPackage ../development/python-modules/zope_configuration { }; - - zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; - - zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { }; - - zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; - - zope_event = callPackage ../development/python-modules/zope_event { }; - - zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; - - zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; - - zope-hookable = callPackage ../development/python-modules/zope-hookable { }; - - zope_i18n = callPackage ../development/python-modules/zope_i18n { }; - - zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; - - zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; - - zope_location = callPackage ../development/python-modules/zope_location { }; - - zope_proxy = callPackage ../development/python-modules/zope_proxy { }; - - zope_schema = callPackage ../development/python-modules/zope_schema { }; - - zope_size = callPackage ../development/python-modules/zope_size { }; - - zope_testing = callPackage ../development/python-modules/zope_testing { }; - - zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; - - zope_interface = callPackage ../development/python-modules/zope_interface { }; - - hgsvn = callPackage ../development/python-modules/hgsvn { }; - - cliapp = callPackage ../development/python-modules/cliapp { }; - - cmdtest = callPackage ../development/python-modules/cmdtest { }; - - tornado = if isPy3k then - callPackage ../development/python-modules/tornado { } - else - callPackage ../development/python-modules/tornado/5.nix { }; - - tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - - tokenlib = callPackage ../development/python-modules/tokenlib { }; - - tunigo = callPackage ../development/python-modules/tunigo { }; - - tarman = callPackage ../development/python-modules/tarman { }; - - libarchive = self.python-libarchive; # The latter is the name upstream uses - - python-libarchive = callPackage ../development/python-modules/python-libarchive { }; - - python-logstash = callPackage ../development/python-modules/python-logstash { }; - - libarchive-c = callPackage ../development/python-modules/libarchive-c { - inherit (pkgs) libarchive; - }; - - libasyncns = callPackage ../development/python-modules/libasyncns { - inherit (pkgs) libasyncns pkgconfig; - }; - - pybrowserid = callPackage ../development/python-modules/pybrowserid { }; - - pyzmq = callPackage ../development/python-modules/pyzmq { }; - - testfixtures = callPackage ../development/python-modules/testfixtures {}; - - tissue = callPackage ../development/python-modules/tissue { }; - - titlecase = callPackage ../development/python-modules/titlecase { }; - - tracing = callPackage ../development/python-modules/tracing { }; - - traitsui = callPackage ../development/python-modules/traitsui { }; - - translationstring = callPackage ../development/python-modules/translationstring { }; - - ttystatus = callPackage ../development/python-modules/ttystatus { }; - - larch = callPackage ../development/python-modules/larch { }; - - websocket_client = callPackage ../development/python-modules/websocket_client { }; - - webhelpers = callPackage ../development/python-modules/webhelpers { }; - - whichcraft = callPackage ../development/python-modules/whichcraft { }; - - whisper = callPackage ../development/python-modules/whisper { }; - - worldengine = callPackage ../development/python-modules/worldengine { }; - - carbon = callPackage ../development/python-modules/carbon { }; - - ujson = callPackage ../development/python-modules/ujson { }; - - unidecode = callPackage ../development/python-modules/unidecode {}; - - pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; - - BlinkStick = callPackage ../development/python-modules/blinkstick { }; - - usbtmc = callPackage ../development/python-modules/usbtmc {}; - - txgithub = callPackage ../development/python-modules/txgithub { }; - - txrequests = callPackage ../development/python-modules/txrequests { }; - - txamqp = callPackage ../development/python-modules/txamqp { }; - - versiontools = callPackage ../development/python-modules/versiontools { }; - - veryprettytable = callPackage ../development/python-modules/veryprettytable { }; - - graphite-web = callPackage ../development/python-modules/graphite-web { }; - - graphite_api = callPackage ../development/python-modules/graphite-api { }; - - graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; - - graph_nets = callPackage ../development/python-modules/graph_nets { }; - - graspy = callPackage ../development/python-modules/graspy { }; - - influxgraph = callPackage ../development/python-modules/influxgraph { }; - - pyspotify = callPackage ../development/python-modules/pyspotify { }; - - pykka = callPackage ../development/python-modules/pykka { }; - - ws4py = callPackage ../development/python-modules/ws4py {}; - - gdata = callPackage ../development/python-modules/gdata { }; - - IMAPClient = callPackage ../development/python-modules/imapclient { }; - - Logbook = callPackage ../development/python-modules/Logbook { }; - - libversion = callPackage ../development/python-modules/libversion { - inherit (pkgs) libversion pkgconfig; - }; - - libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt { - inherit (pkgs) libvirt pkgconfig; - }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { - inherit (pkgs) pkgconfig; - libvirt = pkgs.libvirt_5_9_0; - }); - - rpdb = callPackage ../development/python-modules/rpdb { }; - - grequests = callPackage ../development/python-modules/grequests { }; - - first = callPackage ../development/python-modules/first {}; - - flaskbabel = callPackage ../development/python-modules/flaskbabel { }; - - speaklater = callPackage ../development/python-modules/speaklater { }; - - speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; - - pushbullet = callPackage ../development/python-modules/pushbullet { }; - - power = callPackage ../development/python-modules/power { }; - - pythonefl = callPackage ../development/python-modules/python-efl { - inherit (pkgs) pkgconfig; - }; - - tlsh = callPackage ../development/python-modules/tlsh { }; - - toposort = callPackage ../development/python-modules/toposort { }; - - snakebite = callPackage ../development/python-modules/snakebite { }; - - snapperGUI = callPackage ../development/python-modules/snappergui { }; - - dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; - - uncertainties = callPackage ../development/python-modules/uncertainties { }; - - funcy = callPackage ../development/python-modules/funcy { }; - - vxi11 = callPackage ../development/python-modules/vxi11 { }; - - svg2tikz = callPackage ../development/python-modules/svg2tikz { }; - - WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; - - blist = callPackage ../development/python-modules/blist { }; - - canonicaljson = callPackage ../development/python-modules/canonicaljson { }; - - daemonize = callPackage ../development/python-modules/daemonize { }; - - pydenticon = callPackage ../development/python-modules/pydenticon { }; - - pynac = callPackage ../development/python-modules/pynac { }; - - pybindgen = callPackage ../development/python-modules/pybindgen {}; - - pygccxml = callPackage ../development/python-modules/pygccxml {}; - - pymacaroons = callPackage ../development/python-modules/pymacaroons { }; - - pynacl = callPackage ../development/python-modules/pynacl { }; - - service-identity = callPackage ../development/python-modules/service_identity { }; - - signedjson = callPackage ../development/python-modules/signedjson { }; - - unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; - - thumbor = callPackage ../development/python-modules/thumbor { }; - - thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - - pync = callPackage ../development/python-modules/pync { }; - - weboob = callPackage ../development/python-modules/weboob { }; - - datadiff = callPackage ../development/python-modules/datadiff { }; - - termcolor = callPackage ../development/python-modules/termcolor { }; - - html2text = if isPy3k then callPackage ../development/python-modules/html2text { } - else callPackage ../development/python-modules/html2text/2018.nix { }; - - pychart = callPackage ../development/python-modules/pychart {}; - - parsimonious = callPackage ../development/python-modules/parsimonious { }; - - networkx = if isPy3k then callPackage ../development/python-modules/networkx { } - else - callPackage ../development/python-modules/networkx/2.2.nix { }; - - ofxclient = callPackage ../development/python-modules/ofxclient {}; - - ofxhome = callPackage ../development/python-modules/ofxhome { }; - - ofxparse = callPackage ../development/python-modules/ofxparse { }; - - ofxtools = callPackage ../development/python-modules/ofxtools { }; - - orm = callPackage ../development/python-modules/orm { }; - - basemap = callPackage ../development/python-modules/basemap { }; - - dict2xml = callPackage ../development/python-modules/dict2xml { }; - - dicttoxml = callPackage ../development/python-modules/dicttoxml { }; - - markdown2 = callPackage ../development/python-modules/markdown2 { }; - - evernote = callPackage ../development/python-modules/evernote { }; - - setproctitle = callPackage ../development/python-modules/setproctitle { }; - - thrift = callPackage ../development/python-modules/thrift { }; - - geeknote = callPackage ../development/python-modules/geeknote { }; - - trollius = callPackage ../development/python-modules/trollius {}; - - pynvim = callPackage ../development/python-modules/pynvim {}; - - typogrify = callPackage ../development/python-modules/typogrify { }; - - smartypants = callPackage ../development/python-modules/smartypants { }; - - pypeg2 = callPackage ../development/python-modules/pypeg2 { }; - - torchvision = callPackage ../development/python-modules/torchvision { }; - - torchgpipe = callPackage ../development/python-modules/torchgpipe { }; - - jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; - - jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; - - dot2tex = callPackage ../development/python-modules/dot2tex { - inherit (pkgs) graphviz; - }; - - poezio = callPackage ../applications/networking/instant-messengers/poezio { - inherit (pkgs) pkgconfig; - }; - - potr = callPackage ../development/python-modules/potr {}; - - pyregion = callPackage ../development/python-modules/pyregion {}; - - python-nomad = callPackage ../development/python-modules/python-nomad { }; - - python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; - - python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - - pluggy = callPackage ../development/python-modules/pluggy {}; - - xcffib = callPackage ../development/python-modules/xcffib {}; - - xpybutil = callPackage ../development/python-modules/xpybutil {}; - - pafy = callPackage ../development/python-modules/pafy { }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit pkg-config cppunit check; }; suds = callPackage ../development/python-modules/suds { }; suds-jurko = callPackage ../development/python-modules/suds-jurko { }; - mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; + sumo = callPackage ../development/python-modules/sumo { }; - maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; + sunpy = callPackage ../development/python-modules/sunpy { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; - ovh = callPackage ../development/python-modules/ovh { }; + supervisor = callPackage ../development/python-modules/supervisor { }; - willow = callPackage ../development/python-modules/willow { }; + sure = callPackage ../development/python-modules/sure { }; - importmagic = callPackage ../development/python-modules/importmagic { }; + suseapi = callPackage ../development/python-modules/suseapi { }; - xgboost = callPackage ../development/python-modules/xgboost { - xgboost = pkgs.xgboost; - }; + svg2tikz = callPackage ../development/python-modules/svg2tikz { }; - xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + svglib = callPackage ../development/python-modules/svglib { }; - xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + svg-path = callPackage ../development/python-modules/svg-path { }; - xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; + svgwrite = callPackage ../development/python-modules/svgwrite { }; - xmodem = callPackage ../development/python-modules/xmodem {}; + swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; - xmpppy = callPackage ../development/python-modules/xmpppy {}; + swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; - xstatic = callPackage ../development/python-modules/xstatic {}; + sybil = callPackage ../development/python-modules/sybil { }; - xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox {}; + symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; }; - xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap {}; + sympy = if isPy3k then + callPackage ../development/python-modules/sympy { } + else + callPackage ../development/python-modules/sympy/1_5.nix { }; - xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery {}; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkgconfig systemd; }; - xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload {}; + sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; - xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui {}; + tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments {}; + tables = if isPy3k then + callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; } + else + callPackage ../development/python-modules/tables/3.5.nix { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; - xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { - inherit (pkgs.xorg) xorgserver; - }; + tablib = callPackage ../development/python-modules/tablib { }; - hidapi = callPackage ../development/python-modules/hidapi { - inherit (pkgs) udev libusb1; - }; + tabulate = callPackage ../development/python-modules/tabulate { }; - ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + tadasets = callPackage ../development/python-modules/tadasets { }; - mnemonic = callPackage ../development/python-modules/mnemonic { }; + tag-expressions = callPackage ../development/python-modules/tag-expressions { }; - keepkey = callPackage ../development/python-modules/keepkey { }; + tarman = callPackage ../development/python-modules/tarman { }; - keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; + tasklib = callPackage ../development/python-modules/tasklib { }; - libagent = callPackage ../development/python-modules/libagent { }; + taskw = callPackage ../development/python-modules/taskw { }; - ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + tatsu = callPackage ../development/python-modules/tatsu { }; - ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + tblib = callPackage ../development/python-modules/tblib { }; - ecpy = callPackage ../development/python-modules/ecpy { }; + tbm-utils = callPackage ../development/python-modules/tbm-utils { }; - semver = callPackage ../development/python-modules/semver { }; + telegram = callPackage ../development/python-modules/telegram { }; - ed25519 = callPackage ../development/python-modules/ed25519 { }; + telethon = callPackage ../development/python-modules/telethon { }; - trezor = callPackage ../development/python-modules/trezor { }; + telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; - trezor_agent = callPackage ../development/python-modules/trezor_agent { }; + tempita = callPackage ../development/python-modules/tempita { }; - x11_hash = callPackage ../development/python-modules/x11_hash { }; + tempora = callPackage ../development/python-modules/tempora { }; - termstyle = callPackage ../development/python-modules/termstyle { }; + tenacity = callPackage ../development/python-modules/tenacity { }; - green = callPackage ../development/python-modules/green { }; - - topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 - - w3lib = callPackage ../development/python-modules/w3lib { }; - - queuelib = callPackage ../development/python-modules/queuelib { }; - - scrapy = callPackage ../development/python-modules/scrapy { }; - - scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; - - scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; - - scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; - - pandocfilters = callPackage ../development/python-modules/pandocfilters { }; - - pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; - - htmltreediff = callPackage ../development/python-modules/htmltreediff { }; - - repeated_test = callPackage ../development/python-modules/repeated_test { }; - - Keras = callPackage ../development/python-modules/keras { }; - - keras-applications = callPackage ../development/python-modules/keras-applications { }; - - keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - - Lasagne = callPackage ../development/python-modules/lasagne { }; - - send2trash = callPackage ../development/python-modules/send2trash { }; - - sigtools = callPackage ../development/python-modules/sigtools { }; - - annoy = callPackage ../development/python-modules/annoy { }; - - clize = callPackage ../development/python-modules/clize { }; - - rl-coach = callPackage ../development/python-modules/rl-coach { }; - - zerobin = callPackage ../development/python-modules/zerobin { }; - - tensorflow-estimator = self.tensorflow-estimator_1; - - tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; - - tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; - - tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; - - tensorflow-tensorboard = self.tensorflow-tensorboard_1; - - tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; - - tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; - - tensorflow-bin = self.tensorflow-bin_1; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; @@ -7327,7 +6899,7 @@ in { cudnn = pkgs.cudnn_cudatoolkit_10; }; - tensorflow-build = self.tensorflow-build_1; + tensorflow-bin = self.tensorflow-bin_1; tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 { cudaSupport = pkgs.config.cudaSupport or false; @@ -7349,454 +6921,546 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; }; + tensorflow-build = self.tensorflow-build_1; + + tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; + + tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; + + tensorflow-estimator = self.tensorflow-estimator_1; + + tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; + tensorflow = self.tensorflow_1; tensorflow_1 = self.tensorflow-build_1; tensorflow_2 = self.tensorflow-build_2; - tensorflowWithoutCuda = self.tensorflow.override { - cudaSupport = false; - }; + tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; - tensorflowWithCuda = self.tensorflow.override { - cudaSupport = true; - }; + tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; + + tensorflow-tensorboard = self.tensorflow-tensorboard_1; + + tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; + + tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; }; tensorly = callPackage ../development/python-modules/tensorly { }; + termcolor = callPackage ../development/python-modules/termcolor { }; + + terminado = callPackage ../development/python-modules/terminado { }; + + terminaltables = callPackage ../development/python-modules/terminaltables { }; + + termstyle = callPackage ../development/python-modules/termstyle { }; + + tess = callPackage ../development/python-modules/tess { }; + + tesserocr = callPackage ../development/python-modules/tesserocr { }; + + testfixtures = callPackage ../development/python-modules/testfixtures { }; + + textfsm = callPackage ../development/python-modules/textfsm { }; + + testpath = callPackage ../development/python-modules/testpath { }; + + testrepository = callPackage ../development/python-modules/testrepository { }; + + testresources = callPackage ../development/python-modules/testresources { }; + + testscenarios = callPackage ../development/python-modules/testscenarios { }; + + testtools = callPackage ../development/python-modules/testtools { }; + + test-tube = callPackage ../development/python-modules/test-tube { }; + + textacy = callPackage ../development/python-modules/textacy { }; + + texttable = callPackage ../development/python-modules/texttable { }; + + text-unidecode = callPackage ../development/python-modules/text-unidecode { }; + + textwrap3 = callPackage ../development/python-modules/textwrap3 { }; + tflearn = callPackage ../development/python-modules/tflearn { }; - simpleai = callPackage ../development/python-modules/simpleai { }; + Theano = callPackage ../development/python-modules/Theano rec { + cudaSupport = pkgs.config.cudaSupport or false; + cudnnSupport = cudaSupport; + inherit (pkgs.linuxPackages) nvidia_x11; + }; - word2vec = callPackage ../development/python-modules/word2vec { }; + TheanoWithCuda = self.Theano.override { + cudaSupport = true; + cudnnSupport = true; + }; - tvdb_api = callPackage ../development/python-modules/tvdb_api { }; + TheanoWithoutCuda = self.Theano.override { + cudaSupport = false; + cudnnSupport = false; + }; - sdnotify = callPackage ../development/python-modules/sdnotify { }; + thespian = callPackage ../development/python-modules/thespian { }; - tvnamer = callPackage ../development/python-modules/tvnamer { }; + thinc = callPackage ../development/python-modules/thinc { }; threadpool = callPackage ../development/python-modules/threadpool { }; threadpoolctl = callPackage ../development/python-modules/threadpoolctl { }; - rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; + thrift = callPackage ../development/python-modules/thrift { }; - Yapsy = callPackage ../development/python-modules/yapsy { }; + thumbor = callPackage ../development/python-modules/thumbor { }; - ansi = callPackage ../development/python-modules/ansi { }; + thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; + tkinter = let + py = python.override{x11Support=true;}; + in callPackage ../development/python-modules/tkinter { py = py; }; - pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; + tidylib = callPackage ../development/python-modules/pytidylib { }; - telegram = callPackage ../development/python-modules/telegram { }; + tifffile = callPackage ../development/python-modules/tifffile { }; - python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; + tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; - irc = callPackage ../development/python-modules/irc { }; + tilestache = callPackage ../development/python-modules/tilestache { }; - jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + timelib = callPackage ../development/python-modules/timelib { }; - jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; - jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + timezonefinder = callPackage ../development/python-modules/timezonefinder { }; - jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; + tinycss2 = callPackage ../development/python-modules/tinycss2 { }; - inflect = callPackage ../development/python-modules/inflect { }; + tinycss = callPackage ../development/python-modules/tinycss { }; - more-itertools = if isPy27 then - callPackage ../development/python-modules/more-itertools/2.7.nix { } - else callPackage ../development/python-modules/more-itertools { }; + tinydb = callPackage ../development/python-modules/tinydb { }; - morphys = callPackage ../development/python-modules/morphys { }; + tiros = callPackage ../development/python-modules/tiros { }; - jaraco_functools = if pythonOlder "3.6" then - callPackage ../development/python-modules/jaraco_functools/2.nix { } + tissue = callPackage ../development/python-modules/tissue { }; + + titlecase = callPackage ../development/python-modules/titlecase { }; + + tld = callPackage ../development/python-modules/tld { }; + + tldextract = callPackage ../development/python-modules/tldextract { }; + + tlsh = callPackage ../development/python-modules/tlsh { }; + + tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; + + tls-parser = callPackage ../development/python-modules/tls-parser { }; + + tmdb3 = callPackage ../development/python-modules/tmdb3 { }; + + todoist = callPackage ../development/python-modules/todoist { }; + + toggl-cli = callPackage ../development/python-modules/toggl-cli { }; + + tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + + tokenlib = callPackage ../development/python-modules/tokenlib { }; + + tokenserver = callPackage ../development/python-modules/tokenserver { }; + + toml = callPackage ../development/python-modules/toml { }; + + tomlkit = callPackage ../development/python-modules/tomlkit { }; + + toolz = callPackage ../development/python-modules/toolz { }; + + toposort = callPackage ../development/python-modules/toposort { }; + + topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 + + torchgpipe = callPackage ../development/python-modules/torchgpipe { }; + + torchvision = callPackage ../development/python-modules/torchvision { }; + + tornado = if isPy3k then + callPackage ../development/python-modules/tornado { } else - callPackage ../development/python-modules/jaraco_functools { }; + callPackage ../development/python-modules/tornado/5.nix { }; - jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; + # Used by circus and grab-site, 2020-08-29 + tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - jaraco_stream = if pythonOlder "3.6" - then callPackage ../development/python-modules/jaraco_stream/2.nix { } - else - callPackage ../development/python-modules/jaraco_stream { }; + # Used by luigi, 2020-08-29 + tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; - javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; + towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; - javaproperties = callPackage ../development/python-modules/javaproperties { }; + tox = callPackage ../development/python-modules/tox { }; - tempora= callPackage ../development/python-modules/tempora { }; + tqdm = callPackage ../development/python-modules/tqdm { }; - hypchat = callPackage ../development/python-modules/hypchat { }; + traceback2 = callPackage ../development/python-modules/traceback2 { }; - pivy = callPackage ../development/python-modules/pivy { }; + tracing = callPackage ../development/python-modules/tracing { }; - smugpy = callPackage ../development/python-modules/smugpy { }; + trackpy = callPackage ../development/python-modules/trackpy { }; - smugline = callPackage ../development/python-modules/smugline { }; + traitlets = callPackage ../development/python-modules/traitlets { }; - txaio = callPackage ../development/python-modules/txaio { }; + traits = callPackage ../development/python-modules/traits { }; - ramlfications = callPackage ../development/python-modules/ramlfications { }; + traitsui = callPackage ../development/python-modules/traitsui { }; - yapf = callPackage ../development/python-modules/yapf { }; + traittypes = callPackage ../development/python-modules/traittypes { }; - black = callPackage ../development/python-modules/black { }; + transaction = callPackage ../development/python-modules/transaction { }; - bjoern = callPackage ../development/python-modules/bjoern { }; + transformers = callPackage ../development/python-modules/transformers { }; - autobahn = callPackage ../development/python-modules/autobahn { }; + transforms3d = callPackage ../development/python-modules/transforms3d { }; - jsonref = callPackage ../development/python-modules/jsonref { }; + transip = callPackage ../development/python-modules/transip { }; - whoosh = callPackage ../development/python-modules/whoosh { }; + transitions = callPackage ../development/python-modules/transitions { }; - packet-python = callPackage ../development/python-modules/packet-python { }; + translationstring = callPackage ../development/python-modules/translationstring { }; - pwntools = callPackage ../development/python-modules/pwntools { }; + transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; - ROPGadget = callPackage ../development/python-modules/ROPGadget { }; + treq = callPackage ../development/python-modules/treq { }; - # We need "normal" libxml2 and not the python package by the same name. - pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + trezor_agent = callPackage ../development/python-modules/trezor_agent { }; - unicorn = callPackage ../development/python-modules/unicorn { }; + trezor = callPackage ../development/python-modules/trezor { }; - intervaltree = callPackage ../development/python-modules/intervaltree { }; + trimesh = callPackage ../development/python-modules/trimesh { }; - packaging = callPackage ../development/python-modules/packaging { }; + trio = callPackage ../development/python-modules/trio { }; - preggy = callPackage ../development/python-modules/preggy { }; + trollius = callPackage ../development/python-modules/trollius { }; - prison = callPackage ../development/python-modules/prison { }; + trueskill = callPackage ../development/python-modules/trueskill { }; - pytoml = callPackage ../development/python-modules/pytoml { }; + trustme = callPackage ../development/python-modules/trustme { }; - pypamtest = pkgs.libpam-wrapper.override { - enablePython = true; - inherit python; - }; + trytond = callPackage ../development/python-modules/trytond { }; - pypandoc = callPackage ../development/python-modules/pypandoc { }; + ttystatus = callPackage ../development/python-modules/ttystatus { }; - yamllint = callPackage ../development/python-modules/yamllint { }; + tunigo = callPackage ../development/python-modules/tunigo { }; - yanc = callPackage ../development/python-modules/yanc { }; + TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - yarl = callPackage ../development/python-modules/yarl { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; - solo-python = disabledIf (! pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); + tvnamer = callPackage ../development/python-modules/tvnamer { }; - suseapi = callPackage ../development/python-modules/suseapi { }; + tweepy = callPackage ../development/python-modules/tweepy { }; - tensorboardx = callPackage ../development/python-modules/tensorboardx { }; - - typed-ast = callPackage ../development/python-modules/typed-ast { }; - - stripe = callPackage ../development/python-modules/stripe { }; - - strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; - - strictyaml = callPackage ../development/python-modules/strictyaml { }; + twiggy = callPackage ../development/python-modules/twiggy { }; twilio = callPackage ../development/python-modules/twilio { }; + twill = callPackage ../development/python-modules/twill { }; + + twine = callPackage ../development/python-modules/twine { }; + + twisted = callPackage ../development/python-modules/twisted { }; + + twitter = callPackage ../development/python-modules/twitter { }; + + twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; + + twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; + + twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; + + twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; + + twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; + + twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; + twofish = callPackage ../development/python-modules/twofish { }; + txaio = callPackage ../development/python-modules/txaio { }; + + txamqp = callPackage ../development/python-modules/txamqp { }; + + txdbus = callPackage ../development/python-modules/txdbus { }; + + txgithub = callPackage ../development/python-modules/txgithub { }; + + txrequests = callPackage ../development/python-modules/txrequests { }; + + txtorcon = callPackage ../development/python-modules/txtorcon { }; + + typed-ast = callPackage ../development/python-modules/typed-ast { }; + + typeguard = callPackage ../development/python-modules/typeguard { }; + + typesentry = callPackage ../development/python-modules/typesentry { }; + + typesystem = callPackage ../development/python-modules/typesystem { }; + + typing = callPackage ../development/python-modules/typing { }; + + typing-extensions = callPackage ../development/python-modules/typing-extensions { }; + + typing-inspect = callPackage ../development/python-modules/typing-inspect { }; + + typogrify = callPackage ../development/python-modules/typogrify { }; + + tzlocal = callPackage ../development/python-modules/tzlocal { }; + + uamqp = + callPackage ../development/python-modules/uamqp { inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; }; + + ua-parser = callPackage ../development/python-modules/ua-parser { }; + + uarray = callPackage ../development/python-modules/uarray { }; + + ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; }; + + ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; + + ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; + + ujson = if isPy27 then + callPackage ../development/python-modules/ujson/2.nix { } + else + callPackage ../development/python-modules/ujson { }; + + ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; + + umalqurra = callPackage ../development/python-modules/umalqurra { }; + + umap-learn = callPackage ../development/python-modules/umap-learn { }; + + umemcache = callPackage ../development/python-modules/umemcache { }; + + u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; + + uncertainties = callPackage ../development/python-modules/uncertainties { }; + + uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; + + unicodecsv = callPackage ../development/python-modules/unicodecsv { }; + + unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; + + unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; + + unicorn = callPackage ../development/python-modules/unicorn { }; + + unidecode = callPackage ../development/python-modules/unidecode { }; + + unidiff = callPackage ../development/python-modules/unidiff { }; + + unifi = callPackage ../development/python-modules/unifi { }; + + units = callPackage ../development/python-modules/units { }; + + unittest2 = callPackage ../development/python-modules/unittest2 { }; + + unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; + + unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; + + unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; + + unrpa = callPackage ../development/python-modules/unrpa { }; + + untangle = callPackage ../development/python-modules/untangle { }; + + upass = callPackage ../development/python-modules/upass { }; + + update_checker = callPackage ../development/python-modules/update_checker { }; + + update-copyright = callPackage ../development/python-modules/update-copyright { }; + + update-dotdee = callPackage ../development/python-modules/update-dotdee { }; + + uproot = callPackage ../development/python-modules/uproot { }; + + uproot-methods = callPackage ../development/python-modules/uproot-methods { }; + + uptime = callPackage ../development/python-modules/uptime { }; + uranium = callPackage ../development/python-modules/uranium { }; + uritemplate = callPackage ../development/python-modules/uritemplate { }; + + uritools = callPackage ../development/python-modules/uritools { }; + + urlgrabber = callPackage ../development/python-modules/urlgrabber { }; + + urllib3 = callPackage ../development/python-modules/urllib3 { }; + + urwid = callPackage ../development/python-modules/urwid { }; + + urwidtrees = callPackage ../development/python-modules/urwidtrees { }; + + urwid-readline = callPackage ../development/python-modules/urwid-readline { }; + + usbtmc = callPackage ../development/python-modules/usbtmc { }; + + us = callPackage ../development/python-modules/us { }; + + user-agents = callPackage ../development/python-modules/user-agents { }; + + userpath = callPackage ../development/python-modules/userpath { }; + uuid = callPackage ../development/python-modules/uuid { }; + uvcclient = callPackage ../development/python-modules/uvcclient { }; + + uvicorn = callPackage ../development/python-modules/uvicorn { }; + + uvloop = callPackage ../development/python-modules/uvloop { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; + }; + + validate-email = callPackage ../development/python-modules/validate-email { }; + + validators = callPackage ../development/python-modules/validators { }; + + validictory = callPackage ../development/python-modules/validictory { }; + + variants = callPackage ../development/python-modules/variants { }; + + varint = callPackage ../development/python-modules/varint { }; + + vcrpy = callPackage ../development/python-modules/vcrpy { }; + + vcver = callPackage ../development/python-modules/vcver { }; + + vcversioner = callPackage ../development/python-modules/vcversioner { }; + + vdf = callPackage ../development/python-modules/vdf { }; + + vdirsyncer = callPackage ../development/python-modules/vdirsyncer { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; + inherit (pkgs) pkg-config openssl rustPlatform; + }; + + vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; + + vega = callPackage ../development/python-modules/vega { }; + + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + + venusian = callPackage ../development/python-modules/venusian { }; + + verboselogs = callPackage ../development/python-modules/verboselogs { }; + versioneer = callPackage ../development/python-modules/versioneer { }; + versiontools = callPackage ../development/python-modules/versiontools { }; + + vertica-python = callPackage ../development/python-modules/vertica-python { }; + + veryprettytable = callPackage ../development/python-modules/veryprettytable { }; + + vidstab = callPackage ../development/python-modules/vidstab { }; + viewstate = callPackage ../development/python-modules/viewstate { }; vine = callPackage ../development/python-modules/vine { }; + virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkgconfig; }; + + virtual-display = callPackage ../development/python-modules/virtual-display { }; + + virtualenv = callPackage ../development/python-modules/virtualenv { }; + + virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; + + virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; + visitor = callPackage ../development/python-modules/visitor { }; + vispy = callPackage ../development/python-modules/vispy { }; + + vmprof = callPackage ../development/python-modules/vmprof { }; + + vobject = callPackage ../development/python-modules/vobject { }; + + voluptuous = callPackage ../development/python-modules/voluptuous { }; + + voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; + + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; + + vsts = callPackage ../development/python-modules/vsts { }; + + vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; + vtk = toPythonModule (pkgs.vtk_7.override { inherit (self) python; enablePython = true; }); - whitenoise = callPackage ../development/python-modules/whitenoise { }; + vultr = callPackage ../development/python-modules/vultr { }; - XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; + vulture = callPackage ../development/python-modules/vulture { }; - yowsup = callPackage ../development/python-modules/yowsup { }; + vxi11 = callPackage ../development/python-modules/vxi11 { }; - yubico-client = callPackage ../development/python-modules/yubico-client { }; + w3lib = callPackage ../development/python-modules/w3lib { }; - wptserve = callPackage ../development/python-modules/wptserve { }; + wadllib = callPackage ../development/python-modules/wadllib { }; - yenc = callPackage ../development/python-modules/yenc { }; + waitress = callPackage ../development/python-modules/waitress { }; - zeep = callPackage ../development/python-modules/zeep { }; + waitress-django = callPackage ../development/python-modules/waitress-django { }; - zeitgeist = disabledIf isPy3k - (toPythonModule (pkgs.zeitgeist.override{python2Packages=self;})).py; + wakeonlan = callPackage ../development/python-modules/wakeonlan { }; - zeroconf = callPackage ../development/python-modules/zeroconf { }; + Wand = callPackage ../development/python-modules/Wand { }; - zipfile36 = callPackage ../development/python-modules/zipfile36 { }; - - todoist = callPackage ../development/python-modules/todoist { }; - - zstd = callPackage ../development/python-modules/zstd { - inherit (pkgs) zstd pkgconfig; - }; - - zstandard = callPackage ../development/python-modules/zstandard { }; - - zxcvbn = callPackage ../development/python-modules/zxcvbn { }; - - incremental = callPackage ../development/python-modules/incremental { }; - - treq = callPackage ../development/python-modules/treq { }; - - snakeviz = callPackage ../development/python-modules/snakeviz { }; - - nitpick = callPackage ../applications/version-management/nitpick { }; - - pluginbase = callPackage ../development/python-modules/pluginbase { }; - - node-semver = callPackage ../development/python-modules/node-semver { }; - - diskcache = callPackage ../development/python-modules/diskcache { }; - - dissononce = callPackage ../development/python-modules/dissononce { }; - - distro = callPackage ../development/python-modules/distro { }; - - bz2file = callPackage ../development/python-modules/bz2file { }; - - smart_open = callPackage ../development/python-modules/smart_open { }; - - gensim = callPackage ../development/python-modules/gensim { }; - - genpy = callPackage ../development/python-modules/genpy { }; - - cymem = callPackage ../development/python-modules/cymem { }; - - ftfy = callPackage ../development/python-modules/ftfy { }; - - murmurhash = callPackage ../development/python-modules/murmurhash { }; - - pkuseg = callPackage ../development/python-modules/pkuseg { }; - - plac = callPackage ../development/python-modules/plac { }; - - preshed = callPackage ../development/python-modules/preshed { }; - - backports_weakref = callPackage ../development/python-modules/backports_weakref { }; - - blis = callPackage ../development/python-modules/blis { }; - - srsly = callPackage ../development/python-modules/srsly { }; - - thinc = callPackage ../development/python-modules/thinc { }; - - wasabi = callPackage ../development/python-modules/wasabi { }; - - yahooweather = callPackage ../development/python-modules/yahooweather { }; - - somajo = callPackage ../development/python-modules/somajo { }; - - spacy = callPackage ../development/python-modules/spacy { }; - - spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; - - pyspark = callPackage ../development/python-modules/pyspark { }; - - pysensors = callPackage ../development/python-modules/pysensors { }; - - python-toolbox = callPackage ../development/python-modules/python-toolbox { }; - - pysnooper = callPackage ../development/python-modules/pysnooper { }; - - sseclient = callPackage ../development/python-modules/sseclient { }; + warlock = callPackage ../development/python-modules/warlock { }; warrant = callPackage ../development/python-modules/warrant { }; - textacy = callPackage ../development/python-modules/textacy { }; + wasabi = callPackage ../development/python-modules/wasabi { }; - tld = callPackage ../development/python-modules/tld { }; + watchdog = callPackage ../development/python-modules/watchdog { }; - tldextract = callPackage ../development/python-modules/tldextract { }; + WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; - transip = callPackage ../development/python-modules/transip { }; + wcwidth = callPackage ../development/python-modules/wcwidth { }; - pyemd = callPackage ../development/python-modules/pyemd { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; - openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + webapp2 = callPackage ../development/python-modules/webapp2 { }; - pulp = callPackage ../development/python-modules/pulp { }; + webassets = callPackage ../development/python-modules/webassets { }; - pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + web = callPackage ../development/python-modules/web { }; - behave = callPackage ../development/python-modules/behave { }; + webcolors = callPackage ../development/python-modules/webcolors { }; - bellows = callPackage ../development/python-modules/bellows { }; + webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; - pyhamcrest = if isPy3k then - callPackage ../development/python-modules/pyhamcrest { } - else - callPackage ../development/python-modules/pyhamcrest/1.nix { }; + webencodings = callPackage ../development/python-modules/webencodings { }; - pyhaversion = callPackage ../development/python-modules/pyhaversion { }; + webhelpers = callPackage ../development/python-modules/webhelpers { }; - parse = callPackage ../development/python-modules/parse { }; + webob = callPackage ../development/python-modules/webob { }; - parse-type = callPackage ../development/python-modules/parse-type { }; - - ephem = callPackage ../development/python-modules/ephem { }; - - voluptuous = callPackage ../development/python-modules/voluptuous { }; - - voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; - - pysigset = callPackage ../development/python-modules/pysigset { }; - - us = callPackage ../development/python-modules/us { }; - - wsproto = if (pythonAtLeast "3.6") then - callPackage ../development/python-modules/wsproto { } - else - callPackage ../development/python-modules/wsproto/0.14.nix { }; - - h11 = callPackage ../development/python-modules/h11 { }; - - python-docx = callPackage ../development/python-modules/python-docx { }; - - python-doi = callPackage ../development/python-modules/python-doi { }; - - aiohue = callPackage ../development/python-modules/aiohue { }; - - PyMVGLive = callPackage ../development/python-modules/pymvglive { }; - - coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; - - pyowm = callPackage ../development/python-modules/pyowm { }; - - prometheus_client = callPackage ../development/python-modules/prometheus_client { }; - - pysdl2 = callPackage ../development/python-modules/pysdl2 { }; - - pyogg = callPackage ../development/python-modules/pyogg { }; - - rubymarshal = callPackage ../development/python-modules/rubymarshal { }; - - radio_beam = callPackage ../development/python-modules/radio_beam { }; - - spectral-cube = callPackage ../development/python-modules/spectral-cube { }; - - astunparse = callPackage ../development/python-modules/astunparse { }; - - gast = callPackage ../development/python-modules/gast { }; - - ibis = callPackage ../development/python-modules/ibis { }; - - ibis-framework = callPackage ../development/python-modules/ibis-framework { }; - - qiskit = callPackage ../development/python-modules/qiskit { }; - - qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; - - qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - - qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; - - qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; - - qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; - - qasm2image = callPackage ../development/python-modules/qasm2image { }; - - simpy = callPackage ../development/python-modules/simpy { }; - - x256 = callPackage ../development/python-modules/x256 { }; - - yattag = callPackage ../development/python-modules/yattag { }; - - xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); - - z3 = (toPythonModule (pkgs.z3.override { - inherit python; - })).python; - - zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; - - zm-py = callPackage ../development/python-modules/zm-py { }; - - rfc7464 = callPackage ../development/python-modules/rfc7464 { }; - - foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; - foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; - foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; - foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; - - libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { - inherit python; - })).python; - - libiio = (toPythonModule (pkgs.libiio.override { - inherit python; - })).python; - - localzone = callPackage ../development/python-modules/localzone { }; - - scour = callPackage ../development/python-modules/scour { }; - - pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 - - nanoleaf = callPackage ../development/python-modules/nanoleaf { }; - - nanotime = callPackage ../development/python-modules/nanotime { }; - - importlib-metadata = callPackage ../development/python-modules/importlib-metadata {}; - - importlib-resources = callPackage ../development/python-modules/importlib-resources {}; - - srptools = callPackage ../development/python-modules/srptools { }; - - srp = callPackage ../development/python-modules/srp { }; - - curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; - - pyatv = callPackage ../development/python-modules/pyatv { }; - - pybotvac = callPackage ../development/python-modules/pybotvac { }; - - pymetno = callPackage ../development/python-modules/pymetno { }; - - pytado = callPackage ../development/python-modules/pytado { }; - - casttube = callPackage ../development/python-modules/casttube { }; - - lzstring = callPackage ../development/python-modules/lzstring { }; - - flickrapi = callPackage ../development/python-modules/flickrapi { }; - - aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; - - mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; - - starlette = callPackage ../development/python-modules/starlette { }; - - uvicorn = callPackage ../development/python-modules/uvicorn { }; - - pydantic = callPackage ../development/python-modules/pydantic { }; - - fastapi = callPackage ../development/python-modules/fastapi { }; - - stringcase = callPackage ../development/python-modules/stringcase { }; + weboob = callPackage ../development/python-modules/weboob { }; webrtcvad = callPackage ../development/python-modules/webrtcvad { }; - pykwalify = callPackage ../development/python-modules/pykwalify { }; + websocket_client = callPackage ../development/python-modules/websocket_client { }; + + websockets = callPackage ../development/python-modules/websockets { }; + + websockify = callPackage ../development/python-modules/websockify { }; + + webtest = callPackage ../development/python-modules/webtest { }; + + werkzeug = callPackage ../development/python-modules/werkzeug { }; west = callPackage ../development/python-modules/west { }; @@ -7804,17 +7468,310 @@ in { wget = callPackage ../development/python-modules/wget { }; - runway-python = callPackage ../development/python-modules/runway-python { }; + wheel = callPackage ../development/python-modules/wheel { }; - pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; - hcloud = callPackage ../development/python-modules/hcloud { }; + whisper = callPackage ../development/python-modules/whisper { }; - managesieve = callPackage ../development/python-modules/managesieve { }; + whitenoise = callPackage ../development/python-modules/whitenoise { }; - pony = callPackage ../development/python-modules/pony { }; + whoosh = callPackage ../development/python-modules/whoosh { }; - rxv = callPackage ../development/python-modules/rxv { }; + widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; + + willow = callPackage ../development/python-modules/willow { }; + + word2vec = callPackage ../development/python-modules/word2vec { }; + + wordcloud = callPackage ../development/python-modules/wordcloud { }; + + wordfreq = callPackage ../development/python-modules/wordfreq { }; + + worldengine = callPackage ../development/python-modules/worldengine { }; + + wptserve = callPackage ../development/python-modules/wptserve { }; + + wrapt = callPackage ../development/python-modules/wrapt { }; + + wrf-python = callPackage ../development/python-modules/wrf-python { }; + + ws4py = callPackage ../development/python-modules/ws4py { }; + + wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; + + WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; + + wsgitools = callPackage ../development/python-modules/wsgitools { }; + + WSME = callPackage ../development/python-modules/WSME { }; + + wsproto = if (pythonAtLeast "3.6") then + callPackage ../development/python-modules/wsproto { } + else + callPackage ../development/python-modules/wsproto/0.14.nix { }; + + wtforms = callPackage ../development/python-modules/wtforms { }; + + wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; + + wurlitzer = callPackage ../development/python-modules/wurlitzer { }; + + wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { + wxGTK = pkgs.wxGTK30; + inherit (pkgs) pkgconfig; + }; + + wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { + inherit (pkgs) pkgconfig; + wxGTK = pkgs.wxGTK30.override { + withGtk2 = false; + withWebKit = true; + }; + }; + + wxPython = self.wxPython30; + + x11_hash = callPackage ../development/python-modules/x11_hash { }; + + x256 = callPackage ../development/python-modules/x256 { }; + + xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; + + xapp = callPackage ../development/python-modules/xapp { + inherit (pkgs) gtk3 gobject-introspection polkit; + inherit (pkgs.cinnamon) xapps; + }; + + xarray = callPackage ../development/python-modules/xarray { }; + + xattr = callPackage ../development/python-modules/xattr { }; + + xcaplib = callPackage ../development/python-modules/xcaplib { }; + + xcffib = callPackage ../development/python-modules/xcffib { }; + + xdg = callPackage ../development/python-modules/xdg { }; + + xdis = callPackage ../development/python-modules/xdis { }; + + xdot = callPackage ../development/python-modules/xdot { }; + + xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); + + xgboost = callPackage ../development/python-modules/xgboost { xgboost = pkgs.xgboost; }; + + xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + + xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + + xlib = callPackage ../development/python-modules/xlib { }; + + xlrd = callPackage ../development/python-modules/xlrd { }; + + xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; + + XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; + + xlwt = callPackage ../development/python-modules/xlwt { }; + + xml2rfc = callPackage ../development/python-modules/xml2rfc { }; + + xmlschema = callPackage ../development/python-modules/xmlschema { }; + + xmltodict = callPackage ../development/python-modules/xmltodict { }; + + xmodem = callPackage ../development/python-modules/xmodem { }; + + xmpppy = callPackage ../development/python-modules/xmpppy { }; + + xnd = callPackage ../development/python-modules/xnd { }; + + xpybutil = callPackage ../development/python-modules/xpybutil { }; + + xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox { }; + + xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap { }; + + xstatic = callPackage ../development/python-modules/xstatic { }; + + xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery { }; + + xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload { }; + + xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui { }; + + xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments { }; + + xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { inherit (pkgs.xorg) xorgserver; }; + + xxhash = callPackage ../development/python-modules/xxhash { }; + + yahooweather = callPackage ../development/python-modules/yahooweather { }; + + yamllint = callPackage ../development/python-modules/yamllint { }; + + yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { }; + + yanc = callPackage ../development/python-modules/yanc { }; + + yapf = callPackage ../development/python-modules/yapf { }; + + yappi = callPackage ../development/python-modules/yappi { }; + + Yapsy = callPackage ../development/python-modules/yapsy { }; + + yarg = callPackage ../development/python-modules/yarg { }; + + yarl = callPackage ../development/python-modules/yarl { }; + + yattag = callPackage ../development/python-modules/yattag { }; + + ydiff = callPackage ../development/python-modules/ydiff { }; + + yeelight = callPackage ../development/python-modules/yeelight { }; + + yenc = callPackage ../development/python-modules/yenc { }; + + yfinance = callPackage ../development/python-modules/yfinance { }; + + yoda = toPythonModule (pkgs.yoda.override { inherit python; }); + + youtube-dl = callPackage ../tools/misc/youtube-dl { }; + + youtube-dl-light = callPackage ../tools/misc/youtube-dl { + ffmpegSupport = false; + phantomjsSupport = false; + }; + + yowsup = callPackage ../development/python-modules/yowsup { }; + + yq = callPackage ../development/python-modules/yq { }; + + yt = callPackage ../development/python-modules/yt { }; + + yubico-client = callPackage ../development/python-modules/yubico-client { }; + + z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; + + z3 = (toPythonModule (pkgs.z3.override { inherit python; })).python; + + zake = callPackage ../development/python-modules/zake { }; + + zarr = callPackage ../development/python-modules/zarr { }; + + zbase32 = callPackage ../development/python-modules/zbase32 { }; + + zc_buildout221 = callPackage ../development/python-modules/buildout { }; + + zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix + + zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; + + zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; + + zconfig = callPackage ../development/python-modules/zconfig { }; + + zdaemon = callPackage ../development/python-modules/zdaemon { }; + + zeep = callPackage ../development/python-modules/zeep { }; + + zeitgeist = disabledIf isPy3k (toPythonModule (pkgs.zeitgeist.override { python2Packages = self; })).py; + + zerobin = callPackage ../development/python-modules/zerobin { }; + + zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; + + zeroconf = callPackage ../development/python-modules/zeroconf { }; + + zerorpc = callPackage ../development/python-modules/zerorpc { }; + + zetup = callPackage ../development/python-modules/zetup { }; + + zfec = callPackage ../development/python-modules/zfec { }; + + zha-quirks = callPackage ../development/python-modules/zha-quirks { }; + + zict = callPackage ../development/python-modules/zict { }; + + zigpy = callPackage ../development/python-modules/zigpy { }; + + zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + + zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + + zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + + zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + + zimports = callPackage ../development/python-modules/zimports { }; + + zipfile36 = callPackage ../development/python-modules/zipfile36 { }; + + zipp = if pythonOlder "3.6" then + callPackage ../development/python-modules/zipp/1.nix { } + else + callPackage ../development/python-modules/zipp { }; + + zipstream = callPackage ../development/python-modules/zipstream { }; + + zm-py = callPackage ../development/python-modules/zm-py { }; + + zodb = callPackage ../development/python-modules/zodb { }; + + zodbpickle = callPackage ../development/python-modules/zodbpickle { }; + + zope_broken = callPackage ../development/python-modules/zope_broken { }; + + zope_component = callPackage ../development/python-modules/zope_component { }; + + zope_configuration = callPackage ../development/python-modules/zope_configuration { }; + + zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; + + zope_copy = callPackage ../development/python-modules/zope_copy { }; + + zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { }; + + zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; + + zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; + + zope_event = callPackage ../development/python-modules/zope_event { }; + + zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; + + zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; + + zope-hookable = callPackage ../development/python-modules/zope-hookable { }; + + zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; + + zope_interface = callPackage ../development/python-modules/zope_interface { }; + + zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; + + zope_location = callPackage ../development/python-modules/zope_location { }; + + zope_proxy = callPackage ../development/python-modules/zope_proxy { }; + + zope_schema = callPackage ../development/python-modules/zope_schema { }; + + zope_size = callPackage ../development/python-modules/zope_size { }; + + zope_testing = callPackage ../development/python-modules/zope_testing { }; + + zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; + + zopfli = callPackage ../development/python-modules/zopfli { }; + + zstandard = callPackage ../development/python-modules/zstandard { }; + + zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkgconfig; }; + + zulip = callPackage ../development/python-modules/zulip { }; + + zxcvbn = callPackage ../development/python-modules/zxcvbn { }; }); diff --git a/third_party/nixpkgs/pkgs/top-level/release-cross.nix b/third_party/nixpkgs/pkgs/top-level/release-cross.nix index af4dab5d26..df476db0a7 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-cross.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-cross.nix @@ -5,9 +5,11 @@ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; +with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let nativePlatforms = all; diff --git a/third_party/nixpkgs/pkgs/top-level/release-python.nix b/third_party/nixpkgs/pkgs/top-level/release-python.nix index 8b7240e21a..4854103560 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-python.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-python.nix @@ -5,9 +5,11 @@ { # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix {inherit supportedSystems; }; +with import ./release-lib.nix {inherit supportedSystems nixpkgsArgs; }; with lib; let diff --git a/third_party/nixpkgs/pkgs/top-level/release-small.nix b/third_party/nixpkgs/pkgs/top-level/release-small.nix index 031acba4d2..41aa86a8c4 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-small.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-small.nix @@ -3,9 +3,11 @@ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix { inherit supportedSystems; }; +with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; { @@ -38,7 +40,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; dhcp = linux; diffutils = all; e2fsprogs = linux; - emacs25 = linux; + emacs = linux; enscript = all; file = all; findutils = all; diff --git a/third_party/nixpkgs/pkgs/top-level/stage.nix b/third_party/nixpkgs/pkgs/top-level/stage.nix index 9e07d2bf06..58b0300cc7 100644 --- a/third_party/nixpkgs/pkgs/top-level/stage.nix +++ b/third_party/nixpkgs/pkgs/top-level/stage.nix @@ -215,6 +215,7 @@ let crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { + isStatic = true; parsed = stdenv.hostPlatform.parsed // { abi = { gnu = lib.systems.parse.abis.musl; diff --git a/third_party/nixpkgs/pkgs/top-level/static.nix b/third_party/nixpkgs/pkgs/top-level/static.nix index ca64c4d975..4fa5b92e95 100644 --- a/third_party/nixpkgs/pkgs/top-level/static.nix +++ b/third_party/nixpkgs/pkgs/top-level/static.nix @@ -191,6 +191,9 @@ in { gsm = super.gsm.override { staticSupport = true; }; + crc32c = super.crc32c.override { + staticOnly = true; + }; parted = super.parted.override { enableStatic = true; };